[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.6.2-exp-1-50-g27fb965

Niels Thykier nthykier at alioth.debian.org
Mon Aug 8 21:10:31 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  27fb96571802e0b439f32e697f73ea805f49f406 (commit)
       via  677d581ee580c9bd86a19b321a75497d02969503 (commit)
       via  777da51ec118173e721142a1ab3fdf15ab6e74f0 (commit)
       via  0c6dea33e33cbba78091790077572cfae5bc1bc9 (commit)
      from  a2ce4020c2365efdc5a45c1579d8ec17b0fd6c0b (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 27fb96571802e0b439f32e697f73ea805f49f406
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Aug 8 23:09:40 2011 +0200

    Updated packaging to ensure a sane build environment

commit 677d581ee580c9bd86a19b321a75497d02969503
Merge: 777da51 0c6dea3
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Aug 8 22:50:38 2011 +0200

    Merge branch 'upstream'

commit 777da51ec118173e721142a1ab3fdf15ab6e74f0
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Aug 8 22:50:19 2011 +0200

    Imported eclipse 3.7~exp packaging

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

Summary of changes:
 .project                                           |   11 +
 ChangeLog                                          |   56 +
 bootstrap/configuration/config.ini                 |    2 +
 build.properties                                   |   10 +-
 build.xml                                          |  149 +-
 buildEclipseBuildSource.sh                         |    4 +-
 buildSDKSource.sh                                  |   23 +-
 debian/changelog                                   |    4 +
 debian/control                                     |    5 +-
 debian/eclipse-build-generatedScripts.tar.bz2      |  Bin 14413 -> 0 bytes
 debian/eclipse-platform-data.install               |    6 +
 debian/eclipse-platform.install                    |    4 +
 debian/rules                                       |    1 +
 dependencies.properties                            |   18 +-
 .../META-INF/MANIFEST.MF                           | 4238 -----------
 .../META-INF/MANIFEST.MF                           |   28 +
 .../META-INF/MANIFEST.MF                           |  360 -
 .../META-INF/MANIFEST.MF                           |  173 -
 .../META-INF/MANIFEST.MF                           |   13 +
 .../META-INF/MANIFEST.MF                           |  209 -
 .../META-INF/MANIFEST.MF                           |   11 +
 .../META-INF/MANIFEST.MF                           |  119 -
 .../META-INF/MANIFEST.MF                           |   13 +
 .../META-INF/MANIFEST.MF                           |   86 -
 .../META-INF/MANIFEST.MF                           |   11 +
 .../META-INF/MANIFEST.MF                           |  111 -
 .../META-INF/MANIFEST.MF                           |  462 ++
 .../META-INF/MANIFEST.MF                           | 2348 +++++++
 .../META-INF/MANIFEST.MF                           |  916 ---
 .../META-INF/MANIFEST.MF                           |  520 --
 .../META-INF/MANIFEST.MF                           |  519 ++
 .../META-INF/MANIFEST.MF                           |  544 --
 .../META-INF/MANIFEST.MF                           |   30 +
 .../META-INF/MANIFEST.MF                           |  304 -
 .../META-INF/MANIFEST.MF                           |   25 +
 eclipse-build-additionalArchs.tar.bz2              |  Bin 96235 -> 96412 bytes
 eclipse-build-config/.project                      |   11 +
 eclipse-build-config/ChangeLog                     |    4 +
 eclipse-build-config/build.properties.in           |    1 -
 .../productFiles/platform.sdk/platform.product     |    8 +-
 .../productFiles/platform/platform.product         |    2 +-
 .../productFiles/rcp.sdk/rcp.product               |    8 +-
 eclipse-build-config/productFiles/rcp/rcp.product  |   10 +-
 .../productFiles/rcpConfig/buildConfiguration.xml  |    3 +-
 .../productFiles/rcpConfig/feature.xml             |    2 +-
 eclipse-build-config/productFiles/sdk/p2.inf       |    8 +-
 eclipse-build-config/productFiles/sdk/sdk.product  |    8 +-
 eclipse-build-feature/.project                     |   11 +
 eclipse-build-generatedScripts.tar.bz2             |  Bin 21498 -> 22113 bytes
 eclipse/directory.txt                              |  937 ++--
 eclipse/featureVersions.properties                 |   81 +-
 eclipse/features/com.ibm.icu.base/.project         |   11 +
 eclipse/features/com.ibm.icu.base/feature.xml      |    2 +-
 eclipse/features/master-ecf/build.properties       |    2 +-
 .../features/master-equinox-p2/build.properties    |    2 +-
 eclipse/features/master-equinox-p2/feature.xml     |    4 +-
 .../master-equinox-weaving/build.properties        |    2 +-
 .../features/master-equinox-weaving/feature.xml    |    2 +-
 eclipse/features/master-equinox/build.properties   |    2 +-
 eclipse/features/master-equinox/feature.xml        |   44 +-
 eclipse/features/master-jetty/feature.xml          |    4 +-
 eclipse/features/master/feature.xml                |   22 +-
 .../org.eclipse.core.runtime.feature/.project      |   17 +
 .../build.properties                               |    2 +
 .../feature.properties                             |   33 +
 .../org.eclipse.core.runtime.feature/feature.xml   |   61 +
 eclipse/features/org.eclipse.cvs/build.properties  |    4 +-
 eclipse/features/org.eclipse.cvs/epl-v10.html      |  328 -
 .../features/org.eclipse.cvs/feature.properties    |  145 +-
 eclipse/features/org.eclipse.cvs/feature.xml       |   14 +-
 eclipse/features/org.eclipse.cvs/license.html      |  107 -
 .../features/org.eclipse.cvs/rootfiles/notice.html |  161 +-
 .../sourceTemplateFeature/epl-v10.html             |  328 -
 .../sourceTemplateFeature/feature.properties       |  138 +-
 .../sourceTemplateFeature/license.html             |  107 -
 .../sourceTemplatePlugin/about.properties          |    4 +-
 .../build.properties                               |    5 +-
 .../epl-v10.html                                   |  328 -
 .../feature.properties                             |  135 +-
 .../org.eclipse.equinox.compendium.sdk/feature.xml |   20 +-
 .../license.html                                   |  107 -
 .../org.eclipse.equinox.core.feature/.project      |   17 +
 .../build.properties                               |   14 +
 .../feature.properties                             |   33 +
 .../org.eclipse.equinox.core.feature/feature.xml   |   80 +
 .../org.eclipse.equinox.core.sdk/build.properties  |    5 +-
 .../org.eclipse.equinox.core.sdk/epl-v10.html      |  328 -
 .../feature.properties                             |  135 +-
 .../org.eclipse.equinox.core.sdk/feature.xml       |   27 +-
 .../org.eclipse.equinox.core.sdk/license.html      |  107 -
 .../org.eclipse.equinox.executable/.cproject       |  111 +-
 .../org.eclipse.equinox.executable/.project        |    8 +-
 .../.settings/org.eclipse.cdt.core.prefs           |  275 +-
 .../macosx/ppc/Eclipse.app/Contents/Info.plist     |    6 +-
 .../macosx/x86/Eclipse.app/Contents/Info.plist     |    6 +-
 .../macosx/ppc/Eclipse.app/Contents/Info.plist     |    6 +-
 .../macosx/x86/Eclipse.app/Contents/Info.plist     |    6 +-
 .../macosx/x86_64/Eclipse.app/Contents/Info.plist  |    6 +-
 .../build.properties                               |    4 +-
 .../org.eclipse.equinox.executable/epl-v10.html    |  328 -
 .../feature.properties                             |  133 +-
 .../org.eclipse.equinox.executable/feature.xml     |   47 +-
 .../library/carbon/build.sh                        |    2 +-
 .../library/carbon/eclipseCarbon.c                 |    2 +-
 .../library/carbon/eclipseCarbonCommon.c           |    2 +-
 .../library/carbon/eclipseCarbonMain.c             |    2 +-
 .../library/carbon/eclipseMain.c                   |    2 +-
 .../library/carbon/make_carbon.mak                 |    2 +-
 .../library/eclipse.c                              |  102 +-
 .../library/eclipseCommon.c                        |    6 +-
 .../library/eclipseConfig.c                        |   25 +-
 .../library/eclipseConfig.h                        |   15 +-
 .../library/eclipseMain.c                          |   27 +-
 .../library/eclipseMozilla.c                       |   88 +-
 .../library/eclipseMozilla.h                       |    2 +-
 .../library/eclipseNix.c                           |    2 +-
 .../library/eclipseOS.h                            |    2 +-
 .../library/eclipseShm.c                           |    2 +-
 .../library/eclipseShm.h                           |    2 +-
 .../library/eclipseUnicode.h                       |    2 +-
 .../library/eclipseUtil.c                          |   45 +-
 .../library/eclipseUtil.h                          |    9 +-
 .../library/gtk/build.sh                           |   25 +-
 .../library/gtk/eclipse.ini                        |    4 -
 .../library/gtk/eclipseGtk.c                       |   43 +-
 .../library/gtk/eclipseGtk.h                       |    6 +-
 .../library/gtk/eclipseGtkCommon.c                 |    2 +-
 .../library/gtk/eclipseGtkInit.c                   |   20 +-
 .../library/gtk/make_aix.mak                       |   16 +-
 .../library/gtk/make_hpux.mak                      |   99 +
 .../library/gtk/make_linux.mak                     |    2 +-
 .../library/gtk/make_solaris.mak                   |    2 +-
 .../library/make_version.mak                       |    4 +-
 .../library/motif/NgCommon.c                       |    2 +-
 .../library/motif/NgCommon.h                       |    2 +-
 .../library/motif/NgImage.c                        |    2 +-
 .../library/motif/NgImage.h                        |    2 +-
 .../library/motif/NgImageData.c                    |    2 +-
 .../library/motif/NgImageData.h                    |    2 +-
 .../library/motif/NgWinBMPFileFormat.c             |    2 +-
 .../library/motif/NgWinBMPFileFormat.h             |    2 +-
 .../library/motif/build.sh                         |    2 +-
 .../library/motif/eclipseMotif.c                   |    2 +-
 .../library/motif/eclipseMotifInit.c               |    8 +-
 .../library/motif/make_hpux_PA_RISC.mak            |    2 +-
 .../library/motif/make_hpux_ia64_32.mak            |    2 +-
 .../library/motif/make_linux.mak                   |    2 +-
 .../library/motif/make_solaris.mak                 |    2 +-
 .../library/photon/build.sh                        |    2 +-
 .../library/photon/eclipsePhoton.c                 |    2 +-
 .../library/photon/make_qnx.mak                    |    2 +-
 .../library/win32/build.bat                        |    2 +-
 .../library/win32/build.sh                         |    2 +-
 .../library/win32/eclipse.rc                       |    2 +-
 .../library/win32/eclipseWin.c                     |    2 +-
 .../library/win32/eclipseWinCommon.c               |    2 +-
 .../library/win32/make_mingw.mak                   |    2 +-
 .../library/wpf/build.bat                          |    2 +-
 .../library/wpf/eclipse.rc                         |    2 +-
 .../library/wpf/eclipseWpf.cpp                     |    2 +-
 .../library/wpf/eclipseWpfCommon.cpp               |    2 +-
 .../library/wpf/make_wpf.mak                       |    2 +-
 .../org.eclipse.equinox.executable/license.html    |  107 -
 .../target.build.properties                        |    2 +
 .../target.build.xml                               |   21 +-
 .../org.eclipse.equinox.incubator.feature/.project |   11 +
 .../build.properties                               |   20 +
 .../eclipse_update_120.jpg                         |  Bin 21695 -> 21695 bytes
 .../feature.properties                             |   23 +
 .../feature.xml                                    |   77 +
 .../build.properties                               |    2 +-
 .../feature.xml                                    |    8 +-
 .../sourceTemplateFeature/build.properties         |   14 +
 .../sourceTemplateFeature}/eclipse_update_120.jpg  |  Bin 21695 -> 21695 bytes
 .../sourceTemplateFeature/feature.properties       |   38 +
 .../build.properties                               |   10 +
 .../feature.xml                                    |    6 +-
 .../sourceTemplateFeature/build.properties         |   15 +
 .../sourceTemplateFeature}/eclipse_update_120.jpg  |  Bin 21695 -> 21695 bytes
 .../sourceTemplateFeature/feature.properties       |   38 +
 .../build.properties                               |    2 +-
 .../feature.xml                                    |    8 +-
 .../sourceTemplateFeature/build.properties         |   14 +
 .../sourceTemplateFeature}/eclipse_update_120.jpg  |  Bin 21695 -> 21695 bytes
 .../sourceTemplateFeature/feature.properties       |   38 +
 .../org.eclipse.equinox.p2.core.feature/.project   |   17 +
 .../build.properties                               |   15 +
 .../eclipse_update_120.jpg                         |  Bin 21695 -> 21695 bytes
 .../feature.properties                             |   35 +
 .../feature.xml                                    |  286 +
 .../org.eclipse.equinox.p2.core.feature/pom.xml    |   14 +
 .../sourceTemplateFeature/build.properties         |   13 +
 .../sourceTemplateFeature/feature.properties       |   38 +
 .../build.properties                               |    4 +-
 .../epl-v10.html                                   |  328 -
 .../feature.properties                             |  137 +-
 .../feature.xml                                    |    6 +-
 .../license.html                                   |  107 -
 .../pom.xml                                        |   14 +
 .../sourceTemplateFeature/build.properties         |    2 +-
 .../sourceTemplateFeature/epl-v10.html             |  328 -
 .../sourceTemplateFeature/feature.properties       |  109 +-
 .../sourceTemplateFeature/license.html             |   79 -
 .../org.eclipse.equinox.p2.extras.feature/.project |   17 +
 .../build.properties                               |   15 +
 .../eclipse_update_120.jpg                         |  Bin 21695 -> 21695 bytes
 .../feature.properties                             |   35 +
 .../feature.xml                                    |   75 +
 .../org.eclipse.equinox.p2.extras.feature/pom.xml  |   14 +
 .../sourceTemplateFeature/build.properties         |   12 +
 .../sourceTemplateFeature/feature.properties       |   38 +
 .../org.eclipse.equinox.p2.rcp.feature/.project    |   17 +
 .../build.properties                               |   15 +
 .../eclipse_update_120.jpg                         |  Bin 21695 -> 21695 bytes
 .../feature.properties                             |   35 +
 .../org.eclipse.equinox.p2.rcp.feature/feature.xml |   62 +
 .../sourceTemplateFeature/build.properties         |   12 +
 .../sourceTemplateFeature/feature.properties       |   38 +
 .../org.eclipse.equinox.p2.sdk/build.properties    |    7 +-
 .../org.eclipse.equinox.p2.sdk/epl-v10.html        |  328 -
 .../org.eclipse.equinox.p2.sdk/feature.properties  |  137 +-
 .../org.eclipse.equinox.p2.sdk/feature.xml         |   57 +-
 .../org.eclipse.equinox.p2.sdk/license.html        |  113 -
 .../features/org.eclipse.equinox.p2.sdk/pom.xml    |   14 +
 .../build.properties                               |    7 +-
 .../org.eclipse.equinox.p2.user.ui/epl-v10.html    |  328 -
 .../feature.properties                             |  149 +-
 .../org.eclipse.equinox.p2.user.ui/feature.xml     |  317 +-
 .../org.eclipse.equinox.p2.user.ui/license.html    |  113 -
 .../sourceTemplateFeature/build.properties         |   10 +-
 .../sourceTemplateFeature/epl-v10.html             |  328 -
 .../sourceTemplateFeature/feature.properties       |  136 +-
 .../sourceTemplateFeature/license.html             |  113 -
 .../org.eclipse.equinox.sdk/build.properties       |    4 +-
 .../features/org.eclipse.equinox.sdk/epl-v10.html  |  328 -
 .../org.eclipse.equinox.sdk/feature.properties     |  138 +-
 .../features/org.eclipse.equinox.sdk/feature.xml   |   29 +-
 .../features/org.eclipse.equinox.sdk/license.html  |  107 -
 .../build.properties                               |   13 +-
 .../feature.properties                             |  135 +-
 .../org.eclipse.equinox.server.core/feature.xml    |    8 +-
 .../org.eclipse.equinox.server.core/license.html   |  107 -
 .../build.properties                               |   13 +-
 .../feature.properties                             |  135 +-
 .../org.eclipse.equinox.server.jetty/feature.xml   |    7 +-
 .../org.eclipse.equinox.server.jetty/license.html  |  107 -
 .../org.eclipse.equinox.server.p2/build.properties |   22 +-
 .../feature.properties                             |  135 +-
 .../org.eclipse.equinox.server.p2/feature.xml      |   13 +-
 .../org.eclipse.equinox.server.p2/license.html     |  107 -
 .../build.properties                               |   11 +-
 .../feature.properties                             |  135 +-
 .../feature.xml                                    |    6 +-
 .../license.html                                   |  107 -
 .../build.properties                               |   13 +-
 .../feature.properties                             |  135 +-
 .../org.eclipse.equinox.server.simple/feature.xml  |    8 +-
 .../org.eclipse.equinox.server.simple/license.html |  107 -
 .../build.properties                               |    4 +-
 .../epl-v10.html                                   |  328 -
 .../feature.properties                             |  135 +-
 .../org.eclipse.equinox.serverside.sdk/feature.xml |    8 +-
 .../license.html                                   |  107 -
 .../.project                                       |   17 +
 .../build.properties                               |   14 +
 .../feature.properties                             |   33 +
 .../feature.xml                                    |   30 +
 .../product/EclipseRTOSGiStarterKit.product        |  174 +
 .../product/p2.inf                                 |   17 +
 .../rt.icns                                        |  Bin 0 -> 118560 bytes
 .../rt.ico                                         |  Bin 0 -> 22486 bytes
 .../build.properties                               |   14 +-
 .../org.eclipse.equinox.weaving.sdk/epl-v10.html   |  328 -
 .../feature.properties                             |  133 +-
 .../org.eclipse.equinox.weaving.sdk/feature.xml    |    8 +-
 .../org.eclipse.equinox.weaving.sdk/license.html   |  107 -
 eclipse/features/org.eclipse.help/build.properties |    2 -
 .../features/org.eclipse.help/feature.properties   |  136 +-
 eclipse/features/org.eclipse.help/feature.xml      |   26 +-
 eclipse/features/org.eclipse.help/license.html     |  107 -
 .../sourceTemplateFeature/build.properties         |   17 -
 .../sourceTemplateFeature/epl-v10.html             |  328 -
 .../sourceTemplateFeature/feature.properties       |  138 +-
 .../sourceTemplateFeature/license.html             |  107 -
 eclipse/features/org.eclipse.jdt/build.properties  |    6 +-
 eclipse/features/org.eclipse.jdt/epl-v10.html      |  328 -
 .../features/org.eclipse.jdt/feature.properties    |  142 +-
 eclipse/features/org.eclipse.jdt/feature.xml       |   10 +-
 eclipse/features/org.eclipse.jdt/license.html      |  107 -
 .../features/org.eclipse.jdt/rootfiles/notice.html |  161 +-
 .../sourceTemplateFeature/epl-v10.html             |  328 -
 .../sourceTemplateFeature/feature.properties       |  140 +-
 .../sourceTemplateFeature/license.html             |  107 -
 .../sourceTemplatePlugin/about.properties          |    4 +-
 eclipse/features/org.eclipse.license/.project      |   11 +
 .../features/org.eclipse.license/build.properties  |   11 +
 eclipse/features/org.eclipse.license/epl-v10.html  |  261 +
 .../org.eclipse.license/feature.properties         |  159 +
 eclipse/features/org.eclipse.license/feature.xml   |   19 +
 eclipse/features/org.eclipse.license/license.html  |  108 +
 .../build.properties                               |    4 +-
 .../feature.properties                             |  131 -
 .../feature.xml                                    |    6 +-
 .../license.html                                   |  107 -
 .../org.eclipse.pde.api.tools.ee.fragments/p2.inf  |  189 +-
 .../org.eclipse.pde.build.product.feature/.project |   17 +
 .../build.properties                               |    2 +
 .../feature.properties                             |   33 +
 .../feature.xml                                    |   28 +
 .../product/p2.inf                                 |   17 +
 .../product/pdebuild.product                       |   34 +
 .../org.eclipse.pde.junit.runtime.addon/.project   |   17 +
 .../build.properties                               |    2 +
 .../feature.properties                             |   31 +
 .../feature.xml                                    |   30 +
 .../org.eclipse.pde.junit.runtime.addon/pom.xml    |   29 +
 .../.project                                       |   17 +
 .../build.properties                               |    2 +
 .../feature.properties                             |   31 +
 .../feature.xml                                    |   38 +
 .../pom.xml                                        |   29 +
 eclipse/features/org.eclipse.pde/build.properties  |    2 +-
 eclipse/features/org.eclipse.pde/epl-v10.html      |  328 -
 .../features/org.eclipse.pde/feature.properties    |  136 +-
 eclipse/features/org.eclipse.pde/feature.xml       |    6 +-
 eclipse/features/org.eclipse.pde/license.html      |  107 -
 .../sourceTemplateFeature/build.properties         |   16 -
 .../sourceTemplateFeature/epl-v10.html             |  328 -
 .../sourceTemplateFeature/feature.properties       |  140 +-
 .../sourceTemplateFeature/license.html             |  107 -
 .../{linux.gtk.ppc => linux.gtk.ppc64}/about.html  |    0
 .../about_files/IJG_README                         |    0
 .../about_files/about_cairo.html                   |    0
 .../about_files/lgpl-v21.txt                       |    0
 .../about_files/mpl-v11.txt                        |    0
 .../about_files/pixman-licenses.txt                |    0
 .../about_files/linux.motif.x86/about.html         |  265 -
 .../about_files/about_open_motif.html              |   38 -
 .../linux.motif.x86/about_files/mlpl-v10.html      |  401 --
 .../features/org.eclipse.platform/build.properties |   13 +-
 eclipse/features/org.eclipse.platform/epl-v10.html |  328 -
 .../org.eclipse.platform/feature.properties        |  146 +-
 eclipse/features/org.eclipse.platform/feature.xml  |   54 +-
 eclipse/features/org.eclipse.platform/license.html |  107 -
 .../org.eclipse.platform/rootfiles/.eclipseproduct |    2 +-
 .../org.eclipse.platform/rootfiles/notice.html     |  161 +-
 .../rootfiles/readme/readme_eclipse.html           | 2630 +-------
 .../sourceTemplateFeature/build.properties         |   26 +-
 .../sourceTemplateFeature/epl-v10.html             |  328 -
 .../sourceTemplateFeature/feature.properties       |  141 +-
 .../sourceTemplateFeature/license.html             |  107 -
 .../sourceTemplatePlugin/about.properties          |    4 +-
 eclipse/features/org.eclipse.rcp/build.properties  |    2 +-
 eclipse/features/org.eclipse.rcp/epl-v10.html      |  328 -
 .../features/org.eclipse.rcp/feature.properties    |  133 +-
 eclipse/features/org.eclipse.rcp/feature.xml       |  200 +-
 eclipse/features/org.eclipse.rcp/license.html      |  107 -
 .../sourceTemplateFeature/build.properties         |    5 +-
 .../sourceTemplateFeature/epl-v10.html             |  328 -
 .../sourceTemplateFeature/feature.properties       |  138 +-
 .../sourceTemplateFeature/license.html             |  107 -
 .../sourceTemplateFragment/about.html              |   33 -
 .../sourceTemplatePlugin/about.properties          |    4 +-
 .../org.eclipse.releng.tools/feature.properties    |  138 +-
 .../features/org.eclipse.releng.tools/feature.xml  |   16 +-
 eclipse/features/org.eclipse.sdk/build.properties  |   16 +-
 eclipse/features/org.eclipse.sdk/epl-v10.html      |  328 -
 .../features/org.eclipse.sdk/feature.properties    |  139 +-
 eclipse/features/org.eclipse.sdk/feature.xml       |   20 +-
 eclipse/features/org.eclipse.sdk/license.html      |  107 -
 eclipse/label.properties                           |    6 +-
 eclipse/maps/org.eclipse.releng/maps/ant.map       |   14 +-
 eclipse/maps/org.eclipse.releng/maps/compare.map   |   12 +-
 eclipse/maps/org.eclipse.releng/maps/core-hpux.map |    2 +-
 .../maps/org.eclipse.releng/maps/core-macosx.map   |    2 +-
 .../org.eclipse.releng/maps/core-variables.map     |    2 +-
 eclipse/maps/org.eclipse.releng/maps/core.map      |  189 +-
 eclipse/maps/org.eclipse.releng/maps/doc.map       |   10 +-
 .../org.eclipse.releng/maps/equinox-incubator.map  |   20 +-
 eclipse/maps/org.eclipse.releng/maps/feature.map   |   48 +-
 eclipse/maps/org.eclipse.releng/maps/jdtapt.map    |   14 +-
 eclipse/maps/org.eclipse.releng/maps/jdtcore.map   |   16 +-
 eclipse/maps/org.eclipse.releng/maps/jdtdebug.map  |   24 +-
 eclipse/maps/org.eclipse.releng/maps/jdtui.map     |   30 +-
 eclipse/maps/org.eclipse.releng/maps/orbit.map     |  114 +-
 eclipse/maps/org.eclipse.releng/maps/p2.map        |  134 +-
 eclipse/maps/org.eclipse.releng/maps/pde.map       |   52 +-
 eclipse/maps/org.eclipse.releng/maps/rcp.map       |    4 +-
 eclipse/maps/org.eclipse.releng/maps/releng.map    |   20 +-
 eclipse/maps/org.eclipse.releng/maps/swt.map       |   60 +-
 eclipse/maps/org.eclipse.releng/maps/team.map      |   38 +-
 .../maps/org.eclipse.releng/maps/testframework.map |    8 +-
 eclipse/maps/org.eclipse.releng/maps/text.map      |   24 +-
 eclipse/maps/org.eclipse.releng/maps/ui.map        |   60 +-
 eclipse/maps/org.eclipse.releng/maps/update.map    |    4 +-
 .../maps/org.eclipse.releng/maps/userassist.map    |   26 +-
 eclipse/pluginVersions.properties                  |  538 +-
 .../META-INF/ECLIPSEF.RSA                          |  Bin 5639 -> 0 bytes
 .../META-INF/ECLIPSEF.SF                           |  179 -
 .../META-INF/MANIFEST.MF                           |  234 -
 .../org.apache.ant_1.7.1.v20100518-1145/about.html |   62 -
 .../about_files/LICENSE.dom.html                   |   82 -
 .../about_files/LICENSE.sax.txt                    |   20 -
 .../about_files/NOTICE                             |   26 -
 .../org.apache.ant_1.7.1.v20100518-1145/bin/ant    |  326 -
 .../bin/ant.bat                                    |  226 -
 .../bin/ant.cmd                                    |   93 -
 .../org.apache.ant_1.7.1.v20100518-1145/bin/antRun |   24 -
 .../bin/antRun.bat                                 |   50 -
 .../bin/antRun.pl                                  |   66 -
 .../bin/antenv.cmd                                 |   98 -
 .../bin/complete-ant-cmd.pl                        |  114 -
 .../bin/envset.cmd                                 |  131 -
 .../bin/lcp.bat                                    |   31 -
 .../bin/runant.pl                                  |  153 -
 .../bin/runant.py                                  |  102 -
 .../bin/runrc.cmd                                  |   60 -
 .../etc/changelog.xsl                              |  148 -
 .../etc/checkstyle/checkstyle-frames.xsl           |  299 -
 .../etc/checkstyle/checkstyle-text.xsl             |   34 -
 .../etc/checkstyle/checkstyle-xdoc.xsl             |  130 -
 .../etc/coverage-frames.xsl                        |  489 --
 .../etc/jdepend-frames.xsl                         |  487 --
 .../etc/jdepend.xsl                                |  276 -
 .../etc/junit-frames-xalan1.xsl                    |  719 --
 .../etc/junit-frames.xsl                           |  877 ---
 .../etc/junit-noframes.xsl                         |  467 --
 .../etc/log.xsl                                    |  203 -
 .../etc/maudit-frames.xsl                          |  503 --
 .../etc/mmetrics-frames.xsl                        | 1026 ---
 .../etc/tagdiff.xsl                                |  179 -
 .../plugin.properties                              |   12 -
 .../META-INF/ECLIPSEF.RSA                          |  Bin 0 -> 5638 bytes
 .../META-INF/ECLIPSEF.SF                           |  143 +
 .../META-INF/MANIFEST.MF                           |  196 +
 .../META-INF/eclipse.inf                           |    0
 .../OSGI-INF/l10n/bundle.properties                |   12 +
 .../org.apache.ant_1.8.2.v20110505-1300/about.html |   74 +
 .../about_files/ASL-LICENSE-2.0.txt}               |    0
 .../about_files/DOM-LICENSE.html                   |  111 +
 .../about_files/LICENSE                            |  272 +
 .../about_files/NOTICE                             |    6 +
 .../about_files/SAX-LICENSE.html                   |   81 +
 .../etc/changelog.xsl                              |  148 +
 .../etc/checkstyle/checkstyle-frames.xsl           |  299 +
 .../etc/checkstyle/checkstyle-text.xsl             |   34 +
 .../etc/checkstyle/checkstyle-xdoc.xsl             |  130 +
 .../etc/coverage-frames.xsl                        |  489 ++
 .../etc/jdepend-frames.xsl                         |  487 ++
 .../etc/jdepend.xsl                                |  276 +
 .../etc/junit-frames-xalan1.xsl                    |  733 ++
 .../etc/junit-frames.xsl                           |  902 +++
 .../etc/junit-noframes.xsl                         |  478 ++
 .../etc/log.xsl                                    |  203 +
 .../etc/maudit-frames.xsl                          |  503 ++
 .../etc/mmetrics-frames.xsl                        | 1026 +++
 .../etc/tagdiff.xsl                                |  179 +
 .../plugin.properties                              |   12 +
 eclipse/plugins/org.apache.lucene/.classpath       |    7 +
 .../.gitignore => org.apache.lucene/.cvsignore}    |    0
 eclipse/plugins/org.apache.lucene/.project         |   28 +
 .../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 +
 .../.settings/org.eclipse.core.resources.prefs     |    3 +
 .../.settings/org.eclipse.pde.core.prefs           |    4 +
 .../.settings/org.eclipse.pde.prefs                |   25 +
 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 +
 .../plugins/org.apache.lucene/META-INF/MANIFEST.MF |   31 +
 eclipse/plugins/org.apache.lucene/about.html       |   48 +
 .../org.apache.lucene/about_files/CHANGES.txt      | 3858 ++++++++++
 .../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/about_files/LICENSE.txt      |  240 +
 .../org.apache.lucene/about_files/NOTICE.txt       |   30 +
 .../org.apache.lucene/about_files/README.txt       |   46 +
 eclipse/plugins/org.apache.lucene/build.properties |   15 +
 .../plugins/org.apache.lucene/plugin.properties    |   12 +
 .../plugins/org.apache.lucene/readme-bundles.txt   |   42 +
 .../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/META-INF/MANIFEST.MF             |    9 +
 .../org.apache.lucene/source-bundle/about.html     |   48 +
 .../source-bundle/about_files/CHANGES.txt          | 2803 ++++++++
 .../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 +
 .../source-bundle/about_files/LICENSE.txt          |  240 +
 .../source-bundle/about_files/NOTICE.txt           |   11 +
 .../source-bundle/about_files/README.txt           |   46 +
 .../source-bundle/build.properties                 |   14 +
 .../source-bundle/plugin.properties                |   12 +
 .../.settings/org.eclipse.jdt.core.prefs           |   40 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../org.eclipse.ant.core/META-INF/MANIFEST.MF      |    2 +-
 .../buildfiles/buildExtraJAR.xml                   |    5 +-
 .../buildnotes_platform-ant.html                   |   20 -
 .../r2_0_buildnotes_platform-ant.html              |  552 --
 .../r2_1_buildnotes_platform-ant.html              |  706 --
 .../r3_0_buildnotes_platform-ant.html              |  956 ---
 .../r3_1_buildnotes_platform-ant.html              |  825 ---
 .../r3_2_buildnotes_platform-ant.html              |  186 -
 .../r3_3_buildnotes_platform-ant.html              |  104 -
 .../r3_4_buildnotes_platform-ant.html              |   70 -
 .../r3_5_buildnotes_platform-ant.html              |   95 -
 .../org.eclipse.ant.core/schema/antTasks.exsd      |   14 +-
 .../org/eclipse/ant/core/AntCorePreferences.java   |  103 +-
 .../src/org/eclipse/ant/core/AntRunner.java        |    4 +-
 .../ant/core/IAntPropertyValueProvider.java        |    2 +-
 .../src/org/eclipse/ant/core/ProjectInfo.java      |    8 +-
 .../src/org/eclipse/ant/core/TargetInfo.java       |    6 +-
 .../ant/internal/core/AntClasspathEntry.java       |    6 +-
 .../org/eclipse/ant/internal/core/AntCoreUtil.java |    8 +-
 .../org/eclipse/ant/internal/core/AntObject.java   |    4 +-
 .../ant/internal/core/IAntCoreConstants.java       |   83 +-
 .../internal/core/contentDescriber/AntHandler.java |    8 +-
 .../ant/internal/core/ant/InternalAntRunner.java   |   11 +-
 .../internal/core/ant/ProgressBuildListener.java   |   18 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   65 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../org.eclipse.ant.launching/META-INF/MANIFEST.MF |    2 +-
 .../internal/launching/debug/AntDebugState.java    |   92 +-
 .../runtime/logger/AntProcessBuildLogger.java      |    5 +-
 .../runtime/logger/AntProcessDebugBuildLogger.java |   45 +-
 .../launching/remote/InternalAntRunner.java        |   21 +-
 .../remote/logger/RemoteAntBuildLogger.java        |    7 +-
 .../remote/logger/RemoteAntDebugBuildLogger.java   |   24 +-
 .../ant/internal/launching/AntLaunchingUtil.java   |    5 +-
 .../launching/debug/IAntDebugController.java       |  138 +-
 .../launching/debug/model/AntDebugTarget.java      |   95 +-
 .../internal/launching/debug/model/AntThread.java  |   14 +-
 .../debug/model/RemoteAntDebugBuildListener.java   |   31 +-
 .../launchConfigurations/AntLaunchDelegate.java    |    9 +-
 .../ContributedClasspathEntriesEntry.java          |    5 +-
 .../RemoteAntBuildListener.java                    |  143 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   31 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../TaskXMLFileMerger.java                         |    2 +-
 .../eclipse/ant/internal/ui/dtd/schema/Atom.java   |    4 +-
 .../eclipse/ant/internal/ui/dtd/schema/Model.java  |    6 +-
 .../ant/internal/ui/dtd/schema/NfmParser.java      |    2 +-
 .../ant/internal/ui/dtd/schema/SchemaFactory.java  |    2 +-
 .../ant/internal/ui/dtd/util/SortedMap.java        |    2 +-
 .../internal/ui/editor/AntCompletionProposal.java  |    5 +-
 .../eclipse/ant/internal/ui/editor/AntEditor.java  |   69 +-
 .../ui/editor/AntEditorCompletionProcessor.java    |  114 +-
 .../editor/AntEditorSourceViewerConfiguration.java |    5 +-
 .../ui/editor/TaskDescriptionProvider.java         |  380 +-
 .../editor/actions/ToggleLineBreakpointAction.java |   28 +-
 .../ant/internal/ui/editor/anttasks_1.6.0.xml      |    5 +-
 .../ui/editor/formatter/FormattingPreferences.java |    5 +-
 .../ui/editor/formatter/XmlDocumentFormatter.java  |    5 +-
 .../internal/ui/editor/formatter/XmlFormatter.java |    8 +-
 .../outline/AntEditorContentOutlinePage.java       |    2 +-
 .../ui/editor/outline/AntEditorMarkerUpdater.java  |    5 +-
 .../internal/ui/editor/templates/AntContext.java   |   61 +-
 .../templates/AntTemplatePreferencePage.java       |    5 +-
 .../ui/editor/text/AntEditorDocumentProvider.java  |    2 +-
 .../editor/text/AntFoldingStructureProvider.java   |   21 +-
 .../ant/internal/ui/editor/text/XMLTextHover.java  |   18 +-
 .../internal/ui/editor/utils/ProjectHelper.java    |   41 +-
 .../antsupport/inputhandler/AntInputHandler.java   |    5 +-
 .../org/eclipse/ant/internal/ui/AntUIPlugin.java   |    7 +-
 .../internal/ui/AntUIPreferenceInitializer.java    |    3 +-
 .../org/eclipse/ant/internal/ui/AntUtil.java       |    7 +-
 .../org/eclipse/ant/internal/ui/ColumnSorter.java  |    7 +-
 .../ant/internal/ui/IAntUIPreferenceConstants.java |    9 +-
 .../ui/datatransfer/AntNewJavaProjectPage.java     |   11 +-
 .../ant/internal/ui/datatransfer/AppletUtil.java   |    5 +-
 .../internal/ui/datatransfer/BuildFileCreator.java | 2662 ++++----
 .../internal/ui/datatransfer/EclipseClasspath.java |    9 +-
 .../ant/internal/ui/datatransfer/ExportUtil.java   |    8 +-
 .../ui/datatransfer/JavacTableLabelProvider.java   |    5 +-
 .../ui/debug/model/AntDebugModelPresentation.java  |    5 +-
 .../launchConfigurations/AntBuilderTargetsTab.java |    5 +-
 .../ui/launchConfigurations/AntJRETab.java         |   28 +-
 .../AntJavaLaunchDelegate.java                     |    5 +-
 .../ui/launchConfigurations/AntLaunchShortcut.java |    5 +-
 .../ui/launchConfigurations/AntMainTab.java        |   13 +-
 .../ui/launchConfigurations/SetTargetsDialog.java  |    5 +-
 .../TargetTableLabelProvider.java                  |    5 +-
 .../ui/launchConfigurations/TaskLinkManager.java   |    5 +-
 .../eclipse/ant/internal/ui/model/AntAntNode.java  |    5 +-
 .../ant/internal/ui/model/AntDefiningTaskNode.java |    7 +-
 .../ant/internal/ui/model/AntElementNode.java      |   31 +-
 .../ant/internal/ui/model/AntImportNode.java       |    7 +-
 .../eclipse/ant/internal/ui/model/AntModel.java    |  122 +-
 .../ant/internal/ui/model/AntModelProject.java     |  170 +-
 .../ant/internal/ui/model/AntProjectNode.java      |    9 +-
 .../ant/internal/ui/model/AntPropertyNode.java     |   17 +-
 .../eclipse/ant/internal/ui/model/AntRefTable.java |   63 +
 .../ant/internal/ui/model/AntTargetNode.java       |    9 +-
 .../eclipse/ant/internal/ui/model/IAntModel.java   |   12 +-
 .../ant/internal/ui/model/IAntModelConstants.java  |   13 +-
 .../AbstractAntEditorPreferencePage.java           |   29 +-
 .../internal/ui/preferences/AddCustomDialog.java   |    9 +-
 .../internal/ui/preferences/AntClasspathBlock.java |    9 +-
 .../preferences/AntCodeAssistPreferencePage.java   |    8 +-
 .../ui/preferences/AntEditorPreferencePage.java    |   49 +-
 .../ui/preferences/AntObjectLabelProvider.java     |    5 +-
 .../internal/ui/preferences/AntPreferencePage.java |   48 +-
 .../ui/preferences/AntPreferencesMessages.java     |    4 +-
 .../preferences/AntPreferencesMessages.properties  |    7 +-
 .../ui/preferences/AntPropertiesBlock.java         |    7 +-
 .../internal/ui/preferences/ClasspathEntry.java    |    5 +-
 .../ui/preferences/FileSelectionDialog.java        |    9 +-
 .../ant/internal/ui/preferences/MessageLine.java   |    5 +-
 .../LaunchConfigurationBuildfileChange.java        |    7 +-
 .../org/eclipse/ant/internal/ui/views/AntView.java |    5 +-
 .../ant/internal/ui/views/AntViewDropAdapter.java  |   18 +-
 .../views/actions/SearchForBuildFilesDialog.java   |    8 +-
 .../org.eclipse.ant.ui/META-INF/MANIFEST.MF        |    6 +-
 .../buildfiles/buildExtraJAR.xml                   |    5 +-
 .../buildfiles/buildRemoteExtraJAR.xml             |    5 +-
 .../plugins/org.eclipse.ant.ui/plugin.properties   |    4 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   13 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../org.eclipse.compare.core/META-INF/MANIFEST.MF  |    2 +-
 .../src/org/eclipse/compare/internal/core/LCS.java |    7 +-
 .../eclipse/compare/internal/core/patch/Hunk.java  |    8 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   13 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../org.eclipse.compare.win32/META-INF/MANIFEST.MF |    2 +-
 .../plugins/org.eclipse.compare.win32/plugin.xml   |   14 +-
 .../compare/internal/win32/WordComparison.java     |   82 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    3 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../org.eclipse.compare/META-INF/MANIFEST.MF       |    2 +-
 .../org/eclipse/compare/CompareEditorInput.java    |  240 +-
 .../compare/CompareViewerSwitchingPane.java        |    9 +
 .../eclipse/compare/EditionSelectionDialog.java    |   47 +-
 .../contentmergeviewer/ContentMergeViewer.java     |  173 +-
 .../contentmergeviewer/TextMergeViewer.java        |   33 +-
 .../internal/AddFromHistoryAction.properties       |    4 +-
 .../eclipse/compare/internal/CompareEditor.java    |   12 +-
 .../compare/internal/CompareMessages.properties    |    2 +-
 .../compare/internal/ComparePreferencePage.java    |   31 +-
 .../eclipse/compare/internal/CompareUIPlugin.java  |    2 +-
 .../org/eclipse/compare/internal/IFlushable2.java  |   28 +
 .../eclipse/compare/internal/ISavingSaveable.java  |   23 +
 .../compare/internal/ResourceCompareInput.java     |    4 +-
 .../compare/internal/ShowWhitespaceAction.java     |   96 +-
 .../org/eclipse/compare/internal/Utilities.java    |   79 +-
 .../compare/internal/merge/DocumentMerger.java     |   43 +-
 .../compare/internal/patch/InputPatchPage.java     |   56 +-
 .../compare/internal/patch/PatchTargetPage.java    |   35 +-
 eclipse/plugins/org.eclipse.compare/component.xml  |   11 +
 .../plugins/org.eclipse.compare/plugin.properties  |    2 +-
 eclipse/plugins/org.eclipse.compare/plugin.xml     |   11 +
 .../schema/structureMergeViewers.exsd              |    4 +-
 .../org.eclipse.compare/scripts/exportplugin.xml   |   10 +
 .../core/commands/ParameterizedCommand.java        |   46 +-
 .../operations/DefaultOperationHistory.java        |    6 +-
 .../org.eclipse.core.contenttype/.classpath        |    2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   20 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../core/runtime/content/XMLContentDescriber.java  |   10 +-
 .../beans/BeanListPropertyDecorator.java           |   13 +-
 .../beans/BeanMapPropertyDecorator.java            |   13 +-
 .../databinding/beans/BeanPropertyHelper.java      |    5 +
 .../beans/BeanSetPropertyDecorator.java            |   13 +-
 .../beans/BeanValuePropertyDecorator.java          |   25 +-
 .../beans/PojoListPropertyDecorator.java           |   13 +-
 .../beans/PojoMapPropertyDecorator.java            |   13 +-
 .../beans/PojoSetPropertyDecorator.java            |   13 +-
 .../beans/PojoValuePropertyDecorator.java          |   25 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../observable/DecoratingObservableCollection.java |    7 +-
 .../databinding/observable/list/WritableList.java  |   34 +-
 .../observable/map/DecoratingObservableMap.java    |    7 +-
 .../masterdetail/MasterDetailObservables.java      |  121 +-
 .../ListDetailValueObservableList.java             |  351 +
 .../masterdetail/MapDetailValueObservableMap.java  |  405 ++
 .../masterdetail/SetDetailValueObservableMap.java  |  178 +
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../databinding/property/list/ListProperty.java    |   19 +-
 .../core/databinding/property/map/MapProperty.java |   19 +-
 .../core/databinding/property/set/SetProperty.java |   19 +-
 .../databinding/property/value/ValueProperty.java  |   46 +-
 .../property/map/SimplePropertyObservableMap.java  |   16 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../core/databinding/BindingProperties.java        |   23 +
 .../databinding/ConverterValueProperty.java        |   68 +
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../schema/expressionLanguage.exsd                 |   36 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   67 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../externaltools/internal/ExternalToolsCore.java  |    6 +-
 .../internal/IExternalToolConstants.java           |   10 +-
 .../ExternalToolsCoreUtil.java                     |    4 +-
 .../ProgramLaunchDelegate.java                     |    4 +-
 .../internal/model/BuilderCoreUtils.java           |   65 +-
 .../internal/model/ExternalToolBuilder.java        |   29 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../org/eclipse/core/filebuffers/FileBuffers.java  |   18 +-
 .../org/eclipse/core/filebuffers/IFileBuffer.java  |   16 +-
 .../core/filebuffers/IFileBufferListener.java      |   18 +-
 .../core/filebuffers/IFileBufferManager.java       |   19 +-
 .../filebuffers/FileStoreTextFileBuffer.java       |   20 +-
 .../internal/filebuffers/ResourceFileBuffer.java   |   18 +-
 .../filebuffers/ResourceTextFileBufferManager.java |    4 +-
 .../filebuffers/SynchronizableDocument.java        |    7 +-
 .../org.eclipse.core.filesystem.linux.ppc/.project |   22 -
 .../META-INF/MANIFEST.MF                           |    9 -
 .../build.properties                               |   16 -
 .../fragment.properties                            |   12 -
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../plugins/org.eclipse.core.filesystem/.classpath |    2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   12 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../natives/win32/localfile.c                      |  131 +-
 .../core/filesystem/provider/FileStore.java        |    9 +-
 .../core/internal/filesystem/FileCache.java        |   45 +-
 .../filesystem/local/unix/UnixFileNatives.java     |    6 +-
 .../org.eclipse.core.jobs/META-INF/MANIFEST.MF     |    6 +-
 .../core/internal/jobs/DeadlockDetector.java       |   16 +-
 .../org/eclipse/core/internal/jobs/JobManager.java |   27 +-
 .../eclipse/core/internal/jobs/LockManager.java    |    2 +
 .../org/eclipse/core/internal/jobs/ThreadJob.java  |   23 +-
 .../org/eclipse/core/internal/jobs/WorkerPool.java |   23 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   13 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../META-INF/MANIFEST.MF                           |    2 +-
 eclipse/plugins/org.eclipse.core.net/plugin.xml    |   11 +
 .../core/internal/net/AbstractProxyProvider.java   |   27 +-
 .../org/eclipse/core/internal/net/Activator.java   |   10 +-
 .../core/internal/net/PreferenceInitializer.java   |   36 +-
 .../core/internal/net/PreferenceManager.java       |  379 +
 .../internal/net/PreferenceModifyListener.java     |    7 +-
 .../eclipse/core/internal/net/ProxyManager.java    |  176 +-
 .../org/eclipse/core/internal/net/ProxyType.java   |   98 +-
 .../core/internal/net/WindowsProxyProvider.java    |   16 +-
 .../internal/net/proxy/unix/UnixProxyProvider.java |   88 +-
 .../net/proxy/win32/winhttp/ProxyBypass.java       |   11 +-
 .../org.eclipse.core.resources.jmx/.classpath      |    7 -
 .../org.eclipse.core.resources.jmx/.project        |   28 -
 .../.settings/org.eclipse.jdt.core.prefs           |  309 -
 .../.settings/org.eclipse.jdt.ui.prefs             |    9 -
 .../META-INF/MANIFEST.MF                           |   23 -
 .../org.eclipse.core.resources.jmx/about.html      |   28 -
 .../build.properties                               |   20 -
 .../org.eclipse.core.resources.jmx/icons/file.gif  |  Bin 354 -> 0 bytes
 .../icons/folder.gif                               |  Bin 216 -> 0 bytes
 .../icons/project.gif                              |  Bin 351 -> 0 bytes
 .../icons/resources.gif                            |  Bin 145 -> 0 bytes
 .../org.eclipse.core.resources.jmx/plugin.xml      |    9 -
 .../core/internal/resources/jmx/Activator.java     |   71 -
 .../resources/jmx/ContainerContribution.java       |   46 -
 .../internal/resources/jmx/FileContribution.java   |   47 -
 .../internal/resources/jmx/FolderContribution.java |   37 -
 .../core/internal/resources/jmx/Messages.java      |   34 -
 .../resources/jmx/ProjectContribution.java         |   37 -
 .../resources/jmx/ResourceContribution.java        |  148 -
 .../jmx/ResourceContributionProvider.java          |  143 -
 .../internal/resources/jmx/messages.properties     |   14 -
 .../plugins/org.eclipse.core.resources/.classpath  |    4 +-
 .../.settings/.api_filters                         |    9 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   26 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../META-INF/MANIFEST.MF                           |    8 +-
 .../org.eclipse.core.resources/build.properties    |    4 +-
 .../schema/builders.exsd                           |   21 +-
 .../schema/filterMatchers.exsd                     |    4 +-
 .../schema/modelProviders.exsd                     |   30 +-
 .../eclipse/core/internal/events/AutoBuildJob.java |    7 +-
 .../eclipse/core/internal/events/BuildCommand.java |  124 +-
 .../eclipse/core/internal/events/BuildContext.java |  123 +
 .../eclipse/core/internal/events/BuildManager.java |  325 +-
 .../internal/events/BuilderPersistentInfo.java     |   23 +-
 .../core/internal/events/InternalBuilder.java      |   81 +-
 .../core/internal/events/LifecycleEvent.java       |    4 +-
 .../core/internal/events/NotificationManager.java  |   10 +-
 .../core/internal/events/ResourceChangeEvent.java  |   14 +-
 .../core/internal/events/ResourceDelta.java        |   19 +-
 .../core/internal/events/ResourceDeltaFactory.java |    5 +-
 .../core/internal/events/ResourceDeltaInfo.java    |   13 +-
 .../core/internal/localstore/BlobStore.java        |    9 +-
 .../eclipse/core/internal/localstore/Bucket.java   |   25 +-
 .../core/internal/localstore/BucketTree.java       |   17 +-
 .../localstore/CollectSyncStatusVisitor.java       |    8 +-
 .../core/internal/localstore/CopyVisitor.java      |    4 +-
 .../core/internal/localstore/DeleteVisitor.java    |   16 +-
 .../core/internal/localstore/FileStoreRoot.java    |   22 +-
 .../localstore/FileSystemResourceManager.java      |  228 +-
 .../core/internal/localstore/HistoryBucket.java    |   17 +-
 .../core/internal/localstore/HistoryStore2.java    |   24 +-
 .../core/internal/localstore/IHistoryStore.java    |    4 +-
 .../internal/localstore/IsSynchronizedVisitor.java |   29 +-
 .../localstore/SafeChunkyOutputStream.java         |    7 +-
 .../internal/localstore/SafeFileOutputStream.java  |    4 +-
 .../core/internal/localstore/UnifiedTree.java      |   36 +-
 .../core/internal/localstore/UnifiedTreeNode.java  |    6 +-
 .../core/internal/properties/IPropertyManager.java |    4 +-
 .../core/internal/properties/PropertyBucket.java   |   18 +-
 .../core/internal/properties/PropertyManager2.java |   14 +-
 .../internal/propertytester/StringMatcher.java     |    6 +-
 .../core/internal/refresh/MonitorManager.java      |   60 +-
 .../core/internal/refresh/PollingMonitor.java      |   13 +-
 .../eclipse/core/internal/refresh/RefreshJob.java  |   19 +-
 .../core/internal/refresh/RefreshManager.java      |    8 +-
 .../core/internal/resources/AliasManager.java      |   87 +-
 .../internal/resources/BuildConfiguration.java     |  133 +
 .../core/internal/resources/CharsetDeltaJob.java   |    9 +-
 .../core/internal/resources/CharsetManager.java    |   41 +-
 .../internal/resources/ComputeProjectOrder.java    |  233 +-
 .../eclipse/core/internal/resources/Container.java |   25 +-
 .../resources/ContentDescriptionManager.java       |   43 +-
 .../internal/resources/DelayedSnapshotJob.java     |   11 +-
 .../org/eclipse/core/internal/resources/File.java  |   26 +-
 .../eclipse/core/internal/resources/FileState.java |   18 +-
 .../eclipse/core/internal/resources/Filter.java    |   17 +-
 .../core/internal/resources/FilterDescription.java |   14 +-
 .../core/internal/resources/FilterTypeManager.java |    9 +-
 .../core/internal/resources/ICoreConstants.java    |    2 +
 .../core/internal/resources/LinkDescription.java   |    8 +-
 .../core/internal/resources/LocalMetaArea.java     |   98 +-
 .../core/internal/resources/LocationValidator.java |    8 +-
 .../eclipse/core/internal/resources/Marker.java    |    7 +-
 .../internal/resources/MarkerAttributeMap.java     |   61 +-
 .../core/internal/resources/MarkerDelta.java       |   15 +-
 .../internal/resources/MarkerDeltaManager.java     |   21 +-
 .../core/internal/resources/MarkerInfo.java        |   23 +-
 .../core/internal/resources/MarkerManager.java     |   29 +-
 .../core/internal/resources/MarkerReader_1.java    |   17 +-
 .../core/internal/resources/MarkerReader_2.java    |   17 +-
 .../core/internal/resources/MarkerReader_3.java    |   17 +-
 .../eclipse/core/internal/resources/MarkerSet.java |    5 +-
 .../internal/resources/MarkerSnapshotReader_1.java |   13 +-
 .../internal/resources/MarkerSnapshotReader_2.java |   13 +-
 .../resources/MarkerTypeDefinitionCache.java       |   35 +-
 .../core/internal/resources/MarkerWriter.java      |   17 +-
 .../core/internal/resources/ModelObjectWriter.java |   41 +-
 .../core/internal/resources/NatureManager.java     |   88 +-
 .../internal/resources/PathVariableManager.java    |   33 +-
 .../core/internal/resources/PathVariableUtil.java  |   15 +-
 .../internal/resources/PreferenceInitializer.java  |    7 +-
 .../eclipse/core/internal/resources/Project.java   |  185 +-
 .../internal/resources/ProjectContentTypes.java    |   19 +-
 .../internal/resources/ProjectDescription.java     |  426 +-
 .../resources/ProjectDescriptionReader.java        |   78 +-
 .../core/internal/resources/ProjectInfo.java       |   20 +-
 .../resources/ProjectNatureDescriptor.java         |   19 +-
 .../resources/ProjectPathVariableManager.java      |   25 +-
 .../internal/resources/ProjectPreferences.java     |  146 +-
 .../resources/ProjectVariableProviderManager.java  |    9 +-
 .../eclipse/core/internal/resources/Resource.java  |  105 +-
 .../core/internal/resources/ResourceInfo.java      |   42 +-
 .../org/eclipse/core/internal/resources/Rules.java |   13 +-
 .../core/internal/resources/SafeFileTable.java     |   11 +-
 .../core/internal/resources/SaveManager.java       |  378 +-
 .../core/internal/resources/SyncInfoReader.java    |    5 +-
 .../core/internal/resources/SyncInfoReader_2.java  |   11 +-
 .../core/internal/resources/SyncInfoReader_3.java  |   11 +-
 .../internal/resources/SyncInfoSnapReader_3.java   |    9 +-
 .../core/internal/resources/SyncInfoWriter.java    |   25 +-
 .../core/internal/resources/Synchronizer.java      |   13 +-
 .../internal/resources/VariableDescription.java    |    8 +-
 .../core/internal/resources/WorkManager.java       |    5 +-
 .../eclipse/core/internal/resources/Workspace.java |  599 ++-
 .../resources/WorkspaceDescriptionReader.java      |    7 +-
 .../internal/resources/WorkspacePreferences.java   |    7 +-
 .../core/internal/resources/WorkspaceRoot.java     |    9 +-
 .../internal/resources/WorkspaceTreeReader_1.java  |   27 +-
 .../internal/resources/WorkspaceTreeReader_2.java  |  140 +-
 .../eclipse/core/internal/resources/XMLWriter.java |   19 +-
 .../resources/mapping/ChangeDescription.java       |   25 +-
 .../resources/mapping/ModelProviderDescriptor.java |   15 +-
 .../resources/mapping/ModelProviderManager.java    |   11 +-
 .../resources/mapping/ProposedResourceDelta.java   |   21 +-
 .../resources/mapping/ResourceModelProvider.java   |   10 +-
 .../resources/refresh/win32/Win32Monitor.java      |   49 +-
 .../eclipse/core/internal/utils/ArrayIterator.java |   13 +-
 .../org/eclipse/core/internal/utils/FileUtil.java  |   57 +-
 .../org/eclipse/core/internal/utils/Messages.java  |    1 -
 .../org/eclipse/core/internal/utils/ObjectMap.java |   53 +-
 .../src/org/eclipse/core/internal/utils/Queue.java |   39 +-
 .../eclipse/core/internal/utils/StringPool.java    |    5 +-
 .../eclipse/core/internal/utils/StringPoolJob.java |   12 +-
 .../core/internal/utils/messages.properties        |    3 +-
 .../eclipse/core/internal/watson/ElementTree.java  |    7 +-
 .../core/internal/watson/ElementTreeWriter.java    |   15 +-
 .../core/resources/IBuildConfiguration.java        |   82 +
 .../org/eclipse/core/resources/IBuildContext.java  |   63 +
 .../src/org/eclipse/core/resources/ICommand.java   |   29 +-
 .../src/org/eclipse/core/resources/IContainer.java |   80 +-
 .../src/org/eclipse/core/resources/IFile.java      |   23 +-
 .../src/org/eclipse/core/resources/IMarker.java    |    6 +-
 .../org/eclipse/core/resources/IMarkerDelta.java   |    4 +-
 .../src/org/eclipse/core/resources/IProject.java   |  162 +-
 .../core/resources/IProjectDescription.java        |   99 +-
 .../src/org/eclipse/core/resources/IResource.java  |    6 +-
 .../eclipse/core/resources/IResourceStatus.java    |    9 +-
 .../src/org/eclipse/core/resources/IWorkspace.java |   95 +-
 .../org/eclipse/core/resources/IWorkspaceRoot.java |   34 +-
 .../core/resources/IncrementalProjectBuilder.java  |   65 +-
 .../eclipse/core/resources/ResourceAttributes.java |   17 +-
 .../eclipse/core/resources/ResourcesPlugin.java    |   66 +-
 .../mapping/CompositeResourceMapping.java          |   11 +-
 .../core/resources/mapping/ModelProvider.java      |   15 +-
 .../resources/mapping/ResourceChangeValidator.java |   13 +-
 .../core/resources/mapping/ResourceMapping.java    |    7 +-
 .../core/resources/mapping/ResourceTraversal.java  |    9 +-
 .../core/resources/team/ResourceRuleFactory.java   |    9 +-
 .../org/eclipse/core/resources/ant/Policy.java     |    4 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../core/internal/runtime/auth/Activator.java      |    4 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../build.properties                               |    6 +-
 .../customBuildCallbacks.xml                       |  167 +
 .../src/org/eclipse/core/runtime/IExtension.java   |    2 +-
 .../org.eclipse.core.runtime/META-INF/MANIFEST.MF  |    8 +-
 .../preferences/legacy/PreferenceForwarder.java    |    4 +-
 .../core/internal/runtime/InternalPlatform.java    |   34 +-
 .../src/org/eclipse/core/internal/runtime/Log.java |   49 +-
 .../runtime/PerformanceStatsProcessor.java         |   11 +-
 .../core/internal/runtime/PlatformLogWriter.java   |   62 -
 .../src/org/eclipse/core/runtime/ILog.java         |    4 +-
 .../src/org/eclipse/core/runtime/Plugin.java       |    9 +-
 .../src/org/eclipse/core/runtime/Preferences.java  |    4 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   25 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../schema/valueVariables.exsd                     |    4 +-
 .../internal/variables/StringVariableManager.java  |    8 +-
 .../org/eclipse/core/variables/IValueVariable.java |    4 +-
 .../plugins/org.eclipse.cvs/META-INF/MANIFEST.MF   |    4 +-
 eclipse/plugins/org.eclipse.cvs/about.properties   |    4 +-
 eclipse/plugins/org.eclipse.cvs/notice.html        |  191 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   19 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    4 +-
 .../org.eclipse.debug.core/META-INF/MANIFEST.MF    |    2 +-
 .../buildnotes_platform-debug.html                 |   96 -
 .../core/org/eclipse/debug/core/DebugPlugin.java   |   56 +-
 .../eclipse/debug/core/ILaunchConfiguration.java   |    4 +-
 .../org/eclipse/debug/core/model/IDebugTarget.java |    4 +-
 .../debug/internal/core/BreakpointManager.java     |   62 +-
 .../internal/core/DebugPreferenceInitializer.java  |    2 +-
 .../debug/internal/core/ExpressionManager.java     |  195 +-
 .../debug/internal/core/LaunchConfiguration.java   |    7 +-
 .../eclipse/debug/internal/core/LaunchManager.java |   11 +-
 .../eclipse/debug/internal/core/Preferences.java   |  832 ++--
 .../debug/internal/core/WatchExpression.java       |   10 +-
 .../eclipse/debug/internal/core/XMLMemento.java    |   10 +-
 .../r2_0_buildnotes_platform-debug.html            | 1102 ---
 .../r2_1_buildnotes_platform-debug.html            |  410 --
 .../r3_0_buildnotes_platform-debug.html            |  994 ---
 .../org.eclipse.debug.core/r3_0_changes.html       |  260 -
 .../r3_1_buildnotes_platform-debug.html            |  975 ---
 .../org.eclipse.debug.core/r3_1_changes.html       |  183 -
 .../r3_2_ buildnotes_platform-debug.html           |  601 --
 .../r3_3_buildnotes_platform-debug.html            |  747 --
 .../r3_4_buildnotes_platform-debug.html            |  395 --
 .../r3_5_buildnotes_platform-debug.html            |  354 -
 .../org.eclipse.debug.core/schema/launchers.exsd   |    4 +-
 .../.settings/org.eclipse.jdt.core.prefs           |  208 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../org.eclipse.debug.ui/META-INF/MANIFEST.MF      |    4 +-
 eclipse/plugins/org.eclipse.debug.ui/plugin.xml    |   22 +-
 .../schema/launchShortcuts.exsd                    |   78 +-
 .../schema/stringVariablePresentations.exsd        |   16 +-
 .../schema/toggleBreakpointsTargetFactories.exsd   |    4 +-
 .../eclipse/debug/internal/ui/DebugUIPlugin.java   |   25 +-
 .../debug/internal/ui/actions/ActionMessages.java  |    9 +-
 .../internal/ui/actions/ActionMessages.properties  |    6 +-
 .../internal/ui/actions/LaunchShortcutAction.java  |    6 +-
 .../ui/actions/ToggleBreakpointsTargetManager.java |   22 +-
 .../BreakpointGroupMessages.properties             |    6 +-
 .../breakpoints/OpenBreakpointMarkerAction.java    |    5 +-
 .../breakpoints/RemoveAllBreakpointsAction.java    |   64 +-
 .../breakpoints/RemoveBreakpointAction.java        |   36 +-
 .../breakpoints/ShowTargetBreakpointsAction.java   |  126 +-
 .../EditWatchExpressinInPlaceAction.java           |   85 +
 .../ui/actions/variables/ShowTypesAction.java      |    4 +-
 .../provisional/IBreakpointUIConstants.java        |    2 +-
 .../contextlaunching/LaunchingResourceManager.java |   48 +-
 .../internal/ui/contexts/DebugContextManager.java  |   98 +-
 .../ui/contexts/DebugWindowContextService.java     |  214 +-
 .../adapters/DefaultBreakpointsViewInput.java      |  148 +-
 .../adapters/DefaultViewerInputProvider.java       |    2 +-
 .../adapters/StackFrameSourceDisplayAdapter.java   |    4 +-
 .../LaunchConfigurationEditDialog.java             |   20 +-
 .../LaunchConfigurationFilteredTree.java           |   16 +-
 .../LaunchConfigurationManager.java                |    7 +-
 .../LaunchConfigurationsDialog.java                |   96 +-
 .../LaunchConfigurationsMessages.java              |    6 +-
 .../LaunchConfigurationsMessages.properties        |    8 +-
 .../launchConfigurations/PerspectiveManager.java   |  208 +-
 .../internal/ui/memory/RenderingBindings.java      |    5 +-
 .../provisional/AbstractAsyncTableRendering.java   |    6 +-
 .../elements/BreakpointManagerContentProvider.java |   15 +-
 .../DebugPreferencesMessages.properties            |   10 +-
 .../LaunchConfigurationsPreferencePage.java        |   11 +-
 .../ui/sourcelookup/SourceLookupManager.java       |   10 +-
 .../ui/sourcelookup/SourceLookupService.java       |    5 +-
 .../ui/stringsubstitution/PromptingResolver.java   |    2 +-
 .../StringSubstitutionMessages.java                |    1 +
 .../StringSubstitutionMessages.properties          |    1 +
 .../viewers/AsynchronousSchedulingRuleFactory.java |    6 +-
 .../viewers/breadcrumb/BreadcrumbItemDropDown.java |   81 +-
 .../ui/viewers/breadcrumb/BreadcrumbViewer.java    |    2 +-
 .../ui/viewers/breadcrumb/TreeViewerDropDown.java  |    9 +-
 .../ui/viewers/model/ElementCompareRequest.java    |    6 +-
 .../viewers/model/ITreeModelContentProvider.java   |   15 +-
 .../ui/viewers/model/InternalTreeModelViewer.java  |   88 +-
 .../model/InternalVirtualTreeModelViewer.java      |    9 +-
 .../internal/ui/viewers/model/LabelUpdate.java     |   10 +-
 .../ui/viewers/model/ModelContentProvider.java     |  145 +-
 .../ui/viewers/model/SubTreeModelViewer.java       |    4 +
 .../internal/ui/viewers/model/TreeCursor.java      | 1211 ++--
 .../ui/viewers/model/TreeModelContentProvider.java |  142 +-
 .../ui/viewers/model/TreeModelLabelProvider.java   |   96 +-
 .../internal/ui/viewers/model/VirtualItem.java     |    2 +-
 .../internal/ui/viewers/model/VirtualTree.java     |    2 +-
 .../model/provisional/IColumnPresentation2.java    |   35 +
 .../model/provisional/PresentationContext.java     |    7 +-
 .../viewers/model/provisional/TreeModelViewer.java |    2 +-
 .../model/provisional/VirtualTreeModelViewer.java  |    5 +-
 .../provisional/AbstractColumnPresentation.java    |   13 +-
 .../ui/viewers/update/BreakpointManagerProxy.java  |  364 +-
 .../ui/viewers/update/DefaultSelectionPolicy.java  |   19 +-
 .../internal/ui/views/ViewContextManager.java      |    3 +-
 .../internal/ui/views/ViewContextService.java      |   53 +-
 .../ui/views/breakpoints/BreakpointContainer.java  |    2 +-
 .../ui/views/breakpoints/BreakpointsView.java      |   81 +-
 .../ui/views/expression/ExpressionDropAdapter.java |   11 +-
 .../ui/views/expression/ExpressionView.java        |   25 +-
 .../debug/internal/ui/views/launch/LaunchView.java |   14 +-
 .../LaunchViewCopyToClipboardActionDelegate.java   |    8 +-
 .../ui/views/memory/AbstractMemoryViewPane.java    |    9 +-
 .../ui/views/memory/AddMemoryBlockAction.java      |   14 +-
 .../ui/views/memory/AddMemoryRenderingDialog.java  |    4 +-
 .../ui/views/memory/MemoryBlocksTreeViewPane.java  |   10 +-
 .../debug/internal/ui/views/memory/MemoryView.java |    4 +-
 .../ui/views/memory/RenderingViewPane.java         |    2 +-
 .../views/memory/RetargetAddMemoryBlockAction.java |    4 +-
 .../ui/views/memory/SwitchMemoryBlockAction.java   |   15 +-
 .../views/memory/renderings/GoToAddressAction.java |    9 +-
 .../renderings/TableRenderingContentProvider.java  |    6 +-
 .../views/modules/ModulesViewMessages.properties   |    2 +-
 .../internal/ui/views/registers/RegistersView.java |    2 +-
 .../registers/RegistersViewMessages.properties     |    2 +-
 .../internal/ui/views/variables/VariablesView.java |  168 +-
 .../views/variables/details/DetailPaneManager.java |    7 +-
 .../debug/ui/AbstractLaunchConfigurationTab.java   |   32 +-
 .../ui/org/eclipse/debug/ui/CommonTab.java         |   59 +-
 .../ui/org/eclipse/debug/ui/DebugPopup.java        |    4 +-
 .../ui/org/eclipse/debug/ui/DebugUITools.java      |  261 +-
 .../ui/org/eclipse/debug/ui/EnvironmentTab.java    |   15 +-
 .../ui/org/eclipse/debug/ui/IDetailPane3.java      |    4 +-
 .../debug/ui/StringVariableSelectionDialog.java    |   51 +-
 .../ui/actions/AbstractLaunchHistoryAction.java    |    2 +-
 .../debug/ui/actions/ContextualLaunchAction.java   |    5 +-
 .../debug/ui/actions/DebugCommandAction.java       |    3 +-
 .../org/eclipse/debug/ui/actions/ILaunchable.java  |   31 +-
 .../debug/ui/actions/LaunchShortcutsAction.java    |    5 +-
 .../debug/ui/contexts/IDebugContextProvider2.java  |   44 +
 .../debug/ui/contexts/IDebugContextService.java    |   59 +-
 .../debug/ui/memory/AbstractTableRendering.java    |    2 +-
 .../memory/IMemoryRenderingBindingsProvider.java   |    6 +-
 .../debug/ui/sourcelookup/SourceLookupTab.java     |   15 +-
 .../org.eclipse.ecf.identity/plugin.properties     |    2 +-
 eclipse/plugins/org.eclipse.ecf/javadoc.xml        |   11 +-
 .../core/provider/BaseContainerInstantiator.java   |    3 +-
 .../org.eclipse.equinox.app/META-INF/MANIFEST.MF   |    2 +-
 .../src/org/eclipse/equinox/app/IApplication.java  |    4 +-
 .../eclipse/equinox/internal/app/AppCommands.java  |  114 +-
 .../org/eclipse/equinox/internal/app/Messages.java |   15 +-
 .../equinox/internal/app/messages.properties       |   17 +-
 .../application/ApplicationAdminPermission.java    |   70 +-
 .../service/application/ApplicationDescriptor.java |  229 +-
 .../service/application/ApplicationException.java  |   24 +-
 .../service/application/ApplicationHandle.java     |   63 +-
 .../service/application/ScheduledApplication.java  |    8 +-
 .../org.eclipse.equinox.cm/META-INF/MANIFEST.MF    |    4 +-
 .../equinox/internal/cm/SerializedTaskQueue.java   |    2 +-
 .../META-INF/MANIFEST.MF                           |    6 +-
 .../eclipse/core/internal/runtime/Activator.java   |   22 +-
 .../core/internal/runtime/PlatformLogWriter.java   |  152 +
 .../eclipse/core/internal/runtime/RuntimeLog.java  |  112 +-
 .../org/eclipse/core/runtime/CoreException.java    |    2 +-
 .../src/org/eclipse/core/runtime/ListenerList.java |   26 +-
 .../eclipse/core/runtime/NullProgressMonitor.java  |    2 +-
 .../org/eclipse/core/runtime/PlatformObject.java   |    4 +-
 .../src/org/eclipse/core/runtime/URIUtil.java      |    6 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../plugin.properties                              |    2 +-
 .../org.eclipse.equinox.coordinator/.classpath     |    7 +
 .../org.eclipse.equinox.coordinator/.project       |   39 +
 .../.settings/.api_filters                         |   11 +
 .../.settings/org.eclipse.core.resources.prefs     |    3 +
 .../.settings/org.eclipse.jdt.core.prefs           |  331 +
 .../.settings/org.eclipse.pde.api.tools.prefs      |   94 +
 .../.settings/org.eclipse.pde.core.prefs           |    5 +
 .../META-INF/MANIFEST.MF                           |   20 +
 .../OSGI-INF/component.xml                         |    7 +
 .../about.html                                     |    0
 .../about_files/LICENSE-2.0.txt                    |    0
 .../build.properties                               |   27 +
 .../plugin.properties                              |   12 +
 .../org/eclipse/equinox/coordinator/Activator.java |   47 +
 .../equinox/coordinator/CoordinationImpl.java      |  387 +
 .../equinox/coordinator/CoordinationTimerTask.java |   37 +
 .../equinox/coordinator/CoordinatorComponent.java  |   64 +
 .../equinox/coordinator/CoordinatorImpl.java       |  292 +
 .../coordinator/CoordinatorServiceFactory.java     |   42 +
 .../equinox/coordinator/LogMessages.properties     |   17 +
 .../eclipse/equinox/coordinator/LogTracker.java    |  175 +
 .../eclipse/equinox/coordinator/LogTrackerMsg.java |   28 +
 .../org/eclipse/equinox/coordinator/Messages.java  |   47 +
 .../equinox/coordinator/messages.properties        |   31 +
 .../org/osgi/service/coordinator/Coordination.java |  398 ++
 .../service/coordinator/CoordinationException.java |  159 +
 .../coordinator/CoordinationPermission.java        |  808 +++
 .../org/osgi/service/coordinator/Coordinator.java  |  257 +
 .../org/osgi/service/coordinator/Participant.java  |   87 +
 .../META-INF/MANIFEST.MF                           |    5 +-
 .../org.eclipse.equinox.device/plugin.properties   |    1 -
 .../org.eclipse.equinox.ds/.settings/.api_filters  |   26 +
 .../org.eclipse.equinox.ds/META-INF/MANIFEST.MF    |   10 +-
 eclipse/plugins/org.eclipse.equinox.ds/about.html  |    2 +-
 .../src/org/apache/felix/scr/Component.java        |   28 +-
 .../src/org/apache/felix/scr/Reference.java        |   13 +
 .../src/org/apache/felix/scr/ScrService.java       |   17 +
 .../org/eclipse/equinox/internal/ds/Activator.java |    2 +-
 .../equinox/internal/ds/CircularityException.java  |    2 +-
 .../equinox/internal/ds/ComponentStorage.java      |   39 +-
 .../equinox/internal/ds/InstanceProcess.java       |    2 +-
 .../org/eclipse/equinox/internal/ds/Messages.java  |    2 +-
 .../org/eclipse/equinox/internal/ds/Reference.java |   14 +-
 .../org/eclipse/equinox/internal/ds/Resolver.java  |    2 +-
 .../equinox/internal/ds/SCRCommandProvider.java    |  200 +-
 .../eclipse/equinox/internal/ds/SCRManager.java    |   37 +-
 .../org/eclipse/equinox/internal/ds/SCRUtil.java   |    2 +-
 .../equinox/internal/ds/SCRmessages.properties     |    2 +-
 .../equinox/internal/ds/ScrServiceImpl.java        |    9 +-
 .../eclipse/equinox/internal/ds/ServiceReg.java    |    2 +-
 .../eclipse/equinox/internal/ds/WorkPerformer.java |    2 +-
 .../eclipse/equinox/internal/ds/WorkThread.java    |    2 +-
 .../internal/ds/impl/ComponentContextImpl.java     |    7 +-
 .../internal/ds/impl/ComponentFactoryImpl.java     |    4 +-
 .../internal/ds/impl/ComponentInstanceImpl.java    |    2 +-
 .../internal/ds/impl/ReadOnlyDictionary.java       |  139 +
 .../internal/ds/model/ComponentReference.java      |   21 +-
 .../internal/ds/model/DeclarationParser.java       |  181 +-
 .../internal/ds/model/ServiceComponent.java        |   40 +-
 .../internal/ds/model/ServiceComponentProp.java    |   15 +-
 .../internal/ds/storage/file/FileStorage.java      |    2 +-
 .../equinox/internal/util/io/Externalizable.java   |    2 +-
 .../internal/util/io/ExternalizableDictionary.java |    2 +-
 .../equinox/internal/util/io/PDataStream.java      |    2 +-
 .../equinox/internal/util/string/CharBuffer.java   |    2 +-
 .../equinox/internal/util/xml/ExTagListener.java   |    2 +-
 .../org/eclipse/equinox/internal/util/xml/Tag.java |    2 +-
 .../equinox/internal/util/xml/TagClass.java        |    2 +-
 .../equinox/internal/util/xml/TagListener.java     |    2 +-
 .../equinox/internal/util/xml/XMLParser.java       |    2 +-
 .../equinox/internal/util/xml/XMLReader.java       |    2 +-
 .../eclipse/equinox/internal/util/xml/XMLUtil.java |    2 +-
 .../equinox/internal/util/xml/XmlSerializer.java   |    2 +-
 .../equinox/internal/util/xml/impl/TagImpl.java    |    2 +-
 .../internal/util/xml/impl/XMLParserImpl.java      |    2 +-
 .../plugins/org.eclipse.equinox.event/.classpath   |    2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |  600 +-
 .../.settings/org.eclipse.pde.api.tools.prefs      |   94 +
 .../org.eclipse.equinox.event/META-INF/MANIFEST.MF |   17 +-
 .../org.eclipse.equinox.event/build.properties     |   15 +
 .../org.eclipse.equinox.event/plugin.properties    |    1 -
 .../eclipse/equinox/internal/event/Activator.java  |    8 +-
 .../equinox/internal/event/EventAdminImpl.java     |   50 +-
 .../equinox/internal/event/EventAdminMsg.java      |    3 +-
 .../internal/event/EventHandlerTracker.java        |   69 +-
 .../internal/event/EventHandlerWrapper.java        |   32 +-
 .../internal/event/ExternalMessages.properties     |    5 +-
 .../eclipse/equinox/internal/event/LogTracker.java |   43 +-
 .../internal/event/mapper/BundleEventAdapter.java  |   12 +-
 .../internal/event/mapper/EventAdapter.java        |   14 +-
 .../internal/event/mapper/EventRedeliverer.java    |    8 +-
 .../event/mapper/FrameworkEventAdapter.java        |   12 +-
 .../internal/event/mapper/ServiceEventAdapter.java |   14 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../pom.xml                                        |    2 +-
 .../equinox/EclipseLauncherParser.java             |    9 +-
 .../equinox/EquinoxFwConfigFileParser.java         |    9 +-
 .../frameworkadmin/equinox/ParserUtils.java        |    7 +-
 .../META-INF/MANIFEST.MF                           |    2 -
 .../frameworkadmin/utils/SimpleBundlesState.java   |    2 +-
 .../internal/frameworkadmin/utils/Utils.java       |    2 +-
 .../ConfiguratorManipulator.java                   |    2 +-
 .../ConfiguratorManipulatorFactory.java            |    2 +-
 .../provisional/frameworkadmin/BundlesState.java   |    2 +-
 .../provisional/frameworkadmin/ConfigData.java     |    2 +-
 .../provisional/frameworkadmin/FrameworkAdmin.java |    2 +-
 .../provisional/frameworkadmin/LauncherData.java   |    2 +-
 .../provisional/frameworkadmin/Manipulator.java    |    2 +-
 .../http/jetty/internal/HttpServerManager.java     |    3 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../OSGI-INF/metatype/config.xml                   |   42 +-
 .../plugin.properties                              |   42 +-
 .../equinox/http/jetty/JettyConfigurator.java      |    2 +-
 .../http/jetty/internal/HttpServerManager.java     |    3 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../plugin.properties                              |    2 +-
 .../internal/DefaultRegistryHttpContext.java       |    2 +-
 .../http/registry/internal/FilterManager.java      |    2 +-
 .../registry/internal/HttpRegistryManager.java     |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../equinox/http/servlet/ExtendedHttpService.java  |   10 +
 .../equinox/http/servlet/internal/Activator.java   |    3 +-
 .../http/servlet/internal/FilterChainImpl.java     |   10 +
 .../http/servlet/internal/FilterRegistration.java  |   10 +
 .../http/servlet/internal/HttpServiceFactory.java  |    2 +-
 .../http/servlet/internal/ProxyContext.java        |   22 +-
 .../http/servlet/internal/ProxyServlet.java        |    2 +-
 .../http/servlet/internal/Registration.java        |    2 +-
 .../http/servlet/internal/ResourceServlet.java     |    2 +-
 .../http/servlet/internal/ServletRegistration.java |    2 +-
 .../org.eclipse.equinox.http/META-INF/MANIFEST.MF  |    5 +-
 .../org.eclipse.equinox.http/plugin.properties     |    1 -
 .../org.eclipse.equinox.io/META-INF/MANIFEST.MF    |    4 +-
 .../src/javax/microedition/io/Connection.java      |    2 +-
 .../io/ConnectionNotFoundException.java            |    2 +-
 .../src/javax/microedition/io/Connector.java       |    2 +-
 .../javax/microedition/io/ContentConnection.java   |    2 +-
 .../src/javax/microedition/io/Datagram.java        |    2 +-
 .../javax/microedition/io/DatagramConnection.java  |    2 +-
 .../src/javax/microedition/io/HttpConnection.java  |    2 +-
 .../src/javax/microedition/io/InputConnection.java |    2 +-
 .../javax/microedition/io/OutputConnection.java    |    2 +-
 .../javax/microedition/io/StreamConnection.java    |    2 +-
 .../microedition/io/StreamConnectionNotifier.java  |    2 +-
 .../equinox/internal/io/ConnectionListener.java    |    2 +-
 .../equinox/internal/io/ConnectionNotifier.java    |    2 +-
 .../internal/io/RandomAccessConnection.java        |    2 +-
 .../equinox/internal/io/impl/Activator.java        |    2 +-
 .../io/impl/ConnectionFactoryListener.java         |    2 +-
 .../internal/io/impl/ConnectionNotifierImpl.java   |    2 +-
 .../internal/io/impl/ConnectorServiceImpl.java     |    2 +-
 .../equinox/internal/io/impl/PrivilegedRunner.java |    4 +-
 .../internal/io/impl/TracerConfigConnector.java    |    2 +-
 .../io/util/AbstractConnectionNotifier.java        |    2 +-
 .../equinox/internal/io/util/AbstractDatagram.java |    2 +-
 .../org/eclipse/equinox/internal/io/util/URI.java  |    2 +-
 .../org.eclipse.equinox.ip/META-INF/MANIFEST.MF    |    4 +-
 .../internal/ip/ProvisioningInfoProvider.java      |    2 +-
 .../equinox/internal/ip/ProvisioningStorage.java   |    2 +-
 .../internal/ip/dscagent/DiscoveryAgent.java       |    2 +-
 .../org/eclipse/equinox/internal/ip/impl/Log.java  |    2 +-
 .../internal/ip/impl/ProvisioningAgent.java        |    2 +-
 .../equinox/internal/ip/impl/ProvisioningData.java |    2 +-
 .../equinox/internal/ip/provider/BaseProvider.java |    2 +-
 .../ip/provider/env/EnvironmentInfoProvider.java   |    2 +-
 .../internal/ip/provider/file/FileProvider.java    |    2 +-
 .../equinox/internal/ip/provider/http/Context.java |    2 +-
 .../internal/ip/provider/http/HttpProvider.java    |    2 +-
 .../equinox/internal/ip/storage/cm/CMStorage.java  |    2 +-
 .../internal/ip/storage/file/FileStorage.java      |    2 +-
 .../org.eclipse.equinox.jmx.client.rmi/.classpath  |    7 -
 .../org.eclipse.equinox.jmx.client.rmi/.project    |   28 -
 .../.settings/org.eclipse.jdt.core.prefs           |  308 -
 .../.settings/org.eclipse.jdt.ui.prefs             |    8 -
 .../META-INF/MANIFEST.MF                           |   12 -
 .../org.eclipse.equinox.jmx.client.rmi/about.html  |   28 -
 .../build.properties                               |   19 -
 .../org.eclipse.equinox.jmx.client.rmi/plugin.xml  |   11 -
 .../jmx/client/rmi/RMIConnectorProvider.java       |   34 -
 .../.classpath                                     |    7 -
 .../org.eclipse.equinox.jmx.client.xmlrpc/.project |   28 -
 .../.settings/org.eclipse.jdt.core.prefs           |  309 -
 .../.settings/org.eclipse.jdt.ui.prefs             |    9 -
 .../META-INF/MANIFEST.MF                           |   18 -
 .../about.html                                     |   28 -
 .../build.properties                               |   19 -
 .../plugin.xml                                     |   11 -
 .../internal/xmlrpc/ClientTransportProvider.java   |   42 -
 .../xmlrpc/WebServerTransportProvider.java         |   41 -
 .../client/internal/xmlrpc/XMLRPCJMXConnector.java |   93 -
 .../xmlrpc/XMLRPCJMXConnectorProvider.java         |   38 -
 .../xmlrpc/XMLRPCMBeanServerConnection.java        |  265 -
 .../org.eclipse.equinox.jmx.client/.classpath      |    7 -
 .../org.eclipse.equinox.jmx.client/.project        |   28 -
 .../.settings/org.eclipse.jdt.core.prefs           |  309 -
 .../.settings/org.eclipse.jdt.ui.prefs             |    9 -
 .../JMX Client.launch                              |   33 -
 .../META-INF/MANIFEST.MF                           |   28 -
 .../org.eclipse.equinox.jmx.client/about.html      |   28 -
 .../build.properties                               |   21 -
 .../icons/contribution_desc_view.gif               |  Bin 586 -> 0 bytes
 .../icons/contributions_view.gif                   |  Bin 219 -> 0 bytes
 .../icons/perspective.gif                          |  Bin 362 -> 0 bytes
 .../plugin.properties                              |   18 -
 .../org.eclipse.equinox.jmx.client/plugin.xml      |   67 -
 .../schema/transport.exsd                          |  112 -
 .../equinox/jmx/client/IJMXConnectorProvider.java  |   19 -
 .../jmx/client/remote/RemoteMBeanConnection.java   |   18 -
 .../client/remote/RemoteNotificationHandler.java   |  143 -
 .../equinox/jmx/internal/client/Activator.java     |  165 -
 .../jmx/internal/client/MBeanServerProxy.java      |   97 -
 .../client/ui/ClientPerspectiveFactory.java        |   31 -
 .../equinox/jmx/internal/client/ui/ClientUI.java   |   32 -
 .../internal/client/ui/actions/ActionMessages.java |   47 -
 .../client/ui/actions/ActionMessages.properties    |   28 -
 .../ui/actions/ConnectionSelectionDialog.java      |  149 -
 .../client/ui/actions/NewConnectionAction.java     |  199 -
 .../BundleStatusLabelDecorator.java                |   86 -
 .../ContributionContentProvider.java               |  227 -
 .../ContributionLabelProvider.java                 |  129 -
 .../ContributionViewMessages.java                  |   31 -
 .../ContributionViewMessages.properties            |   12 -
 .../contributionsview/ContributionsViewPart.java   |  101 -
 .../client/ui/invocationView/InvocationView.java   |  217 -
 .../ui/mbeaninfoview/MBeanInfoViewMessages.java    |   45 -
 .../mbeaninfoview/MBeanInfoViewMessages.properties |   27 -
 .../client/ui/mbeaninfoview/MBeanInfoViewPart.java |  261 -
 .../client/ui/mbeaninfoview/MBeanOpTable.java      |  230 -
 .../internal/client/ui/util/ByteImageRegistry.java |   60 -
 .../ui/viewsupport/BundleImageDescriptor.java      |   80 -
 .../ui/viewsupport/ImageImageDescriptor.java       |   53 -
 .../client/ui/viewsupport/ImageRegistry.java       |  102 -
 .../client/ui/viewsupport/JMXPluginImages.java     |   67 -
 .../internal/client/ui/viewsupport/ViewUtil.java   |   69 -
 .../org.eclipse.equinox.jmx.common/.classpath      |    7 -
 .../org.eclipse.equinox.jmx.common/.project        |   28 -
 .../.settings/org.eclipse.jdt.core.prefs           |  320 -
 .../.settings/org.eclipse.jdt.ui.prefs             |    9 -
 .../.settings/org.eclipse.pde.prefs                |   13 -
 .../META-INF/MANIFEST.MF                           |   28 -
 .../org.eclipse.equinox.jmx.common/about.html      |   28 -
 .../build.properties                               |   18 -
 .../jmx/common/ContributionNotificationEvent.java  |   28 -
 .../equinox/jmx/common/ContributionProxy.java      |  180 -
 .../equinox/jmx/common/ContributionProxyMBean.java |   51 -
 .../common/IContributionStateChangeListener.java   |   15 -
 .../IContributionStateChangedDispatcher.java       |   15 -
 .../eclipse/equinox/jmx/common/JMXConstants.java   |   19 -
 .../equinox/jmx/common/NamedNotification.java      |   52 -
 .../equinox/jmx/common/RootContribution.java       |  105 -
 .../equinox/jmx/common/RootContributionMBean.java  |   26 -
 .../equinox/jmx/common/util/ByteArrayHolder.java   |   42 -
 .../equinox/jmx/common/util/MBeanInfoWrapper.java  |   54 -
 .../equinox/jmx/common/util/MBeanUtils.java        |   78 -
 .../equinox/jmx/common/util/RingBuffer.java        |   60 -
 .../eclipse/equinox/jmx/common/util/TextUtils.java |   70 -
 .../equinox/jmx/internal/common/Activator.java     |  160 -
 .../jmx/internal/common/CommonMessages.java        |   28 -
 .../jmx/internal/common/CommonMessages.properties  |   13 -
 .../org.eclipse.equinox.jmx.server.rmi/.classpath  |    7 -
 .../org.eclipse.equinox.jmx.server.rmi/.project    |   28 -
 .../.settings/org.eclipse.jdt.core.prefs           |  309 -
 .../.settings/org.eclipse.jdt.ui.prefs             |    9 -
 .../META-INF/MANIFEST.MF                           |   17 -
 .../org.eclipse.equinox.jmx.server.rmi/about.html  |   28 -
 .../build.properties                               |   20 -
 .../org.eclipse.equinox.jmx.server.rmi/plugin.xml  |   11 -
 .../server.policy                                  |    1 -
 .../equinox/jmx/internal/rmi/Activator.java        |   37 -
 .../equinox/jmx/internal/rmi/RMIServer.java        |   54 -
 .../.classpath                                     |    7 -
 .../org.eclipse.equinox.jmx.server.xmlrpc/.project |   28 -
 .../.settings/org.eclipse.jdt.core.prefs           |  311 -
 .../.settings/org.eclipse.jdt.ui.prefs             |    9 -
 .../META-INF/MANIFEST.MF                           |   24 -
 .../about.html                                     |   28 -
 .../build.properties                               |   19 -
 .../plugin.xml                                     |   11 -
 .../internal/xmlrpc/XMLRPCJMXConnectorServer.java  |   66 -
 .../internal/xmlrpc/XMLRPCMBeanServerAdapter.java  |  538 --
 .../jmx/server/internal/xmlrpc/XMLRPCServer.java   |   36 -
 .../org.eclipse.equinox.jmx.server/.classpath      |    7 -
 .../org.eclipse.equinox.jmx.server/.project        |   28 -
 .../.settings/org.eclipse.jdt.core.prefs           |  313 -
 .../.settings/org.eclipse.jdt.ui.prefs             |    9 -
 .../JMX Server n Client.launch                     |  261 -
 .../JMX Server.launch                              |  266 -
 .../META-INF/MANIFEST.MF                           |   33 -
 .../org.eclipse.equinox.jmx.server/about.html      |   28 -
 .../build.properties                               |   21 -
 .../org.eclipse.equinox.jmx.server/plugin.xml      |   24 -
 .../org.eclipse.equinox.jmx.server/readme.txt      |    9 -
 .../schema/contribution.exsd                       |  133 -
 .../schema/provider.exsd                           |  112 -
 .../server-1.4.product                             |   60 -
 .../server-1.5.product                             |   59 -
 .../server-ppro.product                            |   61 -
 .../equinox/jmx/internal/server/Activator.java     |  268 -
 .../equinox/jmx/internal/server/Application.java   |   30 -
 .../jmx/internal/server/ContributionMessages.java  |   37 -
 .../server/ContributionMessages.properties         |   18 -
 .../equinox/jmx/internal/server/IJMXServer.java    |   52 -
 .../jmx/internal/server/JMXServerFactory.java      |  119 -
 .../internal/server/ServerExtensionManager.java    |  139 -
 .../jmx/internal/server/ServerMessages.java        |   36 -
 .../jmx/internal/server/ServerMessages.properties  |   18 -
 .../equinox/jmx/internal/server/UIStarter.java     |   39 -
 .../eclipse/equinox/jmx/server/Contribution.java   |  387 -
 .../equinox/jmx/server/ContributionProvider.java   |  131 -
 .../jmx/server/IJMXConnectorServerProvider.java    |   19 -
 .../plugins/org.eclipse.equinox.jmx.vm/.classpath  |    7 -
 .../plugins/org.eclipse.equinox.jmx.vm/.project    |   28 -
 .../.settings/org.eclipse.jdt.core.prefs           |  311 -
 .../.settings/org.eclipse.jdt.ui.prefs             |    8 -
 .../META-INF/MANIFEST.MF                           |   18 -
 .../plugins/org.eclipse.equinox.jmx.vm/about.html  |   28 -
 .../org.eclipse.equinox.jmx.vm/build.properties    |   20 -
 .../icons/classloading.gif                         |  Bin 260 -> 0 bytes
 .../icons/compilation.gif                          |  Bin 115 -> 0 bytes
 .../org.eclipse.equinox.jmx.vm/icons/memory.gif    |  Bin 325 -> 0 bytes
 .../org.eclipse.equinox.jmx.vm/icons/os.gif        |  Bin 259 -> 0 bytes
 .../org.eclipse.equinox.jmx.vm/icons/runtime.gif   |  Bin 122 -> 0 bytes
 .../org.eclipse.equinox.jmx.vm/icons/vmstats.gif   |  Bin 582 -> 0 bytes
 .../plugins/org.eclipse.equinox.jmx.vm/plugin.xml  |   11 -
 .../eclipse/equinox/jmx/internal/vm/Activator.java |   41 -
 .../jmx/internal/vm/ClassLoadingContribution.java  |  105 -
 .../jmx/internal/vm/CompilationContribution.java   |  104 -
 .../jmx/internal/vm/MemoryContribution.java        |  165 -
 .../internal/vm/OperatingSystemContribution.java   |  106 -
 .../jmx/internal/vm/RuntimeContribution.java       |  111 -
 .../equinox/jmx/internal/vm/VMStatsMessages.java   |   67 -
 .../jmx/internal/vm/VMStatsMessages.properties     |   51 -
 .../equinox/jmx/internal/vm/VMStatsProvider.java   |  140 -
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../internal/jsp/jasper/JspClassLoader.java        |    2 +-
 .../org/eclipse/equinox/jsp/jasper/JspServlet.java |   43 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../launcher.carbon.macosx.properties              |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../launcher.cocoa.macosx.x86_64.properties        |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../launcher.cocoa.macosx.properties               |    2 +-
 .../.project                                       |   22 +
 .../.settings/org.eclipse.pde.core.prefs           |    4 +
 .../META-INF/MANIFEST.MF                           |   10 +
 .../about.html                                     |    0
 .../build.properties                               |   17 +
 .../customBuildCallbacks.xml                       |    0
 .../launcher.gtk.aix.ppc.properties                |   12 +
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../build.properties                               |   10 +
 .../.project                                       |   22 +
 .../.settings/org.eclipse.pde.core.prefs           |    4 +
 .../META-INF/MANIFEST.MF                           |   10 +
 .../about.html                                     |    0
 .../build.properties                               |   17 +
 .../customBuildCallbacks.xml                       |    0
 .../launcher.gtk.hpux.ia64_32.properties           |   12 +
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../launcher.gtk.linux.ppc.properties              |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../launcher.gtk.linux.ppc64.properties            |    2 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../build.properties                               |   10 +
 .../launcher.gtk.linux.s390.properties             |    2 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../build.properties                               |   10 +
 .../launcher.gtk.linux.s390x.properties            |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../launcher.gtk.linux.x86.properties              |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../launcher.gtk.linux.x86_64.properties           |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../launcher.gtk.solaris.sparc.properties          |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../launcher.gtk.solaris.x86.properties            |    2 +-
 .../.project                                       |   22 -
 .../.settings/org.eclipse.pde.core.prefs           |    4 -
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |    8 -
 .../launcher.motif.aix.ppc.properties              |   12 -
 .../.project                                       |   22 -
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |    7 -
 .../launcher.motif.hpux.ia64_32.properties         |   12 -
 .../.project                                       |   22 -
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |    7 -
 .../launcher.motif.linux.x86.properties            |   12 -
 .../.project                                       |   22 -
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |    7 -
 .../launcher.motif.solaris.sparc.properties        |   12 -
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../launcher.win32.win32.x86.properties            |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../launcher.win32.win32.x86_64.properties         |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../org.eclipse.equinox.launcher/build.properties  |   10 +
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../build.properties                               |   10 +
 .../launcher.gtk.linux.s390.properties             |    2 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../build.properties                               |   10 +
 .../launcher.gtk.linux.s390x.properties            |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../launcher.gtk.solaris.x86.properties            |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../launcher.carbon.macosx.properties              |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../launcher.cocoa.macosx.x86_64.properties        |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../launcher.cocoa.macosx.properties               |    2 +-
 .../.project                                       |   22 +
 .../.settings/org.eclipse.pde.core.prefs           |    4 +
 .../META-INF/MANIFEST.MF                           |   10 +
 .../about.html                                     |    0
 .../build.properties                               |   17 +
 .../customBuildCallbacks.xml                       |    0
 .../launcher.gtk.aix.ppc.properties                |   12 +
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../build.properties                               |   10 +
 .../.project                                       |   22 +
 .../.settings/org.eclipse.pde.core.prefs           |    4 +
 .../META-INF/MANIFEST.MF                           |   10 +
 .../about.html                                     |    0
 .../build.properties                               |   17 +
 .../customBuildCallbacks.xml                       |    0
 .../launcher.gtk.hpux.ia64_32.properties           |   12 +
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../launcher.gtk.linux.ppc.properties              |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../launcher.gtk.linux.ppc64.properties            |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../launcher.gtk.linux.x86.properties              |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../launcher.gtk.linux.x86_64.properties           |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../launcher.gtk.solaris.sparc.properties          |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../launcher.motif.aix.ppc.properties              |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../launcher.motif.hpux.ia64_32.properties         |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../launcher.motif.linux.x86.properties            |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../launcher.motif.solaris.sparc.properties        |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../launcher.win32.win32.ia64.properties           |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../launcher.win32.win32.x86.properties            |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../launcher.win32.win32.x86_64.properties         |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../launcher.wpf.win32.x86.properties              |    2 +-
 .../launcher.properties                            |    2 +-
 .../src/org/eclipse/core/launcher/Main.java        |    2 +-
 .../src/org/eclipse/equinox/launcher/Main.java     |    7 +
 .../org/eclipse/equinox/launcher/WebStartMain.java |    2 +-
 .../org.eclipse.equinox.log/.settings/.api_filters |   13 +
 .../org.eclipse.equinox.log/META-INF/MANIFEST.MF   |   11 +-
 .../equinox/log/LogPermissionCollection.java       |    2 +-
 .../equinox/log/SynchronousLogListener.java        |    2 +-
 .../eclipse/equinox/log/internal/Activator.java    |   11 +-
 .../equinox/log/internal/BasicReadWriteLock.java   |    2 +-
 .../equinox/log/internal/ExtendedLogEntryImpl.java |    2 +-
 .../internal/ExtendedLogReaderServiceFactory.java  |    2 +-
 .../log/internal/ExtendedLogReaderServiceImpl.java |    2 +-
 .../log/internal/ExtendedLogServiceFactory.java    |    2 +-
 .../log/internal/ExtendedLogServiceImpl.java       |    2 +-
 .../eclipse/equinox/log/internal/LoggerImpl.java   |    2 +-
 .../equinox/log/internal/SerializedTaskQueue.java  |    2 +-
 .../org.eclipse.equinox.metatype/.classpath        |    2 +-
 .../.settings/.api_filters                         |   11 +
 .../.settings/org.eclipse.jdt.core.prefs           |  596 +-
 .../.settings/org.eclipse.pde.api.tools.prefs      |   94 +
 .../META-INF/MANIFEST.MF                           |   23 +-
 .../org.eclipse.equinox.metatype/build.properties  |    7 +-
 .../org.eclipse.equinox.metatype/plugin.properties |    1 -
 .../org/eclipse/equinox/metatype/Activator.java    |  259 +-
 .../equinox/metatype/AttributeDefinitionImpl.java  |  276 +-
 .../org/eclipse/equinox/metatype/DataParser.java   |  276 +-
 .../org/eclipse/equinox/metatype/Designate.java    |  104 +
 .../equinox/metatype/ExternalMessages.properties   |   10 +-
 .../eclipse/equinox/metatype/FragmentUtils.java    |   79 +-
 .../equinox/metatype/LocalizationElement.java      |    4 +-
 .../equinox/metatype/LogMessages.properties        |   17 +
 .../org/eclipse/equinox/metatype/LogTracker.java   |  177 +
 .../eclipse/equinox/metatype/LogTrackerMsg.java    |   28 +
 .../src/org/eclipse/equinox/metatype/Logging.java  |   73 -
 .../equinox/metatype/MetaTypeInformationImpl.java  |   15 +-
 .../org/eclipse/equinox/metatype/MetaTypeMsg.java  |   10 +-
 .../equinox/metatype/MetaTypeProviderImpl.java     |  140 +-
 .../equinox/metatype/MetaTypeProviderTracker.java  |  138 +-
 .../equinox/metatype/MetaTypeServiceImpl.java      |   31 +-
 .../metatype/ObjectClassDefinitionImpl.java        |   60 +-
 .../eclipse/equinox/metatype/ValueTokenizer.java   |  272 +-
 .../META-INF/MANIFEST.MF                           |   10 +-
 .../build.properties                               |   10 +
 .../pom.xml                                        |    2 +-
 .../p2/artifact/processing/messages.properties     |    4 +-
 .../p2/artifact/processors/md5/MD5Verifier.java    |    5 +-
 .../p2/artifact/processors/md5/Messages.java       |    2 +-
 .../p2/artifact/processors/md5/messages.properties |    2 +-
 .../processors/pack200/Pack200ProcessorStep.java   |    2 +-
 .../internal/p2/artifact/repository/Activator.java |   76 +-
 .../repository/ArtifactRepositoryComponent.java    |    2 +-
 .../repository/ArtifactRepositoryManager.java      |    7 +-
 .../p2/artifact/repository/ArtifactRequest.java    |    7 +-
 .../repository/CompositeArtifactRepository.java    |   88 +-
 .../CompositeArtifactRepositoryFactory.java        |    9 +-
 .../internal/p2/artifact/repository/Messages.java  |    4 +-
 .../p2/artifact/repository/MirrorRequest.java      |   24 +-
 .../p2/artifact/repository/MirrorSelector.java     |    8 +-
 .../p2/artifact/repository/RawMirrorRequest.java   |    8 +-
 .../p2/artifact/repository/SignatureVerifier.java  |    2 +-
 .../p2/artifact/repository/messages.properties     |    5 +-
 .../p2/artifact/repository/simple/BlobStore.java   |    2 +-
 .../p2/artifact/repository/simple/DownloadJob.java |    2 +-
 .../p2/artifact/repository/simple/Mapper.java      |    2 +-
 .../simple/SimpleArtifactDescriptor.java           |    2 +-
 .../simple/SimpleArtifactRepository.java           |  590 ++-
 .../simple/SimpleArtifactRepositoryFactory.java    |   13 +-
 .../simple/SimpleArtifactRepositoryIO.java         |   85 +-
 .../repository/processing/ProcessingStep.java      |    2 +-
 .../processing/ProcessingStepHandler.java          |    2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    5 +-
 .../META-INF/MANIFEST.MF                           |    7 +-
 .../build.properties                               |    2 +-
 .../plugins/org.eclipse.equinox.p2.console/pom.xml |    2 +-
 .../equinox/internal/p2/console/Activator.java     |   18 +-
 .../equinox/internal/p2/console/Messages.java      |   51 +
 .../internal/p2/console/ProvCommandProvider.java   |  227 +-
 .../internal/p2/console/ProvisioningHelper.java    |    6 +-
 .../internal/p2/console/messages.properties        |   35 +
 .../plugins/org.eclipse.equinox.p2.core/.options   |    5 +-
 .../META-INF/MANIFEST.MF                           |   15 +-
 .../org.eclipse.equinox.p2.core/build.properties   |    2 +-
 .../plugins/org.eclipse.equinox.p2.core/pom.xml    |    2 +-
 .../equinox/internal/p2/core/Activator.java        |   18 +-
 .../equinox/internal/p2/core/AgentLocation.java    |    2 +-
 .../internal/p2/core/DefaultAgentProvider.java     |    4 +-
 .../internal/p2/core/ProvisioningAgent.java        |   33 +-
 .../internal/p2/core/ProvisioningEventBus.java     |   16 +-
 .../internal/p2/core/helpers/FileUtils.java        |    2 +-
 .../p2/core/helpers/OrderedProperties.java         |    2 +-
 .../internal/p2/core/helpers/ServiceHelper.java    |   43 +-
 .../internal/p2/core/helpers/StringHelper.java     |    2 +-
 .../equinox/internal/p2/core/helpers/TarFile.java  |    2 +-
 .../equinox/internal/p2/core/helpers/Tracing.java  |    6 +-
 .../p2/core/eventbus/IProvisioningEventBus.java    |    4 +-
 .../eclipse/equinox/p2/core/IAgentLocation.java    |    2 +-
 .../src/org/eclipse/equinox/p2/core/IPool.java     |   36 +
 .../p2/core/IProvisioningAgentProvider.java        |    2 +-
 .../equinox/p2/core/ProvisionException.java        |   11 +-
 .../org/eclipse/equinox/p2/core/StrongPool.java    |   44 +
 .../org/eclipse/equinox/p2/core/UIServices.java    |    2 +-
 .../src/org/eclipse/equinox/p2/core/WeakPool.java  |   47 +
 .../equinox/p2/core/spi/IAgentServiceFactory.java  |    2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    7 +-
 .../META-INF/MANIFEST.MF                           |    7 +-
 .../build.properties                               |    2 +-
 .../org.eclipse.equinox.p2.director.app/plugin.xml |    5 -
 .../org.eclipse.equinox.p2.director.app/pom.xml    |    2 +-
 .../internal/p2/director/app/Application.java      |  660 --
 .../p2/director/app/DirectorApplication.java       |  313 +-
 .../equinox/internal/p2/director/app/ILog.java     |   10 +
 .../equinox/internal/p2/director/app/Messages.java |   13 +-
 .../internal/p2/director/app/PrettyQuery.java      |   43 +
 .../internal/p2/director/app/messages.properties   |   12 +-
 .../META-INF/MANIFEST.MF                           |   24 +-
 .../build.properties                               |    2 +-
 .../org.eclipse.equinox.p2.director/pom.xml        |    2 +-
 .../internal/p2/director/ApplicablePatchQuery.java |    2 +-
 .../internal/p2/director/AttachmentHelper.java     |    2 +-
 .../equinox/internal/p2/director/Explanation.java  |    2 +-
 .../equinox/internal/p2/director/Messages.java     |    2 +-
 .../internal/p2/director/OperationGenerator.java   |    2 +-
 .../internal/p2/director/PermissiveSlicer.java     |    2 +-
 .../internal/p2/director/PlannerComponent.java     |    2 +-
 .../internal/p2/director/ProfileChangeRequest.java |  279 +
 .../equinox/internal/p2/director/Projector.java    |   42 +-
 .../internal/p2/director/QueryableArray.java       |    2 +-
 .../internal/p2/director/SimpleDirector.java       |   11 +-
 .../internal/p2/director/SimplePlanner.java        |   73 +-
 .../internal/p2/director/messages.properties       |    2 +-
 .../equinox/internal/p2/rollback/FormerState.java  |    7 +-
 .../provisional/p2/director/IDirector.java         |    5 +-
 .../p2/director/PlanExecutionHelper.java           |    2 +-
 .../provisional/p2/director/PlanVerifier.java      |   25 -
 .../provisional/p2/director/PlannerStatus.java     |   10 +
 .../p2/director/ProfileChangeRequest.java          |  281 -
 .../provisional/p2/director/RequestStatus.java     |    2 +-
 .../equinox/p2/planner/ProfileInclusionRules.java  |    2 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../build.properties                               |    2 +-
 .../pom.xml                                        |    2 +-
 .../provisional/p2/directorywatcher/Activator.java |    2 +-
 .../CachingArtifactRepository.java                 |  153 +-
 .../p2/directorywatcher/DirectoryWatcher.java      |    2 +-
 .../p2/directorywatcher/EntryAdvice.java           |    2 +-
 .../p2/directorywatcher/RepositoryListener.java    |   28 +-
 .../META-INF/MANIFEST.MF                           |    3 +-
 .../build.properties                               |    2 +-
 .../plugin.properties                              |    2 +-
 .../pom.xml                                        |    2 +-
 .../p2/discovery/compatibility/Activator.java      |    4 +-
 .../compatibility/BundleDiscoverySource.java       |    2 +-
 .../compatibility/BundleDiscoveryStrategy.java     |    2 +-
 .../ConnectorDiscoveryExtensionReader.java         |    2 +-
 .../p2/discovery/compatibility/Directory.java      |    2 +-
 .../discovery/compatibility/DirectoryParser.java   |    2 +-
 .../compatibility/DiscoveryRegistryStrategy.java   |    2 +-
 .../compatibility/JarDiscoverySource.java          |    2 +-
 .../p2/discovery/compatibility/Messages.java       |    2 +-
 .../RemoteBundleDiscoveryStrategy.java             |    2 +-
 .../p2/discovery/compatibility/SiteVerifier.java   |   12 +-
 .../p2/discovery/compatibility/messages.properties |    2 +-
 .../discovery/compatibility/util/CacheManager.java |   10 +-
 .../compatibility/util/DefaultSaxErrorHandler.java |    2 +-
 .../compatibility/util/IOWithCauseException.java   |    2 +-
 .../compatibility/util/TransportUtil.java          |    4 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../build.properties                               |    2 +-
 .../plugin.properties                              |    2 +-
 .../org.eclipse.equinox.p2.discovery/pom.xml       |    2 +-
 .../p2/discovery/AbstractDiscoveryStrategy.java    |    2 +-
 .../equinox/internal/p2/discovery/Catalog.java     |    4 +-
 .../internal/p2/discovery/DiscoveryCore.java       |    2 +-
 .../equinox/internal/p2/discovery/Messages.java    |    2 +-
 .../equinox/internal/p2/discovery/Policy.java      |    2 +-
 .../internal/p2/discovery/messages.properties      |    2 +-
 .../p2/discovery/model/CatalogCategory.java        |    2 +-
 .../internal/p2/discovery/model/CatalogItem.java   |    2 +-
 .../internal/p2/discovery/model/Certification.java |    2 +-
 .../internal/p2/discovery/model/FeatureFilter.java |    2 +-
 .../equinox/internal/p2/discovery/model/Group.java |    2 +-
 .../equinox/internal/p2/discovery/model/Icon.java  |    2 +-
 .../internal/p2/discovery/model/Messages.java      |    2 +-
 .../internal/p2/discovery/model/Overview.java      |    2 +-
 .../p2/discovery/model/ValidationException.java    |    2 +-
 .../p2/discovery/model/messages.properties         |    2 +-
 .../discovery/util/CatalogCategoryComparator.java  |    2 +-
 .../p2/discovery/util/CatalogItemComparator.java   |    2 +-
 .../META-INF/MANIFEST.MF                           |   21 +-
 .../org.eclipse.equinox.p2.engine/build.properties |    2 +-
 .../plugins/org.eclipse.equinox.p2.engine/pom.xml  |    2 +-
 .../equinox/internal/p2/engine/ActionManager.java  |    2 +-
 .../internal/p2/engine/BeginOperationEvent.java    |    2 +-
 .../internal/p2/engine/CommitOperationEvent.java   |    2 +-
 .../equinox/internal/p2/engine/DebugHelper.java    |    2 +-
 .../eclipse/equinox/internal/p2/engine/Engine.java |    2 +
 .../internal/p2/engine/EngineActivator.java        |    2 +-
 .../equinox/internal/p2/engine/EngineSession.java  |    2 +-
 .../p2/engine/ISurrogateProfileHandler.java        |    2 +-
 .../internal/p2/engine/InstallableUnitEvent.java   |    2 +-
 .../internal/p2/engine/InstallableUnitOperand.java |    2 +-
 .../internal/p2/engine/InstallableUnitPhase.java   |    2 +-
 .../p2/engine/InstallableUnitPropertyOperand.java  |    2 +-
 .../internal/p2/engine/InstructionParser.java      |    2 +-
 .../equinox/internal/p2/engine/Messages.java       |    5 +-
 .../p2/engine/MissingActionsException.java         |    2 +-
 .../equinox/internal/p2/engine/Operand.java        |    2 +-
 .../p2/engine/ParameterizedProvisioningAction.java |    2 +-
 .../eclipse/equinox/internal/p2/engine/Phase.java  |    2 +-
 .../equinox/internal/p2/engine/PhaseSet.java       |    2 +-
 .../p2/engine/ProfileMetadataRepository.java       |    7 +-
 .../engine/ProfileMetadataRepositoryFactory.java   |    2 +-
 .../equinox/internal/p2/engine/ProfileParser.java  |    2 +-
 .../internal/p2/engine/ProfilePreferences.java     |   16 +-
 .../p2/engine/ProfileRegistryComponent.java        |    2 +-
 .../equinox/internal/p2/engine/ProfileWriter.java  |    2 +-
 .../internal/p2/engine/ProfileXMLConstants.java    |    2 +-
 .../internal/p2/engine/PropertyOperand.java        |    2 +-
 .../internal/p2/engine/ProvisioningPlan.java       |    2 +-
 .../internal/p2/engine/RollbackOperationEvent.java |    2 +-
 .../internal/p2/engine/SimpleProfileRegistry.java  |  317 +-
 .../internal/p2/engine/TouchpointManager.java      |    2 +-
 .../internal/p2/engine/TransactionEvent.java       |    2 +-
 .../equinox/internal/p2/engine/messages.properties |    5 +-
 .../p2/engine/phases/CertificateChecker.java       |    6 +-
 .../internal/p2/engine/phases/CheckTrust.java      |    2 +-
 .../equinox/internal/p2/engine/phases/Collect.java |    2 +-
 .../internal/p2/engine/phases/Configure.java       |    2 +-
 .../equinox/internal/p2/engine/phases/Install.java |    2 +-
 .../internal/p2/engine/phases/Property.java        |    2 +-
 .../equinox/internal/p2/engine/phases/Sizing.java  |    2 +-
 .../internal/p2/engine/phases/Unconfigure.java     |    2 +-
 .../internal/p2/engine/phases/Uninstall.java       |    2 +-
 .../src/org/eclipse/equinox/p2/engine/IEngine.java |    2 +-
 .../org/eclipse/equinox/p2/engine/IPhaseSet.java   |    2 +-
 .../org/eclipse/equinox/p2/engine/IProfile.java    |   19 +-
 .../equinox/p2/engine/IProfileRegistry.java        |   86 +-
 .../eclipse/equinox/p2/engine/PhaseSetFactory.java |    2 +-
 .../equinox/p2/engine/ProvisioningContext.java     |   20 +-
 .../org/eclipse/equinox/p2/engine/spi/Memento.java |    3 +-
 .../equinox/p2/engine/spi/ProvisioningAction.java  |    2 +-
 .../eclipse/equinox/p2/engine/spi/Touchpoint.java  |   14 +-
 .../META-INF/MANIFEST.MF                           |    7 +-
 .../build.properties                               |    2 +-
 .../plugin.properties                              |    2 +-
 .../pom.xml                                        |    2 +-
 .../internal/p2/extensionlocation/Activator.java   |    6 +-
 .../BundlePoolFilteredListener.java                |    2 +-
 .../ExtensionLocationArtifactRepository.java       |   72 +-
 ...ExtensionLocationArtifactRepositoryFactory.java |    2 +-
 .../ExtensionLocationMetadataRepository.java       |   29 +-
 ...ExtensionLocationMetadataRepositoryFactory.java |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../build.properties                               |   10 +
 .../plugin.properties                              |    2 +-
 .../pom.xml                                        |    2 +-
 .../internal/p2/garbagecollector/Application.java  |    4 +-
 .../internal/p2/garbagecollector/GCActivator.java  |   10 +-
 .../p2/garbagecollector/GarbageCollector.java      |    2 +-
 .../internal/p2/garbagecollector/MarkSet.java      |    2 +-
 .../p2/garbagecollector/MarkSetProvider.java       |    2 +-
 .../META-INF/MANIFEST.MF                           |    7 +-
 .../build.properties                               |    2 +-
 .../installer.product                              |   31 +-
 .../installer.properties                           |   10 +
 .../org.eclipse.equinox.p2.installer/pom.xml       |    2 +-
 .../internal/p2/installer/InstallApplication.java  |    2 +-
 .../p2/installer/InstallDescriptionParser.java     |    6 +-
 .../installer/InstallUpdateProductOperation.java   |    9 +-
 .../equinox/internal/p2/installer/Messages.java    |    2 +-
 .../internal/p2/installer/messages.properties      |    2 +-
 .../internal/p2/installer/ui/InstallDialog.java    |    2 +-
 .../internal/p2/installer/ui/ProxiesDialog.java    |    2 +-
 .../p2/installer/InstallDescription.java           |    2 +-
 .../equinox/internal/p2/jarprocessor/PackStep.java |    2 +-
 .../equinox/internal/p2/jarprocessor/Utils.java    |    2 +-
 .../p2/jarprocessor/verifier/Verifier.java         |    2 +-
 .../p2/jarprocessor/verifier/VerifyStep.java       |    2 +-
 .../equinox/p2/jarprocessor/JarProcessor.java      |    2 +-
 .../p2/jarprocessor/ant/JarProcessorTask.java      |    2 +-
 .../.classpath                                     |    8 -
 .../Build Metadata Generator Ant Tasks.launch      |   20 -
 .../.project                                       |   44 -
 .../.settings/org.eclipse.jdt.core.prefs           |  353 -
 .../.settings/org.eclipse.jdt.ui.prefs             |   60 -
 .../CDC-1.0_Foundation-1.0.profile                 |   24 -
 .../CDC-1.1_Foundation-1.1.profile                 |   30 -
 .../J2SE-1.2.profile                               |   47 -
 .../J2SE-1.3.profile                               |   68 -
 .../J2SE-1.4.profile                               |  129 -
 .../J2SE-1.5.profile                               |  157 -
 .../JRE-1.1.profile                                |   22 -
 .../JavaSE-1.6.profile                             |  194 -
 .../META-INF/MANIFEST.MF                           |   44 -
 .../Metadata Generator Plugins and Features.launch |   22 -
 .../Metadata Generator SDK.launch                  |   24 -
 .../Metadata Generator Update Site.launch          |   23 -
 .../OSGi_Minimum-1.0.profile                       |   22 -
 .../OSGi_Minimum-1.1.profile                       |   23 -
 .../OSGi_Minimum-1.2.profile                       |   24 -
 .../build.properties                               |   33 -
 .../config.ini                                     |   57 -
 .../generator.product                              |   30 -
 .../p2-izer update site.launch                     |   23 -
 .../plugin.properties                              |   12 -
 .../plugin.xml                                     |   24 -
 .../pom.xml                                        |   14 -
 .../scripts/buildExtraJAR.xml                      |   36 -
 .../internal/p2/metadata/generator/Activator.java  |   32 -
 .../generator/EclipseGeneratorApplication.java     |  422 --
 .../p2/metadata/generator/LocalizationHelper.java  |  200 -
 .../internal/p2/metadata/generator/Messages.java   |   34 -
 .../p2/metadata/generator/ProductQuery.java        |  133 -
 .../generator/features/DefaultSiteParser.java      |  731 --
 .../metadata/generator/features/FeatureParser.java |  363 -
 .../p2/metadata/generator/features/Messages.java   |   41 -
 .../metadata/generator/features/ProductFile.java   |  514 --
 .../metadata/generator/features/SiteCategory.java  |  146 -
 .../metadata/generator/features/SiteFeature.java   |  245 -
 .../p2/metadata/generator/features/SiteModel.java  |  197 -
 .../generator/features/messages.properties         |   28 -
 .../p2/metadata/generator/messages.properties      |   22 -
 .../generator/BundleDescriptionFactory.java        |  180 -
 .../EclipseInstallGeneratorInfoProvider.java       |  538 --
 .../provisional/p2/metadata/generator/Feature.java |  278 -
 .../p2/metadata/generator/FeatureEntry.java        |  179 -
 .../p2/metadata/generator/Generator.java           | 1402 ----
 .../p2/metadata/generator/GeneratorBundleInfo.java |  142 -
 .../p2/metadata/generator/IGeneratorInfo.java      |  117 -
 .../metadata/generator/IncrementalGenerator.java   |   50 -
 .../generator/MetadataGeneratorHelper.java         | 1434 ----
 .../p2/metadata/generator/URLEntry.java            |   41 -
 .../p2/metadata/generator/ant/GeneratorTask.java   |  223 -
 .../p2/metadata/generator/ant/TaskMessages.java    |   24 -
 .../p2/metadata/generator/ant/messages.properties  |   12 -
 .../.externalToolBuilders/New_Builder (1).launch   |   12 +
 .../.project                                       |    2 +-
 .../META-INF/MANIFEST.MF                           |   10 +-
 .../build.properties                               |    2 +-
 .../pom.xml                                        |    2 +-
 .../internal/p2/metadata/repository/Activator.java |    2 +-
 .../repository/CompositeMetadataRepository.java    |   81 +-
 .../CompositeMetadataRepositoryFactory.java        |   12 +-
 .../repository/LocalMetadataRepository.java        |   47 +-
 .../repository/MetadataRepositoryComponent.java    |    2 +-
 .../metadata/repository/MetadataRepositoryIO.java  |   10 +-
 .../repository/MetadataRepositoryManager.java      |    4 +-
 .../SimpleMetadataRepositoryFactory.java           |    2 +-
 .../metadata/repository/URLMetadataRepository.java |    2 +-
 .../p2/metadata/repository/io/MetadataWriter.java  |   10 +-
 .../p2/metadata/repository/io/XMLConstants.java    |    2 +-
 .../p2/metadata/repository/messages.properties     |    2 +-
 .../equinox/p2/metadata/io/IUDeserializer.java     |  137 +
 .../equinox/p2/metadata/io/IUSerializer.java       |   45 +
 .../p2/metadata/repository/ant/AddChildTask.java   |    2 +-
 .../ant/CreateCompositeMetadataRepositoryTask.java |   13 +-
 .../metadata/repository/ant/RemoveChildTask.java   |    2 +-
 .../META-INF/MANIFEST.MF                           |   14 +-
 .../build.properties                               |    2 +-
 .../org.eclipse.equinox.p2.metadata/pom.xml        |    2 +-
 .../equinox/internal/p2/metadata/ArtifactKey.java  |    2 +-
 .../equinox/internal/p2/metadata/BasicVersion.java |    2 +-
 .../internal/p2/metadata/EnumDefinition.java       |  303 +
 .../internal/p2/metadata/IRequiredCapability.java  |    2 +-
 .../equinox/internal/p2/metadata/IUMap.java        |   31 +-
 .../internal/p2/metadata/InstallableUnit.java      |    2 +-
 .../p2/metadata/InstallableUnitFragment.java       |    2 +-
 .../internal/p2/metadata/InstallableUnitPatch.java |    2 +-
 .../equinox/internal/p2/metadata/License.java      |    2 +-
 .../equinox/internal/p2/metadata/Messages.java     |   13 +-
 .../internal/p2/metadata/MetadataActivator.java    |    2 +-
 .../equinox/internal/p2/metadata/OSGiVersion.java  |    2 +-
 .../equinox/internal/p2/metadata/OmniVersion.java  |    2 +-
 .../internal/p2/metadata/ProvidedCapability.java   |    8 +-
 .../internal/p2/metadata/RequiredCapability.java   |    2 +-
 .../internal/p2/metadata/RequirementChange.java    |    2 +-
 .../p2/metadata/ResolvedInstallableUnit.java       |   45 +-
 .../internal/p2/metadata/TouchpointData.java       |    2 +-
 .../p2/metadata/TouchpointInstruction.java         |    2 +-
 .../internal/p2/metadata/TouchpointType.java       |    2 +-
 .../internal/p2/metadata/UpdateDescriptor.java     |    2 +-
 .../internal/p2/metadata/VersionFormat.java        |    6 +-
 .../internal/p2/metadata/VersionFormatParser.java  |  226 +-
 .../internal/p2/metadata/VersionParser.java        |   53 +-
 .../internal/p2/metadata/VersionVector.java        |   11 +-
 .../internal/p2/metadata/expression/All.java       |    2 +-
 .../internal/p2/metadata/expression/Array.java     |    2 +-
 .../p2/metadata/expression/Assignment.java         |    2 +-
 .../internal/p2/metadata/expression/At.java        |    2 +-
 .../internal/p2/metadata/expression/Collect.java   |    2 +-
 .../p2/metadata/expression/CollectionFilter.java   |    2 +-
 .../internal/p2/metadata/expression/Condition.java |    2 +-
 .../p2/metadata/expression/ContextExpression.java  |    2 +-
 .../expression/CurryedLambdaExpression.java        |    2 +-
 .../internal/p2/metadata/expression/Equals.java    |    2 +-
 .../p2/metadata/expression/EvaluationContext.java  |    2 +-
 .../p2/metadata/expression/Everything.java         |    2 +-
 .../internal/p2/metadata/expression/Exists.java    |    2 +-
 .../p2/metadata/expression/Expression.java         |    2 +-
 .../p2/metadata/expression/ExpressionFactory.java  |   10 +
 .../p2/metadata/expression/FilterFunction.java     |    2 +-
 .../internal/p2/metadata/expression/First.java     |    2 +-
 .../internal/p2/metadata/expression/Flatten.java   |    2 +-
 .../internal/p2/metadata/expression/Function.java  |    2 +-
 .../metadata/expression/IExpressionConstants.java  |    2 +-
 .../metadata/expression/IRepeatableIterator.java   |    2 +-
 .../internal/p2/metadata/expression/Intersect.java |    2 +-
 .../p2/metadata/expression/LDAPFilter.java         |   17 +-
 .../p2/metadata/expression/LambdaExpression.java   |    2 +-
 .../internal/p2/metadata/expression/Latest.java    |    2 +-
 .../internal/p2/metadata/expression/Limit.java     |    2 +-
 .../internal/p2/metadata/expression/Literal.java   |    2 +-
 .../p2/metadata/expression/MatchExpression.java    |    2 +-
 .../internal/p2/metadata/expression/Matches.java   |    9 +-
 .../internal/p2/metadata/expression/Member.java    |    2 +-
 .../p2/metadata/expression/MemberProvider.java     |   16 +-
 .../internal/p2/metadata/expression/Not.java       |    2 +-
 .../internal/p2/metadata/expression/Or.java        |    2 +-
 .../internal/p2/metadata/expression/Parameter.java |    2 +-
 .../internal/p2/metadata/expression/Pipe.java      |    2 +-
 .../p2/metadata/expression/RangeFunction.java      |    2 +-
 .../p2/metadata/expression/RepeatableIterator.java |    2 +-
 .../internal/p2/metadata/expression/Select.java    |    2 +-
 .../p2/metadata/expression/SetFunction.java        |    2 +-
 .../internal/p2/metadata/expression/Traverse.java  |    2 +-
 .../internal/p2/metadata/expression/Unary.java     |    2 +-
 .../metadata/expression/UnaryCollectionFilter.java |    2 +-
 .../internal/p2/metadata/expression/Union.java     |    2 +-
 .../internal/p2/metadata/expression/Unique.java    |    2 +-
 .../internal/p2/metadata/expression/Variable.java  |    2 +-
 .../p2/metadata/expression/VersionFunction.java    |    2 +-
 .../p2/metadata/expression/parser/QLParser.java    |    2 +-
 .../internal/p2/metadata/index/IndexProvider.java  |   11 +
 .../internal/p2/metadata/messages.properties       |    8 +-
 .../internal/p2/metadata/query/UpdateQuery.java    |    2 +-
 .../p2/metadata/IInstallableUnitFragment.java      |    2 +-
 .../equinox/p2/metadata/IInstallableUnitPatch.java |    2 +-
 .../org/eclipse/equinox/p2/metadata/ILicense.java  |    2 +-
 .../equinox/p2/metadata/IProvidedCapability.java   |    2 +-
 .../equinox/p2/metadata/IRequirementChange.java    |    2 +-
 .../equinox/p2/metadata/ITouchpointData.java       |    2 +-
 .../p2/metadata/ITouchpointInstruction.java        |    2 +-
 .../equinox/p2/metadata/ITouchpointType.java       |    2 +-
 .../equinox/p2/metadata/IUpdateDescriptor.java     |    2 +-
 .../equinox/p2/metadata/IVersionFormat.java        |    2 +-
 .../eclipse/equinox/p2/metadata/IVersionedId.java  |    2 +-
 .../equinox/p2/metadata/MetadataFactory.java       |    8 +
 .../org/eclipse/equinox/p2/metadata/Version.java   |    2 +-
 .../p2/metadata/VersionFormatException.java        |    2 +-
 .../eclipse/equinox/p2/metadata/VersionRange.java  |    2 +-
 .../p2/metadata/expression/IContextExpression.java |    2 +-
 .../org/eclipse/equinox/p2/query/IQueryResult.java |    2 +-
 .../.settings/.api_filters                         |   11 +
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../build.properties                               |    2 +-
 .../plugin.properties                              |    4 +-
 .../org.eclipse.equinox.p2.operations/pom.xml      |    2 +-
 .../equinox/internal/p2/operations/Activator.java  |    2 +-
 .../internal/p2/operations/IStatusCodes.java       |    2 +-
 .../equinox/internal/p2/operations/Messages.java   |    5 +-
 .../internal/p2/operations/PlanAnalyzer.java       |    5 +-
 .../p2/operations/PlannerResolutionJob.java        |    4 +-
 .../internal/p2/operations/ResolutionResult.java   |    2 +-
 .../operations/SearchForUpdatesResolutionJob.java  |    2 +-
 .../internal/p2/operations/messages.properties     |    5 +-
 .../equinox/p2/operations/IProfileChangeJob.java   |    2 +-
 .../equinox/p2/operations/InstallOperation.java    |   14 +-
 .../equinox/p2/operations/OperationFactory.java    |  181 +
 .../p2/operations/ProfileChangeOperation.java      |   15 +-
 .../p2/operations/ProfileModificationJob.java      |   20 +-
 .../equinox/p2/operations/ProvisioningJob.java     |    2 +-
 .../equinox/p2/operations/RepositoryTracker.java   |   24 +-
 .../p2/operations/SynchronizeOperation.java        |   72 +
 .../equinox/p2/operations/UninstallOperation.java  |    5 +-
 .../org/eclipse/equinox/p2/operations/Update.java  |    2 +-
 .../equinox/p2/operations/UpdateOperation.java     |    5 +-
 .../.classpath                                     |    0
 .../.externalToolBuilders/Ant tasks.launch         |   12 +
 .../.project                                       |   38 +
 .../.settings/org.eclipse.jdt.core.prefs           |  364 +
 .../.settings/org.eclipse.jdt.ui.prefs             |   62 +
 .../.settings/org.eclipse.pde.core.prefs           |    0
 .../META-INF/MANIFEST.MF                           |   60 +
 .../about.html                                     |    0
 .../build.properties                               |   26 +
 .../plugin.properties                              |   13 +
 .../plugin.xml                                     |   47 +
 .../pom.xml                                        |   17 +
 .../scripts/buildExtraJAR.xml                      |   36 +
 .../compatibility/GeneratorApplication.java        |  137 +
 .../compatibility/IGeneratorConstants.java         |   54 +
 .../p2/publisher/eclipse/BrandingIron.java         |  656 ++
 .../internal/p2/publisher/eclipse/DataLoader.java  |  130 +
 .../publisher/eclipse/ExecutablesDescriptor.java   |  265 +
 .../publisher/eclipse/FeatureManifestParser.java   |  292 +
 .../p2/publisher/eclipse/FeatureParser.java        |  125 +
 .../p2/publisher/eclipse/GeneratorBundleInfo.java  |   73 +
 .../p2/publisher/eclipse/IProductDescriptor.java   |  136 +
 .../internal/p2/publisher/eclipse/ProductFile.java |  885 +++
 .../eclipse/AccumulateConfigDataAction.java        |   45 +
 .../eclipse/ApplicationLauncherAction.java         |  147 +
 .../p2/publisher/eclipse/BundleShapeAdvice.java    |   39 +
 .../p2/publisher/eclipse/BundlesAction.java        |  824 +++
 .../equinox/p2/publisher/eclipse/ConfigAdvice.java |   40 +
 .../p2/publisher/eclipse/ConfigCUsAction.java      |  398 ++
 .../p2/publisher/eclipse/DefaultCUsAction.java     |   70 +
 .../p2/publisher/eclipse/EclipseInstallAction.java |  219 +
 .../publisher/eclipse/EclipsePublisherHelper.java  |   48 +
 .../publisher/eclipse/EquinoxExecutableAction.java |  261 +
 .../publisher/eclipse/EquinoxLauncherCUAction.java |  100 +
 .../equinox/p2/publisher/eclipse/Feature.java      |  362 +
 .../equinox/p2/publisher/eclipse/FeatureEntry.java |  224 +
 .../p2/publisher/eclipse/FeaturesAction.java       |  663 ++
 .../FeaturesAndBundlesPublisherApplication.java    |   82 +
 .../p2/publisher/eclipse/IBrandingAdvice.java      |   40 +
 .../p2/publisher/eclipse/IBundleShapeAdvice.java   |   19 +
 .../p2/publisher/eclipse/IConfigAdvice.java        |   21 +
 .../p2/publisher/eclipse/IExecutableAdvice.java    |   40 +
 .../p2/publisher/eclipse/IPlatformEntry.java       |   22 +
 .../eclipse/InstallPublisherApplication.java       |  101 +
 .../p2/publisher/eclipse/LaunchingAdvice.java      |   43 +
 .../p2/publisher/eclipse/ProductAction.java        |  186 +
 .../p2/publisher/eclipse/ProductFileAdvice.java    |  315 +
 .../eclipse/ProductPublisherApplication.java       |   71 +
 .../equinox/p2/publisher/eclipse/URLEntry.java     |   42 +
 .../build/publisher/BuildPublisherApplication.java |   38 +
 .../build/publisher/FeatureRootAdvice.java         |  127 +
 .../build/publisher/GatherBundleAction.java        |   84 +
 .../build/publisher/GatherFeatureAction.java       |  122 +
 .../build/publisher/GatheringComputer.java         |   69 +
 .../eclipse/pde/internal/publishing/Activator.java |   31 +
 .../eclipse/pde/internal/publishing/Constants.java |   22 +
 .../eclipse/pde/internal/publishing/Messages.java  |   32 +
 .../org/eclipse/pde/internal/publishing/Utils.java |  108 +
 .../pde/internal/publishing/messages.properties    |   22 +
 .../eclipse/pde/internal/swt/tools/IconExe.java    | 3351 +++++++++
 .../p2/publisher/ant/AbstractPublishTask.java      |  214 +
 .../ant/FeaturesAndBundlesPublisherTask.java       |   85 +
 .../p2/publisher/ant/ProductPublisherTask.java     |  138 +
 .../internal/p2/publisher/ant/PublisherTask.java   |  182 +
 .../internal/p2/publisher/ant/TaskMessages.java    |   26 +
 .../internal/p2/publisher/ant/messages.properties  |   14 +
 .../org.eclipse.equinox.p2.publisher/.classpath    |    1 -
 .../Build Metadata Generator Ant Tasks.launch      |   20 -
 .../Build Publisher Ant Tasks.launch               |   20 -
 .../org.eclipse.equinox.p2.publisher/.project      |   10 -
 .../META-INF/MANIFEST.MF                           |   39 +-
 .../build.properties                               |    8 +-
 .../plugin.properties                              |    2 +-
 .../org.eclipse.equinox.p2.publisher/plugin.xml    |   47 -
 .../org.eclipse.equinox.p2.publisher/pom.xml       |    2 +-
 .../scripts/buildExtraJAR.xml                      |   36 -
 .../equinox/internal/p2/publisher/Activator.java   |    4 +-
 .../internal/p2/publisher/FileSetDescriptor.java   |    2 +-
 .../equinox/internal/p2/publisher/Messages.java    |    5 +-
 .../internal/p2/publisher/QuotedTokenizer.java     |    2 +-
 .../compatibility/GeneratorApplication.java        |  137 -
 .../compatibility/IGeneratorConstants.java         |   54 -
 .../p2/publisher/eclipse/BrandingIron.java         |  544 --
 .../internal/p2/publisher/eclipse/DataLoader.java  |  130 -
 .../publisher/eclipse/ExecutablesDescriptor.java   |  265 -
 .../publisher/eclipse/FeatureManifestParser.java   |  269 -
 .../p2/publisher/eclipse/FeatureParser.java        |   98 -
 .../p2/publisher/eclipse/GeneratorBundleInfo.java  |   73 -
 .../p2/publisher/eclipse/IProductDescriptor.java   |  131 -
 .../internal/p2/publisher/eclipse/ProductFile.java |  760 --
 .../internal/p2/publisher/messages.properties      |    7 +-
 .../equinox/internal/p2/swt/tools/IconExe.java     | 3339 ---------
 .../equinox/p2/publisher/AbstractAdvice.java       |    2 +-
 .../p2/publisher/AbstractPublisherAction.java      |   23 +-
 .../p2/publisher/AbstractPublisherApplication.java |   28 +-
 .../equinox/p2/publisher/AdviceFileAdvice.java     |  183 +
 .../equinox/p2/publisher/AdviceFileParser.java     |  592 ++
 .../equinox/p2/publisher/IPublisherAdvice.java     |    2 +-
 .../equinox/p2/publisher/IPublisherInfo.java       |    2 +-
 .../equinox/p2/publisher/IPublisherResult.java     |    2 +-
 .../equinox/p2/publisher/PublisherInfo.java        |    2 +-
 .../actions/IAdditionalInstallableUnitAdvice.java  |    2 +-
 .../p2/publisher/actions/ICapabilityAdvice.java    |    2 +-
 .../p2/publisher/actions/IFilterAdvice.java        |    2 +-
 .../p2/publisher/actions/ILicenseAdvice.java       |    2 +-
 .../p2/publisher/actions/IPropertyAdvice.java      |    2 +-
 .../p2/publisher/actions/IRootIUAdvice.java        |    2 +-
 .../p2/publisher/actions/ITouchpointAdvice.java    |    2 +-
 .../publisher/actions/IUpdateDescriptorAdvice.java |   23 +
 .../p2/publisher/actions/IVersionAdvice.java       |    2 +-
 .../equinox/p2/publisher/actions/JREAction.java    |    4 +-
 .../p2/publisher/actions/MergeResultsAction.java   |    2 +-
 .../publisher/actions/QueryableFilterAdvice.java   |    2 +-
 .../p2/publisher/actions/RootFilesAction.java      |    4 +-
 .../equinox/p2/publisher/actions/RootIUAction.java |    7 +-
 .../equinox/p2/publisher/actions/RootIUAdvice.java |    2 +-
 .../actions/RootIUResultFilterAdvice.java          |    2 +-
 .../p2/publisher/actions/VersionAdvice.java        |    2 +-
 .../eclipse/AccumulateConfigDataAction.java        |   45 -
 .../p2/publisher/eclipse/AdviceFileAdvice.java     |  179 -
 .../p2/publisher/eclipse/AdviceFileParser.java     |  557 --
 .../eclipse/ApplicationLauncherAction.java         |  149 -
 .../p2/publisher/eclipse/BundleShapeAdvice.java    |   39 -
 .../p2/publisher/eclipse/BundlesAction.java        |  818 ---
 .../equinox/p2/publisher/eclipse/ConfigAdvice.java |   40 -
 .../p2/publisher/eclipse/ConfigCUsAction.java      |  398 --
 .../p2/publisher/eclipse/DefaultCUsAction.java     |   70 -
 .../p2/publisher/eclipse/EclipseInstallAction.java |  219 -
 .../publisher/eclipse/EquinoxExecutableAction.java |  258 -
 .../publisher/eclipse/EquinoxLauncherCUAction.java |  100 -
 .../equinox/p2/publisher/eclipse/Feature.java      |  326 -
 .../equinox/p2/publisher/eclipse/FeatureEntry.java |  189 -
 .../p2/publisher/eclipse/FeaturesAction.java       |  654 --
 .../FeaturesAndBundlesPublisherApplication.java    |   82 -
 .../p2/publisher/eclipse/IBrandingAdvice.java      |   40 -
 .../p2/publisher/eclipse/IBundleShapeAdvice.java   |   19 -
 .../p2/publisher/eclipse/IConfigAdvice.java        |   21 -
 .../p2/publisher/eclipse/IExecutableAdvice.java    |   40 -
 .../eclipse/InstallPublisherApplication.java       |  101 -
 .../p2/publisher/eclipse/LaunchingAdvice.java      |   43 -
 .../p2/publisher/eclipse/ProductAction.java        |  187 -
 .../p2/publisher/eclipse/ProductFileAdvice.java    |  315 -
 .../eclipse/ProductPublisherApplication.java       |   70 -
 .../equinox/p2/publisher/eclipse/URLEntry.java     |   42 -
 .../spi/p2/publisher/LocalizationHelper.java       |    2 +-
 .../equinox/spi/p2/publisher/PublisherHelper.java  |   37 +-
 .../p2/publisher/ant/AbstractPublishTask.java      |  215 -
 .../ant/FeaturesAndBundlesPublisherTask.java       |   85 -
 .../p2/publisher/ant/ProductPublisherTask.java     |  138 -
 .../internal/p2/publisher/ant/PublisherTask.java   |  182 -
 .../internal/p2/publisher/ant/TaskMessages.java    |   26 -
 .../internal/p2/publisher/ant/messages.properties  |   14 -
 .../org.eclipse.equinox.p2.ql/META-INF/MANIFEST.MF |    2 +-
 .../org.eclipse.equinox.p2.ql/build.properties     |   12 +-
 .../org.eclipse.equinox.p2.ql/plugin.properties    |   14 +-
 eclipse/plugins/org.eclipse.equinox.p2.ql/pom.xml  |    2 +-
 .../org/eclipse/equinox/p2/ql/IQLExpression.java   |    2 +-
 .../src/org/eclipse/equinox/p2/ql/IQLFactory.java  |    2 +-
 .../Bootstrap.product                              |    1 +
 .../META-INF/MANIFEST.MF                           |    6 +-
 .../build.properties                               |    2 +-
 .../plugin.properties                              |    2 +-
 .../pom.xml                                        |    2 +-
 .../internal/p2/reconciler/dropins/Activator.java  |  116 +-
 .../dropins/DropinsRepositoryListener.java         |   51 +-
 .../p2/reconciler/dropins/ProfileSynchronizer.java |  192 +-
 .../META-INF/MANIFEST.MF                           |    3 +-
 .../build.properties                               |    2 +-
 .../plugin.properties                              |    2 +-
 .../pom.xml                                        |    2 +-
 .../repository/comparator/JarComparator.java       |  155 +-
 .../comparator/MD5ArtifactComparator.java          |    2 +-
 .../repository/comparator/java/Annotation.java     |    2 +-
 .../comparator/java/AnnotationComponent.java       |    2 +-
 .../comparator/java/AnnotationComponentValue.java  |    2 +-
 .../java/AnnotationDefaultAttribute.java           |    2 +-
 .../comparator/java/AttributeNamesConstants.java   |    2 +-
 .../repository/comparator/java/CharOperation.java  |    2 +-
 .../comparator/java/ClassFileAttribute.java        |    2 +-
 .../comparator/java/ClassFileReader.java           |    5 +-
 .../comparator/java/ClassFileStruct.java           |    2 +-
 .../comparator/java/ClassFormatException.java      |    2 +-
 .../repository/comparator/java/CodeAttribute.java  |    2 +-
 .../repository/comparator/java/ConstantPool.java   |    2 +-
 .../comparator/java/ConstantPoolConstant.java      |    2 +-
 .../comparator/java/ConstantPoolEntry.java         |    2 +-
 .../comparator/java/ConstantValueAttribute.java    |    2 +-
 .../comparator/java/DefaultBytecodeVisitor.java    |    2 +-
 .../repository/comparator/java/Disassembler.java   |    2 +-
 .../comparator/java/EnclosingMethodAttribute.java  |    2 +-
 .../comparator/java/ExceptionAttribute.java        |    2 +-
 .../comparator/java/ExceptionTableEntry.java       |    2 +-
 .../repository/comparator/java/FieldInfo.java      |    2 +-
 .../comparator/java/IModifierConstants.java        |    2 +-
 .../comparator/java/IOpcodeMnemonics.java          |    2 +-
 .../comparator/java/InnerClassesAttribute.java     |    2 +-
 .../java/InnerClassesAttributeEntry.java           |    2 +-
 .../repository/comparator/java/Messages.java       |    2 +-
 .../repository/comparator/java/MethodInfo.java     |    2 +-
 .../comparator/java/OpcodeStringValues.java        |    2 +-
 .../comparator/java/ParameterAnnotation.java       |    2 +-
 .../java/RuntimeInvisibleAnnotationsAttribute.java |    2 +-
 ...timeInvisibleParameterAnnotationsAttribute.java |    2 +-
 .../java/RuntimeVisibleAnnotationsAttribute.java   |    2 +-
 ...untimeVisibleParameterAnnotationsAttribute.java |    2 +-
 .../repository/comparator/java/Signature.java      |   15 +-
 .../comparator/java/SignatureAttribute.java        |    2 +-
 .../comparator/java/SourceFileAttribute.java       |    2 +-
 .../repository/comparator/java/TypeConstants.java  |    2 +-
 .../repository/comparator/java/Utility.java        |    2 +-
 .../repository/comparator/java/messages.properties |    2 +-
 .../repository/mirroring/FileMirrorLog.java        |    2 +-
 .../repository/mirroring/IArtifactMirrorLog.java   |    2 +-
 .../internal/repository/mirroring/Mirroring.java   |   11 +-
 .../repository/mirroring/XMLMirrorLog.java         |    2 +-
 .../repository/tools/AbstractApplication.java      |    8 +-
 .../p2/internal/repository/tools/Activator.java    |    2 +-
 .../tools/ArtifactRepositoryValidator.java         |   10 +
 .../tools/CompositeRepositoryApplication.java      |    7 +-
 .../p2/internal/repository/tools/Messages.java     |    2 +-
 .../repository/tools/MirrorApplication.java        |   29 +-
 .../tools/RecreateRepositoryApplication.java       |    6 +-
 .../repository/tools/RepositoryDescriptor.java     |   11 +-
 .../internal/repository/tools/SlicingOptions.java  |   12 +-
 .../tools/analyzer/HostCheckAnalyzer.java          |    5 +-
 .../repository/tools/analyzer/IUCounting.java      |    2 +-
 .../repository/tools/analyzer/LicenseAnalyzer.java |    2 +-
 .../tools/analyzer/UniqueIUAnalyzer.java           |    2 +-
 .../tools/analyzer/UnzipFeatureJarAnalyzer.java    |    2 +-
 .../repository/tools/analyzer/VersionAnalyzer.java |    2 +-
 .../internal/repository/tools/messages.properties  |    2 +-
 .../p2/repository/tools/analyzer/IIUAnalyzer.java  |    2 +-
 .../repository/tools/tasks/AntMirrorLog.java       |    2 +-
 .../tools/tasks/ArtifactDescription.java           |   10 +
 .../tools/tasks/CompositeRepositoryTask.java       |   31 +-
 .../CreateCompositeArtifactRepositoryTask.java     |   13 +-
 .../tools/tasks/DestinationRepository.java         |    4 +
 .../repository/tools/tasks/IUDescription.java      |    2 +-
 .../tools/tasks/MirrorArtifactsTask.java           |    2 +-
 .../repository/tools/tasks/MirrorMetadataTask.java |    2 +-
 .../repository/tools/tasks/MirrorTask.java         |    2 +-
 .../repository/tools/tasks/ProcessRepoTask.java    |    2 +-
 .../repository/tools/tasks/Repo2RunnableTask.java  |    2 +-
 .../repository/tools/tasks/RepositoryFileSet.java  |    2 +-
 .../repository/tools/tasks/RepositoryList.java     |    2 +-
 .../repository/tools/tasks/SlicingOption.java      |    8 +-
 .../repository/tools/tasks/TaskHelper.java         |    2 +-
 .../META-INF/MANIFEST.MF                           |   26 +-
 .../build.properties                               |   10 +
 .../org.eclipse.equinox.p2.repository/pom.xml      |    2 +-
 .../internal/p2/persistence/CompositeParser.java   |   10 +-
 .../p2/persistence/CompositeRepositoryIO.java      |    6 +-
 .../p2/persistence/CompositeRepositoryState.java   |    2 +-
 .../internal/p2/persistence/CompositeWriter.java   |    2 +-
 .../internal/p2/persistence/XMLConstants.java      |    2 +-
 .../equinox/internal/p2/persistence/XMLParser.java |   13 +-
 .../equinox/internal/p2/persistence/XMLWriter.java |    2 +-
 .../equinox/internal/p2/repository/Activator.java  |  137 +-
 .../internal/p2/repository/CacheManager.java       |   32 +-
 .../p2/repository/CacheManagerComponent.java       |    2 +-
 .../internal/p2/repository/Credentials.java        |   34 +-
 .../internal/p2/repository/FileInfoReader.java     |  242 -
 .../equinox/internal/p2/repository/FileReader.java |  502 --
 .../equinox/internal/p2/repository/Messages.java   |    3 +-
 .../internal/p2/repository/ProgressStatistics.java |   15 +-
 .../internal/p2/repository/RepositoryStatus.java   |  154 -
 .../p2/repository/RepositoryStatusHelper.java      |  323 -
 .../p2/repository/RepositoryTransport.java         |  250 -
 .../equinox/internal/p2/repository/Transport.java  |   63 +-
 .../helpers/AbstractRepositoryManager.java         |   33 +-
 .../p2/repository/helpers/DebugHelper.java         |    2 +-
 .../p2/repository/helpers/RepositoryHelper.java    |    2 +-
 .../internal/p2/repository/messages.properties     |    3 +-
 .../eclipse/equinox/p2/repository/IRepository.java |   17 +-
 .../equinox/p2/repository/IRepositoryManager.java  |    4 +-
 .../p2/repository/IRunnableWithProgress.java       |   10 +
 .../repository/artifact/IArtifactDescriptor.java   |    2 +-
 .../repository/artifact/IArtifactRepository.java   |   92 +-
 .../artifact/IArtifactRepositoryManager.java       |    2 +-
 .../artifact/spi/AbstractArtifactRepository.java   |   91 +-
 .../artifact/spi/ArtifactDescriptor.java           |    2 +-
 .../artifact/spi/ArtifactRepositoryFactory.java    |    2 +-
 .../artifact/spi/ProcessingStepDescriptor.java     |    2 +-
 .../repository/metadata/IMetadataRepository.java   |   16 +-
 .../metadata/IMetadataRepositoryManager.java       |    2 +-
 .../metadata/spi/AbstractMetadataRepository.java   |   13 +-
 .../metadata/spi/MetadataRepositoryFactory.java    |    2 +-
 .../p2/repository/spi/AbstractRepository.java      |   15 +-
 .../META-INF/MANIFEST.MF                           |    5 +-
 .../build.properties                               |    2 +-
 .../plugin.xml                                     |   30 +
 .../pom.xml                                        |    2 +-
 .../eclipse/AggregatedBundleRepository.java        |    2 +-
 .../p2/touchpoint/eclipse/DirectorUtil.java        |    8 +-
 .../p2/touchpoint/eclipse/EclipseTouchpoint.java   |    2 +-
 .../p2/touchpoint/eclipse/LazyManipulator.java     |    8 +-
 .../p2/touchpoint/eclipse/PublisherUtil.java       |    3 +-
 .../p2/touchpoint/eclipse/WhatIsRunning.java       |    2 +-
 .../eclipse/actions/ActionConstants.java           |    3 +-
 .../eclipse/actions/AddJVMArgumentAction.java      |    2 +-
 .../eclipse/actions/AddProgramArgumentAction.java  |    2 +-
 .../eclipse/actions/AddProgramPropertyAction.java  |   90 +
 .../eclipse/actions/AddSourceBundleAction.java     |    2 +-
 .../eclipse/actions/CheckTrustAction.java          |    2 +-
 .../p2/touchpoint/eclipse/actions/ChmodAction.java |    2 +-
 .../touchpoint/eclipse/actions/CollectAction.java  |    2 +-
 .../eclipse/actions/InstallFeatureAction.java      |    2 +-
 .../p2/touchpoint/eclipse/actions/LinkAction.java  |    2 +-
 .../eclipse/actions/RemoveJVMArgumentAction.java   |    2 +-
 .../actions/RemoveProgramArgumentAction.java       |    2 +-
 .../actions/RemoveProgramPropertyAction.java       |   73 +
 .../eclipse/actions/RemoveSourceBundleAction.java  |    2 +-
 .../touchpoint/eclipse/actions/SetJvmAction.java   |   61 +
 .../eclipse/actions/SetLauncherNameAction.java     |    2 +-
 .../eclipse/actions/SetProgramPropertyAction.java  |    2 +-
 .../eclipse/actions/UninstallFeatureAction.java    |    2 +-
 .../equinox/internal/p2/update/Configuration.java  |    2 +-
 .../internal/p2/update/ConfigurationCache.java     |    2 +-
 .../internal/p2/update/ConfigurationIO.java        |    2 +-
 .../eclipse/equinox/internal/p2/update/Site.java   |   11 +
 .../equinox/internal/p2/update/XMLWriter.java      |    2 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../build.properties                               |    2 +-
 .../pom.xml                                        |    2 +-
 .../p2/touchpoint/natives/BackupStore.java         |   68 +-
 .../p2/touchpoint/natives/NativeTouchpoint.java    |    6 +-
 .../internal/p2/touchpoint/natives/Util.java       |    2 +-
 .../natives/actions/ActionConstants.java           |    2 +-
 .../p2/touchpoint/natives/actions/ChmodAction.java |    2 +-
 .../natives/actions/CleanupcopyAction.java         |    2 +-
 .../natives/actions/CleanupzipAction.java          |    6 +-
 .../touchpoint/natives/actions/CollectAction.java  |    2 +-
 .../p2/touchpoint/natives/actions/CopyAction.java  |    2 +-
 .../p2/touchpoint/natives/actions/LinkAction.java  |    2 +-
 .../p2/touchpoint/natives/actions/MkdirAction.java |    2 +-
 .../touchpoint/natives/actions/RemoveAction.java   |    2 +-
 .../p2/touchpoint/natives/actions/UnzipAction.java |    2 +-
 .../.classpath                                     |    7 +
 .../org.eclipse.equinox.p2.transport.ecf/.project  |   33 +
 .../.settings/org.eclipse.jdt.core.prefs           |    8 +
 .../.settings/org.eclipse.pde.core.prefs           |    4 +
 .../META-INF/MANIFEST.MF                           |   21 +
 .../OSGI-INF/ecfTransport.xml                      |    8 +
 .../about.html                                     |    0
 .../build.properties                               |   19 +
 .../plugin.properties                              |   12 +
 .../org.eclipse.equinox.p2.transport.ecf/pom.xml   |   14 +
 .../internal/p2/transport/ecf/Activator.java       |  169 +
 .../p2/transport/ecf/ECFTransportComponent.java    |   22 +
 .../internal/p2/transport/ecf/FileInfoReader.java  |  247 +
 .../internal/p2/transport/ecf/FileReader.java      |  509 ++
 .../internal/p2/transport/ecf/Messages.java        |   95 +
 .../p2/transport/ecf/RepositoryStatus.java         |  155 +
 .../p2/transport/ecf/RepositoryStatusHelper.java   |  320 +
 .../p2/transport/ecf/RepositoryTransport.java      |  278 +
 .../internal/p2/transport/ecf/messages.properties  |   76 +
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../org.eclipse.equinox.p2.ui.admin.rcp/config.ini |   49 -
 .../plugin.properties                              |    4 +-
 .../org.eclipse.equinox.p2.ui.admin.rcp/pom.xml    |    2 +-
 .../rcp.product                                    |    2 +
 .../ui/admin/rcp/ApplicationActionBarAdvisor.java  |   11 +-
 .../ui/admin/rcp/ApplicationWorkbenchAdvisor.java  |    2 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../build.properties                               |    2 +-
 .../org.eclipse.equinox.p2.ui.admin/pom.xml        |    2 +-
 .../internal/p2/ui/admin/AddProfileJob.java        |    2 +-
 .../p2/ui/admin/ArtifactRepositoriesView.java      |    2 +-
 .../p2/ui/admin/ArtifactRepositoryTracker.java     |    7 +-
 .../internal/p2/ui/admin/InstallAction.java        |  121 +
 .../internal/p2/ui/admin/InstallIUDropAdapter.java |  212 +
 .../p2/ui/admin/MetadataRepositoriesView.java      |    5 +-
 .../p2/ui/admin/MetadataRepositoryTracker.java     |    7 +-
 .../internal/p2/ui/admin/ProfileFactory.java       |    2 +-
 .../equinox/internal/p2/ui/admin/ProfilesView.java |   13 +-
 .../internal/p2/ui/admin/ProvAdminUIActivator.java |    8 +-
 .../internal/p2/ui/admin/ProvAdminUIMessages.java  |    3 +-
 .../equinox/internal/p2/ui/admin/ProvView.java     |   10 +-
 .../internal/p2/ui/admin/RemoveProfilesJob.java    |    2 +-
 .../internal/p2/ui/admin/RepositoriesView.java     |    8 +-
 .../admin/dialogs/AddArtifactRepositoryDialog.java |    2 +-
 .../admin/dialogs/AddMetadataRepositoryDialog.java |    2 +-
 .../p2/ui/admin/dialogs/AddProfileDialog.java      |    2 +-
 .../internal/p2/ui/admin/dialogs/IUGroup.java      |    2 +-
 .../p2/ui/admin/dialogs/IUImplementationGroup.java |    2 +-
 .../dialogs/IUImplementationPropertyPage.java      |    2 +-
 .../ui/admin/dialogs/IUProfilePropertiesGroup.java |    2 +-
 .../p2/ui/admin/dialogs/IUPropertiesGroup.java     |    2 +-
 .../ui/admin/dialogs/InstalledIUPropertyPage.java  |    2 +-
 .../internal/p2/ui/admin/dialogs/ProfileGroup.java |    5 +-
 .../p2/ui/admin/dialogs/ProfilePropertyPage.java   |    2 +-
 .../RepositoryImplementationPropertyPage.java      |    2 +-
 .../internal/p2/ui/admin/messages.properties       |    3 +-
 .../build.properties                               |    2 +-
 .../plugin.properties                              |    2 +-
 .../internal/p2/ui/discovery/DiscoveryImages.java  |    2 +-
 .../internal/p2/ui/discovery/DiscoveryUi.java      |    2 +-
 .../p2/ui/discovery/commands/Messages.java         |    2 +-
 .../p2/ui/discovery/commands/messages.properties   |   10 +
 .../operations/DiscoveryInstallOperation.java      |    2 +-
 .../p2/ui/discovery/util/CommonColors.java         |    2 +-
 .../p2/ui/discovery/util/ControlListItem.java      |    2 +-
 .../p2/ui/discovery/util/ControlListViewer.java    |    2 +-
 .../p2/ui/discovery/util/FilteredViewer.java       |   10 +-
 .../p2/ui/discovery/util/GradientToolTip.java      |    2 +-
 .../internal/p2/ui/discovery/util/Messages.java    |    2 +-
 .../p2/ui/discovery/util/PatternFilter.java        |    2 +-
 .../discovery/util/SelectionProviderAdapter.java   |    2 +-
 .../p2/ui/discovery/util/WorkbenchUtil.java        |    2 +-
 .../p2/ui/discovery/util/messages.properties       |    2 +-
 .../p2/ui/discovery/wizards/CatalogPage.java       |    2 +-
 .../p2/ui/discovery/wizards/CatalogViewer.java     |    2 +-
 .../p2/ui/discovery/wizards/DiscoveryWizard.java   |    2 +-
 .../internal/p2/ui/discovery/wizards/Messages.java |    2 +-
 .../p2/ui/discovery/wizards/OverviewToolTip.java   |    2 +-
 .../p2/ui/discovery/wizards/messages.properties    |    2 +-
 .../.classpath                                     |    0
 .../.project                                       |   39 +
 .../.settings/org.eclipse.jdt.core.prefs           |    0
 .../.settings/org.eclipse.jdt.ui.prefs             |    0
 .../.settings/org.eclipse.pde.core.prefs           |    0
 .../META-INF/MANIFEST.MF                           |   39 +
 .../OSGI-INF/importexport.xml                      |    8 +
 .../P2 Replication.launch                          |  429 ++
 .../about.html                                     |    0
 .../build.properties                               |   21 +
 .../icons}/install_wiz.gif                         |  Bin 3550 -> 3550 bytes
 .../plugin.properties                              |   19 +
 .../plugin.xml                                     |   49 +
 .../org.eclipse.equinox.p2.ui.importexport/pom.xml |   14 +
 .../equinox/internal/p2/importexport/IUDetail.java |   57 +
 .../internal/p2/importexport/P2ImportExport.java   |   32 +
 .../importexport/VersionIncompatibleException.java |   24 +
 .../p2/importexport/internal/Constants.java        |   15 +
 .../p2/importexport/internal/ImportExportImpl.java |  139 +
 .../p2/importexport/internal/Messages.java         |   68 +
 .../p2/importexport/internal/messages.properties   |   59 +
 .../internal/wizard/AbstractImportPage.java        |  124 +
 .../importexport/internal/wizard/AbstractPage.java |  486 ++
 .../internal/wizard/AbstractWizard.java            |   44 +
 .../importexport/internal/wizard/ExportPage.java   |  147 +
 .../importexport/internal/wizard/ExportWizard.java |   51 +
 .../wizard/ImportFromInstallationPage.java         |  355 +
 .../wizard/ImportFromInstallationWizard.java       |   56 +
 .../importexport/internal/wizard/ImportPage.java   |  348 +
 .../importexport/internal/wizard/ImportWizard.java |  124 +
 .../internal/wizard/StyledErrorDialog.java         |  173 +
 .../p2/importexport/persistence/P2FConstants.java  |   27 +
 .../p2/importexport/persistence/P2FParser.java     |  240 +
 .../p2/importexport/persistence/P2FWriter.java     |   62 +
 .../META-INF/MANIFEST.MF                           |    5 +-
 .../build.properties                               |    2 +-
 .../pom.xml                                        |    2 +-
 .../p2/ui/sdk/scheduler/AutomaticUpdatePlugin.java |    4 +-
 .../p2/ui/sdk/scheduler/AutomaticUpdater.java      |    2 +-
 .../p2/ui/sdk/scheduler/AutomaticUpdatesPopup.java |   20 +-
 .../scheduler/AutomaticUpdatesPreferencePage.java  |    9 +-
 .../p2/ui/sdk/scheduler/PreferenceConstants.java   |    6 +-
 .../p2/ui/sdk/scheduler/PreferenceInitializer.java |   34 +-
 .../.settings/.api_filters                         |    8 +
 .../META-INF/MANIFEST.MF                           |    6 +-
 .../org.eclipse.equinox.p2.ui.sdk/META-INF/p2.inf  |    4 +
 .../org.eclipse.equinox.p2.ui.sdk/build.properties |    2 +-
 .../plugin.properties                              |    2 +-
 .../org.eclipse.equinox.p2.ui.sdk/plugin.xml       |    2 +-
 .../plugins/org.eclipse.equinox.p2.ui.sdk/pom.xml  |   26 +-
 .../internal/p2/ui/sdk/ProvSDKMessages.java        |    1 +
 .../internal/p2/ui/sdk/ProvSDKUIActivator.java     |    4 +-
 .../ui/sdk/RevertProfilePageExtensionFactory.java  |   31 +
 .../equinox/internal/p2/ui/sdk/messages.properties |    1 +
 .../p2/ui/sdk/prefs/PreferenceInitializer.java     |    2 +-
 .../ui/sdk/prefs/ProvisioningPreferencePage.java   |   13 +-
 .../org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF |   18 +-
 .../OSGI-INF/repositoryTracker_component.xml       |    5 +-
 .../org.eclipse.equinox.p2.ui/build.properties     |    2 +-
 .../icons/obj/iu_disabled_patch_obj.gif            |  Bin 0 -> 1615 bytes
 .../icons/obj/iu_patch_obj.gif}                    |  Bin 609 -> 609 bytes
 .../org.eclipse.equinox.p2.ui/plugin.properties    |    2 +-
 eclipse/plugins/org.eclipse.equinox.p2.ui/pom.xml  |    2 +-
 .../internal/p2/ui/ColocatedRepositoryTracker.java |   21 +-
 .../internal/p2/ui/ElementQueryDescriptor.java     |    2 +-
 .../equinox/internal/p2/ui/ElementWrapper.java     |    2 +-
 .../internal/p2/ui/IProvHelpContextIds.java        |    2 +-
 .../org/eclipse/equinox/internal/p2/ui/ProvUI.java |   27 +-
 .../equinox/internal/p2/ui/ProvUIActivator.java    |   27 +-
 .../internal/p2/ui/ProvUIAdapterFactory.java       |    2 +-
 .../equinox/internal/p2/ui/ProvUIImages.java       |    4 +-
 .../equinox/internal/p2/ui/ProvUIMessages.java     |    7 +-
 .../internal/p2/ui/ProvUIProvisioningListener.java |   11 +-
 .../p2/ui/ProvisioningOperationRunner.java         |    5 +-
 .../equinox/internal/p2/ui/QueryProvider.java      |   42 +-
 .../p2/ui/QueryableArtifactRepositoryManager.java  |    2 +-
 .../p2/ui/QueryableMetadataRepositoryManager.java  |    2 +-
 .../internal/p2/ui/QueryableRepositoryManager.java |    2 +-
 .../internal/p2/ui/RepositoryLocationQuery.java    |    2 +-
 .../p2/ui/RepositoryOperationBeginningEvent.java   |    2 +-
 .../p2/ui/RepositoryOperationEndingEvent.java      |    2 +-
 .../internal/p2/ui/RepositoryTrackerComponent.java |   30 +
 .../internal/p2/ui/UpdateManagerCompatibility.java |    2 +-
 .../internal/p2/ui/ValidationDialogServiceUI.java  |    2 +-
 .../p2/ui/actions/ColocatedRepositoryAction.java   |    2 +-
 .../p2/ui/actions/ExistingIUInProfileAction.java   |    2 +-
 .../internal/p2/ui/actions/InstallAction.java      |   70 -
 .../p2/ui/actions/ProfileModificationAction.java   |   17 +-
 .../p2/ui/actions/PropertyDialogAction.java        |    2 +-
 .../internal/p2/ui/actions/ProvisioningAction.java |    2 +-
 .../internal/p2/ui/actions/RefreshAction.java      |    2 +-
 .../actions/RemoveColocatedRepositoryAction.java   |    2 +-
 .../p2/ui/dialogs/AddRepositoryDialog.java         |    2 +-
 .../p2/ui/dialogs/ApplyProfileChangesDialog.java   |    2 +-
 .../internal/p2/ui/dialogs/AvailableIUGroup.java   |   11 +-
 .../p2/ui/dialogs/AvailableIUPatternFilter.java    |    2 +-
 .../internal/p2/ui/dialogs/AvailableIUsPage.java   |   26 +-
 .../p2/ui/dialogs/ComboAutoCompleteField.java      |    2 +-
 .../p2/ui/dialogs/ContainerCheckedTreeViewer.java  |    2 +-
 .../internal/p2/ui/dialogs/CopyHandler.java        |    2 +-
 .../equinox/internal/p2/ui/dialogs/CopyPopup.java  |    2 +-
 .../equinox/internal/p2/ui/dialogs/CopyUtils.java  |    2 +-
 .../p2/ui/dialogs/DelayedFilterCheckboxTree.java   |    2 +-
 .../ui/dialogs/IRepositorySelectionListener.java   |    2 +-
 .../ui/dialogs/IResolutionErrorReportingPage.java  |    2 +-
 .../internal/p2/ui/dialogs/IUDetailsGroup.java     |    2 +-
 .../p2/ui/dialogs/IUGeneralInfoPropertyPage.java   |    2 +-
 .../p2/ui/dialogs/IULicensePropertyPage.java       |    2 +-
 .../internal/p2/ui/dialogs/IUPropertyPage.java     |    2 +-
 .../internal/p2/ui/dialogs/InstallWizardPage.java  |    2 +-
 .../internal/p2/ui/dialogs/InstalledIUGroup.java   |   12 +-
 .../p2/ui/dialogs/PreselectedIUInstallWizard.java  |    3 +-
 .../p2/ui/dialogs/ProvisioningOperationWizard.java |    8 +-
 .../p2/ui/dialogs/ProvisioningWizardDialog.java    |    2 +-
 .../p2/ui/dialogs/ProvisioningWizardPage.java      |    2 +-
 .../dialogs/RepositoryManipulatorDropTarget.java   |    2 +-
 .../dialogs/RepositoryNameAndLocationDialog.java   |    2 +-
 .../p2/ui/dialogs/RepositorySelectionGroup.java    |   15 +-
 .../p2/ui/dialogs/ResolutionResultsWizardPage.java |   49 +-
 .../p2/ui/dialogs/ResolutionStatusPage.java        |   38 +-
 .../internal/p2/ui/dialogs/SelectableIUsPage.java  |   42 +-
 .../p2/ui/dialogs/SizeComputingWizardPage.java     |    2 +-
 .../internal/p2/ui/dialogs/StructuredIUGroup.java  |   12 +-
 .../internal/p2/ui/dialogs/UninstallWizard.java    |    2 +-
 .../p2/ui/dialogs/UninstallWizardPage.java         |    2 +-
 .../internal/p2/ui/dialogs/UpdateSingleIUPage.java |   15 +
 .../internal/p2/ui/dialogs/UpdateWizard.java       |   27 +-
 .../internal/p2/ui/dialogs/UpdateWizardPage.java   |    2 +-
 .../p2/ui/dialogs/UserValidationDialog.java        |    2 +-
 .../internal/p2/ui/dialogs/WizardWithLicenses.java |    2 +-
 .../equinox/internal/p2/ui/messages.properties     |   11 +-
 .../internal/p2/ui/model/ArtifactElement.java      |    2 +-
 .../internal/p2/ui/model/ArtifactRepositories.java |    2 +-
 .../p2/ui/model/ArtifactRepositoryElement.java     |   11 +-
 .../internal/p2/ui/model/AvailableIUElement.java   |   26 +-
 .../p2/ui/model/AvailableUpdateElement.java        |   40 +-
 .../internal/p2/ui/model/CategoryElement.java      |    2 +-
 .../equinox/internal/p2/ui/model/ElementUtils.java |   14 +-
 .../equinox/internal/p2/ui/model/IIUElement.java   |    2 +-
 .../internal/p2/ui/model/IRepositoryElement.java   |    2 +-
 .../internal/p2/ui/model/IUElementListRoot.java    |    2 +-
 .../internal/p2/ui/model/InstalledIUElement.java   |   10 +-
 .../internal/p2/ui/model/MetadataRepositories.java |    2 +-
 .../p2/ui/model/MetadataRepositoryElement.java     |   25 +-
 .../internal/p2/ui/model/ProfileElement.java       |    2 +-
 .../internal/p2/ui/model/ProfileSnapshots.java     |   56 +-
 .../equinox/internal/p2/ui/model/Profiles.java     |    2 +-
 .../equinox/internal/p2/ui/model/ProvElement.java  |    2 +-
 .../internal/p2/ui/model/QueriedElement.java       |   21 +-
 .../p2/ui/model/QueriedElementWrapper.java         |    5 +-
 .../internal/p2/ui/model/RemoteQueriedElement.java |    2 +-
 .../p2/ui/model/RollbackProfileElement.java        |   20 +-
 .../equinox/internal/p2/ui/model/RootElement.java  |    2 +-
 .../equinox/internal/p2/ui/model/Updates.java      |    2 +-
 .../internal/p2/ui/query/ArtifactKeyWrapper.java   |    2 +-
 .../ui/query/ArtifactRepositoryElementWrapper.java |   16 +-
 .../internal/p2/ui/query/AvailableIUWrapper.java   |   16 +-
 .../p2/ui/query/CategoryElementWrapper.java        |    2 +-
 .../internal/p2/ui/query/IUViewQueryContext.java   |   12 +-
 .../p2/ui/query/InstalledIUElementWrapper.java     |    2 +-
 .../ui/query/MetadataRepositoryElementWrapper.java |   17 +-
 .../p2/ui/query/ProfileElementWrapper.java         |    2 +-
 .../p2/ui/query/QueryableProfileRegistry.java      |    2 +-
 .../internal/p2/ui/query/QueryableUpdates.java     |    2 +-
 .../ui/viewers/DeferredQueryContentProvider.java   |    2 +-
 .../internal/p2/ui/viewers/IUColumnConfig.java     |    7 +-
 .../internal/p2/ui/viewers/IUComparator.java       |    2 +-
 .../p2/ui/viewers/IUDetailsLabelProvider.java      |    5 +-
 .../internal/p2/ui/viewers/IUDragAdapter.java      |    2 +-
 .../p2/ui/viewers/InstallIUDropAdapter.java        |  216 -
 .../p2/ui/viewers/ProvElementComparer.java         |    2 +-
 .../p2/ui/viewers/ProvElementContentProvider.java  |    9 +-
 .../p2/ui/viewers/ProvElementLabelProvider.java    |   15 +-
 .../p2/ui/viewers/RepositoryContentProvider.java   |    2 +-
 .../ui/viewers/RepositoryDetailsLabelProvider.java |    2 +-
 .../StructuredViewerProvisioningListener.java      |    7 +-
 .../equinox/p2/ui/AcceptLicensesWizardPage.java    |   15 +-
 .../src/org/eclipse/equinox/p2/ui/ICopyable.java   |    2 +-
 .../equinox/p2/ui/InstalledSoftwarePage.java       |   33 +-
 .../org/eclipse/equinox/p2/ui/LicenseManager.java  |    2 +-
 .../equinox/p2/ui/LoadMetadataRepositoryJob.java   |   10 +-
 .../src/org/eclipse/equinox/p2/ui/Policy.java      |  119 +-
 .../org/eclipse/equinox/p2/ui/ProvisioningUI.java  |   18 +-
 .../equinox/p2/ui/RepositoryManipulationPage.java  |   12 +-
 .../eclipse/equinox/p2/ui/RevertProfilePage.java   |   95 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../build.properties                               |   10 +
 .../org.eclipse.equinox.p2.updatechecker/pom.xml   |    2 +-
 .../p2/updatechecker/IUpdateChecker.java           |    2 +-
 .../provisional/p2/updatechecker/UpdateEvent.java  |    2 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../plugin.properties                              |    2 +-
 .../org.eclipse.equinox.p2.updatesite/pom.xml      |    2 +-
 .../updatesite/CategoryPublisherApplication.java   |    2 +-
 .../internal/p2/updatesite/CategoryXMLAction.java  |    8 +-
 .../internal/p2/updatesite/DefaultSiteParser.java  |   10 +-
 .../internal/p2/updatesite/DigestParser.java       |    2 +-
 .../p2/updatesite/LocalUpdateSiteAction.java       |    2 +-
 .../equinox/internal/p2/updatesite/Messages.java   |    2 +-
 .../p2/updatesite/RemoteFeaturesAction.java        |    8 +-
 .../p2/updatesite/RemoteUpdateSiteAction.java      |    2 +-
 .../internal/p2/updatesite/SiteCategory.java       |    2 +-
 .../internal/p2/updatesite/SiteFeature.java        |    2 +-
 .../equinox/internal/p2/updatesite/SiteModel.java  |    3 +-
 .../internal/p2/updatesite/SiteXMLAction.java      |   16 +-
 .../equinox/internal/p2/updatesite/UpdateSite.java |   40 +-
 .../updatesite/UpdateSitePublisherApplication.java |    3 +-
 .../artifact/UpdateSiteArtifactRepository.java     |   54 +-
 .../UpdateSiteArtifactRepositoryFactory.java       |    6 +-
 .../internal/p2/updatesite/messages.properties     |    2 +-
 .../metadata/UpdateSiteMetadataRepository.java     |   17 +-
 .../UpdateSiteMetadataRepositoryFactory.java       |    6 +-
 .../org.eclipse.equinox.preferences.jmx/.classpath |    7 -
 .../org.eclipse.equinox.preferences.jmx/.project   |   28 -
 .../.settings/org.eclipse.jdt.core.prefs           |  309 -
 .../.settings/org.eclipse.jdt.ui.prefs             |    9 -
 .../META-INF/MANIFEST.MF                           |   24 -
 .../org.eclipse.equinox.preferences.jmx/about.html |   28 -
 .../build.properties                               |   20 -
 .../icons/kvp.gif                                  |  Bin 617 -> 0 bytes
 .../icons/node.gif                                 |  Bin 216 -> 0 bytes
 .../icons/preferences.gif                          |  Bin 617 -> 0 bytes
 .../org.eclipse.equinox.preferences.jmx/plugin.xml |   16 -
 .../internal/preferences/jmx/Activator.java        |   83 -
 .../equinox/internal/preferences/jmx/KVP.java      |   56 -
 .../preferences/jmx/KVPContributionProvider.java   |  126 -
 .../preferences/jmx/KeyValuePairContribution.java  |  143 -
 .../equinox/internal/preferences/jmx/Messages.java |   40 -
 .../preferences/jmx/PreferenceContribution.java    |  235 -
 .../jmx/PreferenceContributionProvider.java        |  151 -
 .../internal/preferences/jmx/messages.properties   |   21 -
 .../.settings/.api_filters                         |   17 +
 .../META-INF/MANIFEST.MF                           |    5 +-
 .../core/internal/preferences/Activator.java       |    7 +-
 .../preferences/ConfigurationPreferences.java      |    2 +-
 .../internal/preferences/EclipsePreferences.java   |    5 +-
 .../core/internal/preferences/ImmutableMap.java    |    8 +-
 .../internal/preferences/InstancePreferences.java  |    2 +-
 .../preferences/OSGiPreferencesServiceImpl.java    |   37 +-
 .../preferences/OSGiPreferencesServiceManager.java |   14 +-
 .../PreferenceServiceRegistryHelper.java           |    2 +-
 .../internal/preferences/PreferencesService.java   |   28 +-
 .../runtime/preferences/BundleDefaultsScope.java   |   11 +-
 .../runtime/preferences/ConfigurationScope.java    |   11 +-
 .../core/runtime/preferences/DefaultScope.java     |   11 +-
 .../runtime/preferences/IPreferencesService.java   |    2 +-
 .../core/runtime/preferences/InstanceScope.java    |   11 +-
 .../runtime/preferences/PreferenceFilterEntry.java |    2 +-
 .../osgi/service/prefs/BackingStoreException.java  |   14 +-
 .../src/org/osgi/service/prefs/Preferences.java    |  438 +-
 .../org/osgi/service/prefs/PreferencesService.java |    8 +-
 .../plugins/org.eclipse.equinox.region/.classpath  |    7 +
 .../plugins/org.eclipse.equinox.region/.project    |   28 +
 .../.settings/org.eclipse.core.resources.prefs     |    0
 .../.settings/org.eclipse.jdt.core.prefs           |  329 +
 .../.settings/org.eclipse.jdt.ui.prefs             |   61 +
 .../.settings/org.eclipse.pde.core.prefs           |    4 +
 .../META-INF/MANIFEST.MF                           |   17 +
 .../OSGI-INF/l10n/bundle.properties                |   12 +
 .../about.html                                     |    0
 .../org.eclipse.equinox.region/build.properties    |   17 +
 .../internal/region/BundleIdBasedRegion.java       |  260 +
 .../internal/region/EquinoxStateHelper.java        |   73 +
 .../internal/region/RegionLifecycleListener.java   |   42 +
 .../equinox/internal/region/RegionManager.java     |  155 +
 .../internal/region/StandardRegionDigraph.java     |  449 ++
 .../region/StandardRegionDigraphPersistence.java   |  197 +
 .../internal/region/StandardRegionFilter.java      |  149 +
 .../region/StandardRegionFilterBuilder.java        |   83 +
 .../equinox/internal/region/SubgraphTraverser.java |   61 +
 .../region/hook/RegionBundleEventHook.java         |  106 +
 .../internal/region/hook/RegionBundleFindHook.java |   90 +
 .../region/hook/RegionDigraphVisitorBase.java      |  170 +
 .../internal/region/hook/RegionResolverHook.java   |  170 +
 .../region/hook/RegionResolverHookFactory.java     |   43 +
 .../region/hook/RegionServiceEventHook.java        |   61 +
 .../region/hook/RegionServiceFindHook.java         |   85 +
 .../region/management/RegionObjectNameCreator.java |   47 +
 .../management/StandardManageableRegion.java       |   80 +
 .../StandardManageableRegionDigraph.java           |  191 +
 .../src/org/eclipse/equinox/region/Region.java     |  186 +
 .../org/eclipse/equinox/region/RegionDigraph.java  |  219 +
 .../equinox/region/RegionDigraphPersistence.java   |   55 +
 .../equinox/region/RegionDigraphVisitor.java       |   48 +
 .../org/eclipse/equinox/region/RegionFilter.java   |  115 +
 .../equinox/region/RegionFilterBuilder.java        |   49 +
 .../region/management/ManageableRegion.java        |   49 +
 .../region/management/ManageableRegionDigraph.java |   43 +
 .../org.eclipse.equinox.registry.jmx/.classpath    |    7 -
 .../org.eclipse.equinox.registry.jmx/.project      |   28 -
 .../.settings/org.eclipse.jdt.core.prefs           |  259 -
 .../.settings/org.eclipse.jdt.ui.prefs             |    8 -
 .../META-INF/MANIFEST.MF                           |   16 -
 .../org.eclipse.equinox.registry.jmx/about.html    |   28 -
 .../build.properties                               |   20 -
 .../icons/ext_point.gif                            |  Bin 225 -> 0 bytes
 .../icons/extension.gif                            |  Bin 205 -> 0 bytes
 .../icons/plugin_registry.gif                      |  Bin 597 -> 0 bytes
 .../org.eclipse.equinox.registry.jmx/plugin.xml    |   22 -
 .../equinox/internal/registry/jmx/Activator.java   |   80 -
 .../registry/jmx/ExtensionContribution.java        |  126 -
 .../jmx/ExtensionContributionProvider.java         |  123 -
 .../registry/jmx/ExtensionPointContribution.java   |  114 -
 .../jmx/ExtensionPointContributionProvider.java    |  123 -
 .../jmx/ExtensionRegistryContribution.java         |  111 -
 .../jmx/ExtensionRegistryContributionProvider.java |  123 -
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../org.eclipse.equinox.registry/about.html        |    2 +-
 .../core/internal/registry/ExtensionRegistry.java  |    3 +-
 .../core/internal/registry/ReferenceMap.java       |    5 +-
 .../registry/osgi/EclipseBundleListener.java       |   80 +-
 .../registry/osgi/RegistryCommandProvider.java     |   50 +-
 .../spi/ConfigurationElementAttribute.java         |    2 +-
 .../org/eclipse/core/runtime/RegistryFactory.java  |    2 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../security/ui/storage/view/NewNodeDialog.java    |    6 +-
 .../.classpath                                     |    0
 .../.project                                       |   34 +
 .../.settings/org.eclipse.jdt.core.prefs           |    0
 .../META-INF/MANIFEST.MF                           |   11 +
 .../about.html                                     |    0
 .../build.properties                               |   21 +
 .../cpp/ReadMe.txt                                 |   33 +
 .../cpp/jnicrypt.cpp                               |   81 +
 .../cpp/jnicrypt.h                                 |   28 +
 .../cpp/jnicrypt.vcproj                            |  463 ++
 .../fragment.properties                            |   14 +
 .../fragment.xml                                   |   18 +
 .../equinox/internal/security/win32/WinCrypto.java |  128 +
 .../security/win32/nls/WinCryptoMessages.java      |   32 +
 .../security/win32/nls/messages.properties         |   15 +
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../schema/secureStorage.exsd                      |    2 +-
 .../security/auth/nls/SecAuthMessages.java         |    2 +-
 .../internal/security/auth/nls/messages.properties |    2 +-
 .../security/storage/PasswordProviderSelector.java |    4 +-
 .../security/storage/SecurePreferencesRoot.java    |    2 +-
 .../equinox/security/auth/LoginContextFactory.java |    3 +-
 .../auth/credentials/CredentialsFactory.java       |    3 +-
 .../security/auth/module/ExtensionLoginModule.java |    3 +-
 .../equinox/security/storage/EncodingUtils.java    |    3 +-
 .../security/storage/SecurePreferencesFactory.java |    3 +-
 .../equinox/security/storage/StorageException.java |    3 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../build.properties                               |    2 +-
 .../equinox/servletbridge/BridgeServlet.java       |    2 +-
 .../equinox/servletbridge/FrameworkLauncher.java   |    2 +-
 .../build.properties                               |   10 +
 .../SimpleConfiguratorManipulatorImpl.java         |    2 +-
 .../SimpleConfiguratorManipulatorUtils.java        |    2 +-
 ...ple configurator into metadata generator.launch |   30 -
 .../.project                                       |   10 -
 .../provisional/configurator/Configurator.java     |    2 +-
 .../simpleconfigurator/SimpleConfiguratorImpl.java |    2 +-
 .../simpleconfigurator/console/ApplyCommand.java   |    2 +-
 .../console/ConfiguratorCommandProvider.java       |   46 +-
 .../org.eclipse.equinox.supplement/.classpath      |    4 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   16 +-
 .../META-INF/MANIFEST.MF                           |   14 +-
 .../build.properties                               |    9 +-
 .../runtime/internal/adaptor/BasicLocation.java    |    6 +
 .../adaptor/EclipseAdaptorMessages.properties      |    9 +-
 .../internal/adaptor/EclipseAdaptorMsg.java        |   10 +-
 .../runtime/internal/adaptor/LocationHelper.java   |    3 +-
 .../org/eclipse/equinox/log/ExtendedLogEntry.java  |   69 +
 .../equinox/log/ExtendedLogReaderService.java      |   40 +
 .../eclipse/equinox/log/ExtendedLogService.java    |   40 +
 .../src/org/eclipse/equinox/log/LogFilter.java     |   30 +
 .../src/org/eclipse/equinox/log/LogPermission.java |   65 +
 .../equinox/log/LogPermissionCollection.java       |   59 +
 .../src/org/eclipse/equinox/log/Logger.java        |   83 +
 .../equinox/log/SynchronousLogListener.java        |   19 +
 .../org/eclipse/osgi/framework/debug/Debug.java    |   21 +-
 .../osgi/framework/debug/EclipseDebugTrace.java    |    4 +-
 .../framework/debug/FrameworkDebugOptions.java     |   63 +-
 .../framework/eventmgr/CopyOnWriteIdentityMap.java |  652 ++
 .../osgi/framework/eventmgr/EventDispatcher.java   |   49 +
 .../osgi/framework/eventmgr/EventListeners.java    |   90 +
 .../osgi/framework/eventmgr/EventManager.java      |  419 ++
 .../osgi/framework/eventmgr/ListenerQueue.java     |  151 +
 .../eclipse/osgi/framework/eventmgr/package.html   |    0
 .../internal/core/ExternalMessages.properties      |   15 +-
 .../internal/core/FrameworkProperties.java         |   10 +-
 .../eclipse/osgi/framework/internal/core/Msg.java  |   16 +-
 .../osgi/framework/internal/core/Tokenizer.java    |   47 +-
 .../internal/reliablefile/ReliableFile.java        |   20 +-
 .../reliablefile/ReliableFileInputStream.java      |    3 +-
 .../eclipse/osgi/framework/log/FrameworkLog.java   |    4 +-
 .../osgi/framework/log/FrameworkLogEntry.java      |   52 +-
 .../eclipse/osgi/framework/util/SecureAction.java  |  117 +-
 .../eclipse/osgi/service/debug/DebugOptions.java   |    6 +-
 .../service/localization/BundleLocalization.java   |   13 +-
 .../osgi/storagemanager/StorageManager.java        |   15 +-
 .../src/org/eclipse/osgi/util/ManifestElement.java |  104 +-
 .../src/org/eclipse/osgi/util/NLS.java             |   39 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../internal/transforms/TransformedBundleFile.java |   10 +-
 .../META-INF/MANIFEST.MF                           |    6 +-
 .../plugin.properties                              |    1 -
 .../org.eclipse.equinox.util/META-INF/MANIFEST.MF  |    2 +-
 .../eclipse/equinox/internal/util/TracerMap.java   |    2 +-
 .../equinox/internal/util/UtilActivator.java       |    2 +-
 .../equinox/internal/util/event/EventThread.java   |    2 +-
 .../eclipse/equinox/internal/util/event/Queue.java |    2 +-
 .../internal/util/event/SystemListener.java        |    2 +-
 .../equinox/internal/util/hash/HashIntObjNS.java   |    2 +-
 .../equinox/internal/util/hash/HashIntObjS.java    |    2 +-
 .../equinox/internal/util/hash/HashLongObjNS.java  |    2 +-
 .../equinox/internal/util/hash/HashLongObjS.java   |    2 +-
 .../equinox/internal/util/hash/HashObjIntNS.java   |    2 +-
 .../equinox/internal/util/hash/HashObjIntS.java    |    2 +-
 .../equinox/internal/util/hash/HashObjLongNS.java  |    2 +-
 .../equinox/internal/util/hash/HashObjLongS.java   |    2 +-
 .../internal/util/impl/tpt/ServiceFactoryImpl.java |    2 +-
 .../util/impl/tpt/threadpool/Executor.java         |    2 +-
 .../internal/util/impl/tpt/threadpool/Job.java     |    2 +-
 .../impl/tpt/threadpool/ThreadPoolFactoryImpl.java |    2 +-
 .../impl/tpt/threadpool/ThreadPoolManagerImpl.java |    2 +-
 .../internal/util/impl/tpt/timer/TimerFactory.java |    2 +-
 .../internal/util/impl/tpt/timer/TimerImpl.java    |    2 +-
 .../internal/util/impl/tpt/timer/TimerQueue.java   |    2 +-
 .../util/impl/tpt/timer/TimerQueueNode.java        |    2 +-
 .../equinox/internal/util/pool/ObjectCreator.java  |    2 +-
 .../equinox/internal/util/pool/ObjectPool.java     |    2 +-
 .../org/eclipse/equinox/internal/util/ref/Log.java |    2 +-
 .../equinox/internal/util/ref/LogInterface.java    |    2 +-
 .../equinox/internal/util/ref/TimerRef.java        |    2 +-
 .../internal/util/security/PrivilegedAction.java   |    2 +-
 .../internal/util/security/PrivilegedRunner.java   |    4 +-
 .../internal/util/threadpool/ThreadContext.java    |    2 +-
 .../util/threadpool/ThreadPoolFactory.java         |    2 +-
 .../util/threadpool/ThreadPoolManager.java         |    2 +-
 .../eclipse/equinox/internal/util/timer/Timer.java |    2 +-
 .../equinox/internal/util/timer/TimerListener.java |    2 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../build.properties                               |   10 +
 .../weaving/aspectj/AspectJWeavingService.java     |    2 +-
 .../aspectj/AspectJWeavingServiceFactory.java      |    2 +-
 .../weaving/aspectj/AspectJWeavingStarter.java     |    7 +-
 .../aspectj/loadtime/OSGiWeavingAdaptor.java       |    2 +-
 .../aspectj/loadtime/OSGiWeavingContext.java       |    2 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../build.properties                               |   10 +
 .../internal/caching/j9/CachingService.java        |    2 +-
 .../internal/caching/j9/CachingServicePlugin.java  |    4 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../build.properties                               |   10 +
 .../weaving/internal/caching/Activator.java        |    6 +-
 .../internal/caching/CachingServiceFactory.java    |    2 +-
 .../weaving/internal/caching/IBundleConstants.java |    2 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../build.properties                               |   10 +
 .../hookconfigurators.properties                   |   10 +
 .../equinox/service/weaving/CacheEntry.java        |    2 +-
 .../equinox/service/weaving/ICachingService.java   |    2 +-
 .../service/weaving/ICachingServiceFactory.java    |    2 +-
 .../equinox/service/weaving/IWeavingService.java   |    2 +-
 .../service/weaving/IWeavingServiceFactory.java    |    2 +-
 .../eclipse/equinox/weaving/adaptors/Debug.java    |    2 +-
 .../equinox/weaving/adaptors/IWeavingAdaptor.java  |    2 +-
 .../weaving/adaptors/WeavingAdaptorFactory.java    |    2 +-
 .../equinox/weaving/hooks/AbstractWeavingHook.java |    2 +-
 .../weaving/hooks/BaseWeavingBundleFile.java       |    2 +-
 .../weaving/hooks/BundleAdaptorProvider.java       |   10 +
 .../equinox/weaving/hooks/IAdaptorProvider.java    |   10 +
 .../equinox/weaving/hooks/WeavingBundleFile.java   |    2 +-
 .../eclipse/equinox/weaving/hooks/WeavingHook.java |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../equinox/internal/wireadmin/Activator.java      |    2 +-
 .../internal/wireadmin/EventDispatcher.java        |    2 +-
 .../internal/wireadmin/NotificationEvent.java      |    2 +-
 .../equinox/internal/wireadmin/TracerMap.java      |    2 +-
 .../equinox/internal/wireadmin/WireAdminImpl.java  |    2 +-
 .../equinox/internal/wireadmin/WireImpl.java       |   81 +-
 .../equinox/internal/wireadmin/WireProperties.java |    2 +-
 .../org.eclipse.help.base/.settings/.api_filters   |  263 +
 .../.settings/org.eclipse.pde.api.tools.prefs      |   97 +
 .../org.eclipse.help.base/META-INF/MANIFEST.MF     |    8 +-
 .../plugins/org.eclipse.help.base/about.properties |    4 +-
 .../org.eclipse.help.base/plugin.properties        |    6 +-
 eclipse/plugins/org.eclipse.help.base/plugin.xml   |    2 +
 .../plugins/org.eclipse.help.base/preferences.ini  |   11 +-
 .../org.eclipse.help.base/schema/display.exsd      |  113 +
 .../org.eclipse.help.base/schema/scope.exsd        |   35 +-
 .../schema/searchProcessor.exsd                    |  123 +
 .../org/eclipse/help/base/AbstractHelpDisplay.java |   45 +
 .../org/eclipse/help/base/AbstractHelpScope.java   |    2 +-
 .../org/eclipse/help/base/IHelpScopeProducer.java  |   35 +
 .../src/org/eclipse/help/base/IScopeHandle.java    |   35 +
 .../src/org/eclipse/help/base/package.html         |   16 +
 .../help/internal/base/BookmarkManager.java        |    4 +-
 .../help/internal/base/HelpApplication.java        |   11 +-
 .../eclipse/help/internal/base/HelpDisplay.java    |   94 +-
 .../help/internal/base/IHelpBaseConstants.java     |    4 +-
 .../base/remote/RemoteHelpInputStream.java         |   75 +
 .../help/internal/base/remote/RemoteIC.java        |    2 +-
 .../internal/base/remote/RemoteSearchManager.java  |    6 +-
 .../internal/base/remote/RemoteStatusData.java     |  123 +-
 .../help/internal/base/scope/ScopeHandle.java      |    3 +-
 .../help/internal/base/scope/ScopeRegistry.java    |   21 +-
 .../help/internal/base/scope/ScopeUtils.java       |    5 +-
 .../help/internal/base/scope/WorkingSetScope.java  |   41 +-
 .../internal/base/util/TestConnectionUtility.java  |  102 +
 .../help/internal/protocols/HelpURLConnection.java |    7 +-
 .../internal/protocols/HelpURLStreamHandler.java   |    2 +-
 .../eclipse/help/internal/search/Analyzer_en.java  |   19 +-
 .../help/internal/search/LocalSearchManager.java   |   23 +-
 .../help/internal/search/LuceneSearchDocument.java |    6 +-
 .../eclipse/help/internal/search/PluginIndex.java  |   12 +-
 .../eclipse/help/internal/search/QueryBuilder.java |   13 +-
 .../eclipse/help/internal/search/SearchIndex.java  |   79 +-
 .../help/internal/search/SearchManager.java        |  164 +-
 .../eclipse/help/internal/search/SearchResult.java |  116 +
 .../help/internal/search/SearchResults.java        |   22 +-
 .../internal/search/XHTMLSearchParticipant.java    |    3 +
 .../help/internal/search/federated/LocalHelp.java  |   58 +-
 .../help/internal/server/JettyHelpServer.java      |   25 +-
 .../help/internal/standalone/StandaloneHelp.java   |   21 +
 .../help/search/AbstractSearchProcessor.java       |   51 +
 .../src/org/eclipse/help/search/ISearchResult.java |   94 +
 .../help/search/LuceneSearchParticipant.java       |    6 +-
 .../eclipse/help/search/SearchProcessorInfo.java   |   67 +
 .../org/apache/lucene/demo/html/HTMLParser.java    |    5 +-
 .../org.eclipse.help.ui/META-INF/MANIFEST.MF       |    2 +-
 .../src/org/eclipse/help/ui/RootScopePage.java     |  114 +-
 .../help/ui/internal/ContextHelpDialog.java        |    5 +-
 .../eclipse/help/ui/internal/DefaultHelpUI.java    |    4 +-
 .../help/ui/internal/ExecuteCommandAction.java     |    4 +-
 .../eclipse/help/ui/internal/IHelpUIConstants.java |    5 +-
 .../src/org/eclipse/help/ui/internal/Messages.java |    9 +-
 .../eclipse/help/ui/internal/Messages.properties   |   20 +-
 .../internal/browser/embedded/EmbeddedBrowser.java |    6 +
 .../browser/embedded/EmbeddedBrowserAdapter.java   |    7 +-
 .../ui/internal/preferences/HelpContentBlock.java  |    1 +
 .../preferences/HelpContentPreferencePage.java     |    2 +-
 .../internal/preferences/HelpPreferencePage.java   |    8 +-
 .../preferences/TestConnectionUtility.java         |   76 -
 .../ui/internal/preferences/ViewICPropsDialog.java |    4 +-
 .../help/ui/internal/search/LocalHelpPage.java     |   19 +-
 .../eclipse/help/ui/internal/util/EscapeUtils.java |    5 +-
 .../help/ui/internal/views/AllTopicsPart.java      |    6 +-
 .../help/ui/internal/views/BookmarkHeaderPart.java |   87 +
 .../help/ui/internal/views/ContextHelpPart.java    |   29 +-
 .../help/ui/internal/views/ContextHelpSorter.java  |   34 +-
 .../ui/internal/views/EngineTypeDescriptor.java    |    9 +-
 .../eclipse/help/ui/internal/views/HelpTray.java   |    7 +-
 .../eclipse/help/ui/internal/views/HelpView.java   |   17 +-
 .../help/ui/internal/views/HistoryScopeSet.java    |   25 +-
 .../help/ui/internal/views/HyperlinkTreePart.java  |   80 +-
 .../eclipse/help/ui/internal/views/IndexPart.java  |    6 +-
 .../help/ui/internal/views/IndexTypeinPart.java    |    2 +-
 .../help/ui/internal/views/LocalScopeDialog.java   |   69 +
 .../help/ui/internal/views/RenameDialog.java       |   27 +-
 .../help/ui/internal/views/ReusableHelpPart.java   |   43 +-
 .../help/ui/internal/views/ScopeSelectPart.java    |  168 +
 .../eclipse/help/ui/internal/views/ScopeSet.java   |   36 +-
 .../help/ui/internal/views/ScopeSetDialog.java     |  239 +-
 .../help/ui/internal/views/ScopeSetManager.java    |   27 +-
 .../eclipse/help/ui/internal/views/ScopeState.java |   44 +
 .../eclipse/help/ui/internal/views/SearchPart.java |  122 +-
 .../help/ui/internal/views/SearchResultsPart.java  |   35 +-
 .../help/ui/internal/views/SeeAlsoPart.java        |   83 +-
 .../org.eclipse.help.webapp/META-INF/MANIFEST.MF   |    4 +-
 .../org.eclipse.help.webapp/advanced/advanced.jsp  |    6 +-
 .../org.eclipse.help.webapp/advanced/helptree.js   |    5 +-
 .../org.eclipse.help.webapp/advanced/highlight.js  |   44 +-
 .../org.eclipse.help.webapp/advanced/indexView.css |   10 +-
 .../org.eclipse.help.webapp/advanced/indexView.js  |    4 +
 .../org.eclipse.help.webapp/advanced/indexView.jsp |   18 +
 .../org.eclipse.help.webapp/advanced/nav.jsp       |    4 +
 .../advanced/quickSearch.jsp                       |    4 +-
 .../advanced/searchList.css                        |   10 +-
 .../advanced/searchScoped.jsp                      |   38 +-
 .../advanced/searchSimple.jsp                      |    6 +-
 .../advanced/searchView.jsp                        |   64 +-
 .../org.eclipse.help.webapp/advanced/tabs.jsp      |    6 +-
 .../org.eclipse.help.webapp/advanced/tocTree.css   |    6 +
 .../org.eclipse.help.webapp/advanced/tocView.jsp   |   13 +
 .../org.eclipse.help.webapp/advanced/toolbar.jsp   |   12 +-
 .../org.eclipse.help.webapp/advanced/view.js       |   26 +
 .../org.eclipse.help.webapp/advanced/views.jsp     |    4 +-
 .../advanced/workingSet.jsp                        |    8 +-
 .../advanced/workingSetManager.jsp                 |    8 +-
 .../advancedstate/scopeState.jsp                   |   37 +
 .../advancedstate/workingSetState.jsp              |   37 +
 .../org.eclipse.help.webapp/basic/advanced.inc     |    6 +-
 .../org.eclipse.help.webapp/build.properties       |    5 +-
 .../plugins/org.eclipse.help.webapp/buildJSPs.xml  |    3 +-
 eclipse/plugins/org.eclipse.help.webapp/index.jsp  |    6 +-
 eclipse/plugins/org.eclipse.help.webapp/plugin.xml |  122 +-
 .../schema/validatedServlet.exsd                   |  120 +
 .../org.eclipse.help.webapp/schema/view.exsd       |    2 +-
 .../help/internal/webapp/StatusProducer.java       |    3 +-
 .../internal/webapp/WebappResources.properties     |   15 +-
 .../help/internal/webapp/data/LayoutData.java      |    2 +-
 .../help/internal/webapp/data/PrintData.java       |   10 +-
 .../help/internal/webapp/data/RequestScope.java    |   45 +-
 .../webapp/data/ScopeSavingSearchData.java         |   29 +
 .../help/internal/webapp/data/SearchData.java      |  162 +-
 .../internal/webapp/data/ServletResources.java     |   22 +-
 .../eclipse/help/internal/webapp/data/UrlUtil.java |   50 +-
 .../help/internal/webapp/parser/ContextParser.java |   85 +
 .../internal/webapp/parser/ExtensionParser.java    |   77 +
 .../webapp/parser/IndexFragmentParser.java         |   55 +
 .../help/internal/webapp/parser/IndexParser.java   |   60 +
 .../help/internal/webapp/parser/ParseElement.java  |  130 +
 .../help/internal/webapp/parser/ResultParser.java  |  103 +
 .../help/internal/webapp/parser/SearchParser.java  |   84 +
 .../internal/webapp/parser/TocFragmentParser.java  |  107 +
 .../help/internal/webapp/parser/TocParser.java     |   58 +
 .../help/internal/webapp/service/AboutService.java |   42 +
 .../webapp/service/AdvancedSearchService.java      |  135 +
 .../internal/webapp/service/ContentService.java    |   89 +
 .../internal/webapp/service/ContextService.java    |  109 +
 .../internal/webapp/service/ControlService.java    |   35 +
 .../internal/webapp/service/ExtensionService.java  |   97 +
 .../webapp/service/IndexFragmentService.java       |  112 +
 .../help/internal/webapp/service/IndexService.java |   99 +
 .../internal/webapp/service/LiveHelpService.java   |   34 +
 .../help/internal/webapp/service/NavService.java   |   68 +
 .../internal/webapp/service/SearchService.java     |  102 +
 .../webapp/service/SearchStateService.java         |  118 +
 .../webapp/service/TocFragmentService.java         |  117 +
 .../help/internal/webapp/service/TocService.java   |   98 +
 .../internal/webapp/servlet/ContextServlet.java    |   53 +-
 .../internal/webapp/servlet/ControlServlet.java    |    9 +-
 .../help/internal/webapp/servlet/CookieUtil.java   |   48 +-
 .../internal/webapp/servlet/EclipseConnector.java  |   35 +-
 .../internal/webapp/servlet/ExtensionServlet.java  |   12 +-
 .../webapp/servlet/IndexFragmentServlet.java       |   13 +-
 .../help/internal/webapp/servlet/IndexServlet.java |   13 +-
 .../internal/webapp/servlet/InjectionFilter.java   |   16 +-
 .../help/internal/webapp/servlet/NavServlet.java   |    7 +-
 .../internal/webapp/servlet/SearchServlet.java     |   79 +-
 .../webapp/servlet/ServletPrintWriter.java         |   81 +
 .../webapp/servlet/TocFragmentServlet.java         |   15 +-
 .../help/internal/webapp/servlet/TocServlet.java   |   26 +-
 .../internal/webapp/servlet/ValidatorServlet.java  |  274 +
 .../help/internal/webapp/utils/JSonHelper.java     |   57 +
 .../internal/webapp/utils/SearchXMLGenerator.java  |  117 +
 .../eclipse/help/internal/webapp/utils/Utils.java  |   95 +
 .../help/internal/webapp/utils/XMLHelper.java      |   42 +
 .../src/org/eclipse/help/webapp/TocSystem.java     |   32 +
 .../web-archive/help/WEB-INF/web.xml               |    3 +-
 .../plugins/org.eclipse.help/META-INF/MANIFEST.MF  |    2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   13 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../org.eclipse.jdt.apt.core/META-INF/MANIFEST.MF  |    4 +-
 .../org.eclipse.jdt.apt.core/build_notes.html      |   11 +-
 .../jdt/apt/core/internal/APTDispatchRunnable.java |    3 +-
 .../util/AptCorePreferenceInitializer.java         |    4 +-
 .../org/eclipse/jdt/apt/core/util/AptConfig.java   |   26 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   13 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../pluggable/core/dispatch/IdeMessagerImpl.java   |    4 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   13 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../preferences/AptConfigurationBlock.java         |   27 +-
 .../preferences/BaseConfigurationBlock.java        |   17 +-
 .../preferences/FactoryPathConfigurationBlock.java |   63 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   13 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../customBuildCallbacks.xml                       |   10 +-
 .../apt/dispatch/BaseProcessingEnvImpl.java        |   22 +-
 .../compiler/apt/dispatch/BatchFilerImpl.java      |    8 +-
 .../compiler/apt/dispatch/RoundEnvImpl.java        |   19 +-
 .../compiler/apt/model/AnnotationMirrorImpl.java   |    8 +-
 .../internal/compiler/apt/model/ArrayTypeImpl.java |    9 +-
 .../compiler/apt/model/DeclaredTypeImpl.java       |   15 +-
 .../internal/compiler/apt/model/ElementsImpl.java  |   35 +-
 .../compiler/apt/model/ErrorTypeElement.java       |   24 +-
 .../internal/compiler/apt/model/ErrorTypeImpl.java |   39 +-
 .../compiler/apt/model/ExecutableTypeImpl.java     |    4 +-
 .../jdt/internal/compiler/apt/model/Factory.java   |   57 +-
 .../compiler/apt/model/TypeElementImpl.java        |   26 +-
 .../apt/model/TypeParameterElementImpl.java        |   16 +-
 .../compiler/apt/model/TypeVariableImpl.java       |   17 +-
 .../jdt/internal/compiler/apt/model/TypesImpl.java |   59 +-
 .../compiler/apt/model/WildcardTypeImpl.java       |    9 +-
 .../compiler/apt/util/ArchiveFileObject.java       |    4 +-
 .../compiler/apt/util/EclipseFileManager.java      |    6 +-
 .../compiler/apt/util/EclipseFileObject.java       |    4 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   13 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../customBuildCallbacks.xml                       |   12 +-
 .../internal/compiler/tool/ArchiveFileObject.java  |    4 +-
 .../compiler/tool/EclipseCompilerImpl.java         |   84 +-
 .../internal/compiler/tool/EclipseFileManager.java |    6 +-
 .../internal/compiler/tool/EclipseFileObject.java  |    4 +-
 .../jdt/internal/compiler/tool/Options.java        |    1 +
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../participants/IRefactoringProcessorIds.java     |   45 +
 .../.settings/org.eclipse.jdt.core.prefs           |    3 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../org.eclipse.jdt.core/META-INF/MANIFEST.MF      |   14 +-
 .../org/eclipse/jdt/core/JDTCompilerAdapter.java   |   16 +-
 .../jdt/core/compiler/batch/BatchCompiler.java     |    4 +-
 .../compiler/batch/ClasspathDirectory.java         |   10 +
 .../jdt/internal/compiler/batch/ClasspathJar.java  |    5 +-
 .../internal/compiler/batch/ClasspathLocation.java |   35 +-
 .../compiler/batch/ClasspathSourceJar.java         |    5 +-
 .../jdt/internal/compiler/batch/FileSystem.java    |   35 +-
 .../eclipse/jdt/internal/compiler/batch/Main.java  |  125 +-
 .../internal/compiler/batch/messages.properties    |   11 +-
 .../plugins/org.eclipse.jdt.core/build.properties  |    1 +
 .../org.eclipse.jdt.core/buildnotes_jdt-core.html  | 3230 ++++------
 .../jdt/internal/codeassist/CompletionEngine.java  |  421 +-
 .../codeassist/InternalCompletionProposal.java     |   93 +-
 .../InternalExtendedCompletionContext.java         |   63 +-
 .../internal/codeassist/RelevanceConstants.java    |    3 +-
 .../jdt/internal/codeassist/SelectionEngine.java   |  198 +-
 .../complete/CompletionOnPackageReference.java     |    4 +-
 .../codeassist/complete/CompletionParser.java      |  211 +-
 .../jdt/internal/codeassist/impl/AssistParser.java |   12 +-
 .../codeassist/select/SelectionJavadoc.java        |   14 +-
 .../codeassist/select/SelectionJavadocParser.java  |   15 +-
 .../select/SelectionOnPackageReference.java        |    4 +-
 .../codeassist/select/SelectionParser.java         |   76 +-
 .../eclipse/jdt/core/compiler/CharOperation.java   |   75 +-
 .../org/eclipse/jdt/core/compiler/IProblem.java    |   10 +-
 .../eclipse/jdt/internal/compiler/ClassFile.java   | 7373 ++++++--------------
 .../jdt/internal/compiler/CompilationResult.java   |   31 +-
 .../eclipse/jdt/internal/compiler/Compiler.java    |   42 +-
 .../internal/compiler/ast/AND_AND_Expression.java  |   11 +-
 .../eclipse/jdt/internal/compiler/ast/ASTNode.java |   36 +-
 .../compiler/ast/AbstractMethodDeclaration.java    |   74 +-
 .../compiler/ast/AllocationExpression.java         |   18 +-
 .../jdt/internal/compiler/ast/Annotation.java      |   26 +-
 .../compiler/ast/AnnotationMethodDeclaration.java  |    6 +-
 .../jdt/internal/compiler/ast/Argument.java        |    8 +-
 .../compiler/ast/ArrayAllocationExpression.java    |    6 +-
 .../compiler/ast/ArrayQualifiedTypeReference.java  |    7 +-
 .../jdt/internal/compiler/ast/AssertStatement.java |   18 +-
 .../jdt/internal/compiler/ast/Assignment.java      |   35 +-
 .../jdt/internal/compiler/ast/BreakStatement.java  |    6 +-
 .../jdt/internal/compiler/ast/CaseStatement.java   |    8 +-
 .../jdt/internal/compiler/ast/CastExpression.java  |   84 +-
 .../internal/compiler/ast/ClassLiteralAccess.java  |   17 +-
 .../eclipse/jdt/internal/compiler/ast/Clinit.java  |  107 +-
 .../compiler/ast/CompilationUnitDeclaration.java   |    6 +-
 .../internal/compiler/ast/CompoundAssignment.java  |   15 +-
 .../compiler/ast/ConditionalExpression.java        |   96 +-
 .../compiler/ast/ConstructorDeclaration.java       |   94 +-
 .../jdt/internal/compiler/ast/DoStatement.java     |   13 +-
 .../jdt/internal/compiler/ast/EqualExpression.java |    3 +
 .../compiler/ast/ExplicitConstructorCall.java      |   10 +-
 .../jdt/internal/compiler/ast/Expression.java      |  118 +-
 .../internal/compiler/ast/FieldDeclaration.java    |    9 +-
 .../jdt/internal/compiler/ast/FieldReference.java  |   32 +-
 .../jdt/internal/compiler/ast/ForStatement.java    |    8 +-
 .../internal/compiler/ast/ForeachStatement.java    |    6 +-
 .../jdt/internal/compiler/ast/IfStatement.java     |   22 +-
 .../jdt/internal/compiler/ast/ImportReference.java |    4 +-
 .../compiler/ast/InstanceOfExpression.java         |    3 +
 .../jdt/internal/compiler/ast/IntLiteral.java      |   23 +-
 .../eclipse/jdt/internal/compiler/ast/Javadoc.java |   53 +-
 .../compiler/ast/JavadocArgumentExpression.java    |    5 +-
 .../compiler/ast/JavadocFieldReference.java        |   18 +-
 .../internal/compiler/ast/LocalDeclaration.java    |   46 +-
 .../jdt/internal/compiler/ast/MessageSend.java     |   18 +-
 .../internal/compiler/ast/MethodDeclaration.java   |   46 +-
 .../internal/compiler/ast/OR_OR_Expression.java    |   11 +-
 .../ast/ParameterizedQualifiedTypeReference.java   |   20 +-
 .../ast/ParameterizedSingleTypeReference.java      |   52 +-
 .../ast/QualifiedAllocationExpression.java         |   17 +-
 .../compiler/ast/QualifiedNameReference.java       |   31 +-
 .../jdt/internal/compiler/ast/Reference.java       |   74 +-
 .../jdt/internal/compiler/ast/ReturnStatement.java |    6 +-
 .../internal/compiler/ast/SingleNameReference.java |  128 +-
 .../jdt/internal/compiler/ast/Statement.java       |    9 +-
 .../jdt/internal/compiler/ast/SuperReference.java  |    9 +-
 .../jdt/internal/compiler/ast/SwitchStatement.java |    4 +
 .../compiler/ast/SynchronizedStatement.java        |    4 +-
 .../jdt/internal/compiler/ast/ThisReference.java   |   11 +-
 .../jdt/internal/compiler/ast/TryStatement.java    |   14 +-
 .../jdt/internal/compiler/ast/TypeDeclaration.java |   43 +-
 .../jdt/internal/compiler/ast/WhileStatement.java  |   17 +-
 .../MethodInfoWithParameterAnnotations.java        |   19 +-
 .../jdt/internal/compiler/codegen/CodeStream.java  |   31 +-
 .../compiler/codegen/StackMapFrameCodeStream.java  |    6 +-
 .../compiler/flow/ConditionalFlowInfo.java         |   24 +-
 .../flow/ExceptionHandlingFlowContext.java         |    6 +-
 .../internal/compiler/flow/FinallyFlowContext.java |   18 +-
 .../jdt/internal/compiler/flow/FlowContext.java    |   12 +-
 .../jdt/internal/compiler/flow/FlowInfo.java       |  129 +-
 .../compiler/flow/InsideSubRoutineFlowContext.java |    4 +-
 .../internal/compiler/flow/LoopingFlowContext.java |  106 +-
 .../internal/compiler/flow/NullInfoRegistry.java   |  160 +-
 .../internal/compiler/flow/SwitchFlowContext.java  |    4 +-
 .../compiler/flow/UnconditionalFlowInfo.java       |  320 +-
 .../internal/compiler/impl/BooleanConstant.java    |    4 +-
 .../internal/compiler/impl/CompilerOptions.java    |  150 +-
 .../jdt/internal/compiler/impl/Constant.java       |    3 +-
 .../jdt/internal/compiler/impl/IrritantSet.java    |   10 +-
 .../compiler/lookup/BinaryTypeBinding.java         |  124 +-
 .../jdt/internal/compiler/lookup/Binding.java      |    8 +-
 .../jdt/internal/compiler/lookup/BlockScope.java   |   52 +-
 .../jdt/internal/compiler/lookup/ClassScope.java   |   46 +-
 .../compiler/lookup/CompilationUnitScope.java      |   17 +-
 .../compiler/lookup/ExtraCompilerModifiers.java    |    8 +-
 .../jdt/internal/compiler/lookup/FieldBinding.java |   17 +-
 .../internal/compiler/lookup/LocalTypeBinding.java |    6 +-
 .../compiler/lookup/LocalVariableBinding.java      |    9 +-
 .../compiler/lookup/LookupEnvironment.java         |   33 +-
 .../internal/compiler/lookup/MethodBinding.java    |    8 +-
 .../jdt/internal/compiler/lookup/MethodScope.java  |   16 +-
 .../internal/compiler/lookup/MethodVerifier.java   |   35 +-
 .../internal/compiler/lookup/MethodVerifier15.java |  140 +-
 .../compiler/lookup/ParameterizedTypeBinding.java  |   51 +-
 .../internal/compiler/lookup/RawTypeBinding.java   |    4 +-
 .../internal/compiler/lookup/ReferenceBinding.java |   10 +-
 .../jdt/internal/compiler/lookup/Scope.java        |   85 +-
 .../internal/compiler/lookup/SignatureWrapper.java |   35 +-
 .../compiler/lookup/SourceTypeBinding.java         |  114 +-
 .../compiler/lookup/SyntheticMethodBinding.java    |   40 +-
 .../jdt/internal/compiler/lookup/TagBits.java      |    8 +-
 .../jdt/internal/compiler/lookup/TypeBinding.java  |   52 +-
 .../internal/compiler/lookup/TypeConstants.java    |    3 +-
 .../jdt/internal/compiler/lookup/TypeIds.java      |    2 +-
 .../compiler/lookup/TypeVariableBinding.java       |    6 +-
 .../compiler/parser/AbstractCommentParser.java     |    4 +-
 .../internal/compiler/parser/JavadocParser.java    |   19 +-
 .../jdt/internal/compiler/parser/Parser.java       | 1134 ++--
 .../compiler/parser/ParserBasicInformation.java    |   26 +-
 .../internal/compiler/parser/TerminalTokens.java   |   10 +-
 .../jdt/internal/compiler/parser/parser1.rsc       |  Bin 25854 -> 25580 bytes
 .../jdt/internal/compiler/parser/parser10.rsc      |  Bin 268 -> 272 bytes
 .../jdt/internal/compiler/parser/parser11.rsc      |  Bin 268 -> 272 bytes
 .../jdt/internal/compiler/parser/parser12.rsc      |  Bin 268 -> 272 bytes
 .../jdt/internal/compiler/parser/parser13.rsc      |  Bin 268 -> 272 bytes
 .../jdt/internal/compiler/parser/parser14.rsc      |  Bin 1224 -> 1224 bytes
 .../jdt/internal/compiler/parser/parser15.rsc      |  Bin 946 -> 950 bytes
 .../jdt/internal/compiler/parser/parser16.rsc      |  Bin 1942 -> 1948 bytes
 .../jdt/internal/compiler/parser/parser17.rsc      |  Bin 704 -> 709 bytes
 .../jdt/internal/compiler/parser/parser18.rsc      |  Bin 8111 -> 8050 bytes
 .../jdt/internal/compiler/parser/parser19.rsc      |    4 +-
 .../jdt/internal/compiler/parser/parser2.rsc       |  Bin 24446 -> 24162 bytes
 .../jdt/internal/compiler/parser/parser20.rsc      |  Bin 13232 -> 13312 bytes
 .../jdt/internal/compiler/parser/parser21.rsc      |  Bin 5632 -> 5672 bytes
 .../jdt/internal/compiler/parser/parser22.rsc      |  Bin 628 -> 632 bytes
 .../jdt/internal/compiler/parser/parser23.rsc      |  Bin 68 -> 74 bytes
 .../jdt/internal/compiler/parser/parser24.rsc      |  Bin 628 -> 632 bytes
 .../jdt/internal/compiler/parser/parser3.rsc       |  Bin 1942 -> 1948 bytes
 .../jdt/internal/compiler/parser/parser4.rsc       |  Bin 3416 -> 3416 bytes
 .../jdt/internal/compiler/parser/parser5.rsc       |  Bin 1942 -> 1948 bytes
 .../jdt/internal/compiler/parser/parser6.rsc       |  Bin 986 -> 1000 bytes
 .../jdt/internal/compiler/parser/parser7.rsc       |  Bin 222 -> 222 bytes
 .../jdt/internal/compiler/parser/parser8.rsc       |  Bin 628 -> 632 bytes
 .../jdt/internal/compiler/parser/parser9.rsc       |  Bin 16146 -> 15978 bytes
 .../compiler/parser/readableNames.properties       |   12 +-
 .../internal/compiler/problem/DefaultProblem.java  |    7 +-
 .../internal/compiler/problem/ProblemReporter.java |  190 +-
 .../internal/compiler/problem/messages.properties  |   20 +-
 .../eclipse/jdt/internal/compiler/util/Util.java   |  586 ++-
 .../org.eclipse.jdt.core/customBuildCallbacks.xml  |   38 +-
 .../dom/org/eclipse/jdt/core/dom/AST.java          |    1 +
 .../dom/org/eclipse/jdt/core/dom/ASTConverter.java |  184 +-
 .../dom/org/eclipse/jdt/core/dom/ASTMatcher.java   |    8 +-
 .../dom/org/eclipse/jdt/core/dom/ASTNode.java      |   26 +-
 .../jdt/core/dom/AbstractTypeDeclaration.java      |   32 +-
 .../dom/org/eclipse/jdt/core/dom/Annotation.java   |    8 +-
 .../eclipse/jdt/core/dom/AnnotationBinding.java    |   19 +-
 .../jdt/core/dom/AnnotationTypeDeclaration.java    |   10 +-
 .../core/dom/AnnotationTypeMemberDeclaration.java  |   12 +-
 .../jdt/core/dom/AnonymousClassDeclaration.java    |    8 +-
 .../dom/org/eclipse/jdt/core/dom/ArrayAccess.java  |    6 +-
 .../org/eclipse/jdt/core/dom/ArrayCreation.java    |   12 +-
 .../org/eclipse/jdt/core/dom/ArrayInitializer.java |    8 +-
 .../dom/org/eclipse/jdt/core/dom/ArrayType.java    |    4 +-
 .../org/eclipse/jdt/core/dom/AssertStatement.java  |    6 +-
 .../dom/org/eclipse/jdt/core/dom/Assignment.java   |    8 +-
 .../dom/org/eclipse/jdt/core/dom/Block.java        |    8 +-
 .../org/eclipse/jdt/core/dom/BodyDeclaration.java  |   22 +-
 .../org/eclipse/jdt/core/dom/BooleanLiteral.java   |    4 +-
 .../org/eclipse/jdt/core/dom/BreakStatement.java   |    4 +-
 .../org/eclipse/jdt/core/dom/CastExpression.java   |    6 +-
 .../dom/org/eclipse/jdt/core/dom/CatchClause.java  |    4 +-
 .../org/eclipse/jdt/core/dom/CharacterLiteral.java |    4 +-
 .../jdt/core/dom/ClassInstanceCreation.java        |   24 +-
 .../org/eclipse/jdt/core/dom/CompilationUnit.java  |   16 +-
 .../jdt/core/dom/CompilationUnitResolver.java      |   10 +-
 .../jdt/core/dom/ConditionalExpression.java        |    8 +-
 .../jdt/core/dom/ConstructorInvocation.java        |   14 +-
 .../eclipse/jdt/core/dom/ContinueStatement.java    |    4 +-
 .../eclipse/jdt/core/dom/DefaultASTVisitor.java    |    8 +-
 .../jdt/core/dom/DefaultBindingResolver.java       |   44 +-
 .../eclipse/jdt/core/dom/DefaultCommentMapper.java |    6 +-
 .../jdt/core/dom/DefaultValuePairBinding.java      |    9 +-
 .../dom/org/eclipse/jdt/core/dom/DoStatement.java  |    6 +-
 .../eclipse/jdt/core/dom/EnhancedForStatement.java |    6 +-
 .../jdt/core/dom/EnumConstantDeclaration.java      |   16 +-
 .../org/eclipse/jdt/core/dom/EnumDeclaration.java  |   20 +-
 .../dom/org/eclipse/jdt/core/dom/Expression.java   |   52 +-
 .../eclipse/jdt/core/dom/ExpressionStatement.java  |    4 +-
 .../dom/org/eclipse/jdt/core/dom/FieldAccess.java  |    6 +-
 .../org/eclipse/jdt/core/dom/FieldDeclaration.java |   14 +-
 .../dom/org/eclipse/jdt/core/dom/ForStatement.java |   18 +-
 .../dom/org/eclipse/jdt/core/dom/ITypeBinding.java |   17 +-
 .../dom/org/eclipse/jdt/core/dom/IfStatement.java  |    8 +-
 .../eclipse/jdt/core/dom/ImportDeclaration.java    |    8 +-
 .../org/eclipse/jdt/core/dom/InfixExpression.java  |   14 +-
 .../dom/org/eclipse/jdt/core/dom/Initializer.java  |   10 +-
 .../eclipse/jdt/core/dom/InstanceofExpression.java |    6 +-
 .../dom/org/eclipse/jdt/core/dom/Javadoc.java      |   10 +-
 .../org/eclipse/jdt/core/dom/LabeledStatement.java |    6 +-
 .../org/eclipse/jdt/core/dom/MarkerAnnotation.java |    4 +-
 .../dom/org/eclipse/jdt/core/dom/MemberRef.java    |    6 +-
 .../org/eclipse/jdt/core/dom/MemberValuePair.java  |    6 +-
 .../jdt/core/dom/MemberValuePairBinding.java       |   45 +-
 .../eclipse/jdt/core/dom/MethodDeclaration.java    |   36 +-
 .../org/eclipse/jdt/core/dom/MethodInvocation.java |   18 +-
 .../dom/org/eclipse/jdt/core/dom/MethodRef.java    |   12 +-
 .../eclipse/jdt/core/dom/MethodRefParameter.java   |    8 +-
 .../dom/org/eclipse/jdt/core/dom/Modifier.java     |    4 +-
 .../jdt/core/dom/NameEnviromentWithProgress.java   |   56 -
 .../jdt/core/dom/NameEnvironmentWithProgress.java  |   56 +
 .../org/eclipse/jdt/core/dom/NormalAnnotation.java |    8 +-
 .../org/eclipse/jdt/core/dom/NumberLiteral.java    |    4 +-
 .../eclipse/jdt/core/dom/PackageDeclaration.java   |   12 +-
 .../eclipse/jdt/core/dom/ParameterizedType.java    |   10 +-
 .../jdt/core/dom/ParenthesizedExpression.java      |    4 +-
 .../eclipse/jdt/core/dom/PostfixExpression.java    |    6 +-
 .../org/eclipse/jdt/core/dom/PrefixExpression.java |    6 +-
 .../org/eclipse/jdt/core/dom/PrimitiveType.java    |    4 +-
 .../org/eclipse/jdt/core/dom/QualifiedName.java    |    6 +-
 .../org/eclipse/jdt/core/dom/QualifiedType.java    |    8 +-
 .../eclipse/jdt/core/dom/RecoveredTypeBinding.java |    6 +-
 .../org/eclipse/jdt/core/dom/ReturnStatement.java  |    4 +-
 .../dom/org/eclipse/jdt/core/dom/SimpleName.java   |    4 +-
 .../dom/org/eclipse/jdt/core/dom/SimpleType.java   |    4 +-
 .../jdt/core/dom/SingleMemberAnnotation.java       |    6 +-
 .../jdt/core/dom/SingleVariableDeclaration.java    |   20 +-
 .../dom/org/eclipse/jdt/core/dom/Statement.java    |   66 +-
 .../org/eclipse/jdt/core/dom/StringLiteral.java    |    2 +-
 .../jdt/core/dom/SuperConstructorInvocation.java   |   16 +-
 .../org/eclipse/jdt/core/dom/SuperFieldAccess.java |    6 +-
 .../jdt/core/dom/SuperMethodInvocation.java        |   18 +-
 .../dom/org/eclipse/jdt/core/dom/SwitchCase.java   |    4 +-
 .../org/eclipse/jdt/core/dom/SwitchStatement.java  |   10 +-
 .../jdt/core/dom/SynchronizedStatement.java        |    6 +-
 .../dom/org/eclipse/jdt/core/dom/TagElement.java   |   10 +-
 .../dom/org/eclipse/jdt/core/dom/TextElement.java  |    4 +-
 .../org/eclipse/jdt/core/dom/ThisExpression.java   |    4 +-
 .../org/eclipse/jdt/core/dom/ThrowStatement.java   |    4 +-
 .../dom/org/eclipse/jdt/core/dom/TryStatement.java |   12 +-
 .../dom/org/eclipse/jdt/core/dom/TypeBinding.java  |    7 +-
 .../org/eclipse/jdt/core/dom/TypeDeclaration.java  |   36 +-
 .../jdt/core/dom/TypeDeclarationStatement.java     |    6 +-
 .../dom/org/eclipse/jdt/core/dom/TypeLiteral.java  |    4 +-
 .../org/eclipse/jdt/core/dom/TypeParameter.java    |   10 +-
 .../org/eclipse/jdt/core/dom/VariableBinding.java  |   36 +-
 .../eclipse/jdt/core/dom/VariableDeclaration.java  |   14 +-
 .../core/dom/VariableDeclarationExpression.java    |   16 +-
 .../jdt/core/dom/VariableDeclarationFragment.java  |    8 +-
 .../jdt/core/dom/VariableDeclarationStatement.java |   16 +-
 .../org/eclipse/jdt/core/dom/WhileStatement.java   |    6 +-
 .../dom/org/eclipse/jdt/core/dom/WildcardType.java |    6 +-
 .../eclipse/jdt/core/dom/rewrite/ASTRewrite.java   |  133 +-
 .../core/dom/rewrite/ASTRewriteAnalyzer.java       |   72 +-
 .../jdt/internal/eval/CodeSnippetEvaluator.java    |    6 +-
 .../internal/eval/CodeSnippetFieldReference.java   |    7 +-
 .../jdt/internal/eval/CodeSnippetMessageSend.java  |    4 +-
 .../eval/CodeSnippetQualifiedNameReference.java    |    7 +-
 .../eval/CodeSnippetSingleNameReference.java       |   53 +-
 .../jdt/internal/eval/CodeSnippetToCuMapper.java   |   23 +-
 .../jdt/internal/eval/EvaluationContext.java       |   12 +-
 .../core/formatter/CodeFormatterApplication.java   |   50 +-
 .../formatter/DefaultCodeFormatterConstants.java   |  168 +-
 .../eclipse/jdt/core/formatter/messages.properties |    7 +-
 .../internal/formatter/CodeFormatterVisitor.java   |  553 +-
 .../internal/formatter/DefaultCodeFormatter.java   |    3 +
 .../formatter/DefaultCodeFormatterOptions.java     |  100 +-
 .../jdt/internal/formatter/FormatJavadocBlock.java |   12 +-
 .../formatter/ICodeFormatterConstants.java         |   19 +-
 .../internal/formatter/OptimizedReplaceEdit.java   |    4 +-
 .../org/eclipse/jdt/internal/formatter/Scribe.java |  884 ++-
 .../jdt/internal/formatter/align/Alignment.java    |    7 +-
 .../plugins/org.eclipse.jdt.core/grammar/java.g    |   19 +-
 .../model/org/eclipse/jdt/core/IAnnotation.java    |   15 +-
 .../eclipse/jdt/core/IElementChangedListener.java  |    4 +-
 .../org/eclipse/jdt/core/IImportDeclaration.java   |    3 +-
 .../org/eclipse/jdt/core/IJavaElementDelta.java    |    4 +-
 .../model/org/eclipse/jdt/core/IJavaModel.java     |    5 +-
 .../jdt/core/IJavaModelStatusConstants.java        |   10 +-
 .../model/org/eclipse/jdt/core/IJavaProject.java   |   45 +-
 .../model/org/eclipse/jdt/core/ILocalVariable.java |   44 +-
 .../model/org/eclipse/jdt/core/IMember.java        |   14 -
 .../model/org/eclipse/jdt/core/IMethod.java        |   17 +-
 .../org/eclipse/jdt/core/IPackageDeclaration.java  |    2 +-
 .../org/eclipse/jdt/core/ISourceReference.java     |   40 +-
 .../model/org/eclipse/jdt/core/IType.java          |   12 +-
 .../model/org/eclipse/jdt/core/ITypeParameter.java |   16 +-
 .../model/org/eclipse/jdt/core/JavaCore.java       |  107 +-
 .../model/org/eclipse/jdt/core/Signature.java      |   80 +-
 .../internal/compiler/DocumentElementParser.java   |   54 +-
 .../internal/compiler/ISourceElementRequestor.java |   19 +-
 .../internal/compiler/SourceElementNotifier.java   |   37 +-
 .../jdt/internal/compiler/SourceElementParser.java |   15 +-
 .../compiler/SourceElementRequestorAdapter.java    |    6 +-
 .../compiler/parser/SourceTypeConverter.java       |   58 +-
 .../internal/compiler/parser/TypeConverter.java    |   67 +-
 .../eclipse/jdt/internal/core/AnnotatableInfo.java |    7 +-
 .../eclipse/jdt/internal/core/BinaryMember.java    |   10 +-
 .../eclipse/jdt/internal/core/BinaryMethod.java    |  119 +-
 .../org/eclipse/jdt/internal/core/BinaryType.java  |    8 +-
 .../jdt/internal/core/BinaryTypeConverter.java     |    4 +-
 .../internal/core/CancelableNameEnvironment.java   |    2 +-
 .../org/eclipse/jdt/internal/core/ClassFile.java   |    5 +-
 .../eclipse/jdt/internal/core/ClassFileInfo.java   |   89 +-
 .../eclipse/jdt/internal/core/ClasspathChange.java |   25 +-
 .../eclipse/jdt/internal/core/ClasspathEntry.java  |  105 +-
 .../eclipse/jdt/internal/core/CompilationUnit.java |    3 +
 .../core/CompilationUnitProblemFinder.java         |   37 +-
 .../core/CompilationUnitStructureRequestor.java    |   64 +-
 .../eclipse/jdt/internal/core/DeltaProcessor.java  |  185 +-
 .../jdt/internal/core/ExternalFolderChange.java    |    5 +-
 .../jdt/internal/core/ExternalFoldersManager.java  |   74 +-
 .../internal/core/INameEnviromentWithProgress.java |   36 -
 .../core/INameEnvironmentWithProgress.java         |   36 +
 .../eclipse/jdt/internal/core/ImportContainer.java |    5 +-
 .../jdt/internal/core/ImportDeclaration.java       |    6 +-
 .../core/ImportDeclarationElementInfo.java         |   35 +-
 .../jdt/internal/core/JarPackageFragmentRoot.java  |    3 +-
 .../core/JavaCorePreferenceInitializer.java        |   30 +-
 .../org/eclipse/jdt/internal/core/JavaElement.java |   28 +-
 .../jdt/internal/core/JavaModelManager.java        |  395 +-
 .../eclipse/jdt/internal/core/JavaModelStatus.java |   16 +-
 .../org/eclipse/jdt/internal/core/JavaProject.java |  152 +-
 .../eclipse/jdt/internal/core/JavadocContents.java |   29 +-
 .../eclipse/jdt/internal/core/LocalVariable.java   |  119 +-
 .../org/eclipse/jdt/internal/core/Member.java      |    8 +-
 .../org/eclipse/jdt/internal/core/NameLookup.java  |   12 +-
 .../jdt/internal/core/PackageDeclaration.java      |   10 +-
 .../jdt/internal/core/SearchableEnvironment.java   |   13 +-
 .../jdt/internal/core/SelectionRequestor.java      |   33 +-
 .../eclipse/jdt/internal/core/SourceMapper.java    |  145 +-
 .../eclipse/jdt/internal/core/SourceMethod.java    |    9 +-
 .../jdt/internal/core/SourceMethodElementInfo.java |    4 +-
 .../eclipse/jdt/internal/core/TypeParameter.java   |   10 +-
 .../org/eclipse/jdt/internal/core/UserLibrary.java |   37 +-
 .../jdt/internal/core/UserLibraryManager.java      |   10 +-
 .../core/builder/IncrementalImageBuilder.java      |   12 +-
 .../jdt/internal/core/builder/JavaBuilder.java     |    4 +-
 .../eclipse/jdt/internal/core/builder/State.java   |    2 +-
 .../internal/core/hierarchy/HierarchyBuilder.java  |    6 +-
 .../jdt/internal/core/hierarchy/TypeHierarchy.java |    6 +-
 .../jdt/internal/core/jdom/SimpleDOMBuilder.java   |    4 +-
 .../jdt/internal/core/util/BindingKeyParser.java   |   10 +-
 .../jdt/internal/core/util/Disassembler.java       |   35 +-
 .../jdt/internal/core/util/HandleFactory.java      |    3 +-
 .../jdt/internal/core/util/KeyToSignature.java     |   13 +-
 .../jdt/internal/core/util/MementoTokenizer.java   |   32 +-
 .../eclipse/jdt/internal/core/util/Messages.java   |    5 +-
 .../org/eclipse/jdt/internal/core/util/Util.java   |  503 +--
 .../jdt/internal/core/util/messages.properties     |    7 +-
 .../notes/R36_buildnotes_jdt-core.html             | 2283 ++++++
 .../scripts/antadapter/META-INF/MANIFEST.MF        |   14 +
 .../scripts/antadapter/plugin.properties           |   13 +
 .../scripts/antadapter/plugin.xml                  |   20 +
 .../scripts/binary/META-INF/MANIFEST.MF            |    2 +-
 .../plugins/org.eclipse.jdt.core/scripts/build.xml |    5 +-
 .../org.eclipse.jdt.core/scripts/build_ecj.xml     |    5 +-
 .../org.eclipse.jdt.core/scripts/export-ecj.xml    |    6 +-
 .../org.eclipse.jdt.core/scripts/exportplugin.xml  |  106 +-
 .../scripts/source/META-INF/MANIFEST.MF            |    4 +-
 .../org/eclipse/jdt/core/search/SearchEngine.java  |   52 +-
 .../eclipse/jdt/core/search/SearchParticipant.java |    4 +-
 .../eclipse/jdt/internal/core/index/DiskIndex.java |    2 -
 .../jdt/internal/core/search/StringOperation.java  |    4 +-
 .../core/search/indexing/BinaryIndexer.java        |    4 +-
 .../core/search/indexing/IndexManager.java         |    4 +-
 .../search/indexing/SourceIndexerRequestor.java    |    6 +-
 .../internal/core/search/matching/AndLocator.java  |   11 +-
 .../search/matching/ClassFileMatchLocator.java     |   10 +-
 .../core/search/matching/FieldLocator.java         |    5 +-
 .../core/search/matching/MatchLocator.java         |   15 +-
 .../core/search/matching/MatchLocatorParser.java   |   37 +-
 .../core/search/matching/MethodLocator.java        |   36 +-
 .../internal/core/search/matching/OrLocator.java   |   11 +-
 .../core/search/matching/PatternLocator.java       |   14 +
 .../search/matching/SuperTypeReferenceLocator.java |    3 +-
 .../core/search/processing/JobManager.java         |    5 +-
 .../.settings/org.eclipse.jdt.core.prefs           |  208 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF  |    6 +-
 .../icons/full/elcl16/var_cntnt_prvdr.gif          |  Bin 209 -> 209 bytes
 .../icons/full/etool16/new_sbook.gif               |  Bin 589 -> 589 bytes
 .../org.eclipse.jdt.debug.ui/plugin.properties     |   12 +-
 .../plugins/org.eclipse.jdt.debug.ui/plugin.xml    |   42 +-
 .../scripts/buildExtraJAR.xml                      |    5 +-
 .../breakpoints/JavaBreakpointConditionEditor.java |  528 ++-
 .../internal/debug/ui/BreakpointMarkerUpdater.java |    6 +-
 .../jdt/internal/debug/ui/DebugUIMessages.java     |   13 +-
 .../internal/debug/ui/DebugUIMessages.properties   |    6 +-
 .../debug/ui/IJDIPreferencesConstants.java         |   25 +-
 .../debug/ui/JDIDebugUIPreferenceInitializer.java  |   10 +-
 .../internal/debug/ui/JavaDebugOptionsManager.java | 1591 +++---
 .../internal/debug/ui/JavaDebugPreferencePage.java |   38 +-
 .../debug/ui/JavaStepFilterPreferencePage.java     |   15 +
 .../internal/debug/ui/actions/ActionMessages.java  |   10 +-
 .../debug/ui/actions/ActionMessages.properties     |    9 +-
 .../debug/ui/actions/OpenFromClipboardAction.java  |  693 ++
 .../debug/ui/actions/ToggleBreakpointAdapter.java  |  130 +-
 .../debug/ui/breakpoints/AbstractDetailPane.java   |   32 +-
 .../ui/breakpoints/LineBreakpointDetailPane.java   |    4 +-
 .../ui/breakpoints/MethodBreakpointDetailPane.java |    4 +-
 .../jdt/internal/debug/ui/jres/EEVMPage.java       |    3 +-
 .../internal/debug/ui/jres/InstalledJREsBlock.java |    2 +-
 .../internal/debug/ui/jres/JREMessages.properties  |    4 +-
 .../jdt/internal/debug/ui/jres/MacVMSearch.java    |   89 +-
 .../jdt/internal/debug/ui/jres/StandardVMPage.java |   10 +-
 .../ui/launcher/ExecutionEnvironmentSelector.java  |   45 +
 .../debug/ui/launcher/JreResolutionGenerator.java  |    7 +-
 .../debug/ui/launcher/LauncherMessages.java        |    9 +-
 .../debug/ui/launcher/LauncherMessages.properties  |    6 +-
 .../launcher/ProjectClasspathArgumentSelector.java |   55 +
 .../debug/ui/propertypages/JavaBreakpointPage.java |   22 +-
 .../ui/propertypages/PropertyPageMessages.java     |    4 +-
 .../propertypages/PropertyPageMessages.properties  |    4 +-
 eclipse/plugins/org.eclipse.jdt.debug/.options     |    6 +-
 .../.settings/org.eclipse.jdt.core.prefs           |  209 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../org.eclipse.jdt.debug/META-INF/MANIFEST.MF     |    2 +-
 .../buildnotes_jdt-debug.html                      |   38 -
 .../debug/eval/ast/engine/ASTEvaluationEngine.java |   96 +-
 .../debug/eval/ast/engine/ArrayRuntimeContext.java |    4 +-
 .../ast/engine/SourceBasedSourceGenerator.java     |   92 +-
 .../jdi/org/eclipse/jdi/internal/MirrorImpl.java   |   20 +-
 .../eclipse/jdt/debug/core/IJavaDebugTarget.java   |   39 +-
 .../jdt/internal/debug/core/EventDispatcher.java   |    2 -
 .../internal/debug/core/HeapWalkingManager.java    |    7 +-
 .../jdt/internal/debug/core/JDIDebugOptions.java   |   17 +-
 .../debug/core/hcr/JavaHotCodeReplaceManager.java  |    6 +-
 .../internal/debug/core/model/JDIDebugTarget.java  |   40 +-
 .../jdt/internal/debug/core/model/JDIMethod.java   |  119 +
 .../debug/core/model/JDIReferenceListVariable.java |   10 +-
 .../jdt/internal/debug/core/model/JDIThread.java   |  232 +-
 .../r2_0_buildnotes_jdt-debug.html                 | 1846 -----
 .../r2_1_buildnotes_jdt-debug.html                 |  806 ---
 .../r3_0_buildnotes_jdt-debug.html                 |  978 ---
 .../org.eclipse.jdt.debug/r3_0_changes.html        |   29 -
 .../r3_1_buildnotes_jdt-debug.html                 |  774 --
 .../org.eclipse.jdt.debug/r3_1_changes.html        |   25 -
 .../r3_2_buildnotes_jdt-debug.html                 |  461 --
 .../r3_3_buildnotes_jdt-debug.html                 |  438 --
 .../r3_4_buildnotes_jdt-debug.html                 |  376 -
 .../r3_5_buildnotes_jdt-debug.html                 |  156 -
 .../org.eclipse.jdt.doc.isv/META-INF/MANIFEST.MF   |    2 +-
 .../aaa-how-to-add-things.txt                      |    1 -
 eclipse/plugins/org.eclipse.jdt.doc.isv/about.html |    5 +-
 .../org.eclipse.jdt.doc.isv/about.properties       |    4 +-
 eclipse/plugins/org.eclipse.jdt.doc.isv/book.css   |   22 +
 .../plugins/org.eclipse.jdt.doc.isv/buildDoc.xml   |   33 -
 .../guide/CopyrightTabPage.html                    |  433 +-
 .../guide/jdt_api_classpath.htm                    |  488 +-
 .../guide/jdt_api_codeassist.htm                   |  299 +-
 .../guide/jdt_api_codeformatter.htm                |  677 ++-
 .../guide/jdt_api_compile.htm                      | 1046 +---
 .../guide/jdt_api_contributing_a_cleanup.htm       |  240 +-
 .../guide/jdt_api_manip.htm                        |  773 ++-
 .../guide/jdt_api_open_editor.htm                  |   33 +-
 .../guide/jdt_api_options.htm                      | 5194 +++++++++-----
 .../guide/jdt_api_prompter.htm                     |   37 +-
 .../guide/jdt_api_render.htm                       |  182 +-
 .../org.eclipse.jdt.doc.isv/guide/jdt_api_run.htm  |   68 +-
 .../guide/jdt_api_search.htm                       |  365 +-
 .../guide/jdt_api_wizards.htm                      |  191 +-
 .../guide/jdt_api_write_jar_file.htm               |   55 +-
 .../guide/jdt_apt_building_with_apt.htm            |   14 +-
 .../guide/jdt_apt_getting_started.htm              |   18 +-
 .../guide/jdt_int_model.htm                        |  427 +-
 .../plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt |   55 +-
 .../org.eclipse.jdt.doc.isv/jdtaptOptions.txt      |  112 -
 .../plugins/org.eclipse.jdt.doc.isv/notices.html   |    4 +-
 .../porting/3.2/recommended.html                   |    5 +-
 .../porting/3.3/recommended.html                   |    5 +-
 .../org.eclipse.jdt.doc.isv/porting/3.7/faq.html   |   42 +
 .../porting/3.7/incompatibilities.html             |   29 +
 .../porting/3.7/recommended.html                   |   34 +
 .../porting/eclipse_3_7_porting_guide.html         |   39 +
 .../org.eclipse.jdt.doc.isv/questions/index.html   |   73 +-
 .../reference/extension-points/index.html          |    9 +-
 .../reference/misc/api-usage-rules.html            |    4 +-
 .../reference/misc/index.html                      |   11 +-
 eclipse/plugins/org.eclipse.jdt.doc.isv/toc.xml    |    2 +-
 .../org.eclipse.jdt.doc.isv/topics_Porting.xml     |    6 +
 .../org.eclipse.jdt.doc.isv/topics_Reference.xml   |   20 +-
 .../org.eclipse.jdt.doc.user/META-INF/MANIFEST.MF  |    2 +-
 .../plugins/org.eclipse.jdt.doc.user/about.html    |    5 +-
 .../org.eclipse.jdt.doc.user/about.properties      |    4 +-
 eclipse/plugins/org.eclipse.jdt.doc.user/book.css  |    4 +
 .../concept-access-rules-combine-rules.htm         |   48 +
 .../concepts/concept-access-rules.htm              |   82 +-
 .../concepts/concept-build-classpath.htm           |   61 +-
 .../concepts/concept-classpath-variables.htm       |   75 +-
 .../concepts/concept-editor-templates.htm          |  103 +-
 .../concept-inclusion-exclusion-patterns.htm       |   85 +-
 .../concepts/concept-java-builder.htm              |   96 +-
 .../concepts/concept-java-editor.htm               |  142 +-
 .../concepts/concept-java-perspective.htm          |  196 +-
 .../concepts/concept-java-project.htm              |   81 +-
 .../concepts/concept-java-search.htm               |  170 +-
 .../concepts/concept-java-views-decorators.htm     |   99 +-
 .../concepts/concept-java-views-filtering.htm      |  147 +-
 .../concepts/concept-java-views-presentation.htm   |  149 +-
 .../concepts/concept-java-views-sorting.htm        |   76 +-
 .../concepts/concept-java-views.htm                |  328 +-
 .../concepts/concept-jdt.htm                       |   80 +-
 .../concepts/concept-quickfix-assist.htm           |    4 +-
 .../concepts/concept-refactoring.htm               |  114 +-
 .../concepts/concept-string-externalization.htm    |  133 +-
 .../concepts/concept-template-variables.htm        |    4 +-
 .../org.eclipse.jdt.doc.user/contexts_Debugger.xml |   14 +-
 .../org.eclipse.jdt.doc.user/contexts_JDT.xml      |   56 +-
 .../contexts_JDT_Debugger.xml                      |    5 +-
 .../images/editor_mytestcase_moved.png             |  Bin 11044 -> 23890 bytes
 .../images/editor_vectortest_quickoutline.png      |  Bin 14172 -> 16168 bytes
 .../images/extract_method_dialog.png               |  Bin 7465 -> 20900 bytes
 .../j2se50/wiz_new_java_project_myproject.png      |  Bin 11718 -> 25938 bytes
 .../gettingStarted/images/pref_editor.png          |  Bin 5285 -> 2613 bytes
 .../images/qs-DetectingExistingLayout2.png         |  Bin 11654 -> 25566 bytes
 .../images/qs-DetectingExistingLayout4.png         |  Bin 27863 -> 4891 bytes
 .../gettingStarted/images/qs-OrganizeSources6.png  |  Bin 29693 -> 6788 bytes
 .../images/qs-WorkingWithExistingLayout11.png      |  Bin 11793 -> 25700 bytes
 .../images/qs-WorkingWithExistingLayout15.png      |  Bin 30888 -> 8764 bytes
 .../images/qs-WorkingWithExistingLayout21.png      |  Bin 11793 -> 25700 bytes
 .../images/qs-WorkingWithExistingLayout29.png      |  Bin 30882 -> 8541 bytes
 .../images/qs-WorkingWithExistingLayout31.png      |  Bin 11793 -> 25700 bytes
 .../images/qs-WorkingWithExistingLayout36.png      |  Bin 29893 -> 6942 bytes
 .../images/qs-WorkingWithExistingLayout41.png      |  Bin 11793 -> 25700 bytes
 .../images/qs-WorkingWithExistingLayout49.png      |  Bin 35001 -> 12213 bytes
 .../images/qs-WorkingWithExistingLayout51.png      |  Bin 11682 -> 25689 bytes
 .../images/qs-WorkingWithExistingLayout61.png      |  Bin 12046 -> 26030 bytes
 .../images/qs-WorkingWithExistingLayout63.png      |  Bin 11914 -> 26016 bytes
 .../gettingStarted/images/quickoutline_menu.png    |  Bin 9852 -> 9851 bytes
 .../images/quickoutline_submethods.png             |  Bin 9214 -> 5870 bytes
 .../gettingStarted/images/view_junit_red.png       |  Bin 5257 -> 10573 bytes
 .../images/view_package_explorer_junit.png         |  Bin 7853 -> 7799 bytes
 .../images/view_package_explorer_junit_exp.png     |  Bin 15101 -> 18914 bytes
 .../view_package_explorer_vectortest_error.png     |  Bin 9818 -> 9909 bytes
 .../gettingStarted/images/view_problems_goto.png   |  Bin 19236 -> 9734 bytes
 .../gettingStarted/images/wiz_new_project.png      |  Bin 34373 -> 27069 bytes
 .../gettingStarted/intro/overview.htm              |   58 +-
 .../gettingStarted/qs-12.htm                       |  299 +-
 .../gettingStarted/qs-13.htm                       |    8 +-
 .../gettingStarted/qs-14.htm                       |    8 +-
 .../gettingStarted/qs-15.htm                       |   10 +-
 .../gettingStarted/qs-AddMethod.htm                |  150 +-
 .../gettingStarted/qs-ContentAssist.htm            |    4 +-
 .../gettingStarted/qs-DetectingExistingLayout.htm  |   47 +-
 .../gettingStarted/qs-EditorTemplates.htm          |    2 +-
 .../gettingStarted/qs-ExtractMethod.htm            |    6 +-
 .../gettingStarted/qs-LocalHistory.htm             |    6 +-
 .../gettingStarted/qs-Navigate.htm                 |  147 +-
 .../gettingStarted/qs-OpenJavaEditor.htm           |    4 +-
 .../gettingStarted/qs-OrganizeImports.htm          |   92 +-
 .../gettingStarted/qs-OrganizingSources.htm        |  219 +-
 .../gettingStarted/qs-ProjectConfiguration.htm     |    2 +-
 .../gettingStarted/qs-Quickviews.htm               |    3 +-
 .../qs-WorkingWithExistingLayout1.htm              |  216 +-
 .../qs-WorkingWithExistingLayout2.htm              |  303 +-
 .../qs-WorkingWithExistingLayout3.htm              |  227 +-
 .../qs-WorkingWithExistingLayout4.htm              |  341 +-
 .../qs-WorkingWithExistingLayout5.htm              |  316 +-
 .../qs-WorkingWithExistingLayout6.htm              |  428 +-
 .../gettingStarted/qs-junit.htm                    |  303 +-
 .../org.eclipse.jdt.ui/elcl16/external_browser.png |  Bin 0 -> 654 bytes
 .../elcl16/pin_view.png}                           |  Bin 1003 -> 1003 bytes
 .../plugins/org.eclipse.jdt.doc.user/notices.html  |    4 +-
 .../plugins/org.eclipse.jdt.doc.user/plugin.xml    |    2 +
 .../breakpoints/images/ref-breakpoint_caught.PNG   |  Bin 17310 -> 6511 bytes
 .../images/ref-breakpoint_condition.PNG            |  Bin 20847 -> 5721 bytes
 .../breakpoints/images/ref-breakpoint_enabled.PNG  |  Bin 20729 -> 5719 bytes
 .../breakpoints/images/ref-breakpoint_entry.PNG    |  Bin 20531 -> 5624 bytes
 .../breakpoints/images/ref-breakpoint_exit.PNG     |  Bin 20477 -> 5601 bytes
 .../breakpoints/images/ref-breakpoint_hitcount.PNG |  Bin 20719 -> 5708 bytes
 .../images/ref-breakpoint_suspendpolicy.PNG        |  Bin 20771 -> 5716 bytes
 .../images/ref-breakpoint_suspendsubclass.PNG      |  Bin 17342 -> 6548 bytes
 .../breakpoints/images/ref-breakpoint_uncaught.PNG |  Bin 17356 -> 6570 bytes
 .../images/ref-watchpoint_access_option.PNG        |  Bin 15260 -> 5374 bytes
 .../breakpoints/images/ref-watchpoint_mod.PNG      |  Bin 15269 -> 5495 bytes
 .../appearance/ref-preferences-type-filters.htm    |   45 +-
 .../compiler/ref-preferences-errors-warnings.htm   |   52 +-
 .../java/compiler/ref-preferences-javadoc.htm      |   29 +-
 .../java/compiler/ref-preferences-task-tags.htm    |    2 -
 .../reference/preferences/java/debug/ref-debug.htm |  396 +-
 .../java/debug/ref-detail_formatters.htm           |  289 +-
 .../java/debug/ref-execution_environments.htm      |  204 +-
 .../preferences/java/debug/ref-heap_walking.htm    |  198 +-
 .../preferences/java/debug/ref-installed_jres.htm  |  258 +-
 .../java/debug/ref-logical_structures.htm          |  248 +-
 .../java/debug/ref-primitive_display_options.htm   |  212 +-
 .../preferences/java/debug/ref-step_filtering.htm  |  421 +-
 .../java/editor/ref-preferences-content-assist.htm |  104 +-
 .../java/editor/ref-preferences-typing.htm         |   18 +-
 .../java/ref-preferences-appearance.htm            |   19 +-
 .../preferences/java/ref-preferences-junit.htm     |   10 +-
 .../run-debug/images/ref-default_launchers.PNG     |  Bin 36302 -> 16046 bytes
 .../run-debug/images/ref-ext_string_subbed.PNG     |  Bin 50144 -> 23997 bytes
 .../run-debug/images/ref-lcd_string_subbed.PNG     |  Bin 48873 -> 21185 bytes
 .../run-debug/images/ref-string_sub.PNG            |  Bin 30974 -> 11612 bytes
 .../preferences/run-debug/ref-console.htm          |  375 +-
 .../run-debug/ref-default_launchers.htm            |  131 +-
 .../run-debug/ref-launch_configurations.htm        |  281 +-
 .../preferences/run-debug/ref-perspectives.htm     |  246 +-
 .../run-debug/ref-string_substitution.htm          |  188 +-
 .../preferences/run-debug/ref-view_management.htm  |  211 +-
 .../propertypages/images/rundebug-proppage.PNG     |  Bin 32729 -> 12554 bytes
 .../reference/ref-apt-factoryPath.htm              |    6 +-
 .../reference/ref-dialog-tostring.htm              |    4 +-
 .../reference/ref-icons.htm                        |   32 +-
 .../reference/ref-java-editor-breadcrumb.htm       |  101 +-
 .../reference/ref-java-editor-formatter.htm        |  125 +-
 .../reference/ref-java-editor-quickassist.htm      | 1496 +++--
 .../reference/ref-java-editor-quickfix.htm         |  524 +-
 .../reference/ref-jdt-faq.htm                      |  255 +-
 .../reference/ref-keybindings.htm                  |   12 +-
 .../reference/ref-menu-file.htm                    |    4 +-
 .../reference/ref-menu-navigate.htm                |   37 +-
 .../reference/ref-refactoring-extract-method.htm   |    3 +-
 .../reference/ref-toolbar-run.htm                  |    4 +-
 .../reference/ref-wizard-java-project.htm          |    4 +-
 .../reference/ref-wizard-refactorings.htm          |    6 +-
 .../images/ref-views_breakpoint_details.PNG        |  Bin 12490 -> 7498 bytes
 .../ref-views_breakpoint_properties_dialog.PNG     |  Bin 28147 -> 5546 bytes
 .../views/breakpoints/ref-breakpoints_view.htm     |    6 +-
 .../reference/views/console/ref-clear_action.htm   |    4 +-
 .../reference/views/console/ref-console_view.htm   |    4 +-
 .../reference/views/console/ref-prefs_action.htm   |    4 +-
 .../views/debug/images/ref-configdialog.PNG        |  Bin 31981 -> 15296 bytes
 .../views/debug/images/ref-properties_dialog.PNG   |  Bin 27648 -> 12240 bytes
 .../views/debug/images/ref-properties_dialog2.PNG  |  Bin 35462 -> 19025 bytes
 .../reference/views/debug/ref-breadcrumb.htm       |    4 +-
 .../reference/views/debug/ref-properties.htm       |    8 +-
 .../views/expressions/ref-expressions_view.htm     |    4 +-
 .../reference/views/ref-call-hierarchy.htm         |   79 +-
 .../reference/views/ref-type-hierarchy.htm         |   63 +-
 .../reference/views/ref-view-javadoc.htm           |  134 +
 .../reference/views/ref-view-junit.htm             |  312 +
 .../reference/views/ref-view-outline.htm           |   73 +-
 .../reference/views/ref-view-package-explorer.htm  |   52 +-
 .../reference/views/ref-view-scrapbook.htm         |   96 +-
 .../reference/views/ref-viewsandeditors.htm        |    7 +-
 .../views/shared/images/ref-viewlayoutmenu.PNG     |  Bin 14609 -> 17156 bytes
 .../reference/views/shared/ref-allinstances.htm    |    4 +-
 .../reference/views/shared/ref-contentassist.htm   |    4 +-
 .../reference/views/shared/ref-display.htm         |    6 +-
 .../reference/views/shared/ref-execute.htm         |    4 +-
 .../reference/views/shared/ref-findreplace.htm     |    6 +-
 .../reference/views/shared/ref-forcereturn.htm     |    4 +-
 .../reference/views/shared/ref-horizview.htm       |    8 +-
 .../reference/views/shared/ref-inspect.htm         |    6 +-
 .../reference/views/shared/ref-vertview.htm        |    8 +-
 .../views/shared/ref-viewlayoutcommands.htm        |    6 +-
 .../reference/views/shared/ref-viewonly.htm        |    5 +-
 .../views/variables/ref-variables_view.htm         |    4 +-
 .../reference/wizards/ref-export_breakpoints.htm   |    4 +-
 .../wizards/ref-export_launch_configs.htm          |    4 +-
 .../reference/wizards/ref-import_breakpoints.htm   |    4 +-
 .../wizards/ref-import_launch_configs.htm          |    4 +-
 .../tasks/task-ant_javac_adapter.htm               |   88 +
 .../tasks/task-launching_java_applet.htm           |    4 +-
 .../tasks/task-launching_java_program.htm          |    4 +-
 .../tasks/task-suppress_warnings.htm               |   56 +
 .../tasks/task-using_batch_compiler.htm            |  851 +++
 .../org.eclipse.jdt.doc.user/tasks/tasks-230.htm   |    4 +-
 .../org.eclipse.jdt.doc.user/tasks/tasks-231.htm   |  151 +-
 .../org.eclipse.jdt.doc.user/tasks/tasks-232.htm   |   70 +-
 .../org.eclipse.jdt.doc.user/tasks/tasks-32.htm    |   36 +-
 .../org.eclipse.jdt.doc.user/tasks/tasks-62.htm    |   61 +-
 .../org.eclipse.jdt.doc.user/tasks/tasks-63.htm    |   87 +-
 .../org.eclipse.jdt.doc.user/tasks/tasks-63a.htm   |   82 +-
 .../org.eclipse.jdt.doc.user/tasks/tasks-64.htm    |   65 +-
 .../org.eclipse.jdt.doc.user/tasks/tasks-72.htm    |   19 -
 .../org.eclipse.jdt.doc.user/tasks/tasks-73.htm    |   69 +-
 .../org.eclipse.jdt.doc.user/tasks/tasks-74.htm    |   77 +-
 .../org.eclipse.jdt.doc.user/tasks/tasks-75.htm    |   85 +-
 .../org.eclipse.jdt.doc.user/tasks/tasks-76.htm    |   88 +-
 .../org.eclipse.jdt.doc.user/tasks/tasks-77.htm    |   54 +-
 .../org.eclipse.jdt.doc.user/tasks/tasks-9.htm     |  177 +-
 .../org.eclipse.jdt.doc.user/tasks/tasks-JREs.htm  |  106 +-
 .../tasks/tasks-consoleAppearance.htm              |  102 +-
 .../tasks/tasks-debug-launch.htm                   |  110 +-
 .../tasks/tasks-executionArgs.htm                  |  107 +-
 .../tasks/tasks-java-local-configuration.htm       |  222 +-
 .../tips/images/assign-to-casted-quickfix.png      |  Bin 1889 -> 2501 bytes
 .../tips/images/focus-ovr.png                      |  Bin 0 -> 161 bytes
 .../tips/images/quick-outline-inherited.png        |  Bin 5671 -> 11291 bytes
 .../org.eclipse.jdt.doc.user/tips/jdt_tips.html    |   56 +-
 eclipse/plugins/org.eclipse.jdt.doc.user/toc.xml   |    8 +-
 .../org.eclipse.jdt.doc.user/topics_Concepts.xml   |    4 +-
 .../topics_GettingStarted.xml                      |    4 +-
 .../org.eclipse.jdt.doc.user/topics_Reference.xml  |   26 +-
 .../org.eclipse.jdt.doc.user/topics_Tasks.xml      |    9 +-
 .../org.eclipse.jdt.doc.user/topics_Tips.xml       |   14 +
 .../org.eclipse.jdt.doc.user/topics_WhatsNew.xml   |   13 +
 .../whatsNew/images/abstract-class-hl.png          |  Bin 0 -> 9977 bytes
 .../images/add-missing-case-statements.png         |  Bin 0 -> 5667 bytes
 .../whatsNew/images/annotations-in-javadoc.png     |  Bin 10352 -> 0 bytes
 .../whatsNew/images/assert-null-analysis.png       |  Bin 0 -> 9315 bytes
 .../background-computation-of-type-hierarchy.png   |  Bin 20643 -> 0 bytes
 .../whatsNew/images/bp-details.png                 |  Bin 25393 -> 0 bytes
 .../whatsNew/images/browser-preferences.png        |  Bin 11332 -> 0 bytes
 .../whatsNew/images/build-path-error-decorator.png |  Bin 6940 -> 0 bytes
 .../whatsNew/images/build-path-problems.png        |  Bin 9783 -> 0 bytes
 ...rmatter-preserve-space-line-comment-example.png |  Bin 0 -> 2560 bytes
 .../code-formatter-preserve-space-line-comment.png |  Bin 0 -> 6062 bytes
 .../whatsNew/images/code-select-inheritDoc.png     |  Bin 0 -> 5344 bytes
 .../whatsNew/images/condition-history.png          |  Bin 0 -> 6267 bytes
 .../whatsNew/images/edit-test-method.png           |  Bin 8199 -> 0 bytes
 .../images/enter-key-indent-preference.png         |  Bin 0 -> 5637 bytes
 .../whatsNew/images/escape-backslashes.png         |  Bin 0 -> 2601 bytes
 .../whatsNew/images/exchange-operands.png          |  Bin 0 -> 5333 bytes
 .../whatsNew/images/export-all-profiles.png        |  Bin 4900 -> 0 bytes
 .../whatsNew/images/extract-method-continue.png    |  Bin 1875 -> 0 bytes
 .../extract-method-multiple-return-values.png      |  Bin 8749 -> 0 bytes
 .../whatsNew/images/filter-getters-and-setters.png |  Bin 0 -> 29779 bytes
 .../images/find-externalized-strings-constants.png |  Bin 7229 -> 0 bytes
 .../whatsNew/images/focus-ovr.png                  |  Bin 0 -> 161 bytes
 ...matter-align-annotation-arguments-formatted.png |  Bin 1137 -> 0 bytes
 ...atter-align-annotation-arguments-preference.png |  Bin 2502 -> 0 bytes
 ...ormatter-align-method-declaration-formatted.png |  Bin 1741 -> 0 bytes
 ...rmatter-align-method-declaration-preference.png |  Bin 2105 -> 0 bytes
 ...ter-condense-multi-lines-comments-formatted.png |  Bin 1134 -> 0 bytes
 ...er-condense-multi-lines-comments-preference.png |  Bin 2478 -> 0 bytes
 ...formatter-disabling-enabling-tags-formatted.png |  Bin 7427 -> 0 bytes
 ...ormatter-disabling-enabling-tags-preference.png |  Bin 12725 -> 0 bytes
 .../formatter-new-line-after-label-formatted.png   |  Bin 903 -> 0 bytes
 .../formatter-new-line-after-label-preference.png  |  Bin 2577 -> 0 bytes
 .../formatter-newline-annotation-formatted.png     |  Bin 0 -> 7817 bytes
 .../formatter-newline-annotation-preference.png    |  Bin 0 -> 12659 bytes
 ...prefer-wrapping-outer-expressions-formatted.png |  Bin 1731 -> 0 bytes
 ...refer-wrapping-outer-expressions-preference.png |  Bin 3691 -> 0 bytes
 ...matter-skip-first-column-comments-formatted.png |  Bin 1376 -> 0 bytes
 ...atter-skip-first-column-comments-preference.png |  Bin 3654 -> 0 bytes
 .../whatsNew/images/instance-counts.png            |  Bin 10770 -> 0 bytes
 .../images/introduce-new-local-with-cast-type.png  |  Bin 0 -> 4561 bytes
 .../images/javadoc-untagged-type-params.png        |  Bin 0 -> 7621 bytes
 .../whatsNew/images/join-variable-declaration.png  |  Bin 0 -> 6933 bytes
 .../whatsNew/images/junit-4-suite-wizard.png       |  Bin 0 -> 20145 bytes
 .../whatsNew/images/junit-import-url.png           |  Bin 11123 -> 0 bytes
 .../whatsNew/images/junit-show-new-launches.png    |  Bin 0 -> 2772 bytes
 .../whatsNew/images/local-variable-unused.png      |  Bin 0 -> 3439 bytes
 .../whatsNew/images/method-can-be-static.png       |  Bin 0 -> 5499 bytes
 .../images/move-type-to-new-file-refactoring.png   |  Bin 10598 -> 0 bytes
 .../whatsNew/images/multifix-problem-hover.png     |  Bin 4522 -> 0 bytes
 .../whatsNew/images/open-declared-type.png         |  Bin 0 -> 2528 bytes
 .../images/open-implementation-command.png         |  Bin 2855 -> 0 bytes
 .../whatsNew/images/open-return-type.png           |  Bin 0 -> 3234 bytes
 .../whatsNew/images/open-super-implementation.png  |  Bin 0 -> 4817 bytes
 .../whatsNew/images/override.png                   |  Bin 6236 -> 0 bytes
 .../whatsNew/images/package-abbreviations-off.png  |  Bin 6743 -> 0 bytes
 .../whatsNew/images/package-abbreviations-on.png   |  Bin 6613 -> 0 bytes
 .../whatsNew/images/pin-call-hierarchy-view.png    |  Bin 0 -> 10745 bytes
 .../whatsNew/images/preference-filter.png          |  Bin 0 -> 9073 bytes
 .../images/preference-transfer-appearance.png      |  Bin 9942 -> 0 bytes
 .../whatsNew/images/preference-transfer-code.png   |  Bin 10022 -> 0 bytes
 .../images/preference-transfer-compiler.png        |  Bin 10118 -> 0 bytes
 .../whatsNew/images/prompt-on-deletion.png         |  Bin 0 -> 5742 bytes
 .../images/properties-file-editor-hover.png        |  Bin 0 -> 3919 bytes
 .../images/put-expression-in-parentheses.png       |  Bin 0 -> 5663 bytes
 .../images/put-expressions-in-parentheses.png      |  Bin 0 -> 7480 bytes
 .../images/quick-outline-inherited-for-nested.png  |  Bin 0 -> 19072 bytes
 .../whatsNew/images/refresh-element-action.png     |  Bin 5626 -> 0 bytes
 .../whatsNew/images/remove-from-view-action.png    |  Bin 11248 -> 0 bytes
 .../whatsNew/images/search-in-options.png          |  Bin 0 -> 11351 bytes
 .../source-attachments-in-referenced-JARs.png      |  Bin 17017 -> 0 bytes
 .../whatsNew/images/suppress-optional-errors.png   |  Bin 6549 -> 0 bytes
 .../whatsNew/images/suppresswarnings-javadoc.png   |  Bin 0 -> 5414 bytes
 .../unavoidable-generic-type-problems-example.png  |  Bin 0 -> 7691 bytes
 .../images/unavoidable-generic-type-problems.png   |  Bin 0 -> 7314 bytes
 .../whatsNew/images/unescape-backslashes.png       |  Bin 0 -> 2604 bytes
 .../whatsNew/images/unused-object-allocation.png   |  Bin 6302 -> 0 bytes
 .../whatsNew/images/value-in-javadoc.png           |  Bin 7031 -> 0 bytes
 .../whatsNew/jdt_whatsnew.html                     |  943 ++--
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../jdt/internal/junit/JUnitCorePlugin.java        |    8 +-
 .../internal/junit/JUnitPreferencesConstants.java  |    8 +-
 .../internal/junit/JunitPreferenceInitializer.java |   27 +-
 .../internal/junit/buildpath/BuildPathSupport.java |   94 +-
 .../junit/buildpath/JUnitContainerInitializer.java |    6 +-
 .../jdt/internal/junit/model/JUnitModel.java       |   21 +-
 .../jdt/internal/junit/model/ModelMessages.java    |    5 +-
 .../internal/junit/model/ModelMessages.properties  |    6 +-
 .../junit/model/RemoteTestRunnerClient.java        |   83 +-
 .../jdt/internal/junit/model/TestRunHandler.java   |   25 +-
 .../jdt/internal/junit/model/TestRunSession.java   |   16 +-
 .../src/org/eclipse/jdt/junit/JUnitCore.java       |   83 +
 .../eclipse/jdt/junit/model/ITestSuiteElement.java |    9 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../junit/runner/junit3/JUnit3TestLoader.java      |    4 +-
 eclipse/plugins/org.eclipse.jdt.junit/.classpath   |    2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   25 +-
 .../org.eclipse.jdt.junit/META-INF/MANIFEST.MF     |    7 +-
 .../plugins/org.eclipse.jdt.junit/build.properties |    4 +-
 .../junit/launcher/TestSelectionDialog.java        |    5 +
 .../junit/buildpath/JUnitContainerWizardPage.java  |   19 +-
 .../internal/junit/launcher/AssertionVMArg.java    |    4 +-
 .../jdt/internal/junit/launcher/JUnitTabGroup.java |    3 +-
 .../junit/refactoring/JUnitRenameParticipant.java  |   25 +-
 .../junit/refactoring/LaunchConfigChange.java      |    6 +-
 .../refactoring/LaunchConfigRenameChange.java      |    6 +-
 .../LaunchConfigSetAttributeChange.java            |    6 +-
 .../refactoring/ProjectRenameParticipant.java      |    4 +-
 .../junit/refactoring/TypeRenameParticipant.java   |    2 +
 .../jdt/internal/junit/ui/CompareResultDialog.java |   32 +-
 .../internal/junit/ui/CompareResultsAction.java    |    3 +-
 .../internal/junit/ui/CopyFailureListAction.java   |    6 +-
 .../internal/junit/ui/EnableStackFilterAction.java |    3 +-
 .../junit/ui/GotoReferencedTestAction.java         |   14 +-
 .../internal/junit/ui/JUnitAddLibraryProposal.java |    6 +-
 .../junit/ui/JUnitClasspathFixProcessor.java       |   16 +-
 .../jdt/internal/junit/ui/JUnitCopyAction.java     |    3 +-
 .../jdt/internal/junit/ui/JUnitMessages.java       |   10 +-
 .../jdt/internal/junit/ui/JUnitMessages.properties |    4 +
 .../eclipse/jdt/internal/junit/ui/JUnitPlugin.java |   22 +-
 .../jdt/internal/junit/ui/JUnitPreferencePage.java |   82 +-
 .../jdt/internal/junit/ui/JUnitProgressBar.java    |    4 +-
 .../internal/junit/ui/JUnitQuickFixProcessor.java  |   27 +-
 .../junit/ui/JUnitUIPreferencesConstants.java      |   48 +
 .../jdt/internal/junit/ui/OpenEditorAction.java    |   17 +-
 .../internal/junit/ui/OpenEditorAtLineAction.java  |    4 +-
 .../jdt/internal/junit/ui/OpenTestAction.java      |   22 +-
 .../eclipse/jdt/internal/junit/ui/RerunAction.java |    3 +-
 .../jdt/internal/junit/ui/ScrollLockAction.java    |    3 +-
 .../internal/junit/ui/ShowNextFailureAction.java   |    3 +-
 .../junit/ui/ShowPreviousFailureAction.java        |    3 +-
 .../junit/ui/TestMethodSelectionDialog.java        |   22 +-
 .../jdt/internal/junit/ui/TestRunnerViewPart.java  |  197 +-
 .../junit/ui/TestSessionLabelProvider.java         |    4 +-
 .../junit/ui/TestSessionTableContentProvider.java  |    9 +-
 .../eclipse/jdt/internal/junit/ui/TestViewer.java  |   63 +-
 .../jdt/internal/junit/ui/UITestRunListener.java   |    3 +-
 .../junit/util/CheckedTableSelectionDialog.java    |   21 +-
 .../jdt/internal/junit/util/JUnitStubUtility.java  |    7 +-
 .../eclipse/jdt/internal/junit/util/Resources.java |   26 +-
 .../jdt/internal/junit/util/TestSearchEngine.java  |    4 +-
 .../jdt/internal/junit/wizards/JUnitWizard.java    |    3 +-
 .../junit/wizards/NewTestCaseCreationWizard.java   |   14 +-
 .../junit/wizards/NewTestSuiteCreationWizard.java  |    5 +-
 .../junit/wizards/SuiteClassesContentProvider.java |   50 +-
 .../internal/junit/wizards/UpdateTestSuite.java    |  199 +-
 .../jdt/internal/junit/wizards/WizardMessages.java |    6 +
 .../junit/wizards/WizardMessages.properties        |    6 +
 .../launcher/JUnitLaunchConfigurationTab.java      |   42 +-
 .../jdt/junit/launcher/JUnitLaunchShortcut.java    |   23 +-
 .../junit/wizards/NewTestCaseWizardPageOne.java    |  243 +-
 .../junit/wizards/NewTestCaseWizardPageTwo.java    |   23 +-
 .../jdt/junit/wizards/NewTestSuiteWizardPage.java  |  263 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../internal/junit4/runner/JUnit4TestLoader.java   |   36 +-
 .../junit4/runner/JUnit4TestMethodReference.java   |    9 +-
 .../junit4/runner/JUnit4TestReference.java         |    5 +-
 .../.settings/org.eclipse.jdt.core.prefs           |  176 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../macosx/MacOSXLauncherMessages.properties       |    4 +-
 .../launching/macosx/MacOSXVMInstallType.java      |   75 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   67 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../internal/ui/macbundler/BundleWizardPage3.java  |    4 +-
 .../.settings/org.eclipse.jdt.core.prefs           |  208 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../org.eclipse.jdt.launching/META-INF/MANIFEST.MF |    2 +-
 .../launching/DefaultProjectClasspathEntry.java    |   10 +-
 .../launching/EECompilationParticipant.java        |   16 +-
 .../launching/JREPreferenceModifyListener.java     |    5 +-
 .../jdt/internal/launching/LaunchingMessages.java  |    6 +-
 .../launching/LaunchingMessages.properties         |    5 +-
 .../jdt/internal/launching/LaunchingPlugin.java    |  210 +-
 .../launching/LaunchingPreferenceInitializer.java  |    7 +-
 .../jdt/internal/launching/MacInstalledJREs.java   |  190 +
 .../jdt/internal/launching/PListParser.java        |  237 +
 .../ProjectClasspathVariableResolver.java          |  100 +
 .../jdt/internal/launching/StandardVMDebugger.java |   32 +-
 .../jdt/internal/launching/StandardVMType.java     |  234 +-
 .../internal/launching/VMDefinitionsContainer.java |  105 +-
 .../environments/EnvironmentMessages.java          |    5 +-
 .../environments/EnvironmentMessages.properties    |    5 +-
 .../environments/EnvironmentsManager.java          |   39 +-
 .../environments/ExecutionEnvironment.java         |   32 +-
 .../ExecutionEnvironmentVariableResolver.java      |   52 +
 .../eclipse/jdt/launching/AbstractVMInstall.java   |   13 +-
 .../org/eclipse/jdt/launching/JavaRuntime.java     |  174 +-
 .../org.eclipse.jdt.launching/plugin.properties    |    5 +-
 .../plugins/org.eclipse.jdt.launching/plugin.xml   |   13 +
 .../org.eclipse.jdt.launching/r3_0_changes.html    |   57 -
 .../scripts/buildLaunchingSupportJAR.xml           |    5 +-
 .../launching/support/LibraryDetector.java         |   19 +-
 eclipse/plugins/org.eclipse.jdt.ui/.classpath      |    2 +-
 .../Build Jar in Jar Loader.launch                 |    2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   48 +-
 .../.settings/org.eclipse.jdt.ui.prefs             |    4 +-
 .../org.eclipse.jdt.ui/META-INF/MANIFEST.MF        |   16 +-
 .../plugins/org.eclipse.jdt.ui/build.properties    |    5 +-
 .../internal/corext/buildpath/BuildpathDelta.java  |   26 +-
 .../internal/corext/buildpath/CPJavaProject.java   |   22 +-
 .../corext/buildpath/ClasspathModifier.java        |  140 +-
 .../corext/callhierarchy/CallHierarchy.java        |   28 +-
 .../corext/callhierarchy/CallLocation.java         |    5 +-
 .../callhierarchy/CallSearchResultCollector.java   |   12 +-
 .../callhierarchy/CalleeAnalyzerVisitor.java       |   37 +-
 .../corext/callhierarchy/CalleeMethodWrapper.java  |   28 +-
 .../corext/callhierarchy/CallerMethodWrapper.java  |   14 +-
 .../corext/callhierarchy/IImplementorFinder.java   |    6 +-
 .../corext/callhierarchy/Implementors.java         |   18 +-
 .../callhierarchy/JavaImplementorFinder.java       |   10 +-
 .../internal/corext/callhierarchy/MethodCall.java  |   12 +-
 .../MethodReferencesSearchRequestor.java           |    7 +-
 .../corext/callhierarchy/MethodWrapper.java        |   45 +-
 .../internal/corext/callhierarchy/RealCallers.java |    4 +-
 .../AddDelegateMethodsOperation.java               |    4 +-
 .../codemanipulation/AddGetterSetterOperation.java |    8 +-
 .../codemanipulation/AddImportsOperation.java      |   10 +-
 .../AddUnimplementedConstructorsOperation.java     |    8 +-
 .../AddUnimplementedMethodsOperation.java          |    8 +-
 .../ContextSensitiveImportRewriteContext.java      |   14 +-
 .../GenerateHashCodeEqualsOperation.java           |   24 +-
 .../corext/codemanipulation/GetterSetterUtil.java  |   15 +-
 .../ImportReferencesCollector.java                 |   57 +-
 .../codemanipulation/OrganizeImportsOperation.java |   82 +-
 .../codemanipulation/SortMembersOperation.java     |   21 +-
 .../corext/codemanipulation/StubUtility.java       |   74 +-
 .../corext/codemanipulation/StubUtility2.java      |  180 +-
 .../AbstractToStringGenerator.java                 |   18 +-
 .../tostringgeneration/CustomBuilderGenerator.java |   30 +-
 .../GenerateToStringOperation.java                 |   22 +-
 .../StringBuilderChainGenerator.java               |    5 +-
 .../tostringgeneration/StringBuilderGenerator.java |    6 +-
 .../StringConcatenationGenerator.java              |    7 +-
 .../tostringgeneration/StringFormatGenerator.java  |   13 +-
 .../ToStringGenerationContext.java                 |    2 +-
 .../ToStringGenerationSettings.java                |    2 +-
 .../tostringgeneration/ToStringTemplateParser.java |   22 +-
 .../jdt/internal/corext/dom/ASTBatchParser.java    |   27 +-
 .../jdt/internal/corext/dom/ASTFlattener.java      |  268 +-
 .../jdt/internal/corext/dom/ASTNodeFactory.java    |   25 +-
 .../eclipse/jdt/internal/corext/dom/ASTNodes.java  |  133 +-
 .../eclipse/jdt/internal/corext/dom/Bindings.java  |   82 +-
 .../corext/dom/BodyDeclarationRewrite.java         |    4 +-
 .../jdt/internal/corext/dom/CodeScopeBuilder.java  |   55 +-
 .../jdt/internal/corext/dom/GenericVisitor.java    |  168 +-
 .../corext/dom/HierarchicalASTVisitor.java         |  179 +-
 .../jdt/internal/corext/dom/JdtASTMatcher.java     |    3 +-
 .../jdt/internal/corext/dom/LinkedNodeFinder.java  |   28 +-
 .../internal/corext/dom/LocalVariableIndex.java    |    4 +-
 .../jdt/internal/corext/dom/ModifierRewrite.java   |   61 +-
 .../corext/dom/NecessaryParenthesesChecker.java    |  302 +
 .../jdt/internal/corext/dom/ScopeAnalyzer.java     |   67 +-
 .../eclipse/jdt/internal/corext/dom/Selection.java |    3 +-
 .../jdt/internal/corext/dom/SelectionAnalyzer.java |   25 +-
 .../jdt/internal/corext/dom/StatementRewrite.java  |    3 +-
 .../eclipse/jdt/internal/corext/dom/TypeRules.java |  103 +-
 .../corext/dom/VariableDeclarationRewrite.java     |  128 +-
 .../corext/dom/fragments/ASTFragmentFactory.java   |    7 +-
 .../dom/fragments/ASTMatchingFragmentFinder.java   |    8 +-
 .../AssociativeInfixExpressionFragment.java        |   88 +-
 .../corext/dom/fragments/SimpleFragment.java       |    5 +-
 .../jdt/internal/corext/fix/AbstractFix.java       |    6 +-
 .../corext/fix/AbstractSerialVersionOperation.java |    3 +-
 .../fix/AddUnimplementedMethodsOperation.java      |    4 +-
 .../jdt/internal/corext/fix/CleanUpConstants.java  |    8 +-
 .../corext/fix/CleanUpPostSaveListener.java        |   68 +-
 .../internal/corext/fix/CleanUpPreferenceUtil.java |   75 +-
 .../internal/corext/fix/CleanUpRefactoring.java    |  152 +-
 .../jdt/internal/corext/fix/CleanUpRegistry.java   |   35 +-
 .../jdt/internal/corext/fix/CodeFormatFix.java     |    8 +-
 .../jdt/internal/corext/fix/CodeStyleFix.java      |   54 +-
 .../fix/CompilationUnitRewriteOperationsFix.java   |    4 +-
 .../internal/corext/fix/ControlStatementsFix.java  |   29 +-
 .../corext/fix/ConvertForLoopOperation.java        |   31 +-
 .../corext/fix/ConvertIterableLoopOperation.java   |   54 +-
 .../jdt/internal/corext/fix/ConvertLoopFix.java    |   21 +-
 .../internal/corext/fix/ConvertLoopOperation.java  |   10 +-
 .../jdt/internal/corext/fix/ExpressionsFix.java    |  229 +-
 .../jdt/internal/corext/fix/FixMessages.java       |   10 +-
 .../jdt/internal/corext/fix/FixMessages.properties |   12 +-
 .../eclipse/jdt/internal/corext/fix/Java50Fix.java |   84 +-
 .../internal/corext/fix/LinkedProposalModel.java   |   14 +-
 .../corext/fix/LinkedProposalPositionGroup.java    |   97 +-
 .../fix/PotentialProgrammingProblemsFix.java       |   32 +-
 .../corext/fix/SerialVersionDefaultOperation.java  |    4 +-
 .../eclipse/jdt/internal/corext/fix/StringFix.java |   12 +-
 .../internal/corext/fix/UnimplementedCodeFix.java  |    8 +-
 .../jdt/internal/corext/fix/UnusedCodeFix.java     |  103 +-
 .../corext/fix/VariableDeclarationFix.java         |  103 +-
 .../corext/javadoc/JavaDocCommentReader.java       |    5 +-
 .../internal/corext/javadoc/JavaDocLocations.java  |   33 +-
 .../template/java/AbstractJavaContextType.java     |   25 +-
 .../template/java/AbstractVariableResolver.java    |   16 +-
 .../corext/template/java/CodeTemplateContext.java  |    8 +-
 .../template/java/CodeTemplateContextType.java     |   11 +-
 .../template/java/CompilationUnitCompletion.java   |   69 +-
 .../template/java/CompilationUnitContextType.java  |   41 +-
 .../corext/template/java/ElementTypeResolver.java  |    7 +-
 .../java/ExceptionVariableNameResolver.java        |    3 +-
 .../corext/template/java/FieldResolver.java        |    3 +-
 .../corext/template/java/ImportsResolver.java      |   10 +-
 .../internal/corext/template/java/JavaContext.java |   36 +-
 .../corext/template/java/JavaContextType.java      |    3 +-
 .../corext/template/java/JavaDocContext.java       |    7 +-
 .../corext/template/java/JavaDocContextType.java   |   37 +-
 .../corext/template/java/JavaFormatter.java        |   38 +-
 .../corext/template/java/JavaTemplateMessages.java |    4 +-
 .../template/java/JavaTemplateMessages.properties  |    4 +-
 .../corext/template/java/JavaVariable.java         |    3 +-
 .../corext/template/java/LinkResolver.java         |   10 +-
 .../corext/template/java/LocalVarResolver.java     |    3 +-
 .../corext/template/java/NameResolver.java         |    9 +-
 .../corext/template/java/SWTContextType.java       |    3 +-
 .../corext/template/java/StaticImportResolver.java |   10 +-
 .../internal/corext/template/java/TemplateSet.java |   24 +-
 .../corext/template/java/TypeResolver.java         |    7 +-
 .../corext/template/java/TypeVariableResolver.java |    9 +-
 .../internal/corext/template/java/VarResolver.java |    3 +-
 .../internal/corext/util/CodeFormatterUtil.java    |   50 +-
 .../jdt/internal/corext/util/CollectionsUtil.java  |   37 +
 .../corext/util/DelegateEntryComparator.java       |   14 +-
 .../eclipse/jdt/internal/corext/util/History.java  |   27 +-
 .../corext/util/JavaElementResourceMapping.java    |   48 +-
 .../jdt/internal/corext/util/JavaModelUtil.java    |   62 +-
 .../eclipse/jdt/internal/corext/util/LRUMap.java   |   25 +-
 .../internal/corext/util/MethodOverrideTester.java |   82 +-
 .../util/MethodsSourcePositionComparator.java      |   13 +-
 .../jdt/internal/corext/util/OpenTypeHistory.java  |   31 +-
 .../corext/util/QualifiedTypeNameHistory.java      |    5 +-
 .../jdt/internal/corext/util/Resources.java        |   24 +-
 .../corext/util/SuperTypeHierarchyCache.java       |   27 +-
 .../corext/util/TypeNameMatchCollector.java        |   22 +-
 .../AbstractJavaElementRenameChange.java           |    5 +-
 .../jdt/internal/corext/refactoring/Checks.java    |   28 +-
 .../refactoring/CollectingSearchRequestor.java     |    9 +-
 .../refactoring/CuCollectingSearchRequestor.java   |    4 +-
 .../internal/corext/refactoring/ExceptionInfo.java |    3 +-
 .../JDTRefactoringDescriptorComment.java           |   11 +-
 .../refactoring/JavaRefactoringArguments.java      |    9 +-
 .../internal/corext/refactoring/ParameterInfo.java |    3 +-
 .../refactoring/RefactoringAvailabilityTester.java |   73 +-
 .../refactoring/RefactoringCoreMessages.java       |    4 +-
 .../refactoring/RefactoringExecutionStarter.java   |    6 +-
 .../refactoring/RefactoringScopeFactory.java       |   34 +-
 .../refactoring/RefactoringSearchEngine.java       |   45 +-
 .../refactoring/RefactoringSearchEngine2.java      |  110 +-
 .../corext/refactoring/ReturnTypeInfo.java         |    3 +-
 .../corext/refactoring/SearchResultGroup.java      |   15 +-
 .../corext/refactoring/TypeContextChecker.java     |  101 +-
 .../internal/corext/refactoring/TypedSource.java   |   35 +-
 .../corext/refactoring/base/JavaStatusContext.java |   21 +-
 .../refactoring/base/JavaStringStatusContext.java  |    3 +-
 .../base/ReferencesInBinaryContext.java            |    8 +-
 .../binary/AbstractCodeCreationOperation.java      |   10 +-
 .../binary/SourceCreationOperation.java            |    7 +-
 .../refactoring/binary/StubCreationOperation.java  |    9 +-
 .../corext/refactoring/binary/StubCreator.java     |   60 +-
 .../refactoring/changes/AbstractDeleteChange.java  |    3 +-
 .../refactoring/changes/ClasspathChange.java       |   10 +-
 .../changes/CompilationUnitReorgChange.java        |    5 +-
 .../changes/CopyCompilationUnitChange.java         |    4 +-
 .../refactoring/changes/CopyPackageChange.java     |    4 +-
 .../changes/CopyPackageFragmentRootChange.java     |    4 +-
 .../refactoring/changes/CopyResourceChange.java    |    5 +-
 .../changes/CreateCompilationUnitChange.java       |    3 +-
 .../refactoring/changes/CreatePackageChange.java   |    7 +-
 .../changes/DeletePackageFragmentRootChange.java   |   16 +-
 .../changes/DeleteSourceManipulationChange.java    |    6 +-
 .../DynamicValidationRefactoringChange.java        |    3 +-
 .../changes/DynamicValidationStateChange.java      |    7 +-
 .../changes/MoveCompilationUnitChange.java         |    8 +-
 .../refactoring/changes/MovePackageChange.java     |    4 +-
 .../changes/MovePackageFragmentRootChange.java     |    4 +-
 .../changes/MultiStateCompilationUnitChange.java   |    4 +-
 .../changes/PackageFragmentRootReorgChange.java    |    5 +-
 .../refactoring/changes/PackageReorgChange.java    |    5 +-
 .../changes/RenameCompilationUnitChange.java       |    6 +-
 .../changes/RenameJavaProjectChange.java           |    6 +-
 .../refactoring/changes/RenamePackageChange.java   |   25 +-
 .../changes/RenameSourceFolderChange.java          |    7 +-
 .../changes/UndoDeleteResourceChange.java          |    8 +-
 .../changes/UndoablePackageDeleteChange.java       |   11 +-
 .../refactoring/code/AstMatchingNodeFinder.java    |   93 +-
 .../corext/refactoring/code/CallContext.java       |    6 +-
 .../corext/refactoring/code/CallInliner.java       |  154 +-
 .../corext/refactoring/code/ConstantChecks.java    |   14 +-
 .../code/ConvertAnonymousToNestedRefactoring.java  |  140 +-
 .../corext/refactoring/code/ExceptionAnalyzer.java |   10 +-
 .../code/ExtractConstantRefactoring.java           |   82 +-
 .../refactoring/code/ExtractMethodAnalyzer.java    |   55 +-
 .../refactoring/code/ExtractMethodRefactoring.java |  160 +-
 .../refactoring/code/ExtractTempRefactoring.java   |   53 +-
 .../code/InlineConstantRefactoring.java            |   66 +-
 .../refactoring/code/InlineMethodRefactoring.java  |   22 +-
 .../refactoring/code/InlineTempRefactoring.java    |   19 +-
 .../code/IntroduceFactoryRefactoring.java          |   53 +-
 .../code/IntroduceIndirectionRefactoring.java      |   80 +-
 .../code/IntroduceParameterRefactoring.java        |   43 +-
 .../corext/refactoring/code/Invocations.java       |   97 +-
 .../corext/refactoring/code/LocalTypeAnalyzer.java |   16 +-
 .../corext/refactoring/code/NameCollector.java     |   12 +-
 .../refactoring/code/OperatorPrecedence.java       |   10 +-
 .../corext/refactoring/code/ParameterData.java     |   12 +-
 .../code/PromoteTempToFieldRefactoring.java        |   70 +-
 .../code/ReplaceInvocationsRefactoring.java        |   33 +-
 .../corext/refactoring/code/SnippetFinder.java     |   38 +-
 .../corext/refactoring/code/SourceAnalyzer.java    |  120 +-
 .../corext/refactoring/code/SourceProvider.java    |  183 +-
 .../corext/refactoring/code/TargetProvider.java    |   87 +-
 .../refactoring/code/TempAssignmentFinder.java     |    5 +-
 .../refactoring/code/flow/BranchFlowInfo.java      |    4 +-
 .../corext/refactoring/code/flow/FlowAnalyzer.java |  128 +-
 .../corext/refactoring/code/flow/FlowContext.java  |   16 +-
 .../corext/refactoring/code/flow/FlowInfo.java     |   36 +-
 .../refactoring/code/flow/InOutFlowAnalyzer.java   |   21 +-
 .../refactoring/code/flow/InputFlowAnalyzer.java   |   20 +-
 .../refactoring/delegates/DelegateCreator.java     |    4 +-
 .../delegates/DelegateFieldCreator.java            |   10 +-
 .../delegates/DelegateMethodCreator.java           |   22 +-
 .../generics/ElementStructureEnvironment.java      |    8 +-
 .../InferTypeArgumentsConstraintCreator.java       |   75 +-
 .../InferTypeArgumentsConstraintsSolver.java       |  103 +-
 .../generics/InferTypeArgumentsRefactoring.java    |  111 +-
 .../generics/InferTypeArgumentsTCModel.java        |  100 +-
 .../generics/InferTypeArgumentsUpdate.java         |   14 +-
 .../generics/ParametricStructureComputer.java      |   49 +-
 .../refactoring/nls/AccessorClassCreator.java      |   16 +-
 .../refactoring/nls/AccessorClassModifier.java     |   36 +-
 .../refactoring/nls/AccessorClassReference.java    |    8 +-
 .../nls/NLSAccessorFieldRenameParticipant.java     |    7 +-
 .../corext/refactoring/nls/NLSElement.java         |    3 +-
 .../internal/corext/refactoring/nls/NLSHint.java   |   17 +-
 .../corext/refactoring/nls/NLSHintHelper.java      |   23 +-
 .../internal/corext/refactoring/nls/NLSLine.java   |   13 +-
 .../refactoring/nls/NLSPropertyFileModifier.java   |   42 +-
 .../corext/refactoring/nls/NLSRefactoring.java     |   10 +-
 .../corext/refactoring/nls/NLSScanner.java         |   16 +-
 .../corext/refactoring/nls/NLSSourceModifier.java  |   11 +-
 .../internal/corext/refactoring/nls/NLSUtil.java   |   12 +-
 .../refactoring/nls/PropertyFileDocumentModel.java |  106 +-
 .../refactoring/nls/changes/CreateFileChange.java  |    6 +-
 .../refactoring/participants/JavaProcessors.java   |    6 +-
 .../participants/RefactoringProcessors.java        |    6 +-
 .../participants/ResourceModifications.java        |   70 +-
 .../participants/ResourceProcessors.java           |   16 +-
 .../corext/refactoring/refactoring.properties      |    3 +-
 .../refactoring/rename/JavaRenameProcessor.java    |    4 +-
 .../rename/MethodOccurenceCollector.java           |    3 +-
 .../refactoring/rename/RefactoringAnalyzeUtil.java |   18 +-
 .../rename/RefactoringHandleTransplanter.java      |   16 +-
 .../refactoring/rename/RefactoringScanner.java     |   19 +-
 .../refactoring/rename/RenameAnalyzeUtil.java      |   49 +-
 .../rename/RenameCompilationUnitProcessor.java     |   15 +-
 .../rename/RenameEnumConstProcessor.java           |    9 +-
 .../refactoring/rename/RenameFieldProcessor.java   |   18 +-
 .../rename/RenameJavaProjectProcessor.java         |   13 +-
 .../rename/RenameLocalVariableProcessor.java       |   15 +-
 .../refactoring/rename/RenameMethodProcessor.java  |  102 +-
 .../refactoring/rename/RenameModifications.java    |   35 +-
 .../rename/RenameNonVirtualMethodProcessor.java    |    5 +-
 .../refactoring/rename/RenamePackageProcessor.java |  123 +-
 .../rename/RenameSourceFolderProcessor.java        |   13 +-
 .../rename/RenameTypeParameterProcessor.java       |   15 +-
 .../refactoring/rename/RenameTypeProcessor.java    |  148 +-
 .../rename/RenameVirtualMethodProcessor.java       |   25 +-
 .../refactoring/rename/RenamingNameSuggestor.java  |    6 +-
 .../refactoring/rename/RippleMethodFinder2.java    |  149 +-
 .../refactoring/rename/TempDeclarationFinder.java  |    4 +-
 .../refactoring/rename/TempOccurrenceAnalyzer.java |   25 +-
 .../refactoring/rename/TextMatchUpdater.java       |   24 +-
 .../rename/TypeOccurrenceCollector.java            |    3 +-
 .../refactoring/reorg/ASTNodeDeleteUtil.java       |   19 +-
 .../refactoring/reorg/ArrayTypeConverter.java      |   22 +-
 .../refactoring/reorg/CopyModifications.java       |   22 +-
 .../reorg/CreateCopyOfCompilationUnitChange.java   |    5 +-
 .../reorg/CreateTargetExecutionLog.java            |    4 +-
 .../refactoring/reorg/DeleteChangeCreator.java     |   20 +-
 .../refactoring/reorg/DeleteModifications.java     |   30 +-
 .../refactoring/reorg/JavaCopyProcessor.java       |   20 +-
 .../refactoring/reorg/JavaDeleteProcessor.java     |  139 +-
 .../refactoring/reorg/JavaElementTransfer.java     |    6 +-
 .../refactoring/reorg/JavaMoveProcessor.java       |   20 +-
 .../reorg/LoggedCreateTargetChange.java            |    6 +-
 .../reorg/LoggedCreateTargetQueries.java           |    6 +-
 .../refactoring/reorg/MoveCuUpdateCreator.java     |   25 +-
 .../refactoring/reorg/MoveModifications.java       |   31 +-
 .../corext/refactoring/reorg/OverwriteHelper.java  |   22 +-
 .../corext/refactoring/reorg/ParentChecker.java    |   14 +-
 .../reorg/RefactoringModifications.java            |    8 +-
 .../refactoring/reorg/ReorgPolicyFactory.java      |  253 +-
 .../corext/refactoring/reorg/ReorgUtils.java       |  124 +-
 .../refactoring/reorg/SourceReferenceUtil.java     |   34 +-
 ...angeMethodSignatureRefactoringContribution.java |    5 +-
 .../ChangeTypeRefactoringContribution.java         |    5 +-
 .../ConvertAnonymousRefactoringContribution.java   |    5 +-
 .../scripting/CopyRefactoringContribution.java     |    5 +-
 .../scripting/DeleteRefactoringContribution.java   |    5 +-
 .../scripting/ExtractClassContribution.java        |    5 +-
 .../ExtractConstantRefactoringContribution.java    |    5 +-
 .../ExtractInterfaceRefactoringContribution.java   |    5 +-
 .../ExtractMethodRefactoringContribution.java      |    5 +-
 .../ExtractSupertypeRefactoringContribution.java   |    5 +-
 .../ExtractTempRefactoringContribution.java        |    5 +-
 .../InferTypeArgumentsRefactoringContribution.java |    5 +-
 .../InlineConstantRefactoringContribution.java     |    5 +-
 .../InlineMethodRefactoringContribution.java       |   15 +-
 .../InlineTempRefactoringContribution.java         |    5 +-
 .../IntroduceFactoryRefactoringContribution.java   |    5 +-
 ...ntroduceIndirectionRefactoringContribution.java |    5 +-
 .../IntroduceParameterObjectContribution.java      |    5 +-
 .../IntroduceParameterRefactoringContribution.java |    5 +-
 .../MoveMemberTypeRefactoringContribution.java     |    5 +-
 .../MoveMethodRefactoringContribution.java         |    5 +-
 .../scripting/MoveRefactoringContribution.java     |    5 +-
 .../MoveStaticMembersRefactoringContribution.java  |    5 +-
 .../PromoteTempToFieldRefactoringContribution.java |    5 +-
 .../scripting/PullUpRefactoringContribution.java   |    5 +-
 .../scripting/PushDownRefactoringContribution.java |    5 +-
 ...nameCompilationUnitRefactoringContribution.java |    5 +-
 .../RenameEnumConstRefactoringContribution.java    |    5 +-
 .../RenameFieldRefactoringContribution.java        |    5 +-
 .../RenameJavaProjectRefactoringContribution.java  |    5 +-
 ...RenameLocalVariableRefactoringContribution.java |    5 +-
 .../RenameMethodRefactoringContribution.java       |    5 +-
 .../RenamePackageRefactoringContribution.java      |    5 +-
 .../RenameSourceFolderRefactoringContribution.java |    5 +-
 ...RenameTypeParameterRefactoringContribution.java |    5 +-
 .../RenameTypeRefactoringContribution.java         |    5 +-
 .../SelfEncapsulateRefactoringContribution.java    |    5 +-
 .../UseSupertypeRefactoringContribution.java       |    5 +-
 .../corext/refactoring/sef/AccessAnalyzer.java     |   24 +-
 .../sef/SelfEncapsulateFieldRefactoring.java       |   67 +-
 .../refactoring/structure/ASTNodeSearchUtil.java   |   12 +-
 .../structure/ChangeSignatureProcessor.java        |  479 +-
 .../structure/ChangeTypeRefactoring.java           |  185 +-
 .../structure/CompilationUnitRewrite.java          |   17 +-
 .../structure/ConstructorReferenceFinder.java      |   42 +-
 .../structure/ExtractClassRefactoring.java         |   85 +-
 .../ExtractInterfaceConstraintsSolver.java         |    3 +-
 .../structure/ExtractInterfaceProcessor.java       |   65 +-
 .../structure/ExtractSupertypeProcessor.java       |  116 +-
 .../refactoring/structure/HierarchyProcessor.java  |   46 +-
 .../structure/IDefaultValueAdvisor.java            |    4 +-
 .../refactoring/structure/ImportRemover.java       |   61 +-
 .../refactoring/structure/ImportRewriteUtil.java   |   34 +-
 .../IntroduceParameterObjectProcessor.java         |  137 +-
 .../refactoring/structure/MemberCheckUtil.java     |    6 +-
 .../structure/MemberVisibilityAdjustor.java        |   90 +-
 .../structure/MoveInnerToTopRefactoring.java       |  155 +-
 .../structure/MoveInstanceMethodProcessor.java     |  228 +-
 .../structure/MoveStaticMemberAnalyzer.java        |    6 +-
 .../structure/MoveStaticMembersProcessor.java      |   86 +-
 .../refactoring/structure/MovedMemberAnalyzer.java |    8 +-
 .../structure/ParameterObjectFactory.java          |   69 +-
 .../structure/PullUpRefactoringProcessor.java      |  322 +-
 .../structure/PushDownRefactoringProcessor.java    |  128 +-
 .../refactoring/structure/ReferenceAnalyzer.java   |   14 +-
 .../refactoring/structure/ReferenceFinderUtil.java |   66 +-
 .../refactoring/structure/TypeVariableMaplet.java  |    4 +-
 .../refactoring/structure/TypeVariableUtil.java    |   22 +-
 .../structure/UseSuperTypeProcessor.java           |   30 +-
 .../constraints/ConditionalTypeConstraint.java     |    5 +-
 .../constraints/CovariantTypeConstraint.java       |    5 +-
 .../constraints/SuperTypeConstraintsCreator.java   |   92 +-
 .../constraints/SuperTypeConstraintsModel.java     |   94 +-
 .../constraints/SuperTypeConstraintsSolver.java    |   78 +-
 .../constraints/SuperTypeRefactoringProcessor.java |  178 +-
 .../structure/constraints/SuperTypeSet.java        |    6 +-
 .../refactoring/surround/ExceptionAnalyzer.java    |   30 +-
 .../surround/LocalDeclarationAnalyzer.java         |    9 +-
 .../refactoring/surround/SurroundWithAnalyzer.java |   12 +-
 .../surround/SurroundWithTryCatchAnalyzer.java     |    3 +-
 .../surround/SurroundWithTryCatchRefactoring.java  |   47 +-
 .../refactoring/typeconstraints/ASTCreator.java    |    7 +-
 .../typeconstraints/CompilationUnitRange.java      |    5 +-
 .../typeconstraints/CompositeOrTypeConstraint.java |   11 +-
 .../typeconstraints/ConstraintCollector.java       |   73 +-
 .../typeconstraints/ConstraintCreator.java         |  250 +-
 .../typeconstraints/ConstraintOperator.java        |    7 +-
 .../typeconstraints/ConstraintVariable.java        |    3 +-
 .../typeconstraints/ConstraintVariableFactory.java |   44 +-
 .../typeconstraints/DeclaringTypeVariable.java     |    3 +-
 .../typeconstraints/ExpressionVariable.java        |    3 +-
 .../typeconstraints/FullConstraintCreator.java     |  181 +-
 .../typeconstraints/ParameterTypeVariable.java     |    3 +-
 .../typeconstraints/ReturnTypeVariable.java        |    3 +-
 .../typeconstraints/SimpleTypeConstraint.java      |    3 +-
 .../typeconstraints/TypeConstraintFactory.java     |   26 +-
 .../refactoring/typeconstraints/TypeVariable.java  |    3 +-
 .../types/AbstractTypeVariable.java                |    7 +-
 .../typeconstraints/types/ArrayType.java           |   12 +-
 .../typeconstraints/types/CaptureType.java         |    8 +-
 .../typeconstraints/types/ExtendsWildcardType.java |   10 +-
 .../typeconstraints/types/GenericType.java         |   12 +-
 .../typeconstraints/types/HierarchyType.java       |    8 +-
 .../typeconstraints/types/NullType.java            |    9 +-
 .../typeconstraints/types/ParameterizedType.java   |   14 +-
 .../typeconstraints/types/PrimitiveType.java       |    8 +-
 .../refactoring/typeconstraints/types/RawType.java |   12 +-
 .../typeconstraints/types/StandardType.java        |   11 +-
 .../typeconstraints/types/SuperWildcardType.java   |    9 +-
 .../refactoring/typeconstraints/types/TType.java   |   24 +-
 .../typeconstraints/types/TypeEnvironment.java     |  117 +-
 .../typeconstraints/types/TypeTuple.java           |    4 +-
 .../typeconstraints/types/TypeVariable.java        |    9 +-
 .../typeconstraints/types/UnboundWildcardType.java |    9 +-
 .../typeconstraints/types/VoidType.java            |    9 +-
 .../typeconstraints/types/WildcardType.java        |    6 +-
 .../typesets/ArraySuperTypeSet.java                |   28 +-
 .../typeconstraints/typesets/ArrayTypeSet.java     |   39 +-
 .../typeconstraints/typesets/EmptyTypeSet.java     |   27 +-
 .../typesets/EnumeratedTypeSet.java                |  105 +-
 .../typeconstraints/typesets/SingletonTypeSet.java |   27 +-
 .../typesets/SubTypesOfSingleton.java              |   32 +-
 .../typeconstraints/typesets/SubTypesSet.java      |   46 +-
 .../typesets/SuperTypesOfSingleton.java            |   32 +-
 .../typeconstraints/typesets/SuperTypesSet.java    |   46 +-
 .../typeconstraints/typesets/TypeSet.java          |    6 +-
 .../typesets/TypeSetEnvironment.java               |   20 +-
 .../typesets/TypeSetIntersection.java              |   33 +-
 .../typeconstraints/typesets/TypeSetUnion.java     |   22 +-
 .../typeconstraints/typesets/TypeUniverseSet.java  |    7 +-
 .../typeconstraints2/ArrayElementVariable2.java    |    4 +-
 .../CollectionElementVariable2.java                |    5 +-
 .../typeconstraints2/ConstraintVariable2.java      |    3 +-
 .../typeconstraints2/ImmutableTypeVariable2.java   |    5 +-
 .../typeconstraints2/ParameterTypeVariable2.java   |    5 +-
 .../ParameterizedTypeVariable2.java                |    3 +-
 .../typeconstraints2/ReturnTypeVariable2.java      |    4 +-
 .../typeconstraints2/SubTypeConstraint2.java       |    5 +-
 .../refactoring/typeconstraints2/TTypes.java       |   26 +-
 .../typeconstraints2/TypeEquivalenceSet.java       |   13 +-
 .../typeconstraints2/TypeVariable2.java            |    5 +-
 .../typeconstraints2/VariableVariable2.java        |    4 +-
 .../util/AbstractExceptionAnalyzer.java            |   46 +-
 .../internal/corext/refactoring/util/Changes.java  |    8 +-
 .../corext/refactoring/util/CodeAnalyzer.java      |    3 +-
 .../corext/refactoring/util/JavaElementUtil.java   |   28 +-
 .../corext/refactoring/util/JavadocUtil.java       |   14 +-
 .../util/NoCommentSourceRangeComputer.java         |    3 +-
 .../refactoring/util/QualifiedNameFinder.java      |   10 +-
 .../util/QualifiedNameSearchResult.java            |   22 +-
 .../refactoring/util/RefactoringASTParser.java     |   20 +-
 .../corext/refactoring/util/ResourceUtil.java      |    6 +-
 .../util/SelectionAwareSourceRangeComputer.java    |   15 +-
 .../corext/refactoring/util/StatementAnalyzer.java |   47 +-
 .../corext/refactoring/util/TextChangeManager.java |   24 +-
 .../util/TextEditBasedChangeManager.java           |   24 +-
 .../refactoring/util/TightSourceRangeComputer.java |   17 +-
 .../org.eclipse.jdt.ui/customBuildCallbacks.xml    |  176 +
 .../dictionaries/en_GB.dictionary                  |   40 +
 .../dictionaries/en_US.dictionary                  |   41 +
 .../icons/full/dlcl16/pin_view.gif                 |  Bin 223 -> 223 bytes
 .../full/dlcl16/{refresh_nav.gif => refresh.gif}   |  Bin 211 -> 211 bytes
 .../icons/full/elcl16/pin_view.gif                 |  Bin 358 -> 358 bytes
 .../icons/full/elcl16/refresh.gif                  |  Bin 327 -> 327 bytes
 .../icons/full/elcl16/refresh_nav.gif              |  Bin 327 -> 0 bytes
 .../icons/full/ovr16/default_tsk.gif               |  Bin 0 -> 851 bytes
 .../eclipse/jdt/internal/corext/SourceRange.java   |   15 +-
 .../jdt/internal/corext/dom/NodeFinder.java        |    3 +-
 .../jdt/internal/ui/dialogs/TypeInfoViewer.java    |   20 +-
 .../ui/dialogs/TypeSelectionComponent.java         |    8 +-
 .../internal/ui/dialogs/TypeSelectionDialog2.java  |    9 +-
 .../ui/refactoring/RefactoringSaveHelper.java      |    6 +-
 .../plugins/org.eclipse.jdt.ui/plugin.properties   |    9 +-
 eclipse/plugins/org.eclipse.jdt.ui/plugin.xml      |   29 +-
 .../scripts/build_jar-in-jar-loader.xml            |    2 +-
 .../templates/default-templates.xml                |    4 +-
 .../ui/refactoring/ChangeExceptionHandler.java     |    6 +-
 .../ui/refactoring/ChangeExceptionsControl.java    |   29 +-
 .../ui/refactoring/ChangeParametersControl.java    |   53 +-
 .../ui/refactoring/ChangeSignatureWizard.java      |   10 +-
 .../ui/refactoring/ChangeTypeContentProvider.java  |   20 +-
 .../internal/ui/refactoring/ChangeTypeWizard.java  |   63 +-
 .../ui/refactoring/ComboSelectionDialog.java       |    4 +-
 .../ui/refactoring/CompilationUnitChangeNode.java  |   28 +-
 .../ConvertAnonymousToNestedWizard.java            |  104 +-
 .../CreateTextFileChangePreviewViewer.java         |    3 +-
 .../internal/ui/refactoring/DelegateUIHelper.java  |    4 +-
 .../ui/refactoring/ExtractClassWizard.java         |   17 +-
 .../ui/refactoring/ExtractConstantWizard.java      |   10 +-
 .../ui/refactoring/ExtractInterfaceWizard.java     |   20 +-
 .../ui/refactoring/ExtractSupertypeMemberPage.java |   37 +-
 .../ui/refactoring/ExtractSupertypeMethodPage.java |    4 +-
 .../ui/refactoring/ExtractSupertypeWizard.java     |    3 +-
 .../internal/ui/refactoring/ExtractTempWizard.java |    8 +-
 .../ui/refactoring/InferTypeArgumentsWizard.java   |    5 +-
 .../ui/refactoring/InlineConstantWizard.java       |    6 +-
 .../internal/ui/refactoring/InlineTempWizard.java  |    6 +-
 .../ui/refactoring/IntroduceFactoryInputPage.java  |    4 +-
 .../ui/refactoring/IntroduceFactoryWizard.java     |    3 +-
 .../refactoring/IntroduceIndirectionInputPage.java |   10 +-
 .../ui/refactoring/IntroduceIndirectionWizard.java |    3 +-
 .../IntroduceParameterObjectWizard.java            |   49 +-
 .../ui/refactoring/IntroduceParameterWizard.java   |    8 +-
 .../ui/refactoring/JavaStatusContextViewer.java    |    4 +-
 .../ui/refactoring/MoveInnerToTopWizard.java       |    8 +-
 .../ui/refactoring/MoveInstanceMethodWizard.java   |    6 +-
 .../internal/ui/refactoring/MoveMembersWizard.java |   14 +-
 .../ui/refactoring/ParameterEditDialog.java        |    5 +-
 .../internal/ui/refactoring/PromoteTempWizard.java |    7 +-
 .../refactoring/PullPushCheckboxTableViewer.java   |    5 +-
 .../internal/ui/refactoring/PullUpMemberPage.java  |   58 +-
 .../internal/ui/refactoring/PullUpMethodPage.java  |   59 +-
 .../jdt/internal/ui/refactoring/PullUpWizard.java  |    3 +-
 .../internal/ui/refactoring/PushDownWizard.java    |   39 +-
 .../ui/refactoring/QualifiedNameComponent.java     |    3 +-
 .../ui/refactoring/RefactoringAdapterFactory.java  |    4 +-
 .../ReferencesInBinaryStatusContextViewer.java     |   31 +-
 .../ui/refactoring/TextInputWizardPage.java        |    4 +-
 .../ui/refactoring/UseSupertypeWizard.java         |   29 +-
 .../ui/refactoring/UserInterfaceManager.java       |   22 +-
 .../ui/refactoring/VisibilityControlUtil.java      |    9 +-
 .../refactoring/actions/InlineConstantAction.java  |    7 +-
 .../ui/refactoring/actions/InlineMethodAction.java |    7 +-
 .../actions/MoveInstanceMethodAction.java          |    7 +-
 .../actions/MoveStaticMembersAction.java           |   18 +-
 .../actions/RenameJavaElementAction.java           |   15 +-
 .../refactoring/actions/RenameResourceAction.java  |    4 +-
 .../binary/BinaryRefactoringHistoryWizard.java     |   34 +-
 .../refactoring/code/ExtractMethodInputPage.java   |   16 +-
 .../ui/refactoring/code/ExtractMethodWizard.java   |    3 +-
 .../ui/refactoring/code/InlineMethodInputPage.java |    5 +-
 .../ui/refactoring/code/InlineMethodWizard.java    |    3 +-
 .../code/ReplaceInvocationsInputPage.java          |    5 +-
 .../refactoring/code/ReplaceInvocationsWizard.java |    3 +-
 .../CUPositionCompletionProcessor.java             |   10 +-
 .../contentassist/FieldNameProcessor.java          |    6 +-
 .../JavaPackageCompletionProcessor.java            |    6 +-
 ...JavaPackageFragmentRootCompletionProcessor.java |    6 +-
 ...urcePackageFragmentRootCompletionProcessor.java |    6 +-
 .../contentassist/JavaTypeCompletionProcessor.java |    6 +-
 .../contentassist/VariableNamesProcessor.java      |    8 +-
 .../ui/refactoring/nls/AccessorDescription.java    |    4 +-
 .../ui/refactoring/nls/ExternalizeWizard.java      |    4 +-
 .../ui/refactoring/nls/ExternalizeWizardPage.java  |  143 +-
 .../ui/refactoring/nls/MultiStateCellEditor.java   |    7 +-
 .../nls/NLSAccessorConfigurationDialog.java        |    7 +-
 .../internal/ui/refactoring/nls/NLSUIMessages.java |    3 +-
 .../ui/refactoring/nls/NLSUIMessages.properties    |    2 +-
 .../ui/refactoring/nls/PackageBrowseAdapter.java   |   14 +-
 .../ui/refactoring/nls/RenameKeysDialog.java       |   14 +-
 .../ui/refactoring/nls/SourceContainerDialog.java  |    4 +-
 .../SourceFirstPackageSelectionDialogField.java    |    6 +-
 .../ui/refactoring/nls/search/FileEntry.java       |    3 +-
 .../nls/search/NLSSearchEditorOpener.java          |    3 +-
 .../nls/search/NLSSearchMessages.properties        |    2 +-
 .../ui/refactoring/nls/search/NLSSearchResult.java |   32 +-
 .../nls/search/NLSSearchResultLabelProvider2.java  |    5 +-
 .../nls/search/NLSSearchResultPage.java            |    8 +-
 .../nls/search/NLSSearchResultRequestor.java       |   18 +-
 .../ui/refactoring/nls/search/Properties.java      |    9 +-
 .../refactoring/reorg/CopyToClipboardAction.java   |   31 +-
 .../internal/ui/refactoring/reorg/CutAction.java   |    8 +-
 .../ui/refactoring/reorg/DeleteAction.java         |   11 +-
 .../ui/refactoring/reorg/DeleteWizard.java         |   10 +-
 .../reorg/DestinationContentProvider.java          |   10 +-
 .../ui/refactoring/reorg/NewNameQueries.java       |    3 +-
 .../internal/ui/refactoring/reorg/PasteAction.java |  124 +-
 .../ui/refactoring/reorg/RenameCuWizard.java       |    7 +-
 .../refactoring/reorg/RenameEnumConstWizard.java   |    4 +-
 .../ui/refactoring/reorg/RenameFieldWizard.java    |    8 +-
 .../refactoring/reorg/RenameInformationPopup.java  |   13 +-
 .../refactoring/reorg/RenameInputWizardPage.java   |   10 +-
 .../ui/refactoring/reorg/RenameLinkedMode.java     |   11 +-
 .../reorg/RenameMethodUserInterfaceStarter.java    |    3 +-
 .../ui/refactoring/reorg/RenamePackageWizard.java  |    7 +-
 .../refactoring/reorg/RenameRefactoringWizard.java |    4 +-
 .../ui/refactoring/reorg/RenameSelectionState.java |   12 +-
 .../ui/refactoring/reorg/RenameTypeWizard.java     |    5 +-
 .../reorg/RenameTypeWizardInputPage.java           |    9 +-
 ...nameTypeWizardSimilarElementsOptionsDialog.java |    5 +-
 .../reorg/RenameTypeWizardSimilarElementsPage.java |   77 +-
 .../reorg/RenameUserInterfaceStarter.java          |    3 +-
 .../ui/refactoring/reorg/ReorgCopyAction.java      |    8 +-
 .../ui/refactoring/reorg/ReorgCopyWizard.java      |    8 +-
 .../ui/refactoring/reorg/ReorgMoveAction.java      |   10 +-
 .../ui/refactoring/reorg/ReorgMoveWizard.java      |   15 +-
 .../ui/refactoring/reorg/ReorgQueries.java         |    5 +-
 .../ui/refactoring/reorg/TypedSourceTransfer.java  |    6 +-
 .../sef/SelfEncapsulateFieldInputPage.java         |   16 +-
 .../sef/SelfEncapsulateFieldWizard.java            |    3 +-
 .../ui/AbstractJavaElementLabelDecorator.java      |   10 +-
 .../ui/BuildpathIndicatorLabelDecorator.java       |    6 +-
 .../internal/ui/CompatibilityTemplateStore.java    |    9 +-
 .../jdt/internal/ui/EditorInputAdapterFactory.java |    4 +-
 .../jdt/internal/ui/IJavaHelpContextIds.java       |   87 +-
 .../jdt/internal/ui/InitializeAfterLoadJob.java    |    5 +-
 .../ui/InterfaceIndicatorLabelDecorator.java       |  118 +-
 .../internal/ui/JarEntryEditorInputFactory.java    |    8 +-
 .../jdt/internal/ui/JavaElementAdapterFactory.java |   47 +-
 .../ui/org/eclipse/jdt/internal/ui/JavaPlugin.java |   77 +-
 .../eclipse/jdt/internal/ui/JavaPluginImages.java  |   17 +-
 .../jdt/internal/ui/JavaProjectAdapterFactory.java |    4 +-
 .../eclipse/jdt/internal/ui/JavaUIMessages.java    |    2 -
 .../jdt/internal/ui/JavaUIMessages.properties      |    2 -
 .../internal/ui/JavaUIPreferenceInitializer.java   |    3 +-
 .../internal/ui/LogicalPackageAdapterFactory.java  |    4 +-
 .../jdt/internal/ui/MarkerAdapterFactory.java      |    4 +-
 .../jdt/internal/ui/ResourceAdapterFactory.java    |    4 +-
 .../ui/actions/AbstractToggleLinkingAction.java    |    3 +-
 .../jdt/internal/ui/actions/ActionMessages.java    |    7 +-
 .../internal/ui/actions/ActionMessages.properties  |   11 +-
 .../jdt/internal/ui/actions/ActionUtil.java        |    4 +-
 .../internal/ui/actions/AddBlockCommentAction.java |   12 +-
 .../jdt/internal/ui/actions/AddTaskAction.java     |    4 +-
 .../jdt/internal/ui/actions/AllCleanUpsAction.java |   17 +-
 .../internal/ui/actions/BlockCommentAction.java    |   11 +-
 .../ui/actions/CategoryFilterActionGroup.java      |   82 +-
 .../jdt/internal/ui/actions/CleanUpAction.java     |   16 +-
 .../jdt/internal/ui/actions/CollapseAllAction.java |    3 +-
 .../internal/ui/actions/CompositeActionGroup.java  |    7 +-
 .../ui/actions/CopyQualifiedNameAction.java        |   66 +-
 .../ui/actions/ExtractSuperClassAction.java        |   18 +-
 .../ui/actions/FindBrokenNLSKeysAction.java        |   24 +-
 .../internal/ui/actions/FoldingActionGroup.java    |    8 +-
 ...erateConstructorUsingFieldsContentProvider.java |   36 +-
 ...erateConstructorUsingFieldsSelectionDialog.java |   19 +-
 .../GenerateConstructorUsingFieldsValidator.java   |    8 +-
 .../jdt/internal/ui/actions/IndentAction.java      |   12 +-
 .../ui/actions/IntroduceParameterObjectAction.java |   15 +-
 .../internal/ui/actions/JDTQuickMenuCreator.java   |    3 +-
 .../internal/ui/actions/JarImportWizardAction.java |    3 +-
 .../internal/ui/actions/LexicalSortingAction.java  |    3 +-
 .../jdt/internal/ui/actions/MultiActionGroup.java  |    5 +-
 .../jdt/internal/ui/actions/MultiFormatAction.java |    6 +-
 .../ui/actions/MultiOrganizeImportAction.java      |    6 +-
 .../ui/actions/MultiSortMembersAction.java         |   10 +-
 .../internal/ui/actions/NewWizardsActionGroup.java |    7 +-
 .../ui/actions/OccurrencesSearchMenuAction.java    |   13 +-
 .../jdt/internal/ui/actions/OpenBrowserUtil.java   |    5 +-
 .../jdt/internal/ui/actions/OpenTypeAction.java    |    4 +-
 .../ui/actions/OpenTypeInHierarchyAction.java      |    3 +-
 .../ui/actions/RemoveBlockCommentAction.java       |    6 +-
 .../jdt/internal/ui/actions/SelectAllAction.java   |    9 +-
 .../internal/ui/actions/SelectionConverter.java    |    4 +-
 .../ui/actions/SurroundWithActionGroup.java        |    4 +-
 .../ui/actions/SurroundWithTemplateMenuAction.java |   12 +-
 .../ui/actions/WorkbenchRunnableAdapter.java       |    4 +-
 .../internal/ui/browsing/IPackagesViewViewer.java  |    4 +-
 .../ui/browsing/JavaBrowsingContentProvider.java   |   28 +-
 .../jdt/internal/ui/browsing/JavaBrowsingPart.java |   33 +-
 .../ui/browsing/JavaElementTypeComparator.java     |   25 +-
 .../jdt/internal/ui/browsing/LogicalPackage.java   |   14 +-
 .../ui/browsing/LogicalPackagesProvider.java       |   17 +-
 .../jdt/internal/ui/browsing/MembersView.java      |   19 +-
 .../internal/ui/browsing/PackageViewerWrapper.java |   57 +-
 .../jdt/internal/ui/browsing/PackagesView.java     |   85 +-
 .../browsing/PackagesViewFlatContentProvider.java  |   13 +-
 .../PackagesViewHierarchicalContentProvider.java   |   58 +-
 .../ui/browsing/PackagesViewLabelProvider.java     |    5 +-
 .../ui/browsing/PackagesViewTableViewer.java       |   15 +-
 .../ui/browsing/PackagesViewTreeViewer.java        |   15 +-
 .../ui/browsing/PatchedOpenInNewWindowAction.java  |    3 +-
 .../ProjectAndSourceFolderContentProvider.java     |   13 +-
 .../jdt/internal/ui/browsing/ProjectsView.java     |   20 +-
 .../internal/ui/browsing/ToggleLinkingAction.java  |    3 +-
 .../TopLevelTypeProblemsLabelDecorator.java        |    3 +-
 .../jdt/internal/ui/browsing/TypesView.java        |   18 +-
 .../CallHierarchyFiltersActionGroup.java           |   14 +-
 .../CallHierarchyImageDescriptor.java              |   14 +-
 .../callhierarchy/CallHierarchyLabelProvider.java  |    8 +-
 .../ui/callhierarchy/CallHierarchyMessages.java    |   10 +-
 .../callhierarchy/CallHierarchyMessages.properties |   16 +-
 .../CallHierarchyTransferDropAdapter.java          |   62 +-
 .../internal/ui/callhierarchy/CallHierarchyUI.java |  110 +-
 .../ui/callhierarchy/CallHierarchyViewPart.java    |  373 +-
 .../ui/callhierarchy/CallHierarchyViewer.java      |   89 +-
 .../ui/callhierarchy/CancelSearchAction.java       |    3 +-
 .../ui/callhierarchy/CopyCallHierarchyAction.java  |    3 +-
 .../ui/callhierarchy/DeferredMethodWrapper.java    |    9 +-
 .../ExpandWithConstructorsAction.java              |    8 +-
 .../ExpandWithConstructorsConfigurationBlock.java  |   51 +-
 .../ExpandWithConstructorsDialog.java              |    6 +-
 .../internal/ui/callhierarchy/FiltersDialog.java   |   34 +-
 .../ui/callhierarchy/FocusOnSelectionAction.java   |    3 +-
 .../internal/ui/callhierarchy/HistoryAction.java   |   40 +-
 .../ui/callhierarchy/HistoryDropDownAction.java    |   17 +-
 .../ui/callhierarchy/HistoryListAction.java        |   39 +-
 .../ui/callhierarchy/LocationCopyAction.java       |    5 +-
 .../ui/callhierarchy/LocationLabelProvider.java    |    8 +-
 .../internal/ui/callhierarchy/LocationViewer.java  |    6 +-
 .../MethodWrapperWorkbenchAdapter.java             |    8 +-
 .../ui/callhierarchy/OpenCallHierarchyAction.java  |   14 +-
 .../ui/callhierarchy/OpenDeclarationAction.java    |    8 +-
 .../ui/callhierarchy/OpenLocationAction.java       |   12 +-
 .../callhierarchy/PinCallHierarchyViewAction.java  |   50 +
 .../ui/callhierarchy/RefreshElementAction.java     |   39 +-
 .../ui/callhierarchy/RefreshViewAction.java        |    7 +-
 .../ui/callhierarchy/RemoveFromViewAction.java     |   50 +-
 .../internal/ui/callhierarchy/SearchInDialog.java  |  253 +
 .../ui/callhierarchy/SearchScopeAction.java        |   26 +-
 .../ui/callhierarchy/SearchScopeActionGroup.java   |   51 +-
 .../callhierarchy/SearchScopeHierarchyAction.java  |   80 -
 .../ui/callhierarchy/SearchScopeProjectAction.java |   24 +-
 .../callhierarchy/SearchScopeWorkingSetAction.java |   16 +-
 .../callhierarchy/SearchScopeWorkspaceAction.java  |   19 +-
 .../jdt/internal/ui/callhierarchy/SearchUtil.java  |   10 +-
 .../ui/callhierarchy/SelectFieldModeAction.java    |    5 +-
 .../ui/callhierarchy/SelectWorkingSetAction.java   |    3 +-
 .../ui/callhierarchy/ShowSearchInDialogAction.java |   61 +
 .../ui/callhierarchy/ToggleCallModeAction.java     |    5 +-
 .../ui/callhierarchy/ToggleOrientationAction.java  |    5 +-
 .../jdt/internal/ui/callhierarchy/TreeRoot.java    |   22 +-
 .../ui/commands/JavaElementReferenceConverter.java |    4 +-
 .../jdt/internal/ui/compare/CompareDialog.java     |    7 +-
 .../ui/compare/JavaAddElementFromHistory.java      |    3 +-
 .../ui/compare/JavaAddElementFromHistoryImpl.java  |   11 +-
 .../internal/ui/compare/JavaCompareUtilities.java  |    6 +-
 .../ui/compare/JavaCompareWithEditionAction.java   |    3 +-
 .../compare/JavaCompareWithEditionActionImpl.java  |    3 +-
 .../ui/compare/JavaElementHistoryPageSource.java   |    3 +-
 .../jdt/internal/ui/compare/JavaHistoryAction.java |    3 +-
 .../internal/ui/compare/JavaHistoryActionImpl.java |    8 +-
 .../jdt/internal/ui/compare/JavaMergeViewer.java   |   69 +-
 .../eclipse/jdt/internal/ui/compare/JavaNode.java  |    3 +-
 .../internal/ui/compare/JavaParseTreeBuilder.java  |   77 +-
 .../ui/compare/JavaReplaceWithEditionAction.java   |    3 +-
 .../compare/JavaReplaceWithEditionActionImpl.java  |    6 +-
 .../JavaReplaceWithPreviousEditionAction.java      |    3 +-
 .../internal/ui/compare/JavaStructureCreator.java  |   44 +-
 .../ui/compare/JavaStructureDiffViewer.java        |   20 +-
 .../jdt/internal/ui/compare/JavaTextViewer.java    |    8 +-
 .../ui/compare/LocalHistoryActionGroup.java        |    3 +-
 .../ui/compare/PropertiesFileMergeViewer.java      |   13 +-
 .../internal/ui/compare/PropertiesFileViewer.java  |    8 +-
 .../ui/compare/PropertiesStructureCreator.java     |    7 +-
 .../jdt/internal/ui/compare/ResizableDialog.java   |    6 +-
 .../ui/dialogs/FilteredTypesSelectionDialog.java   |   85 +-
 .../ui/dialogs/GenerateHashCodeEqualsDialog.java   |    7 +-
 .../ui/dialogs/GenerateToStringDialog.java         |  135 +-
 .../ui/dialogs/MainTypeSelectionDialog.java        |    6 +-
 .../dialogs/MultiElementListSelectionDialog.java   |   22 +-
 .../ui/dialogs/MultiMainTypeSelectionDialog.java   |    4 +-
 .../ui/dialogs/OpenTypeSelectionDialog.java        |    4 +-
 .../internal/ui/dialogs/OptionalMessageDialog.java |    4 +-
 .../internal/ui/dialogs/OverrideMethodDialog.java  |   28 +-
 .../ui/dialogs/PackageSelectionDialog.java         |   15 +-
 .../ui/dialogs/SortMembersMessageDialog.java       |    8 +-
 .../internal/ui/dialogs/SourceActionDialog.java    |   31 +-
 .../jdt/internal/ui/dialogs/StatusInfo.java        |    3 +-
 .../internal/ui/dialogs/TableTextCellEditor.java   |   69 +-
 .../ui/dialogs/TextFieldNavigationHandler.java     |   41 +-
 .../ui/dnd/BasicSelectionTransferDragAdapter.java  |    5 +-
 .../ui/dnd/EditorInputTransferDragAdapter.java     |   11 +-
 .../jdt/internal/ui/dnd/JdtViewerDragAdapter.java  |    3 +-
 .../jdt/internal/ui/dnd/JdtViewerDropAdapter.java  |   17 +-
 .../ui/dnd/ResourceTransferDragAdapter.java        |   21 +-
 .../internal/ui/dnd/ViewerInputDropAdapter.java    |    6 +-
 .../jdt/internal/ui/filters/AnnotationFilter.java  |    3 +-
 .../jdt/internal/ui/filters/ClassFilter.java       |    3 +-
 .../internal/ui/filters/ClosedProjectFilter.java   |    3 +-
 .../ui/filters/ContainedLibraryFilter.java         |    3 +-
 .../internal/ui/filters/CustomFiltersDialog.java   |   43 +-
 .../ui/filters/EmptyInnerPackageFilter.java        |    3 +-
 .../ui/filters/EmptyLibraryContainerFilter.java    |    3 +-
 .../internal/ui/filters/EmptyPackageFilter.java    |    3 +-
 .../jdt/internal/ui/filters/EnumFilter.java        |    3 +-
 .../jdt/internal/ui/filters/FilterDescriptor.java  |   25 +-
 .../ui/filters/ImportDeclarationFilter.java        |    3 +-
 .../internal/ui/filters/InnerClassFilesFilter.java |    3 +-
 .../jdt/internal/ui/filters/InterfaceFilter.java   |    3 +-
 .../jdt/internal/ui/filters/JavaFileFilter.java    |    3 +-
 .../jdt/internal/ui/filters/LibraryFilter.java     |    3 +-
 .../jdt/internal/ui/filters/NamePatternFilter.java |    3 +-
 .../filters/NoPackageContainingFoldersFilter.java  |    3 +-
 .../internal/ui/filters/NonJavaElementFilter.java  |    3 +-
 .../internal/ui/filters/NonJavaProjectsFilter.java |    3 +-
 .../internal/ui/filters/NonPublicTypeFilter.java   |    3 +-
 .../ui/filters/NonSharedProjectFilter.java         |   29 +-
 .../internal/ui/filters/OutputFolderFilter.java    |    3 +-
 .../ui/filters/PackageDeclarationFilter.java       |    3 +-
 .../ui/filters/SyntheticMembersFilter.java         |    3 +-
 .../jdt/internal/ui/fix/AbstractCleanUp.java       |    4 +-
 .../jdt/internal/ui/fix/AbstractMultiFix.java      |   13 +-
 .../internal/ui/fix/CleanUpRefactoringWizard.java  |   74 +-
 ...anUpSaveParticipantPreferenceConfiguration.java |   32 +-
 .../internal/ui/fix/CleanUpSelectionDialog.java    |   21 +-
 .../jdt/internal/ui/fix/CodeFormatCleanUp.java     |   12 +-
 .../jdt/internal/ui/fix/CodeStyleCleanUp.java      |   20 +-
 .../internal/ui/fix/ControlStatementsCleanUp.java  |   12 +-
 .../jdt/internal/ui/fix/ConvertLoopCleanUp.java    |   12 +-
 .../jdt/internal/ui/fix/ExpressionsCleanUp.java    |   12 +-
 .../jdt/internal/ui/fix/ImportsCleanUp.java        |   20 +-
 .../eclipse/jdt/internal/ui/fix/Java50CleanUp.java |   20 +-
 .../jdt/internal/ui/fix/MapCleanUpOptions.java     |   16 +-
 .../internal/ui/fix/MultiFixMessages.properties    |    4 +-
 .../fix/PotentialProgrammingProblemsCleanUp.java   |   22 +-
 .../internal/ui/fix/SaveActionSelectionDialog.java |   11 +-
 .../jdt/internal/ui/fix/SortMembersCleanUp.java    |   17 +-
 .../eclipse/jdt/internal/ui/fix/StringCleanUp.java |   20 +-
 .../internal/ui/fix/UnimplementedCodeCleanUp.java  |   12 +-
 .../internal/ui/fix/UnnecessaryCodeCleanUp.java    |   20 +-
 .../jdt/internal/ui/fix/UnusedCodeCleanUp.java     |   20 +-
 .../ui/fix/VariableDeclarationCleanUp.java         |   12 +-
 .../internal/ui/infoviews/AbstractInfoView.java    |    5 +-
 .../ui/infoviews/CopyToClipboardAction.java        |    4 +-
 .../jdt/internal/ui/infoviews/GotoInputAction.java |    3 +-
 .../jdt/internal/ui/infoviews/JavadocView.java     |   45 +-
 .../jdt/internal/ui/infoviews/SourceView.java      |   21 +-
 .../jdt/internal/ui/jarimport/JarImportWizard.java |   14 +-
 .../internal/ui/jarimport/JarImportWizardPage.java |   15 +-
 .../ui/jarimport/RefactoringLocationControl.java   |    7 +-
 .../AbstractJarDestinationWizardPage.java          |   14 +-
 .../ui/jarpackager/CheckboxTreeAndListGroup.java   |   60 +-
 .../internal/ui/jarpackager/ContainerFilter.java   |    3 +-
 .../ui/jarpackager/CreateJarActionDelegate.java    |    6 +-
 .../ui/jarpackager/JarFileExportOperation.java     |   58 +-
 .../ui/jarpackager/JarManifestWizardPage.java      |   34 +-
 .../internal/ui/jarpackager/JarOptionsPage.java    |    6 +-
 .../ui/jarpackager/JarPackageActionDelegate.java   |    4 +-
 .../internal/ui/jarpackager/JarPackageReader.java  |   27 +-
 .../internal/ui/jarpackager/JarPackageWizard.java  |   16 +-
 .../ui/jarpackager/JarPackageWizardPage.java       |   58 +-
 .../internal/ui/jarpackager/JarPackagerUtil.java   |   16 +-
 .../ui/jarpackager/JarRefactoringDialog.java       |   12 +-
 .../internal/ui/jarpackager/PlainJarBuilder.java   |    3 +-
 .../ui/jarpackager/SealPackagesFilter.java         |    8 +-
 .../ui/jarpackagerfat/FatJarAntExporter.java       |    6 +-
 .../internal/ui/jarpackagerfat/FatJarBuilder.java  |    3 +-
 .../ui/jarpackagerfat/FatJarManifestProvider.java  |   28 +-
 .../ui/jarpackagerfat/FatJarPackageWizard.java     |   10 +-
 .../ui/jarpackagerfat/FatJarPackageWizardPage.java |   75 +-
 .../jarpackagerfat/FatJarRsrcUrlAntExporter.java   |    3 +-
 .../ui/jarpackagerfat/FatJarRsrcUrlBuilder.java    |   10 +-
 .../FatJarRsrcUrlManifestProvider.java             |   11 +-
 .../ui/jarpackagerfat/UnpackFatJarAntExporter.java |    3 +-
 .../ui/jarpackagerfat/UnpackFatJarBuilder.java     |    9 +-
 .../ui/jarpackagerfat/UnpackJarAntExporter.java    |    3 +-
 .../ui/jarpackagerfat/UnpackJarBuilder.java        |   16 +-
 .../ContributedJavadocWizardPage.java              |   28 +-
 .../javadocexport/JavadocConsoleLineTracker.java   |    7 +-
 .../JavadocLinkDialogLabelProvider.java            |    4 +-
 .../internal/ui/javadocexport/JavadocLinkRef.java  |    8 +-
 .../ui/javadocexport/JavadocOptionsManager.java    |   54 +-
 .../JavadocProjectContentProvider.java             |    6 +-
 .../javadocexport/JavadocSpecificsWizardPage.java  |    7 +-
 .../javadocexport/JavadocStandardWizardPage.java   |   58 +-
 .../ui/javadocexport/JavadocTreeWizardPage.java    |   43 +-
 .../internal/ui/javadocexport/JavadocWizard.java   |   52 +-
 .../ui/javadocexport/JavadocWizardPage.java        |    4 +-
 .../internal/ui/javadocexport/JavadocWriter.java   |   18 +-
 .../ui/javadocexport/RecentSettingsStore.java      |   22 +-
 .../jdt/internal/ui/javaeditor/ASTProvider.java    |   21 +-
 .../ui/javaeditor/AddClassFileMarkerAction.java    |    6 +-
 .../ui/javaeditor/AddImportOnSelectionAction.java  |   10 +-
 ...asicCompilationUnitEditorActionContributor.java |   16 +-
 .../BasicJavaEditorActionContributor.java          |   17 +-
 .../ui/javaeditor/ClassFileDocumentProvider.java   |   16 +-
 .../internal/ui/javaeditor/ClassFileEditor.java    |   47 +-
 .../javaeditor/ClassFileMarkerAnnotationModel.java |    7 +-
 .../ui/javaeditor/ClassFileMarkerRulerAction.java  |    6 +-
 .../ui/javaeditor/ClipboardOperationAction.java    |  104 +-
 .../CompilationUnitAnnotationModelEvent.java       |   16 +-
 .../CompilationUnitDocumentProvider.java           |   97 +-
 .../ui/javaeditor/CompilationUnitEditor.java       |   59 +-
 .../CompilationUnitEditorActionContributor.java    |    4 +-
 .../ConstructedJavaEditorMessages.properties       |   20 +-
 .../internal/ui/javaeditor/DocumentAdapter.java    |   12 +-
 .../jdt/internal/ui/javaeditor/EditorUtility.java  |   36 +-
 .../javaeditor/ExternalClassFileEditorInput.java   |    3 +-
 .../ui/javaeditor/GotoMatchingBracketAction.java   |    3 +-
 .../internal/ui/javaeditor/IJavaAnnotation.java    |    4 +-
 .../javaeditor/InternalClassFileEditorInput.java   |    4 +-
 .../ui/javaeditor/JarEntryEditorInput.java         |    4 +-
 .../ui/javaeditor/JavaAnnotationIterator.java      |   12 +-
 .../jdt/internal/ui/javaeditor/JavaEditor.java     |  182 +-
 .../ui/javaeditor/JavaEditorBreadcrumb.java        |   47 +-
 .../JavaEditorBreadcrumbActionGroup.java           |   14 +-
 .../internal/ui/javaeditor/JavaEditorMessages.java |   15 +-
 .../ui/javaeditor/JavaEditorMessages.properties    |   15 +-
 .../JavaElementDeclaredTypeHyperlink.java          |  157 +
 .../ui/javaeditor/JavaElementHyperlink.java        |   17 +-
 .../JavaElementHyperlinkDeclaredTypeDetector.java  |   68 +
 .../javaeditor/JavaElementHyperlinkDetector.java   |   93 +-
 ...JavaElementHyperlinkImplementationDetector.java |   31 +-
 .../JavaElementHyperlinkReturnTypeDetector.java    |   49 +
 ...lementHyperlinkSuperImplementationDetector.java |   62 +
 .../JavaElementImplementationHyperlink.java        |   45 +-
 .../javaeditor/JavaElementReturnTypeHyperlink.java |  147 +
 .../JavaElementSuperImplementationHyperlink.java   |  118 +
 .../ui/javaeditor/JavaMarkerAnnotation.java        |    4 +-
 .../ui/javaeditor/JavaMoveLinesAction.java         |    5 +-
 .../internal/ui/javaeditor/JavaOutlinePage.java    |  232 +-
 .../JavaSelectAnnotationRulerAction.java           |    9 +-
 .../javaeditor/JavaSelectMarkerRulerAction2.java   |    3 +-
 .../ui/javaeditor/JavaSelectRulerAction.java       |    3 +-
 .../internal/ui/javaeditor/JavaSourceViewer.java   |   55 +-
 .../internal/ui/javaeditor/JavaTemplatesPage.java  |   13 +-
 .../internal/ui/javaeditor/JavaTextSelection.java  |   41 +-
 .../internal/ui/javaeditor/NLSKeyHyperlink.java    |    4 +-
 .../ui/javaeditor/OverrideIndicatorManager.java    |   14 +-
 .../ui/javaeditor/RemoveOccurrenceAnnotations.java |    3 +-
 .../ui/javaeditor/SemanticHighlightingManager.java |   12 +-
 .../javaeditor/SemanticHighlightingPresenter.java  |   40 +-
 .../javaeditor/SemanticHighlightingReconciler.java |   22 +-
 .../ui/javaeditor/SemanticHighlightings.java       |  266 +-
 .../ui/javaeditor/ShowInBreadcrumbAction.java      |    7 +-
 .../ui/javaeditor/SpecificContentAssistAction.java |    3 +-
 .../javaeditor/SpecificContentAssistExecutor.java  |   12 +-
 .../ui/javaeditor/ToggleBreadcrumbAction.java      |   28 +-
 .../ui/javaeditor/ToggleCommentAction.java         |   13 +-
 .../ui/javaeditor/ToggleMarkOccurrencesAction.java |    5 +-
 .../ui/javaeditor/TogglePresentationAction.java    |    5 +-
 .../ui/javaeditor/ToggleTextHoverAction.java       |    5 +-
 .../internal/ui/javaeditor/WorkingCopyManager.java |    8 +-
 .../ui/javaeditor/breadcrumb/BreadcrumbItem.java   |    5 +-
 .../breadcrumb/BreadcrumbItemDetails.java          |    5 +-
 .../breadcrumb/BreadcrumbItemDropDown.java         |   94 +-
 .../ui/javaeditor/breadcrumb/BreadcrumbViewer.java |   74 +-
 .../javaeditor/breadcrumb/BreadcrumbViewerRow.java |   21 +-
 ...ractSaveParticipantPreferenceConfiguration.java |   10 +-
 .../saveparticipant/SaveParticipantDescriptor.java |    4 +-
 .../saveparticipant/SaveParticipantRegistry.java   |   25 +-
 .../GoToNextPreviousMemberAction.java              |   11 +-
 .../selectionactions/SelectionHistory.java         |    8 +-
 .../StructureSelectEnclosingAction.java            |    3 +-
 .../StructureSelectHistoryAction.java              |    3 +-
 .../StructureSelectNextAction.java                 |    4 +-
 .../StructureSelectPreviousAction.java             |    4 +-
 .../selectionactions/StructureSelectionAction.java |    7 +-
 .../ui/model/JavaModelContentProvider.java         |    6 +-
 .../internal/ui/model/JavaModelLabelProvider.java  |    5 +-
 .../jdt/internal/ui/model/JavaModelMerger.java     |    7 +-
 .../jdt/internal/ui/model/JavaModelProvider.java   |    3 +-
 .../JavaRefactoringDescriptorResourceMapping.java  |    3 +-
 .../JavaRefactoringHistoryResourceMapping.java     |    3 +-
 .../jdt/internal/ui/model/JavaResourceMapping.java |    6 +-
 .../model/JavaSynchronizationCompareAdapter.java   |    7 +-
 .../model/JavaSynchronizationContentProvider.java  |   68 +-
 .../ui/model/JavaSynchronizationLabelProvider.java |   11 +-
 .../ui/navigator/CommonLayoutActionGroup.java      |    4 +-
 .../ui/navigator/JavaDropAdapterAssistant.java     |    7 +-
 .../ui/navigator/JavaNavigatorActionProvider.java  |    7 +-
 .../ui/navigator/JavaNavigatorContentProvider.java |   32 +-
 .../ui/navigator/JavaNavigatorLabelProvider.java   |    5 +-
 .../JavaNavigatorRefactorActionProvider.java       |    7 +-
 .../navigator/JavaNavigatorViewActionProvider.java |    8 +-
 .../ui/navigator/NonEssentialElementsFilter.java   |    3 +-
 .../jdt/internal/ui/navigator/OpenAndExpand.java   |   52 +-
 .../PackageExplorerOpenActionProvider.java         |    7 +-
 .../ui/packageview/ClassPathContainer.java         |   12 +-
 .../internal/ui/packageview/CustomHashtable.java   |  403 --
 .../ui/packageview/FileTransferDragAdapter.java    |   45 +-
 .../ui/packageview/FileTransferDropAdapter.java    |    5 +-
 .../internal/ui/packageview/GotoPackageAction.java |    3 +-
 .../ui/packageview/GotoRequiredProjectAction.java  |    3 +-
 .../ui/packageview/GotoResourceAction.java         |    6 +-
 .../internal/ui/packageview/GotoTypeAction.java    |    3 +-
 .../packageview/HierarchicalDecorationContext.java |    6 +-
 .../internal/ui/packageview/LayoutActionGroup.java |    5 +-
 .../internal/ui/packageview/LibraryContainer.java  |   12 +-
 .../ui/packageview/PackageExplorerActionGroup.java |    5 +-
 .../PackageExplorerContentProvider.java            |   65 +-
 .../packageview/PackageExplorerLabelProvider.java  |   16 +-
 .../ui/packageview/PackageExplorerPart.java        |   61 +-
 .../PackageExplorerProblemsDecorator.java          |   17 +-
 .../ui/packageview/PackagesFrameSource.java        |    3 +-
 .../packageview/SelectionTransferDropAdapter.java  |   14 +-
 .../ui/packageview/ToggleLinkingAction.java        |    3 +-
 .../WorkingSetAwareContentProvider.java            |   43 +-
 .../WorkingSetAwareJavaElementSorter.java          |    3 +-
 .../ui/packageview/WorkingSetDropAdapter.java      |   70 +-
 .../ui/preferences/AbstractConfigurationBlock.java |   43 +-
 ...onfigurationBlockPreferenceAndPropertyPage.java |    8 +-
 .../AbstractConfigurationBlockPreferencePage.java  |    9 +-
 .../ui/preferences/AppearancePreferencePage.java   |   13 +-
 .../ui/preferences/BuildPathsPropertyPage.java     |   10 +-
 .../internal/ui/preferences/BulletListBlock.java   |    4 +-
 .../ClasspathContainerPreferencePage.java          |    5 +-
 .../ClasspathVariablesPreferencePage.java          |   14 +-
 .../ui/preferences/CleanUpPreferencePage.java      |    6 +-
 .../CodeAssistAdvancedConfigurationBlock.java      |   78 +-
 .../CodeAssistAdvancedPreferencePage.java          |   11 +-
 .../preferences/CodeAssistConfigurationBlock.java  |   62 +-
 .../CodeAssistFavoritesConfigurationBlock.java     |   55 +-
 .../CodeAssistFavoritesPreferencePage.java         |   11 +-
 .../ui/preferences/CodeAssistPreferencePage.java   |   11 +-
 .../preferences/CodeFormatterPreferencePage.java   |    6 +-
 .../ui/preferences/CodeStylePreferencePage.java    |   12 +-
 .../internal/ui/preferences/CodeTemplateBlock.java |   56 +-
 .../ui/preferences/CodeTemplatePreferencePage.java |   15 +-
 .../CodeTemplateSourceViewerConfiguration.java     |    8 +-
 .../ui/preferences/ColorSettingPreviewCode.txt     |    1 +
 .../preferences/ComplianceConfigurationBlock.java  |   88 +-
 .../ui/preferences/CompliancePreferencePage.java   |   15 +-
 .../ui/preferences/EditTemplateDialog.java         |   60 +-
 .../internal/ui/preferences/FilterTextControl.java |  275 +
 .../ui/preferences/FoldingConfigurationBlock.java  |   39 +-
 .../ui/preferences/FoldingPreferencePage.java      |    7 +-
 .../ImportOrganizeConfigurationBlock.java          |   56 +-
 .../ui/preferences/ImportOrganizeInputDialog.java  |   14 +-
 .../preferences/ImportOrganizePreferencePage.java  |   13 +-
 .../ui/preferences/JavaBasePreferencePage.java     |   32 +-
 .../preferences/JavaBuildConfigurationBlock.java   |    6 +-
 .../ui/preferences/JavaBuildPreferencePage.java    |   13 +-
 .../ui/preferences/JavaCategoryPropertyPage.java   |  118 -
 .../JavaEditorAppearanceConfigurationBlock.java    |   18 +-
 .../JavaEditorColoringConfigurationBlock.java      |   67 +-
 .../JavaEditorColoringPreferencePage.java          |    7 +-
 .../JavaEditorHoverConfigurationBlock.java         |   29 +-
 .../preferences/JavaEditorHoverPreferencePage.java |    7 +-
 .../ui/preferences/JavaEditorPreferencePage.java   |    7 +-
 .../ui/preferences/JavaEditorPropertyPage.java     |    4 +-
 .../ui/preferences/JavaTemplatePreferencePage.java |   13 +-
 .../ui/preferences/JavadocConfigurationBlock.java  |   14 +-
 .../JavadocConfigurationPropertyPage.java          |   45 +-
 .../JavadocProblemsConfigurationBlock.java         |   24 +-
 .../preferences/JavadocProblemsPreferencePage.java |   17 +-
 .../MarkOccurrencesConfigurationBlock.java         |   37 +-
 .../preferences/MarkOccurrencesPreferencePage.java |    7 +-
 .../ui/preferences/MembersOrderPreferencePage.java |   40 +-
 .../NameConventionConfigurationBlock.java          |   33 +-
 .../NativeLibrariesConfigurationBlock.java         |    4 +-
 .../preferences/NativeLibrariesPropertyPage.java   |   65 +-
 .../preferences/NewJavaProjectPreferencePage.java  |   40 +-
 .../ui/preferences/OccurrencesPreferencePage.java  |    6 +-
 .../ui/preferences/OptionsConfigurationBlock.java  |  601 ++-
 .../internal/ui/preferences/PreferencesAccess.java |   10 +-
 .../ui/preferences/PreferencesMessages.java        |   52 +-
 .../ui/preferences/PreferencesMessages.properties  |  111 +-
 .../ProblemSeveritiesConfigurationBlock.java       |  268 +-
 .../ProblemSeveritiesPreferencePage.java           |   26 +-
 .../ui/preferences/ProfilePreferencePage.java      |   11 +-
 .../ui/preferences/ProjectSelectionDialog.java     |   10 +-
 .../PropertiesFileEditorPreferencePage.java        |   59 +-
 .../ui/preferences/PropertyAndPreferencePage.java  |   21 +-
 .../SaveParticipantConfigurationBlock.java         |   14 +-
 .../preferences/SaveParticipantPreferencePage.java |    7 +-
 .../preferences/SmartTypingConfigurationBlock.java |   49 +-
 .../ui/preferences/SmartTypingPreferencePage.java  |   12 +-
 .../preferences/SourceAttachmentPropertyPage.java  |   42 +-
 .../ui/preferences/SpellingConfigurationBlock.java |   37 +-
 .../ui/preferences/TodoTaskConfigurationBlock.java |   39 +-
 .../ui/preferences/TodoTaskInputDialog.java        |   12 +-
 .../ui/preferences/TodoTaskPreferencePage.java     |   12 +-
 .../ui/preferences/TypeFilterInputDialog.java      |    8 +-
 .../ui/preferences/TypeFilterPreferencePage.java   |  109 +-
 .../ui/preferences/UserLibraryPreferencePage.java  |  176 +-
 .../preferences/WorkInProgressPreferencePage.java  |  168 -
 .../cleanup/AbstractCleanUpTabPage.java            |    9 +-
 .../cleanup/CleanUpConfigurationBlock.java         |   40 +-
 .../preferences/cleanup/CleanUpModifyDialog.java   |    9 +-
 .../ui/preferences/cleanup/CleanUpPreview.java     |    6 +-
 .../preferences/cleanup/CleanUpProfileManager.java |   12 +-
 .../cleanup/CleanUpProfileVersioner.java           |   18 +-
 .../ui/preferences/cleanup/CleanUpTabPage.java     |   10 +-
 .../preferences/cleanup/CodeFormatingTabPage.java  |   12 +-
 .../ui/preferences/cleanup/CodeStyleTabPage.java   |    8 +-
 .../cleanup/ContributedCleanUpTabPage.java         |    9 +-
 .../preferences/cleanup/MemberAccessesTabPage.java |    8 +-
 .../ui/preferences/cleanup/MissingCodeTabPage.java |    6 +-
 .../cleanup/UnnecessaryCodeTabPage.java            |    8 +-
 .../preferences/formatter/AlreadyExistsDialog.java |    5 +-
 .../preferences/formatter/BlankLinesTabPage.java   |   12 +-
 .../ui/preferences/formatter/BracesTabPage.java    |   10 +-
 .../formatter/CodeFormatterConfigurationBlock.java |   11 +-
 .../ui/preferences/formatter/CommentsTabPage.java  |   65 +-
 .../formatter/CompilationUnitPreview.java          |    7 +-
 .../formatter/ControlStatementsTabPage.java        |   12 +-
 .../preferences/formatter/CreateProfileDialog.java |    9 +-
 .../preferences/formatter/FormatterMessages.java   |    9 +-
 .../formatter/FormatterMessages.properties         |   13 +-
 .../formatter/FormatterModifyDialog.java           |    6 +-
 .../formatter/FormatterProfileManager.java         |   30 +-
 .../formatter/FormatterProfileStore.java           |   29 +-
 .../ui/preferences/formatter/FormatterTabPage.java |    7 +-
 .../formatter/IModifyDialogTabPage.java            |    4 +-
 .../preferences/formatter/IndentationTabPage.java  |   18 +-
 .../ui/preferences/formatter/JavaPreview.java      |   14 +-
 .../preferences/formatter/LineWrappingTabPage.java |  131 +-
 .../ui/preferences/formatter/ModifyDialog.java     |   38 +-
 .../preferences/formatter/ModifyDialogTabPage.java |   57 +-
 .../ui/preferences/formatter/NewLinesTabPage.java  |   24 +-
 .../ui/preferences/formatter/OffOnTagsTabPage.java |    9 +-
 .../formatter/ProfileConfigurationBlock.java       |   22 +-
 .../ui/preferences/formatter/ProfileManager.java   |  148 +-
 .../ui/preferences/formatter/ProfileStore.java     |   40 +-
 .../ui/preferences/formatter/ProfileVersioner.java |   96 +-
 .../ui/preferences/formatter/SnippetPreview.java   |   17 +-
 .../preferences/formatter/WhiteSpaceOptions.java   |  221 +-
 .../preferences/formatter/WhiteSpaceTabPage.java   |   69 +-
 .../ui/propertiesfileeditor/ArgumentRule.java      |    4 +-
 .../EscapeBackslashCompletionProposal.java         |   83 +
 .../LeadingWhitespacePredicateRule.java            |    3 +-
 .../ui/propertiesfileeditor/OpenAction.java        |   15 +-
 .../PropertiesCorrectionAssistant.java             |   48 +
 .../PropertiesCorrectionProcessor.java             |  192 +
 .../PropertiesFileAutoEditStrategy.java            |  144 +
 .../PropertiesFileDocumentProvider.java            |   42 +-
 .../propertiesfileeditor/PropertiesFileEditor.java |   50 +-
 .../PropertiesFileEditorActionContributor.java     |    6 +-
 .../PropertiesFileEditorMessages.java              |    7 +-
 .../PropertiesFileEditorMessages.properties        |    6 +-
 .../PropertiesFileEscapes.java                     |  336 +
 .../propertiesfileeditor/PropertiesFileHover.java  |  175 +
 .../PropertiesFilePartitionScanner.java            |    4 +-
 .../PropertiesFileSourceViewerConfiguration.java   |   80 +-
 .../propertiesfileeditor/PropertyKeyHyperlink.java |  125 +-
 .../PropertyKeyHyperlinkDetector.java              |   33 +-
 .../propertiesfileeditor/PropertyValueScanner.java |   33 +-
 .../ui/search/AbstractJavaSearchResult.java        |   12 +-
 .../ui/search/BreakContinueTargetFinder.java       |   24 +-
 .../ui/search/ExceptionOccurrencesFinder.java      |   21 +-
 .../jdt/internal/ui/search/GroupAction.java        |    3 +-
 .../jdt/internal/ui/search/IOccurrencesFinder.java |    3 +-
 .../ui/search/ImplementOccurrencesFinder.java      |   11 +-
 .../jdt/internal/ui/search/JavaElementLine.java    |    6 +-
 .../jdt/internal/ui/search/JavaMatchFilter.java    |   95 +-
 .../jdt/internal/ui/search/JavaSearchPage.java     |   46 +-
 .../jdt/internal/ui/search/JavaSearchQuery.java    |    4 +-
 .../jdt/internal/ui/search/JavaSearchResult.java   |   12 +-
 .../internal/ui/search/JavaSearchResultPage.java   |   33 +-
 .../internal/ui/search/JavaSearchScopeFactory.java |   32 +-
 .../ui/search/JavaSearchTableContentProvider.java  |   16 +-
 .../jdt/internal/ui/search/LRUWorkingSetsList.java |   26 +-
 .../ui/search/LevelTreeContentProvider.java        |   40 +-
 .../jdt/internal/ui/search/MatchLocations.java     |   25 +-
 .../jdt/internal/ui/search/MethodExitsFinder.java  |   42 +-
 .../ui/search/NewSearchResultCollector.java        |   13 +-
 .../jdt/internal/ui/search/OccurrenceMatch.java    |    4 +-
 .../jdt/internal/ui/search/OccurrencesFinder.java  |   23 +-
 .../ui/search/OccurrencesSearchLabelProvider.java  |    4 +-
 .../internal/ui/search/OccurrencesSearchQuery.java |   12 +-
 .../ui/search/OccurrencesSearchResult.java         |    4 +-
 .../ui/search/OccurrencesSearchResultPage.java     |   13 +-
 .../internal/ui/search/PostfixLabelProvider.java   |    6 +-
 .../internal/ui/search/SearchLabelProvider.java    |   27 +-
 .../internal/ui/search/SearchMessages.properties   |    4 +-
 .../search/SearchParticipantsExtensionPoint.java   |   20 +-
 .../internal/ui/search/SearchResultUpdater.java    |   18 +-
 .../eclipse/jdt/internal/ui/search/SearchUtil.java |   19 +-
 .../eclipse/jdt/internal/ui/search/SortAction.java |    3 +-
 .../internal/ui/search/SortingLabelProvider.java   |    5 +-
 .../ui/search/TextSearchTableContentProvider.java  |    6 +-
 .../internal/ui/search/WorkingSetsComparator.java  |   23 +-
 .../ui/text/AbstractInformationControl.java        |   25 +-
 .../jdt/internal/ui/text/AbstractJavaScanner.java  |   13 +-
 .../ui/text/ChangeHoverInformationControl.java     |    6 +-
 .../jdt/internal/ui/text/CombinedWordRule.java     |   13 +-
 .../ui/text/DocumentCharacterIterator.java         |    3 +-
 .../jdt/internal/ui/text/HTMLAnnotationHover.java  |    6 +-
 .../jdt/internal/ui/text/JavaBreakIterator.java    |   23 +-
 .../jdt/internal/ui/text/JavaChangeHover.java      |    7 +-
 .../jdt/internal/ui/text/JavaCodeReader.java       |    4 +-
 .../jdt/internal/ui/text/JavaColorManager.java     |   20 +-
 .../jdt/internal/ui/text/JavaCommentScanner.java   |   27 +-
 .../ui/text/JavaCompositeReconcilingStrategy.java  |    5 +-
 .../jdt/internal/ui/text/JavaElementProvider.java  |   10 +-
 .../jdt/internal/ui/text/JavaHeuristicScanner.java |   53 +-
 .../eclipse/jdt/internal/ui/text/JavaIndenter.java |  358 +-
 .../ui/text/JavaOutlineInformationControl.java     |   54 +-
 .../jdt/internal/ui/text/JavaPairMatcher.java      |    3 +-
 .../jdt/internal/ui/text/JavaPartitionScanner.java |    4 +-
 .../jdt/internal/ui/text/JavaReconciler.java       |   10 +-
 .../internal/ui/text/JavaWhitespaceDetector.java   |    8 +-
 .../jdt/internal/ui/text/JavaWordFinder.java       |   18 +-
 .../jdt/internal/ui/text/JavaWordIterator.java     |   13 +-
 .../jdt/internal/ui/text/LineComparator.java       |   14 +-
 .../ui/text/SequenceCharacterIterator.java         |    3 +-
 .../text/SimpleJavaSourceViewerConfiguration.java  |   14 +-
 .../internal/ui/text/SingleTokenJavaScanner.java   |    8 +-
 .../internal/ui/text/SmartBackspaceManager.java    |   17 +-
 .../org/eclipse/jdt/internal/ui/text/Symbols.java  |    6 +-
 .../eclipse/jdt/internal/ui/text/TypingRun.java    |   15 +-
 .../jdt/internal/ui/text/TypingRunDetector.java    |   17 +-
 .../internal/ui/text/correction/ASTResolving.java  |   43 +-
 .../correction/AdvancedQuickAssistProcessor.java   |  528 +-
 .../ClasspathFixProcessorDescriptor.java           |   26 +-
 .../correction/ContributedProcessorDescriptor.java |   10 +-
 .../text/correction/CorrectionCommandHandler.java  |   11 +-
 .../correction/CorrectionCommandInstaller.java     |   12 +-
 .../CorrectionMarkerResolutionGenerator.java       |   59 +-
 .../ui/text/correction/CorrectionMessages.java     |    8 +-
 .../text/correction/CorrectionMessages.properties  |   10 +-
 .../correction/DefaultClasspathFixProcessor.java   |   22 +-
 .../GetterSetterCorrectionSubProcessor.java        |   10 +-
 .../text/correction/JavaCorrectionAssistant.java   |   24 +-
 .../text/correction/JavaCorrectionProcessor.java   |   53 +-
 .../text/correction/JavadocTagsSubProcessor.java   |  131 +-
 .../correction/LocalCorrectionsSubProcessor.java   |  366 +-
 .../correction/ModifierCorrectionSubProcessor.java |   77 +-
 .../ui/text/correction/ProblemLocation.java        |    3 +-
 .../correction/QuickAssistLightBulbUpdater.java    |    6 +-
 .../ui/text/correction/QuickAssistProcessor.java   |  302 +-
 .../ui/text/correction/QuickFixProcessor.java      |   24 +-
 .../ui/text/correction/QuickTemplateProcessor.java |   17 +-
 .../correction/ReorgCorrectionsSubProcessor.java   |   40 +-
 .../ui/text/correction/ReturnTypeSubProcessor.java |   21 +-
 .../correction/SerialVersionHashOperation.java     |   22 +-
 .../text/correction/SerialVersionSubProcessor.java |    7 +-
 .../ui/text/correction/SimilarElement.java         |    4 +-
 .../text/correction/SimilarElementsRequestor.java  |   11 +-
 .../correction/SuppressWarningsSubProcessor.java   |   25 +-
 .../internal/ui/text/correction/SurroundWith.java  |   84 +-
 .../TypeArgumentMismatchSubProcessor.java          |    4 +-
 .../text/correction/TypeMismatchSubProcessor.java  |   42 +-
 .../correction/UnresolvedElementsSubProcessor.java |  102 +-
 .../proposals/ASTRewriteCorrectionProposal.java    |    3 +-
 .../AbstractMethodCorrectionProposal.java          |   30 +-
 .../proposals/AddArgumentCorrectionProposal.java   |    7 +-
 .../proposals/AddImportCorrectionProposal.java     |    3 +-
 .../proposals/AddTypeParameterProposal.java        |    9 +-
 .../proposals/AssignToVariableAssistProposal.java  |   29 +-
 .../correction/proposals/CUCorrectionProposal.java |   17 +-
 .../proposals/CastCorrectionProposal.java          |    3 +-
 .../proposals/ChangeMethodSignatureProposal.java   |   51 +-
 .../ConstructorFromSuperclassProposal.java         |   18 +-
 .../proposals/CorrectMainTypeNameProposal.java     |    9 +-
 .../CorrectPackageDeclarationProposal.java         |    4 +-
 .../proposals/FixCorrectionProposal.java           |    6 +-
 .../proposals/ImplementInterfaceProposal.java      |    3 +-
 .../proposals/LinkedNamesAssistProposal.java       |   12 +-
 .../MissingAnnotationAttributesProposal.java       |   11 +-
 .../MissingReturnTypeCorrectionProposal.java       |    9 +-
 .../ModifierChangeCorrectionProposal.java          |   25 +-
 .../proposals/NewAnnotationMemberProposal.java     |    8 +-
 .../proposals/NewCUUsingWizardProposal.java        |    6 +-
 .../proposals/NewDefiningMethodProposal.java       |   33 +-
 .../proposals/NewMethodCorrectionProposal.java     |   47 +-
 .../proposals/NewVariableCorrectionProposal.java   |   25 +-
 .../RemoveDeclarationCorrectionProposal.java       |   18 +-
 .../proposals/RenameNodeCorrectionProposal.java    |    3 +-
 .../proposals/ReplaceCorrectionProposal.java       |    3 +-
 .../correction/proposals/TaskMarkerProposal.java   |    3 +-
 .../proposals/TypeChangeCorrectionProposal.java    |   61 +-
 .../folding/DefaultJavaFoldingPreferenceBlock.java |   16 +-
 .../JavaFoldingStructureProviderRegistry.java      |   10 +-
 .../text/java/AbstractJavaCompletionProposal.java  |    3 +-
 ...AbstractTemplateCompletionProposalComputer.java |   19 +-
 .../internal/ui/text/java/AlphabeticSorter.java    |    3 +-
 .../java/AnnotationAtttributeProposalInfo.java     |    3 +-
 .../text/java/AnonymousTypeCompletionProposal.java |   51 +-
 .../ui/text/java/AnonymousTypeProposalInfo.java    |    3 +-
 .../ui/text/java/CompletionProposalCategory.java   |   49 +-
 .../java/CompletionProposalComputerDescriptor.java |   40 +-
 .../java/CompletionProposalComputerRegistry.java   |  101 +-
 .../text/java/ContentAssistComputerParameter.java  |   12 +-
 .../ui/text/java/ContentAssistHistory.java         |   80 +-
 .../ui/text/java/ContentAssistProcessor.java       |  100 +-
 .../internal/ui/text/java/FieldProposalInfo.java   |    3 +-
 ...llArgumentNamesCompletionProposalCollector.java |    3 +-
 .../java/FilledArgumentNamesMethodProposal.java    |    6 +-
 .../text/java/GetterSetterCompletionProposal.java  |    7 +-
 .../ui/text/java/HippieProposalComputer.java       |    9 +-
 .../ui/text/java/ImportCompletionProposal.java     |    4 +-
 .../java/JavaAllCompletionProposalComputer.java    |    4 +-
 .../ui/text/java/JavaAutoIndentStrategy.java       |   27 +-
 .../jdt/internal/ui/text/java/JavaCodeScanner.java |   21 +-
 .../ui/text/java/JavaCompletionProcessor.java      |   10 +-
 .../ui/text/java/JavaCompletionProposal.java       |    4 +-
 .../text/java/JavaCompletionProposalComputer.java  |   32 +-
 .../ui/text/java/JavaDoubleClickSelector.java      |    4 +-
 ...aFieldWithCastedReceiverCompletionProposal.java |    3 +-
 .../ui/text/java/JavaFormattingContext.java        |    5 +-
 .../ui/text/java/JavaFormattingStrategy.java       |   20 +-
 .../ui/text/java/JavaMethodCompletionProposal.java |   22 +-
 .../java/JavaNoTypeCompletionProposalComputer.java |    4 +-
 .../ui/text/java/JavaParameterListValidator.java   |    6 +-
 .../ui/text/java/JavaStringAutoIndentStrategy.java |    7 +-
 .../ui/text/java/JavaTypeCompletionProposal.java   |    5 +-
 .../java/JavaTypeCompletionProposalComputer.java   |   20 +-
 .../ui/text/java/JavadocDoubleClickStrategy.java   |    3 +-
 .../ui/text/java/LazyGenericTypeProposal.java      |   21 +-
 .../ui/text/java/LazyJavaCompletionProposal.java   |   59 +-
 .../text/java/LazyJavaTypeCompletionProposal.java  |   11 +-
 .../internal/ui/text/java/MemberProposalInfo.java  |    3 +-
 .../java/MethodDeclarationCompletionProposal.java  |    7 +-
 .../internal/ui/text/java/MethodProposalInfo.java  |   31 +-
 .../ui/text/java/OverrideCompletionProposal.java   |   14 +-
 .../internal/ui/text/java/ParameterGuesser.java    |   61 +-
 .../ui/text/java/ParameterGuessingProposal.java    |   17 +-
 .../ui/text/java/PartitionDoubleClickSelector.java |    3 +-
 .../ui/text/java/ProposalContextInformation.java   |    4 +-
 .../jdt/internal/ui/text/java/ProposalInfo.java    |    5 +-
 .../ui/text/java/ProposalSorterHandle.java         |    6 +-
 .../ui/text/java/ProposalSorterRegistry.java       |   18 +-
 .../jdt/internal/ui/text/java/RelevanceSorter.java |    5 +-
 .../SWTTemplateCompletionProposalComputer.java     |    3 +-
 .../java/TemplateCompletionProposalComputer.java   |    3 +-
 .../internal/ui/text/java/TypeProposalInfo.java    |    3 +-
 .../text/java/hover/AbstractAnnotationHover.java   |   28 +-
 .../java/hover/AbstractJavaEditorTextHover.java    |   30 +-
 .../ui/text/java/hover/AnnotationExpandHover.java  |   28 +-
 .../java/hover/AnnotationExpansionControl.java     |   26 +-
 .../ui/text/java/hover/BestMatchHover.java         |   25 +-
 .../java/hover/JavaEditorTextHoverDescriptor.java  |   16 +-
 .../text/java/hover/JavaEditorTextHoverProxy.java  |    7 +-
 .../ui/text/java/hover/JavaExpandHover.java        |   18 +-
 .../ui/text/java/hover/JavaHoverMessages.java      |    3 +-
 .../text/java/hover/JavaHoverMessages.properties   |    3 +-
 .../ui/text/java/hover/JavaSourceHover.java        |    6 +-
 .../JavadocBrowserInformationControlInput.java     |    6 +-
 .../internal/ui/text/java/hover/JavadocHover.java  |   36 +-
 .../ui/text/java/hover/NLSStringHover.java         |   79 +-
 .../internal/ui/text/java/hover/ProblemHover.java  |   19 +-
 .../javadoc/HTMLTagCompletionProposalComputer.java |   18 +-
 .../ui/text/javadoc/JavaDoc2HTMLTextReader.java    |   39 +-
 .../ui/text/javadoc/JavaDocAutoIndentStrategy.java |    5 +-
 .../internal/ui/text/javadoc/JavaDocScanner.java   |   22 +-
 .../text/javadoc/JavadocCompletionProcessor.java   |    5 +-
 .../javadoc/JavadocCompletionProposalComputer.java |    3 +-
 .../ui/text/javadoc/JavadocContentAccess2.java     |  218 +-
 .../JavadocContentAssistInvocationContext.java     |    4 +-
 .../JavadocInlineTagCompletionProposal.java        |    4 +-
 .../javadoc/JavadocLinkTypeCompletionProposal.java |    4 +-
 .../LegacyJavadocCompletionProposalComputer.java   |   15 +-
 .../ui/text/spelling/ChangeCaseProposal.java       |    3 +-
 .../ui/text/spelling/CoreSpellingProblem.java      |    4 +-
 .../ui/text/spelling/DefaultSpellingEngine.java    |    6 +-
 .../ui/text/spelling/HtmlTagDictionary.java        |    6 +-
 .../ui/text/spelling/JavaDocTagDictionary.java     |    6 +-
 .../ui/text/spelling/JavaSpellingEngine.java       |    3 +-
 .../ui/text/spelling/JavaSpellingProblem.java      |   13 +-
 .../spelling/JavaSpellingReconcileStrategy.java    |    7 +-
 .../spelling/PropertiesFileSpellCheckIterator.java |    5 +-
 .../spelling/PropertiesFileSpellingEngine.java     |    7 +-
 .../ui/text/spelling/SpellCheckEngine.java         |   83 +-
 .../ui/text/spelling/SpellCheckIterator.java       |    8 +-
 .../ui/text/spelling/TaskTagDictionary.java        |   24 +-
 .../ui/text/spelling/TextSpellingEngine.java       |    3 +-
 .../spelling/WordCompletionProposalComputer.java   |   21 +-
 .../ui/text/spelling/WordQuickFixProcessor.java    |    8 +-
 .../spelling/engine/AbstractSpellDictionary.java   |   49 +-
 .../text/spelling/engine/DefaultSpellChecker.java  |   48 +-
 .../text/spelling/engine/ISpellCheckIterator.java  |    4 +-
 .../ui/text/spelling/engine/ISpellChecker.java     |    4 +-
 .../ui/text/spelling/engine/ISpellDictionary.java  |    4 +-
 .../ui/text/spelling/engine/ISpellEvent.java       |    4 +-
 .../engine/LocaleSensitiveSpellDictionary.java     |    4 +-
 .../spelling/engine/PersistentSpellDictionary.java |    5 +-
 .../text/spelling/engine/RankedWordProposal.java   |    9 +-
 .../ui/text/spelling/engine/SpellEvent.java        |    4 +-
 .../text/template/contentassist/MultiVariable.java |   11 +-
 .../template/contentassist/MultiVariableGuess.java |   23 +-
 .../SurroundWithTemplateProposal.java              |   15 +-
 .../template/contentassist/TemplateEngine.java     |   16 +-
 .../template/contentassist/VariablePosition.java   |    5 +-
 .../preferences/TemplateVariableProcessor.java     |   17 +-
 .../AbstractHierarchyViewerSorter.java             |    4 +-
 .../ui/typehierarchy/EnableMemberFilterAction.java |    3 +-
 .../ui/typehierarchy/FocusOnSelectionAction.java   |    3 +-
 .../ui/typehierarchy/FocusOnTypeAction.java        |    3 +-
 .../typehierarchy/HierarchyInformationControl.java |   25 +-
 .../ui/typehierarchy/HierarchyLabelProvider.java   |   74 +-
 .../ui/typehierarchy/HierarchyViewerSorter.java    |    6 +-
 .../internal/ui/typehierarchy/HistoryAction.java   |   65 +-
 .../ui/typehierarchy/HistoryDropDownAction.java    |   26 +-
 .../ui/typehierarchy/HistoryListAction.java        |   85 +-
 .../ui/typehierarchy/MethodsContentProvider.java   |    6 +-
 .../ui/typehierarchy/MethodsLabelProvider.java     |    8 +-
 .../internal/ui/typehierarchy/MethodsViewer.java   |   10 +-
 .../typehierarchy/ShowInheritedMembersAction.java  |    3 +-
 .../ShowQualifiedTypeNamesAction.java              |    3 +-
 .../ui/typehierarchy/SortByDefiningTypeAction.java |    3 +-
 .../ui/typehierarchy/SubTypeHierarchyViewer.java   |    7 +-
 .../ui/typehierarchy/SuperTypeHierarchyViewer.java |    7 +-
 .../ui/typehierarchy/ToggleLinkingAction.java      |    3 +-
 .../ui/typehierarchy/ToggleOrientationAction.java  |    3 +-
 .../ui/typehierarchy/ToggleViewAction.java         |    3 +-
 .../typehierarchy/TraditionalHierarchyViewer.java  |   10 +-
 .../TypeHierarchyContentProvider.java              |   72 +-
 .../ui/typehierarchy/TypeHierarchyLifeCycle.java   |  116 +-
 .../ui/typehierarchy/TypeHierarchyMessages.java    |   11 +-
 .../typehierarchy/TypeHierarchyMessages.properties |   15 +-
 .../TypeHierarchyTransferDropAdapter.java          |    4 +-
 .../ui/typehierarchy/TypeHierarchyViewPart.java    |  316 +-
 .../ui/typehierarchy/TypeHierarchyViewer.java      |    3 +-
 .../ui/util/BusyIndicatorRunnableContext.java      |    3 +-
 .../eclipse/jdt/internal/ui/util/CoreUtility.java  |    4 +-
 .../jdt/internal/ui/util/ElementValidator.java     |    6 +-
 .../eclipse/jdt/internal/ui/util/JavaUIHelp.java   |    4 +-
 .../jdt/internal/ui/util/JavadocHelpContext.java   |    6 +-
 .../internal/ui/util/MainMethodSearchEngine.java   |   11 +-
 .../internal/ui/util/OpenTypeHierarchyUtil.java    |   41 +-
 .../org/eclipse/jdt/internal/ui/util/SWTUtil.java  |   23 +-
 .../jdt/internal/ui/util/SelectionUtil.java        |   10 +-
 .../jdt/internal/ui/util/StringMatcher.java        |    4 +-
 .../jdt/internal/ui/util/TableLayoutComposite.java |   15 +-
 .../ui/util/TypeNameMatchLabelProvider.java        |    4 +-
 .../viewsupport/AppearanceAwareLabelProvider.java  |   11 +-
 .../ui/viewsupport/BindingLabelProvider.java       |   18 +-
 .../ui/viewsupport/ColoredViewersManager.java      |   10 +-
 .../ui/viewsupport/ColoringLabelProvider.java      |    5 +-
 .../FilteredElementTreeSelectionDialog.java        |   13 +-
 .../internal/ui/viewsupport/FocusDescriptor.java   |   59 +
 .../ui/viewsupport/HistoryDropDownAction.java      |   25 +-
 .../internal/ui/viewsupport/HistoryListAction.java |   45 +-
 .../ui/viewsupport/ImageDescriptorRegistry.java    |   27 +-
 .../ui/viewsupport/ImageImageDescriptor.java       |    5 +-
 .../ui/viewsupport/ImagesOnFileSystemRegistry.java |    8 +-
 .../ui/viewsupport/JavaElementImageProvider.java   |   75 +-
 .../ui/viewsupport/JavaElementLabelComposer.java   |   55 +-
 .../internal/ui/viewsupport/JavaElementLinks.java  |   20 +-
 .../ui/viewsupport/JavaUILabelProvider.java        |   16 +-
 .../internal/ui/viewsupport/JavaViewerFilter.java  |    3 +-
 .../jdt/internal/ui/viewsupport/LibraryFilter.java |    3 +-
 .../viewsupport/LinkedProposalModelPresenter.java  |   12 +-
 .../jdt/internal/ui/viewsupport/MemberFilter.java  |    3 +-
 .../ui/viewsupport/MemberFilterAction.java         |    3 +-
 .../ui/viewsupport/ProblemMarkerManager.java       |   25 +-
 .../ui/viewsupport/ProblemTableViewer.java         |   19 +-
 .../internal/ui/viewsupport/ProblemTreeViewer.java |   20 +-
 .../ui/viewsupport/ProjectTemplateStore.java       |    6 +-
 .../ui/viewsupport/ResourceToItemsMapper.java      |   35 +-
 .../SelectionListenerWithASTManager.java           |   11 +-
 .../ui/viewsupport/SourcePositionComparator.java   |    3 +-
 .../ui/viewsupport/StorageLabelProvider.java       |   15 +-
 .../TreeHierarchyLayoutProblemsDecorator.java      |    3 +-
 .../jdt/internal/ui/viewsupport/ViewHistory.java   |   20 +-
 .../jdt/internal/ui/wizards/ClassPathDetector.java |   74 +-
 .../jdt/internal/ui/wizards/JavaProjectWizard.java |    8 +-
 .../ui/wizards/NewAnnotationCreationWizard.java    |    7 +-
 .../ui/wizards/NewClassCreationWizard.java         |    7 +-
 .../jdt/internal/ui/wizards/NewElementWizard.java  |    3 +-
 .../internal/ui/wizards/NewEnumCreationWizard.java |    7 +-
 .../ui/wizards/NewInterfaceCreationWizard.java     |    7 +-
 .../ui/wizards/NewJavaWorkingSetWizard.java        |    4 +-
 .../ui/wizards/NewPackageCreationWizard.java       |    6 +-
 .../ui/wizards/NewSourceFolderCreationWizard.java  |    6 +-
 .../ui/wizards/NewSourceFolderWizardPage.java      |   28 +-
 .../internal/ui/wizards/NewTypeDropDownAction.java |    8 +-
 .../jdt/internal/ui/wizards/NewWizardMessages.java |   11 +-
 .../ui/wizards/NewWizardMessages.properties        |   13 +-
 .../ui/wizards/SuperInterfaceSelectionDialog.java  |   16 +-
 .../ui/wizards/TypedElementSelectionValidator.java |    8 +-
 .../jdt/internal/ui/wizards/TypedViewerFilter.java |    5 +-
 .../wizards/buildpaths/AccessRuleEntryDialog.java  |    5 +-
 .../ui/wizards/buildpaths/AccessRulesDialog.java   |   54 +-
 .../wizards/buildpaths/AddSourceFolderWizard.java  |   16 +-
 .../buildpaths/AddSourceFolderWizardPage.java      |   58 +-
 .../ui/wizards/buildpaths/ArchiveFileFilter.java   |    7 +-
 .../ui/wizards/buildpaths/BuildPathBasePage.java   |   16 +-
 .../ui/wizards/buildpaths/BuildPathSupport.java    |   28 +-
 .../ui/wizards/buildpaths/BuildPathWizard.java     |   22 +-
 .../ui/wizards/buildpaths/BuildPathsBlock.java     |   67 +-
 .../ui/wizards/buildpaths/CPListElement.java       |   50 +-
 .../wizards/buildpaths/CPListElementAttribute.java |   13 +-
 .../ui/wizards/buildpaths/CPListElementSorter.java |    4 +-
 .../ui/wizards/buildpaths/CPListLabelProvider.java |    4 +-
 .../wizards/buildpaths/CPUserLibraryElement.java   |   34 +-
 .../ui/wizards/buildpaths/CPVariableElement.java   |    4 +-
 .../buildpaths/CPVariableElementLabelProvider.java |    7 +-
 ...ClasspathAttributeConfigurationDescriptors.java |   12 +-
 .../buildpaths/ClasspathContainerDefaultPage.java  |    6 +-
 .../buildpaths/ClasspathContainerDescriptor.java   |    6 +-
 .../ClasspathContainerSelectionPage.java           |    8 +-
 .../buildpaths/ClasspathContainerWizard.java       |    7 +-
 .../buildpaths/ClasspathFixSelectionDialog.java    |    9 +-
 .../buildpaths/ClasspathOrderingWorkbookPage.java  |   18 +-
 .../CreateMultipleSourceFoldersDialog.java         |   71 +-
 .../ui/wizards/buildpaths/EditFilterWizard.java    |    5 +-
 .../buildpaths/EditVariableEntryDialog.java        |    9 +-
 .../buildpaths/ExclusionInclusionDialog.java       |   53 +-
 .../buildpaths/ExclusionInclusionEntryDialog.java  |   10 +-
 .../wizards/buildpaths/FolderSelectionDialog.java  |    4 +-
 .../wizards/buildpaths/JARFileSelectionDialog.java |    6 +-
 .../buildpaths/JavadocAttributeConfiguration.java  |    9 +-
 .../wizards/buildpaths/JavadocLocationDialog.java  |    5 +-
 .../wizards/buildpaths/LibrariesWorkbookPage.java  |  146 +-
 .../buildpaths/MultipleFolderSelectionDialog.java  |   21 +-
 .../NativeLibAttributeConfiguration.java           |    9 +-
 .../wizards/buildpaths/NativeLibrariesDialog.java  |    4 +-
 .../ui/wizards/buildpaths/NewContainerDialog.java  |    4 +-
 .../wizards/buildpaths/NewSourceFolderDialog.java  |    8 +-
 .../wizards/buildpaths/NewVariableEntryDialog.java |   43 +-
 .../wizards/buildpaths/OutputLocationDialog.java   |   10 +-
 .../wizards/buildpaths/ProjectsWorkbookPage.java   |   78 +-
 .../ui/wizards/buildpaths/SetFilterWizardPage.java |   65 +-
 .../wizards/buildpaths/SourceAttachmentBlock.java  |    4 +-
 .../wizards/buildpaths/SourceAttachmentDialog.java |    5 +-
 .../buildpaths/SourceContainerWorkbookPage.java    |  128 +-
 .../UserLibraryMarkerResolutionGenerator.java      |   15 +-
 .../wizards/buildpaths/UserLibraryWizardPage.java  |   87 +-
 .../ui/wizards/buildpaths/VariableBlock.java       |   67 +-
 .../wizards/buildpaths/VariableCreationDialog.java |   10 +-
 .../buildpaths/VariablePathDialogField.java        |   15 +-
 .../newsourcepage/AddArchiveToBuildpathAction.java |   15 +-
 .../newsourcepage/AddFolderToBuildpathAction.java  |   25 +-
 .../newsourcepage/AddLibraryToBuildpathAction.java |   14 +-
 .../AddSelectedLibraryToBuildpathAction.java       |   21 +-
 .../newsourcepage/BuildpathModifierAction.java     |   22 +-
 .../ClasspathModifierDropDownAction.java           |   28 +-
 .../newsourcepage/ClasspathModifierQueries.java    |  102 +-
 .../newsourcepage/ConfigureBuildPathAction.java    |    7 +-
 .../CreateLinkedSourceFolderAction.java            |   11 +-
 .../CreateLinkedSourceFolderAction2.java           |    3 +-
 .../newsourcepage/CreateSourceFolderAction.java    |   11 +-
 .../newsourcepage/CreateSourceFolderAction2.java   |    3 +-
 .../newsourcepage/DialogPackageExplorer.java       |   33 +-
 .../DialogPackageExplorerActionGroup.java          |   54 +-
 .../buildpaths/newsourcepage/EditFilterAction.java |    9 +-
 .../newsourcepage/EditOutputFolderAction.java      |   11 +-
 .../newsourcepage/ExcludeFromBuildpathAction.java  |   17 +-
 .../GenerateBuildPathActionGroup.java              |   27 +-
 .../buildpaths/newsourcepage/HelpAction.java       |    5 +-
 .../buildpaths/newsourcepage/HintTextGroup.java    |   31 +-
 .../newsourcepage/IncludeToBuildpathAction.java    |   17 +-
 .../buildpaths/newsourcepage/LinkFolderDialog.java |  532 --
 .../NewSourceContainerWorkbookPage.java            |   48 +-
 .../newsourcepage/RemoveFromBuildpathAction.java   |   25 +-
 .../newsourcepage/RemoveLinkedFolderDialog.java    |    4 +-
 .../buildpaths/newsourcepage/ResetAction.java      |   19 +-
 .../buildpaths/newsourcepage/ResetAllAction.java   |   19 +-
 .../newsourcepage/ResetAllOutputFoldersAction.java |   17 +-
 .../dialogfields/CheckedListDialogField.java       |   46 +-
 .../ui/wizards/dialogfields/ComboDialogField.java  |    7 +-
 .../ui/wizards/dialogfields/IListAdapter.java      |   21 +-
 .../ui/wizards/dialogfields/ITreeListAdapter.java  |   20 +-
 .../ui/wizards/dialogfields/ListDialogField.java   |   89 +-
 .../dialogfields/SelectionButtonDialogField.java   |    7 +-
 .../SelectionButtonDialogFieldGroup.java           |    6 +-
 .../ui/wizards/dialogfields/Separator.java         |    4 +-
 .../dialogfields/StringButtonDialogField.java      |    5 +-
 .../StringButtonStatusDialogField.java             |    6 +-
 .../ui/wizards/dialogfields/StringDialogField.java |    7 +-
 .../wizards/dialogfields/TextBoxDialogField.java   |    3 +-
 .../wizards/dialogfields/TreeListDialogField.java  |  107 +-
 .../workingsets/AbstractWorkingSetWizardPage.java  |   21 +-
 .../ui/workingsets/ClearWorkingSetAction.java      |    3 +-
 .../ui/workingsets/ConfigureWorkingSetAction.java  |   10 +-
 .../ConfigureWorkingSetAssignementAction.java      |   98 +-
 .../ui/workingsets/EditWorkingSetAction.java       |    3 +-
 .../workingsets/JavaWorkingSetElementAdapter.java  |    6 +-
 .../ui/workingsets/JavaWorkingSetPage.java         |   11 +-
 .../JavaWorkingSetPageContentProvider.java         |    5 +-
 .../ui/workingsets/JavaWorkingSetUpdater.java      |   24 +-
 .../ui/workingsets/OthersWorkingSetUpdater.java    |   21 +-
 .../workingsets/RemoveWorkingSetElementAction.java |   16 +-
 .../ui/workingsets/SelectWorkingSetAction.java     |    3 +-
 .../jdt/internal/ui/workingsets/ViewAction.java    |    3 +-
 .../internal/ui/workingsets/ViewActionGroup.java   |    5 +-
 .../ui/workingsets/WorkingSetComparator.java       |   32 +-
 .../workingsets/WorkingSetConfigurationDialog.java |  152 +-
 .../internal/ui/workingsets/WorkingSetFilter.java  |    5 +-
 .../workingsets/WorkingSetFilterActionGroup.java   |   10 +-
 .../WorkingSetMenuContributionItem.java            |    6 +-
 .../ui/workingsets/WorkingSetMessages.properties   |   10 +-
 .../internal/ui/workingsets/WorkingSetModel.java   |  292 +-
 .../ui/workingsets/WorkingSetShowActionGroup.java  |    9 +-
 .../ui/org/eclipse/jdt/ui/CodeGeneration.java      |    4 +-
 .../org/eclipse/jdt/ui/JavaElementComparator.java  |    4 +-
 .../eclipse/jdt/ui/JavaElementContentProvider.java |    4 +-
 .../eclipse/jdt/ui/JavaElementImageDescriptor.java |   32 +-
 .../eclipse/jdt/ui/JavaElementLabelProvider.java   |    5 +-
 .../ui/org/eclipse/jdt/ui/JavaElementLabels.java   |    6 +-
 .../ui/org/eclipse/jdt/ui/JavaElementSorter.java   |    5 +-
 .../ui/org/eclipse/jdt/ui/JavaUI.java              |   12 +-
 .../ui/org/eclipse/jdt/ui/PreferenceConstants.java |   44 +-
 .../org/eclipse/jdt/ui/ProblemsLabelDecorator.java |   20 +-
 .../ui/org/eclipse/jdt/ui/SharedASTProvider.java   |   12 +-
 .../jdt/ui/StandardJavaElementContentProvider.java |    6 +-
 .../jdt/ui/actions/AbstractOpenWizardAction.java   |    3 +-
 .../jdt/ui/actions/AddDelegateMethodsAction.java   |   33 +-
 .../jdt/ui/actions/AddGetterSetterAction.java      |   93 +-
 .../jdt/ui/actions/AddJavaDocStubAction.java       |    8 +-
 .../jdt/ui/actions/AddToClasspathAction.java       |   12 +-
 .../AddUnimplementedConstructorsAction.java        |   22 +-
 .../eclipse/jdt/ui/actions/BuildActionGroup.java   |    6 +-
 .../org/eclipse/jdt/ui/actions/CCPActionGroup.java |   73 +-
 .../eclipse/jdt/ui/actions/ChangeTypeAction.java   |    7 +-
 .../ui/actions/ConvertAnonymousToNestedAction.java |    7 +-
 .../jdt/ui/actions/ConvertLocalToFieldAction.java  |    5 +-
 .../jdt/ui/actions/ConvertNestedToTopAction.java   |   11 +-
 .../ui/actions/ConvertingSelectionProvider.java    |    6 +-
 .../jdt/ui/actions/CustomFiltersActionGroup.java   |  104 +-
 .../jdt/ui/actions/DeclarationsSearchGroup.java    |    9 +-
 .../jdt/ui/actions/ExternalizeStringsAction.java   |   48 +-
 .../eclipse/jdt/ui/actions/ExtractClassAction.java |   11 +-
 .../jdt/ui/actions/ExtractConstantAction.java      |    5 +-
 .../jdt/ui/actions/ExtractInterfaceAction.java     |   11 +-
 .../jdt/ui/actions/ExtractMethodAction.java        |    5 +-
 .../eclipse/jdt/ui/actions/ExtractTempAction.java  |    5 +-
 .../ui/org/eclipse/jdt/ui/actions/FindAction.java  |   10 +-
 .../FindBreakContinueTargetOccurrencesAction.java  |    6 +-
 .../jdt/ui/actions/FindDeclarationsAction.java     |    7 +-
 .../actions/FindDeclarationsInHierarchyAction.java |    7 +-
 .../actions/FindDeclarationsInProjectAction.java   |    4 +-
 .../FindDeclarationsInWorkingSetAction.java        |    4 +-
 .../ui/actions/FindExceptionOccurrencesAction.java |    6 +-
 .../ui/actions/FindImplementOccurrencesAction.java |    6 +-
 .../jdt/ui/actions/FindImplementorsAction.java     |    9 +-
 .../actions/FindImplementorsInProjectAction.java   |    4 +-
 .../FindImplementorsInWorkingSetAction.java        |    4 +-
 .../actions/FindMethodExitOccurrencesAction.java   |    6 +-
 .../ui/actions/FindOccurrencesInFileAction.java    |    7 +-
 .../jdt/ui/actions/FindReadReferencesAction.java   |    8 +-
 .../FindReadReferencesInHierarchyAction.java       |    8 +-
 .../actions/FindReadReferencesInProjectAction.java |    4 +-
 .../FindReadReferencesInWorkingSetAction.java      |    8 +-
 .../jdt/ui/actions/FindReferencesAction.java       |    9 +-
 .../actions/FindReferencesInHierarchyAction.java   |    7 +-
 .../ui/actions/FindReferencesInProjectAction.java  |    7 +-
 .../actions/FindReferencesInWorkingSetAction.java  |    4 +-
 .../ui/actions/FindStringsToExternalizeAction.java |   38 +-
 .../jdt/ui/actions/FindWriteReferencesAction.java  |    8 +-
 .../FindWriteReferencesInHierarchyAction.java      |    8 +-
 .../FindWriteReferencesInProjectAction.java        |    4 +-
 .../FindWriteReferencesInWorkingSetAction.java     |    8 +-
 .../eclipse/jdt/ui/actions/FormatAllAction.java    |    6 +-
 .../jdt/ui/actions/GenerateActionGroup.java        |   15 +-
 .../ui/actions/GenerateHashCodeEqualsAction.java   |   32 +-
 .../ui/actions/GenerateMethodAbstractAction.java   |   10 +-
 .../GenerateNewConstructorUsingFieldsAction.java   |   24 +-
 .../jdt/ui/actions/GenerateToStringAction.java     |   61 +-
 .../ui/actions/IJavaEditorActionDefinitionIds.java |   14 +-
 .../jdt/ui/actions/ImplementorsSearchGroup.java    |    9 +-
 .../eclipse/jdt/ui/actions/ImportActionGroup.java  |    4 +-
 .../jdt/ui/actions/InferTypeArgumentsAction.java   |    9 +-
 .../org/eclipse/jdt/ui/actions/InlineAction.java   |    5 +-
 .../eclipse/jdt/ui/actions/InlineTempAction.java   |    7 +-
 .../jdt/ui/actions/IntroduceFactoryAction.java     |    7 +-
 .../jdt/ui/actions/IntroduceIndirectionAction.java |   19 +-
 .../jdt/ui/actions/IntroduceParameterAction.java   |    5 +-
 .../jdt/ui/actions/JavaSearchActionGroup.java      |    6 +-
 .../jdt/ui/actions/MemberFilterActionGroup.java    |    8 +-
 .../jdt/ui/actions/ModifyParametersAction.java     |    7 +-
 .../ui/org/eclipse/jdt/ui/actions/MoveAction.java  |   13 +-
 .../jdt/ui/actions/NavigateActionGroup.java        |    7 +-
 .../jdt/ui/actions/OccurrencesSearchGroup.java     |    6 +-
 .../ui/org/eclipse/jdt/ui/actions/OpenAction.java  |   58 +-
 .../jdt/ui/actions/OpenAttachedJavadocAction.java  |    7 +-
 .../jdt/ui/actions/OpenEditorActionGroup.java      |    5 +-
 .../jdt/ui/actions/OpenExternalJavadocAction.java  |    4 +-
 .../jdt/ui/actions/OpenImplementationAction.java   |   28 +-
 .../actions/OpenJavaBrowsingPerspectiveAction.java |    3 +-
 .../jdt/ui/actions/OpenJavaPerspectiveAction.java  |    3 +-
 .../ui/actions/OpenNewAnnotationWizardAction.java  |    3 +-
 .../jdt/ui/actions/OpenNewClassWizardAction.java   |    3 +-
 .../jdt/ui/actions/OpenNewEnumWizardAction.java    |    3 +-
 .../ui/actions/OpenNewInterfaceWizardAction.java   |    3 +-
 .../ui/actions/OpenNewJavaProjectWizardAction.java |    4 +-
 .../jdt/ui/actions/OpenNewPackageWizardAction.java |    3 +-
 .../actions/OpenNewSourceFolderWizardAction.java   |    3 +-
 .../eclipse/jdt/ui/actions/OpenProjectAction.java  |   20 +-
 .../ui/actions/OpenSuperImplementationAction.java  |    6 +-
 .../jdt/ui/actions/OpenTypeHierarchyAction.java    |  235 +-
 .../jdt/ui/actions/OpenViewActionGroup.java        |    5 +-
 .../jdt/ui/actions/OrganizeImportsAction.java      |   13 +-
 .../jdt/ui/actions/OverrideMethodsAction.java      |   12 +-
 .../eclipse/jdt/ui/actions/ProjectActionGroup.java |   11 +-
 .../org/eclipse/jdt/ui/actions/PullUpAction.java   |   13 +-
 .../org/eclipse/jdt/ui/actions/PushDownAction.java |   13 +-
 .../jdt/ui/actions/ReadReferencesSearchGroup.java  |    9 +-
 .../jdt/ui/actions/RefactorActionGroup.java        |   33 +-
 .../jdt/ui/actions/ReferencesSearchGroup.java      |    9 +-
 .../org/eclipse/jdt/ui/actions/RefreshAction.java  |   43 +-
 .../jdt/ui/actions/RemoveFromClasspathAction.java  |   12 +-
 .../org/eclipse/jdt/ui/actions/RenameAction.java   |   11 +-
 .../jdt/ui/actions/ReplaceInvocationsAction.java   |    7 +-
 .../jdt/ui/actions/SelectionDispatchAction.java    |    3 +-
 .../jdt/ui/actions/SelfEncapsulateFieldAction.java |   17 +-
 .../eclipse/jdt/ui/actions/ShowActionGroup.java    |    5 +-
 .../jdt/ui/actions/ShowInNavigatorViewAction.java  |    6 +-
 .../jdt/ui/actions/ShowInPackageViewAction.java    |    6 +-
 .../eclipse/jdt/ui/actions/SortMembersAction.java  |   11 +-
 .../jdt/ui/actions/SurroundWithTryCatchAction.java |    6 +-
 .../eclipse/jdt/ui/actions/UseSupertypeAction.java |   11 +-
 .../jdt/ui/actions/WorkingSetFindAction.java       |   10 +-
 .../jdt/ui/actions/WriteReferencesSearchGroup.java |    9 +-
 .../org/eclipse/jdt/ui/cleanup/CleanUpContext.java |    4 +-
 .../org/eclipse/jdt/ui/cleanup/CleanUpOptions.java |   12 +-
 .../jdt/ui/cleanup/CleanUpRequirements.java        |    8 +-
 .../org/eclipse/jdt/ui/jarpackager/JarWriter.java  |    8 +-
 .../org/eclipse/jdt/ui/jarpackager/JarWriter2.java |    8 +-
 .../org/eclipse/jdt/ui/jarpackager/JarWriter3.java |   20 +-
 .../ui/refactoring/IRefactoringProcessorIds.java   |    4 +-
 .../jdt/ui/refactoring/RefactoringSaveHelper.java  |    6 +-
 .../eclipse/jdt/ui/refactoring/RenameSupport.java  |    3 +-
 .../jdt/ui/text/JavaSourceViewerConfiguration.java |   35 +-
 .../DefaultJavaFoldingStructureProvider.java       |   95 +-
 .../jdt/ui/text/java/AbstractProposalSorter.java   |   26 +-
 .../ui/text/java/CompletionProposalCollector.java  |   19 +-
 .../ui/text/java/CompletionProposalComparator.java |   14 +-
 .../text/java/CompletionProposalLabelProvider.java |    5 +-
 .../text/java/ContentAssistInvocationContext.java  |    4 +-
 .../text/java/IJavaCompletionProposalComputer.java |    6 +-
 .../jdt/ui/wizards/BuildPathDialogAccess.java      |   14 +-
 .../wizards/JavaCapabilityConfigurationPage.java   |    5 +-
 .../jdt/ui/wizards/JavadocExportWizardPage.java    |    4 +-
 .../jdt/ui/wizards/NewAnnotationWizardPage.java    |    4 +-
 .../eclipse/jdt/ui/wizards/NewClassWizardPage.java |    5 +-
 .../jdt/ui/wizards/NewContainerWizardPage.java     |    6 +-
 .../jdt/ui/wizards/NewElementWizardPage.java       |    3 +-
 .../eclipse/jdt/ui/wizards/NewEnumWizardPage.java  |    4 +-
 .../jdt/ui/wizards/NewInterfaceWizardPage.java     |    4 +-
 .../jdt/ui/wizards/NewJavaProjectWizardPage.java   |    6 +-
 .../ui/wizards/NewJavaProjectWizardPageOne.java    |   42 +-
 .../ui/wizards/NewJavaProjectWizardPageTwo.java    |   16 +-
 .../jdt/ui/wizards/NewPackageWizardPage.java       |    4 +-
 .../eclipse/jdt/ui/wizards/NewTypeWizardPage.java  |   92 +-
 .../plugins/org.eclipse.jdt/META-INF/MANIFEST.MF   |    2 +-
 eclipse/plugins/org.eclipse.jdt/about.properties   |    4 +-
 .../org.eclipse.jdt/cheatsheets/HelloWorldSWT.xml  |   27 +-
 eclipse/plugins/org.eclipse.jdt/notice.html        |  191 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../jface/databinding/swt/SWTObservables.java      |   55 +-
 .../jface/databinding/swt/WidgetProperties.java    |   28 +-
 .../viewers/ObservableListContentProvider.java     |   17 +-
 .../viewers/ObservableListTreeContentProvider.java |   12 +
 .../viewers/ObservableSetContentProvider.java      |   17 +-
 .../viewers/ObservableSetTreeContentProvider.java  |   12 +
 .../swt/CTabItemTooltipTextProperty.java           |    2 +-
 .../databinding/swt/MenuEnabledProperty.java       |   31 +
 .../databinding/swt/MenuItemEnabledProperty.java   |   31 +
 .../databinding/swt/MenuItemSelectionProperty.java |   39 +
 .../databinding/swt/ScrollBarEnabledProperty.java  |   31 +
 .../databinding/swt/SliderMaximumProperty.java     |   31 +
 .../databinding/swt/SliderMinimumProperty.java     |   31 +
 .../databinding/swt/SliderSelectionProperty.java   |   39 +
 .../swt/TabItemTooltipTextProperty.java            |    2 +-
 .../swt/TableColumnTooltipTextProperty.java        |    2 +-
 .../databinding/swt/ToolItemEnabledProperty.java   |   31 +
 .../swt/ToolItemTooltipTextProperty.java           |    2 +-
 .../swt/TrayItemTooltipTextProperty.java           |    2 +-
 .../swt/TreeColumnTooltipTextProperty.java         |    2 +-
 .../databinding/swt/WidgetEnabledProperty.java     |   66 +
 .../databinding/swt/WidgetMaximumProperty.java     |    8 +
 .../databinding/swt/WidgetMinimumProperty.java     |    8 +
 .../databinding/swt/WidgetSelectionProperty.java   |   14 +
 .../databinding/viewers/TreeViewerUpdater.java     |    3 +-
 .../org.eclipse.jface.text/META-INF/MANIFEST.MF    |    2 +-
 .../text/source/projection/ProjectionSummary.java  |   58 +-
 .../text/source/projection/ProjectionViewer.java   |    2 +-
 .../jface/internal/text/SelectionProcessor.java    |    2 +-
 .../jface/internal/text/html/HTMLPrinter.java      |   57 +
 .../contentassist/CompletionProposalPopup2.java    |   85 +-
 .../text/link/contentassist/ContentAssistant2.java |   21 +-
 .../jface/text/AbstractInformationControl.java     |    3 +-
 .../text/AbstractInformationControlManager.java    |   13 +-
 .../jface/text/DefaultTextDoubleClickStrategy.java |   94 +-
 .../eclipse/jface/text/IInformationControl.java    |    6 +-
 .../jface/text/JFaceTextMessages.properties        |    4 +-
 .../org/eclipse/jface/text/TextPresentation.java   |   18 +-
 .../src/org/eclipse/jface/text/TextViewer.java     |   56 +-
 .../jface/text/WhitespaceCharacterPainter.java     |  241 +-
 .../contentassist/CompletionProposalPopup.java     |   62 +-
 .../ContentAssistSubjectControlAdapter.java        |    4 +-
 .../jface/text/contentassist/ContentAssistant.java |   14 +-
 .../text/hyperlink/DefaultHyperlinkPresenter.java  |    5 +-
 .../jface/text/hyperlink/HyperlinkManager.java     |   79 +-
 .../jface/text/hyperlink/IHyperlinkPresenter.java  |    7 +-
 .../hyperlink/IHyperlinkPresenterExtension2.java   |   36 +
 .../text/hyperlink/MultipleHyperlinkPresenter.java |  136 +-
 .../jface/text/hyperlink/URLHyperlinkDetector.java |   19 +-
 .../text/information/InformationPresenter.java     |    8 +-
 .../text/quickassist/QuickAssistAssistant.java     |   28 +-
 .../jface/text/reconciler/AbstractReconciler.java  |    4 +-
 .../text/source/AnnotationBarHoverManager.java     |   18 +
 .../jface/text/source/AnnotationPainter.java       |   41 +-
 .../jface/text/source/ChangeRulerColumn.java       |    2 +-
 .../jface/text/source/DefaultAnnotationHover.java  |    4 +-
 .../eclipse/jface/text/source/OverviewRuler.java   |  408 +-
 .../eclipse/jface/text/source/SourceViewer.java    |   11 +-
 .../jface/text/source/VisualAnnotationModel.java   |  144 -
 .../jface/text/templates/ContextTypeRegistry.java  |    4 +-
 eclipse/plugins/org.eclipse.jface/.options         |    7 +-
 .../org.eclipse.jface/.settings/.api_filters       |   10 +
 .../plugins/org.eclipse.jface/META-INF/MANIFEST.MF |    2 +-
 .../src/org/eclipse/jface/action/MenuManager.java  |   18 +-
 .../src/org/eclipse/jface/action/StatusLine.java   |   50 +-
 .../org/eclipse/jface/dialogs/DialogSettings.java  |   23 +-
 .../src/org/eclipse/jface/dialogs/ErrorDialog.java |    4 +
 .../jface/dialogs/ErrorSupportProvider.java        |   15 +
 .../eclipse/jface/dialogs/IDialogConstants.java    |  149 +-
 .../eclipse/jface/dialogs/IDialogLabelKeys.java    |  209 +
 .../org/eclipse/jface/dialogs/IDialogSettings.java |    8 +-
 .../src/org/eclipse/jface/dialogs/PopupDialog.java |   37 +-
 .../src/org/eclipse/jface/dialogs/TrayDialog.java  |   95 +-
 .../jface/fieldassist/ControlDecoration.java       |    9 +-
 .../org/eclipse/jface/internal/InternalPolicy.java |    9 +-
 .../eclipse/jface/preference/ColorSelector.java    |   14 +-
 .../eclipse/jface/preference/IPreferenceStore.java |   92 +-
 .../eclipse/jface/preference/PreferencePage.java   |   17 +-
 .../jface/resource/CompositeImageDescriptor.java   |   25 +-
 .../eclipse/jface/resource/ResourceRegistry.java   |    9 +-
 .../jface/resource/jfacefonts_windows7.properties  |   22 +
 .../resource/jfacefonts_windowsvista.properties    |   22 +
 .../src/org/eclipse/jface/util/OpenStrategy.java   |   18 +-
 .../eclipse/jface/viewers/AbstractTreeViewer.java  |   49 +-
 .../src/org/eclipse/jface/viewers/CellEditor.java  |   18 +-
 .../eclipse/jface/viewers/CheckboxTableViewer.java |   88 +-
 .../eclipse/jface/viewers/ColumnViewerEditor.java  |    5 +-
 .../jface/viewers/ComboBoxViewerCellEditor.java    |   14 +-
 .../org/eclipse/jface/viewers/ContentViewer.java   |    6 +
 .../eclipse/jface/viewers/IBaseLabelProvider.java  |   20 +-
 .../jface/viewers/IPostSelectionProvider.java      |    8 +-
 .../eclipse/jface/viewers/ISelectionProvider.java  |    4 +-
 .../eclipse/jface/viewers/SWTFocusCellManager.java |    5 +-
 .../eclipse/jface/viewers/StructuredViewer.java    |   34 +-
 .../jface/viewers/StyledCellLabelProvider.java     |   46 +-
 .../src/org/eclipse/jface/viewers/Viewer.java      |   16 +-
 .../eclipse/jface/viewers/ViewerDropAdapter.java   |   12 +-
 .../jface/viewers/deferred/ChangeQueue.java        |    8 +-
 .../src/org/eclipse/jface/wizard/IWizard.java      |   30 +-
 .../src/org/eclipse/jface/wizard/Wizard.java       |   43 +-
 .../src/org/eclipse/jface/wizard/WizardDialog.java |   65 +-
 .../org.eclipse.jsch.core/META-INF/MANIFEST.MF     |    2 +-
 eclipse/plugins/org.eclipse.jsch.core/plugin.xml   |   11 +
 .../org/eclipse/jsch/internal/core/IConstants.java |    6 +-
 .../jsch/internal/core/PreferenceInitializer.java  |   74 +-
 .../src/org/eclipse/jsch/internal/core/Utils.java  |    2 +-
 eclipse/plugins/org.eclipse.jsch.ui/plugin.xml     |   11 +
 .../src/org/eclipse/jsch/internal/ui/Messages.java |    2 +-
 .../internal/ui/preference/PreferencePage.java     |    2 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../participants/ProcessorBasedRefactoring.java    |    6 +-
 .../participants/RefactoringProcessor.java         |    8 +-
 .../resource/MoveResourcesDescriptor.java          |    4 +-
 .../internal/core/refactoring/UndoManager2.java    |   48 +-
 .../history/RefactoringHistoryManager.java         |   21 +-
 .../resource/RenameResourceProcessor.java          |    8 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../ui/refactoring/AbstractChangeNode.java         |    6 +-
 .../ui/refactoring/RefactoringStatusViewer.java    |   16 +-
 .../ui/refactoring/RefactoringWizardDialog2.java   |    7 +-
 .../history/RefactoringHistoryControl.java         |   38 +-
 .../ltk/internal/ui/refactoring/util/SWTUtil.java  |   24 +-
 .../ltk/ui/refactoring/RefactoringWizard.java      |   44 +-
 .../RefactoringWizardOpenOperation.java            |    3 +-
 eclipse/plugins/org.eclipse.osgi.jmx/.classpath    |    7 -
 eclipse/plugins/org.eclipse.osgi.jmx/.project      |   28 -
 .../.settings/org.eclipse.jdt.core.prefs           |  309 -
 .../.settings/org.eclipse.jdt.ui.prefs             |    9 -
 .../org.eclipse.osgi.jmx/META-INF/MANIFEST.MF      |   23 -
 eclipse/plugins/org.eclipse.osgi.jmx/about.html    |   28 -
 .../plugins/org.eclipse.osgi.jmx/build.properties  |   20 -
 .../org.eclipse.osgi.jmx/icons/bundles/bundle.gif  |  Bin 335 -> 0 bytes
 .../icons/bundles/bundle_provider.gif              |  Bin 344 -> 0 bytes
 .../icons/bundles/bundle_service.gif               |  Bin 581 -> 0 bytes
 .../icons/bundles/component.gif                    |  Bin 197 -> 0 bytes
 .../icons/bundles/mbean_operation.gif              |  Bin 111 -> 0 bytes
 .../icons/bundles/mbean_operation_none.gif         |  Bin 954 -> 0 bytes
 .../icons/bundles/mbean_operations.gif             |  Bin 923 -> 0 bytes
 .../icons/bundles/ovr_bundle_active.gif            |  Bin 122 -> 0 bytes
 .../icons/bundles/ovr_bundle_resolved.gif          |  Bin 119 -> 0 bytes
 .../icons/bundles/ovr_bundle_stopped.gif           |  Bin 168 -> 0 bytes
 .../icons/services/bundle_reg_service.gif          |  Bin 225 -> 0 bytes
 .../icons/services/bundle_reg_service.png          |  Bin 423 -> 0 bytes
 .../icons/services/bundle_use_reg_service.gif      |  Bin 238 -> 0 bytes
 .../icons/services/bundle_use_reg_service.png      |  Bin 392 -> 0 bytes
 .../icons/services/bundle_use_service.gif          |  Bin 225 -> 0 bytes
 .../icons/services/bundle_use_service.png          |  Bin 452 -> 0 bytes
 .../icons/services/service.gif                     |  Bin 197 -> 0 bytes
 .../icons/services/service_provider.gif            |  Bin 364 -> 0 bytes
 eclipse/plugins/org.eclipse.osgi.jmx/plugin.xml    |   28 -
 .../org/eclipse/osgi/jmx/internal/Activator.java   |   87 -
 .../osgi/jmx/internal/BundleContribution.java      |  475 --
 .../jmx/internal/BundleContributionMessages.java   |   37 -
 .../internal/BundleContributionMessages.properties |   19 -
 .../jmx/internal/BundleContributionProvider.java   |  221 -
 .../eclipse/osgi/jmx/internal/BundleMessages.java  |   27 -
 .../osgi/jmx/internal/BundleMessages.properties    |   13 -
 .../osgi/jmx/internal/BundlePackagesProvider.java  |  221 -
 .../osgi/jmx/internal/BundleRequiresProvider.java  |  152 -
 .../org/eclipse/osgi/jmx/internal/BundleUtils.java |  176 -
 .../osgi/jmx/internal/ServiceContribution.java     |  241 -
 .../jmx/internal/ServiceContributionMessages.java  |   32 -
 .../ServiceContributionMessages.properties         |   14 -
 .../jmx/internal/ServiceContributionProvider.java  |  170 -
 .../org.eclipse.osgi.services/META-INF/MANIFEST.MF |   18 +-
 .../org.eclipse.osgi.services/META-INF/p2.inf      |   14 +
 .../org.eclipse.osgi.services/plugin.properties    |    1 -
 .../src/org/osgi/service/cm/Configuration.java     |  113 +-
 .../org/osgi/service/cm/ConfigurationAdmin.java    |  188 +-
 .../org/osgi/service/cm/ConfigurationEvent.java    |   46 +-
 .../osgi/service/cm/ConfigurationException.java    |   18 +-
 .../org/osgi/service/cm/ConfigurationListener.java |   24 +-
 .../osgi/service/cm/ConfigurationPermission.java   |   52 +-
 .../org/osgi/service/cm/ConfigurationPlugin.java   |   52 +-
 .../src/org/osgi/service/cm/ManagedService.java    |   46 +-
 .../org/osgi/service/cm/ManagedServiceFactory.java |   30 +-
 .../src/org/osgi/service/cm/package-info.java      |   38 +
 .../src/org/osgi/service/cm/package.html           |   11 -
 .../src/org/osgi/service/cm/packageinfo            |    2 +-
 .../osgi/service/component/ComponentConstants.java |   23 +-
 .../osgi/service/component/ComponentContext.java   |   81 +-
 .../osgi/service/component/ComponentException.java |   12 +-
 .../osgi/service/component/ComponentFactory.java   |   15 +-
 .../osgi/service/component/ComponentInstance.java  |    7 +-
 .../org/osgi/service/component/package-info.java   |   38 +
 .../src/org/osgi/service/component/package.html    |   11 -
 .../src/org/osgi/service/device/Constants.java     |   15 +-
 .../src/org/osgi/service/device/Device.java        |   14 +-
 .../src/org/osgi/service/device/Driver.java        |   30 +-
 .../src/org/osgi/service/device/DriverLocator.java |   24 +-
 .../org/osgi/service/device/DriverSelector.java    |   16 +-
 .../src/org/osgi/service/device/Match.java         |   11 +-
 .../src/org/osgi/service/device/package-info.java  |   38 +
 .../src/org/osgi/service/device/package.html       |   10 -
 .../src/org/osgi/service/event/Event.java          |  225 +-
 .../src/org/osgi/service/event/EventAdmin.java     |   14 +-
 .../src/org/osgi/service/event/EventConstants.java |  117 +-
 .../src/org/osgi/service/event/EventHandler.java   |   22 +-
 .../org/osgi/service/event/EventProperties.java    |  262 +
 .../org/osgi/service/event/TopicPermission.java    |  128 +-
 .../src/org/osgi/service/event/package-info.java   |   38 +
 .../src/org/osgi/service/event/package.html        |   10 -
 .../src/org/osgi/service/event/packageinfo         |    2 +-
 .../src/org/osgi/service/http/HttpContext.java     |   72 +-
 .../src/org/osgi/service/http/HttpService.java     |   75 +-
 .../org/osgi/service/http/NamespaceException.java  |   16 +-
 .../src/org/osgi/service/http/package-info.java    |   38 +
 .../src/org/osgi/service/http/package.html         |   10 -
 .../src/org/osgi/service/io/ConnectionFactory.java |   30 +-
 .../src/org/osgi/service/io/ConnectorService.java  |   50 +-
 .../src/org/osgi/service/io/package-info.java      |   38 +
 .../src/org/osgi/service/io/package.html           |   10 -
 .../src/org/osgi/service/log/LogEntry.java         |   55 +-
 .../src/org/osgi/service/log/LogListener.java      |   18 +-
 .../src/org/osgi/service/log/LogReaderService.java |   52 +-
 .../src/org/osgi/service/log/LogService.java       |   43 +-
 .../src/org/osgi/service/log/package-info.java     |   38 +
 .../src/org/osgi/service/log/package.html          |   11 -
 .../osgi/service/metatype/AttributeDefinition.java |  214 +-
 .../osgi/service/metatype/MetaTypeInformation.java |    5 +-
 .../osgi/service/metatype/MetaTypeProvider.java    |   53 +-
 .../org/osgi/service/metatype/MetaTypeService.java |   15 +-
 .../service/metatype/ObjectClassDefinition.java    |   32 +-
 .../org/osgi/service/metatype/package-info.java    |   38 +
 .../src/org/osgi/service/metatype/package.html     |   11 -
 .../src/org/osgi/service/metatype/packageinfo      |    2 +-
 .../service/provisioning/ProvisioningService.java  |  103 +-
 .../osgi/service/provisioning/package-info.java    |   38 +
 .../src/org/osgi/service/provisioning/package.html |   10 -
 .../src/org/osgi/service/upnp/UPnPAction.java      |   42 +-
 .../src/org/osgi/service/upnp/UPnPDevice.java      |   74 +-
 .../org/osgi/service/upnp/UPnPEventListener.java   |   26 +-
 .../src/org/osgi/service/upnp/UPnPException.java   |    4 +-
 .../src/org/osgi/service/upnp/UPnPIcon.java        |   22 +-
 .../osgi/service/upnp/UPnPLocalStateVariable.java  |    6 +-
 .../src/org/osgi/service/upnp/UPnPService.java     |   58 +-
 .../org/osgi/service/upnp/UPnPStateVariable.java   |   74 +-
 .../src/org/osgi/service/upnp/package-info.java    |   38 +
 .../src/org/osgi/service/upnp/package.html         |   10 -
 .../org/osgi/service/useradmin/Authorization.java  |   45 +-
 .../src/org/osgi/service/useradmin/Group.java      |   87 +-
 .../src/org/osgi/service/useradmin/Role.java       |   59 +-
 .../src/org/osgi/service/useradmin/User.java       |   69 +-
 .../src/org/osgi/service/useradmin/UserAdmin.java  |   95 +-
 .../org/osgi/service/useradmin/UserAdminEvent.java |   40 +-
 .../osgi/service/useradmin/UserAdminListener.java  |   18 +-
 .../service/useradmin/UserAdminPermission.java     |  104 +-
 .../org/osgi/service/useradmin/package-info.java   |   38 +
 .../src/org/osgi/service/useradmin/package.html    |   10 -
 .../org/osgi/service/wireadmin/BasicEnvelope.java  |   14 +-
 .../src/org/osgi/service/wireadmin/Consumer.java   |   46 +-
 .../src/org/osgi/service/wireadmin/Envelope.java   |   38 +-
 .../src/org/osgi/service/wireadmin/Producer.java   |   70 +-
 .../src/org/osgi/service/wireadmin/Wire.java       |  177 +-
 .../src/org/osgi/service/wireadmin/WireAdmin.java  |  121 +-
 .../org/osgi/service/wireadmin/WireAdminEvent.java |  104 +-
 .../osgi/service/wireadmin/WireAdminListener.java  |   34 +-
 .../org/osgi/service/wireadmin/WireConstants.java  |  113 +-
 .../org/osgi/service/wireadmin/WirePermission.java |   72 +-
 .../org/osgi/service/wireadmin/package-info.java   |   38 +
 .../src/org/osgi/service/wireadmin/package.html    |   11 -
 .../org.eclipse.osgi.util/META-INF/MANIFEST.MF     |    3 +-
 .../org.eclipse.osgi.util/plugin.properties        |    1 -
 .../src/org/osgi/util/measurement/Measurement.java |  176 +-
 .../src/org/osgi/util/measurement/State.java       |   34 +-
 .../src/org/osgi/util/measurement/Unit.java        |  142 +-
 .../org/osgi/util/measurement/package-info.java    |   32 +
 .../src/org/osgi/util/measurement/package.html     |   10 -
 .../src/org/osgi/util/position/Position.java       |   40 +-
 .../src/org/osgi/util/position/package-info.java   |   32 +
 .../src/org/osgi/util/position/package.html        |   10 -
 .../src/org/osgi/util/xml/XMLParserActivator.java  |   78 +-
 .../src/org/osgi/util/xml/package-info.java        |   32 +
 .../src/org/osgi/util/xml/package.html             |   10 -
 eclipse/plugins/org.eclipse.osgi/.classpath        |    4 +-
 .../plugins/org.eclipse.osgi/.classpath.osgisource |   21 +
 .../org.eclipse.osgi/.settings/.api_filters        | 1201 +++-
 .../.settings/org.eclipse.jdt.core.prefs           |   26 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 -
 .../.settings/org.eclipse.pde.api.tools.prefs      |    4 +-
 .../CDC-1.0_Foundation-1.0.profile                 |    3 +
 .../CDC-1.1_Foundation-1.1.profile                 |    3 +
 eclipse/plugins/org.eclipse.osgi/J2SE-1.2.profile  |    4 +-
 eclipse/plugins/org.eclipse.osgi/J2SE-1.3.profile  |    5 +-
 eclipse/plugins/org.eclipse.osgi/J2SE-1.4.profile  |    5 +-
 eclipse/plugins/org.eclipse.osgi/J2SE-1.5.profile  |    5 +-
 .../plugins/org.eclipse.osgi/JavaSE-1.6.profile    |    5 +-
 .../plugins/org.eclipse.osgi/JavaSE-1.7.profile    |    6 +-
 .../plugins/org.eclipse.osgi/META-INF/MANIFEST.MF  |   25 +-
 .../org.eclipse.osgi/OSGi_Minimum-1.0.profile      |    2 +
 .../org.eclipse.osgi/OSGi_Minimum-1.1.profile      |    2 +
 .../org.eclipse.osgi/OSGi_Minimum-1.2.profile      |    2 +
 eclipse/plugins/org.eclipse.osgi/bnd.bnd           |   35 +
 eclipse/plugins/org.eclipse.osgi/build.properties  |   20 +-
 .../framework/internal/core/ConsoleManager.java    |   91 +-
 .../internal/core/ConsoleMessages.properties       |    7 +-
 .../osgi/framework/internal/core/ConsoleMsg.java   |    5 +-
 .../internal/core/FrameworkCommandInterpreter.java |  164 +-
 .../internal/core/FrameworkCommandProvider.java    |  261 +-
 .../framework/internal/core/FrameworkConsole.java  |   15 +-
 .../osgi/framework/adaptor/BundleClassLoader.java  |   58 +-
 .../eclipse/osgi/framework/adaptor/BundleData.java |   15 +-
 .../framework/adaptor/ClassLoaderDelegate.java     |   28 +-
 .../framework/adaptor/ClassLoaderDelegateHook.java |    8 +-
 .../eclipse/osgi/framework/adaptor/FilePath.java   |    4 +-
 .../osgi/framework/adaptor/FrameworkAdaptor.java   |   22 +-
 .../org/eclipse/osgi/framework/util/Headers.java   |   93 +-
 .../eclipse/osgi/framework/util/KeyedHashSet.java  |    8 +-
 .../eclipse/osgi/framework/util/ObjectPool.java    |    8 +-
 .../osgi/service/resolver/BaseDescription.java     |   32 +-
 .../eclipse/osgi/service/resolver/BundleDelta.java |    7 +-
 .../osgi/service/resolver/BundleDescription.java   |   44 +-
 .../service/resolver/ExportPackageDescription.java |    6 +-
 .../osgi/service/resolver/GenericDescription.java  |   31 +-
 .../resolver/ImportPackageSpecification.java       |    6 +-
 .../service/resolver/NativeCodeDescription.java    |    7 +-
 .../osgi/service/resolver/PlatformAdmin.java       |    5 +-
 .../eclipse/osgi/service/resolver/Resolver.java    |    8 +-
 .../osgi/service/resolver/ResolverError.java       |   22 +-
 .../service/resolver/ResolverHookException.java    |   29 +
 .../org/eclipse/osgi/service/resolver/State.java   |  112 +-
 .../eclipse/osgi/service/resolver/StateDelta.java  |    9 +-
 .../osgi/service/resolver/StateObjectFactory.java  |   30 +-
 .../eclipse/osgi/service/resolver/StateWire.java   |   81 +
 .../osgi/service/resolver/VersionConstraint.java   |   14 +-
 .../osgi/internal/composite/CompositeBase.java     |    4 +-
 .../internal/composite/CompositeClassLoader.java   |   17 +-
 .../osgi/internal/composite/CompositeHelper.java   |   16 +-
 .../osgi/internal/composite/CompositeImpl.java     |   20 +-
 .../osgi/framework/console/CommandInterpreter.java |    2 +-
 .../osgi/framework/console/ConsoleSession.java     |   10 +-
 .../framework/eventmgr/CopyOnWriteIdentityMap.java |  439 --
 .../osgi/framework/eventmgr/EventDispatcher.java   |   49 -
 .../osgi/framework/eventmgr/EventListeners.java    |   89 -
 .../osgi/framework/eventmgr/EventManager.java      |  416 --
 .../osgi/framework/eventmgr/ListenerQueue.java     |  152 -
 .../framework/internal/core/AbstractBundle.java    |  374 +-
 .../osgi/framework/internal/core/AliasMapper.java  |  109 +-
 .../framework/internal/core/BundleContextImpl.java |  189 +-
 .../framework/internal/core/BundleFragment.java    |   22 +-
 .../osgi/framework/internal/core/BundleHost.java   |  124 +-
 .../framework/internal/core/BundleRepository.java  |   20 +-
 .../osgi/framework/internal/core/BundleSource.java |    8 +-
 .../osgi/framework/internal/core/Constants.java    |   25 +-
 .../internal/core/CoreResolverHookFactory.java     |  198 +
 .../framework/internal/core/EquinoxLauncher.java   |   92 +-
 .../internal/core/ExportedPackageImpl.java         |   13 +-
 .../osgi/framework/internal/core/FilterImpl.java   |  598 +-
 .../osgi/framework/internal/core/Framework.java    |  649 ++-
 .../internal/core/InternalSystemBundle.java        |   96 +-
 .../internal/core/ManifestLocalization.java        |  172 +-
 .../framework/internal/core/PackageAdminImpl.java  |  227 +-
 .../framework/internal/core/StartLevelEvent.java   |   20 +-
 .../framework/internal/core/StartLevelManager.java |  104 +-
 .../internal/core/SystemBundleActivator.java       |   44 +-
 .../internal/core/UniversalUniqueIdentifier.java   |  266 +
 .../eclipse/osgi/framework/internal/core/Util.java |    7 +-
 .../osgi/framework/internal/core/osname.aliases    |    4 +-
 .../internal/protocol/ContentHandlerFactory.java   |   19 +-
 .../internal/protocol/ContentHandlerProxy.java     |   28 +-
 .../internal/protocol/MultiplexingFactory.java     |   51 +-
 .../protocol/MultiplexingURLStreamHandler.java     |   26 +-
 .../internal/protocol/StreamHandlerFactory.java    |   39 +-
 .../URLStreamHandlerFactoryProxyFor15.java         |    3 +-
 .../internal/protocol/URLStreamHandlerProxy.java   |   33 +-
 .../eclipse/osgi/internal/loader/BundleLoader.java |  283 +-
 .../osgi/internal/loader/BundleLoaderProxy.java    |   29 +-
 .../internal/loader/FilteredSourcePackage.java     |   22 +-
 .../osgi/internal/loader/MultiSourcePackage.java   |   25 +-
 .../osgi/internal/loader/NullPackageSource.java    |   14 +-
 .../osgi/internal/loader/PackageSource.java        |    9 +-
 .../osgi/internal/loader/SingleSourcePackage.java  |   14 +-
 .../osgi/internal/loader/SystemBundleLoader.java   |   67 +-
 .../internal/loader/buddy/DependentPolicy.java     |   20 +-
 .../osgi/internal/loader/buddy/GlobalPolicy.java   |    8 +-
 .../osgi/internal/loader/buddy/IBuddyPolicy.java   |    6 +-
 .../osgi/internal/loader/buddy/PolicyHandler.java  |   36 +-
 .../internal/loader/buddy/RegisteredPolicy.java    |   22 +-
 .../osgi/internal/loader/buddy/SystemPolicy.java   |    8 +-
 .../osgi/internal/permadmin/BundlePermissions.java |    8 +-
 .../internal/permadmin/EquinoxSecurityManager.java |   43 +-
 .../internal/permadmin/PermissionAdminTable.java   |   11 +-
 .../permadmin/PermissionInfoCollection.java        |   29 +-
 .../osgi/internal/permadmin/PermissionsHash.java   |   12 +-
 .../permadmin/SecurePermissionStorage.java         |   26 +-
 .../osgi/internal/permadmin/SecurityAdmin.java     |   86 +-
 .../osgi/internal/permadmin/SecurityRow.java       |   30 +-
 .../osgi/internal/permadmin/SecurityTable.java     |    4 +-
 .../internal/permadmin/SecurityTableUpdate.java    |    9 +-
 .../osgi/internal/permadmin/implied.permissions    |    6 +-
 .../internal/profile/DefaultProfileLogger.java     |   22 +-
 .../org/eclipse/osgi/internal/profile/Profile.java |    4 +-
 .../serviceregistry/FilteredServiceListener.java   |   10 +-
 .../osgi/internal/serviceregistry/HookContext.java |   49 +
 .../serviceregistry/ModifiedServiceEvent.java      |    4 +-
 .../serviceregistry/ServiceProperties.java         |   28 +-
 .../serviceregistry/ServiceReferenceImpl.java      |   16 +-
 .../serviceregistry/ServiceRegistrationImpl.java   |   95 +-
 .../internal/serviceregistry/ServiceRegistry.java  |  666 +-
 .../osgi/internal/serviceregistry/ServiceUse.java  |   74 +-
 .../serviceregistry/ShrinkableCollection.java      |  154 +-
 .../ShrinkableEntrySetValueCollection.java         |   65 +
 .../ShrinkableValueCollectionMap.java              |  191 +
 .../framework/org/eclipse/osgi/launch/Equinox.java |   67 +-
 .../eclipse/osgi/launch/EquinoxFWClassLoader.java  |    6 +-
 .../org/eclipse/osgi/launch/EquinoxFactory.java    |    4 +-
 .../org.eclipse.osgi/customBuildCallbacks.xml      |  164 +
 .../org/eclipse/osgi/baseadaptor/BaseAdaptor.java  |  229 +-
 .../src/org/eclipse/osgi/baseadaptor/BaseData.java |   62 +-
 .../org/eclipse/osgi/baseadaptor/HookRegistry.java |   24 +-
 .../osgi/baseadaptor/bundlefile/BundleEntry.java   |    4 +-
 .../osgi/baseadaptor/bundlefile/BundleFile.java    |   13 +-
 .../bundlefile/BundleFileWrapperChain.java         |    7 +-
 .../osgi/baseadaptor/bundlefile/DirBundleFile.java |   41 +-
 .../baseadaptor/bundlefile/DirZipBundleEntry.java  |    7 +-
 .../baseadaptor/bundlefile/FileBundleEntry.java    |    3 +-
 .../baseadaptor/bundlefile/MRUBundleFileList.java  |   16 +-
 .../bundlefile/NestedDirBundleFile.java            |   49 +-
 .../baseadaptor/bundlefile/ZipBundleEntry.java     |    4 +-
 .../osgi/baseadaptor/bundlefile/ZipBundleFile.java |   33 +-
 .../osgi/baseadaptor/hooks/ClassLoadingHook.java   |    4 +-
 .../baseadaptor/hooks/ClassLoadingStatsHook.java   |    6 +-
 .../osgi/baseadaptor/hooks/StorageHook.java        |    6 +-
 .../osgi/baseadaptor/loader/BaseClassLoader.java   |    6 +-
 .../osgi/baseadaptor/loader/ClasspathManager.java  |  193 +-
 .../internal/core/BundleResourceHandler.java       |    4 +-
 .../internal/protocol/reference/Handler.java       |    7 +-
 .../protocol/reference/ReferenceURLConnection.java |    3 +-
 .../osgi/internal/baseadaptor/AdaptorMsg.java      |    6 +-
 .../osgi/internal/baseadaptor/AdaptorUtil.java     |   25 +-
 .../osgi/internal/baseadaptor/ArrayMap.java        |  160 +
 .../internal/baseadaptor/BaseClassLoadingHook.java |   10 +-
 .../baseadaptor/BasePermissionStorage.java         |   28 +-
 .../osgi/internal/baseadaptor/BaseStorage.java     |  200 +-
 .../osgi/internal/baseadaptor/BaseStorageHook.java |   53 +-
 .../osgi/internal/baseadaptor/BundleInstall.java   |   13 +-
 .../osgi/internal/baseadaptor/BundleUninstall.java |   10 +-
 .../osgi/internal/baseadaptor/BundleUpdate.java    |   12 +-
 .../internal/baseadaptor/DefaultClassLoader.java   |   53 +-
 .../internal/baseadaptor/DevClassLoadingHook.java  |    8 +-
 .../internal/baseadaptor/DevClassPathHelper.java   |   99 +-
 .../baseadaptor/ExternalMessages.properties        |    6 +-
 .../osgi/internal/baseadaptor/StateManager.java    |   60 +-
 .../internal/baseadaptor/SystemBundleData.java     |   65 +-
 .../baseadaptor/weaving/DynamicImportList.java     |   83 +
 .../weaving/WeavingHookConfigurator.java           |  129 +
 .../baseadaptor/weaving/WovenClassImpl.java        |  198 +
 .../eclipse/core/runtime/adaptor/EclipseLog.java   |  690 --
 .../core/runtime/adaptor/EclipseStarter.java       |  151 +-
 .../core/runtime/adaptor/LocationManager.java      |    8 +-
 .../runtime/internal/adaptor/CachedManifest.java   |   24 +-
 .../runtime/internal/adaptor/ContextFinder.java    |   59 +-
 .../internal/adaptor/DefaultStartupMonitor.java    |    4 +-
 .../internal/adaptor/EclipseAdaptorHook.java       |   33 +-
 .../internal/adaptor/EclipseAppLauncher.java       |   10 +-
 .../internal/adaptor/EclipseClassLoadingHook.java  |   22 +-
 .../internal/adaptor/EclipseCommandProvider.java   |   87 +-
 .../internal/adaptor/EclipseEnvironmentInfo.java   |   16 +-
 .../internal/adaptor/EclipseErrorHandler.java      |   15 +-
 .../internal/adaptor/EclipseLazyStarter.java       |   36 +-
 .../internal/adaptor/EclipseLogFactory.java        |  107 +
 .../runtime/internal/adaptor/EclipseLogHook.java   |  127 +-
 .../runtime/internal/adaptor/EclipseLogWriter.java |  719 ++
 .../internal/adaptor/EclipseStorageHook.java       |   77 +-
 .../core/runtime/internal/adaptor/IPluginInfo.java |    8 +-
 .../runtime/internal/adaptor/MessageHelper.java    |    2 +-
 .../internal/adaptor/PluginConverterImpl.java      |  153 +-
 .../runtime/internal/adaptor/PluginParser.java     |   98 +-
 .../core/runtime/internal/stats/BundleStats.java   |    7 +-
 .../core/runtime/internal/stats/ClassStats.java    |    7 +-
 .../runtime/internal/stats/ClassloaderStats.java   |   49 +-
 .../internal/stats/ResourceBundleStats.java        |    8 +-
 .../core/runtime/internal/stats/StatsManager.java  |   37 +-
 .../equinox/log/internal/BasicReadWriteLock.java   |   50 +
 .../equinox/log/internal/EventAdminAdapter.java    |  117 +
 .../log/internal/EventAdminLogListener.java        |  153 +
 .../equinox/log/internal/ExtendedLogEntryImpl.java |  120 +
 .../internal/ExtendedLogReaderServiceFactory.java  |  225 +
 .../log/internal/ExtendedLogReaderServiceImpl.java |   66 +
 .../log/internal/ExtendedLogServiceFactory.java    |   73 +
 .../log/internal/ExtendedLogServiceImpl.java       |   93 +
 .../equinox/log/internal/LogServiceManager.java    |  316 +
 .../eclipse/equinox/log/internal/LoggerImpl.java   |   56 +
 .../equinox/log/internal/SerializedTaskQueue.java  |   58 +
 .../service/pluginconversion/PluginConverter.java  |    8 +-
 .../org.eclipse.osgi/hookconfigurators.properties  |    5 +-
 .../src/org/osgi/framework/AdaptPermission.java    |  635 ++
 .../src/org/osgi/framework/AdminPermission.java    |  290 +-
 .../src/org/osgi/framework/AllServiceListener.java |   38 +-
 .../osgi/src/org/osgi/framework/Bundle.java        |  904 ++--
 .../src/org/osgi/framework/BundleActivator.java    |   34 +-
 .../osgi/src/org/osgi/framework/BundleContext.java |  804 ++-
 .../osgi/src/org/osgi/framework/BundleEvent.java   |   61 +-
 .../src/org/osgi/framework/BundleException.java    |   58 +-
 .../src/org/osgi/framework/BundleListener.java     |   20 +-
 .../src/org/osgi/framework/BundlePermission.java   |  127 +-
 .../src/org/osgi/framework/BundleReference.java    |   13 +-
 .../org/osgi/framework/CapabilityPermission.java   |  807 +++
 .../osgi/src/org/osgi/framework/Configurable.java  |   10 +-
 .../osgi/src/org/osgi/framework/Constants.java     |  930 ++-
 .../osgi/src/org/osgi/framework/Filter.java        |  113 +-
 .../src/org/osgi/framework/FrameworkEvent.java     |   34 +-
 .../src/org/osgi/framework/FrameworkListener.java  |   24 +-
 .../osgi/src/org/osgi/framework/FrameworkUtil.java |  679 +-
 .../org/osgi/framework/InvalidSyntaxException.java |   20 +-
 .../src/org/osgi/framework/PackagePermission.java  |  197 +-
 .../osgi/src/org/osgi/framework/ServiceEvent.java  |   20 +-
 .../src/org/osgi/framework/ServiceException.java   |   27 +-
 .../src/org/osgi/framework/ServiceFactory.java     |   93 +-
 .../src/org/osgi/framework/ServiceListener.java    |   32 +-
 .../src/org/osgi/framework/ServicePermission.java  |  276 +-
 .../src/org/osgi/framework/ServiceReference.java   |  116 +-
 .../org/osgi/framework/ServiceRegistration.java    |   44 +-
 .../src/org/osgi/framework/SignerProperty.java     |   33 +-
 .../osgi/framework/SynchronousBundleListener.java  |   53 +-
 .../osgi/src/org/osgi/framework/Version.java       |  104 +-
 .../org/osgi/framework/hooks/bundle/EventHook.java |   60 +
 .../org/osgi/framework/hooks/bundle/FindHook.java  |   66 +
 .../framework/hooks/resolver/ResolverHook.java     |  198 +
 .../hooks/resolver/ResolverHookFactory.java        |   94 +
 .../osgi/framework/hooks/service/EventHook.java    |   28 +-
 .../framework/hooks/service/EventListenerHook.java |   61 +
 .../org/osgi/framework/hooks/service/FindHook.java |   33 +-
 .../osgi/framework/hooks/service/ListenerHook.java |   57 +-
 .../framework/hooks/weaving/WeavingException.java  |   51 +
 .../osgi/framework/hooks/weaving/WeavingHook.java  |   63 +
 .../osgi/framework/hooks/weaving/WovenClass.java   |  157 +
 .../src/org/osgi/framework/launch/Framework.java   |  125 +-
 .../osgi/framework/launch/FrameworkFactory.java    |   13 +-
 .../framework/startlevel/BundleStartLevel.java     |  106 +
 .../framework/startlevel/FrameworkStartLevel.java  |  161 +
 .../osgi/framework/wiring/BundleCapability.java    |   61 +
 .../osgi/framework/wiring/BundleRequirement.java   |   73 +
 .../org/osgi/framework/wiring/BundleRevision.java  |  255 +
 .../org/osgi/framework/wiring/BundleRevisions.java |   67 +
 .../src/org/osgi/framework/wiring/BundleWire.java  |   72 +
 .../org/osgi/framework/wiring/BundleWiring.java    |  344 +
 .../org/osgi/framework/wiring/FrameworkWiring.java |  176 +
 .../condpermadmin/BundleLocationCondition.java     |   12 +-
 .../condpermadmin/BundleSignerCondition.java       |   18 +-
 .../org/osgi/service/condpermadmin/Condition.java  |   43 +-
 .../osgi/service/condpermadmin/ConditionInfo.java  |   88 +-
 .../condpermadmin/ConditionalPermissionAdmin.java  |   65 +-
 .../condpermadmin/ConditionalPermissionInfo.java   |   49 +-
 .../condpermadmin/ConditionalPermissionUpdate.java |   21 +-
 .../osgi/service/framework/CompositeBundle.java    |   10 +-
 .../service/framework/CompositeBundleFactory.java  |   19 +-
 .../osgi/service/framework/SurrogateBundle.java    |   11 +-
 .../osgi/src/org/osgi/service/log/LogEntry.java    |  109 +
 .../osgi/src/org/osgi/service/log/LogListener.java |   50 +
 .../src/org/osgi/service/log/LogReaderService.java |   97 +
 .../osgi/src/org/osgi/service/log/LogService.java  |  156 +
 .../src/org/osgi/service/log/package-info.java     |   38 +
 .../osgi}/src/org/osgi/service/log/packageinfo     |    0
 .../osgi/service/packageadmin/ExportedPackage.java |   41 +-
 .../osgi/service/packageadmin/PackageAdmin.java    |  105 +-
 .../osgi/service/packageadmin/RequiredBundle.java  |   43 +-
 .../service/permissionadmin/PermissionAdmin.java   |   33 +-
 .../service/permissionadmin/PermissionInfo.java    |   86 +-
 .../org/osgi/service/startlevel/StartLevel.java    |   49 +-
 .../url/AbstractURLStreamHandlerService.java       |   42 +-
 .../src/org/osgi/service/url/URLConstants.java     |    9 +-
 .../osgi/service/url/URLStreamHandlerService.java  |   28 +-
 .../osgi/service/url/URLStreamHandlerSetter.java   |   16 +-
 .../src/org/osgi/util/tracker/AbstractTracked.java |   92 +-
 .../src/org/osgi/util/tracker/BundleTracker.java   |  260 +-
 .../osgi/util/tracker/BundleTrackerCustomizer.java |   75 +-
 .../src/org/osgi/util/tracker/ServiceTracker.java  |  608 +-
 .../util/tracker/ServiceTrackerCustomizer.java     |   70 +-
 .../plugins/org.eclipse.osgi/osgi/src2/empty.txt   |    1 +
 .../osgi/internal/module/GenericCapability.java    |   23 +-
 .../osgi/internal/module/GenericConstraint.java    |   51 +-
 .../osgi/internal/module/GroupingChecker.java      |  154 +-
 .../eclipse/osgi/internal/module/MappedList.java   |   64 +-
 .../osgi/internal/module/PermissionChecker.java    |   33 +-
 .../osgi/internal/module/ResolverBundle.java       |  304 +-
 .../osgi/internal/module/ResolverConstraint.java   |   12 +-
 .../osgi/internal/module/ResolverExport.java       |    4 +-
 .../eclipse/osgi/internal/module/ResolverImpl.java | 1407 +++--
 .../osgi/internal/module/VersionHashMap.java       |   84 +-
 .../osgi/internal/module/VersionSupplier.java      |   15 +-
 .../internal/resolver/BaseDescriptionImpl.java     |  118 +-
 .../osgi/internal/resolver/BundleDeltaImpl.java    |    6 +-
 .../internal/resolver/BundleDescriptionImpl.java   |  578 ++-
 .../internal/resolver/BundleSpecificationImpl.java |   83 +-
 .../osgi/internal/resolver/ComputeNodeOrder.java   |   78 +-
 .../resolver/ExportPackageDescriptionImpl.java     |  104 +-
 .../internal/resolver/GenericDescriptionImpl.java  |  106 +-
 .../resolver/GenericSpecificationImpl.java         |   56 +-
 .../internal/resolver/HostSpecificationImpl.java   |   81 +-
 .../resolver/ImportPackageSpecificationImpl.java   |   64 +-
 .../resolver/NativeCodeDescriptionImpl.java        |   21 +-
 .../resolver/NativeCodeSpecificationImpl.java      |   27 +-
 .../osgi/internal/resolver/ReadOnlyState.java      |   38 +-
 .../osgi/internal/resolver/ResolverErrorImpl.java  |    4 +-
 .../osgi/internal/resolver/StateBuilder.java       |  362 +-
 .../osgi/internal/resolver/StateDeltaImpl.java     |   23 +-
 .../osgi/internal/resolver/StateHelperImpl.java    |  261 +-
 .../eclipse/osgi/internal/resolver/StateImpl.java  |  461 +-
 .../internal/resolver/StateMessages.properties     |    3 +-
 .../eclipse/osgi/internal/resolver/StateMsg.java   |    3 +-
 .../internal/resolver/StateObjectFactoryImpl.java  |   78 +-
 .../osgi/internal/resolver/StateReader.java        |  192 +-
 .../osgi/internal/resolver/StateWriter.java        |  303 +-
 .../osgi/internal/resolver/SystemState.java        |   27 +-
 .../eclipse/osgi/internal/resolver/UserState.java  |    7 +-
 .../internal/resolver/VersionConstraintImpl.java   |  142 +-
 .../service/security/AuthorizationEngine.java      |   24 +-
 .../service/security/KeyStoreTrustEngine.java      |   15 +-
 .../signedcontent/LegacyVerifierFactory.java       |    7 +-
 .../internal/signedcontent/PKCS7DateParser.java    |   14 +-
 .../internal/signedcontent/PKCS7Processor.java     |   34 +-
 .../signedcontent/SignatureBlockProcessor.java     |   49 +-
 .../internal/signedcontent/SignedBundleFile.java   |    4 +-
 .../internal/signedcontent/SignedBundleHook.java   |   41 +-
 .../internal/signedcontent/SignedContentFile.java  |   12 +-
 .../internal/signedcontent/SignedContentImpl.java  |   28 +-
 .../internal/signedcontent/SignedStorageHook.java  |   35 +-
 .../signedcontent/TrustEngineListener.java         |   31 +-
 .../plugins/org.eclipse.osgi/supplement/.classpath |    4 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   16 +-
 .../supplement/META-INF/MANIFEST.MF                |   14 +-
 .../org.eclipse.osgi/supplement/build.properties   |    9 +-
 .../runtime/internal/adaptor/BasicLocation.java    |    6 +
 .../adaptor/EclipseAdaptorMessages.properties      |    9 +-
 .../internal/adaptor/EclipseAdaptorMsg.java        |   10 +-
 .../runtime/internal/adaptor/LocationHelper.java   |    3 +-
 .../org/eclipse/equinox/log/ExtendedLogEntry.java  |   69 +
 .../equinox/log/ExtendedLogReaderService.java      |   40 +
 .../eclipse/equinox/log/ExtendedLogService.java    |   40 +
 .../src/org/eclipse/equinox/log/LogFilter.java     |   30 +
 .../src/org/eclipse/equinox/log/LogPermission.java |   65 +
 .../equinox/log/LogPermissionCollection.java       |   59 +
 .../src/org/eclipse/equinox/log/Logger.java        |   83 +
 .../equinox/log/SynchronousLogListener.java        |   19 +
 .../org/eclipse/osgi/framework/debug/Debug.java    |   21 +-
 .../osgi/framework/debug/EclipseDebugTrace.java    |    4 +-
 .../framework/debug/FrameworkDebugOptions.java     |   63 +-
 .../framework/eventmgr/CopyOnWriteIdentityMap.java |  652 ++
 .../osgi/framework/eventmgr/EventDispatcher.java   |   49 +
 .../osgi/framework/eventmgr/EventListeners.java    |   90 +
 .../osgi/framework/eventmgr/EventManager.java      |  419 ++
 .../osgi/framework/eventmgr/ListenerQueue.java     |  151 +
 .../eclipse/osgi/framework/eventmgr/package.html   |    0
 .../internal/core/ExternalMessages.properties      |   15 +-
 .../internal/core/FrameworkProperties.java         |   10 +-
 .../eclipse/osgi/framework/internal/core/Msg.java  |   16 +-
 .../osgi/framework/internal/core/Tokenizer.java    |   47 +-
 .../internal/reliablefile/ReliableFile.java        |   20 +-
 .../reliablefile/ReliableFileInputStream.java      |    3 +-
 .../eclipse/osgi/framework/log/FrameworkLog.java   |    4 +-
 .../osgi/framework/log/FrameworkLogEntry.java      |   52 +-
 .../eclipse/osgi/framework/util/SecureAction.java  |  117 +-
 .../eclipse/osgi/service/debug/DebugOptions.java   |    6 +-
 .../service/localization/BundleLocalization.java   |   13 +-
 .../osgi/storagemanager/StorageManager.java        |   15 +-
 .../src/org/eclipse/osgi/util/ManifestElement.java |  104 +-
 .../supplement/src/org/eclipse/osgi/util/NLS.java  |   39 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../.settings/org.eclipse.jdt.ui.prefs             |   56 +
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../icons/full/ovr16/warning_ovr.gif               |  Bin 173 -> 173 bytes
 .../org.eclipse.pde.api.tools.ui/plugin.properties |   14 +-
 .../org.eclipse.pde.api.tools.ui/plugin.xml        |   20 +
 .../ui/internal/ActionFilterAdapterFactory.java    |    4 +-
 .../pde/api/tools/ui/internal/ApiUIPlugin.java     |   28 +-
 .../api/tools/ui/internal/IApiToolsConstants.java  |    4 +-
 .../tools/ui/internal/IApiToolsHelpContextIds.java |   15 +-
 .../pde/api/tools/ui/internal/StringMatcher.java   |  384 -
 .../tools/ui/internal/actions/ActionMessages.java  |    5 +-
 .../tools/ui/internal/actions/DeltaSession.java    |   33 +-
 .../tools/ui/internal/actions/ExportDialog.java    |    6 +-
 .../ui/internal/actions/actionmessages.properties  |    7 +-
 .../ApiBaselinesConfigurationBlock.java            |    8 +-
 .../ApiErrorsWarningsConfigurationBlock.java       |  780 ++-
 .../ApiErrorsWarningsPreferencePage.java           |   47 +-
 .../preferences/ApiUseScanConfigurationBlock.java  |  442 ++
 .../preferences/ApiUseScanPreferencePage.java      |  489 ++
 .../internal/preferences/PreferenceMessages.java   |   22 +-
 .../preferences/preferencemessages.properties      |   24 +-
 .../properties/ApiErrorsWarningsPropertyPage.java  |    4 +-
 .../ui/internal/use/ApiUseLaunchDelegate.java      |    9 +
 .../tools/ui/internal/use/ApiUsePatternTab.java    |   17 +-
 .../api/tools/ui/internal/use/ApiUseScanJob.java   |   63 +-
 .../api/tools/ui/internal/use/ApiUseScanTab.java   |   82 +-
 .../pde/api/tools/ui/internal/use/Messages.java    |    4 +
 .../api/tools/ui/internal/use/messages.properties  |   38 +-
 .../tools/ui/internal/views/APIToolingView.java    |    4 +-
 .../ui/internal/wizards/ApiBaselineWizardPage.java |   91 +-
 .../wizards/ApiToolingSetupRefactoring.java        |    4 +-
 .../wizards/ApiToolingSetupWizardPage.java         |    7 +-
 .../ui/internal/wizards/wizardmessages.properties  |    8 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../.settings/org.eclipse.jdt.ui.prefs             |   56 +
 .../org.eclipse.pde.api.tools/META-INF/MANIFEST.MF |    6 +-
 .../R10100_buildnotes_api_tools.html               |  473 --
 .../R10_buildnotes_api_tools.html                  |  376 -
 .../org.eclipse.pde.api.tools/build.properties     |    3 +-
 .../buildnotes_api_tools.html                      |   53 -
 .../org.eclipse.pde.api.tools/plugin.properties    |    3 +-
 .../plugins/org.eclipse.pde.api.tools/plugin.xml   |   28 +-
 .../scripts/api-tasks.properties                   |    6 +-
 .../scripts/api-tasks.xml                          |    5 +-
 .../pde/api/tools/internal/ApiBaselineManager.java |    8 +-
 .../pde/api/tools/internal/ApiDescription.java     |    2 +-
 .../pde/api/tools/internal/ApiFilterStore.java     |    6 +-
 .../internal/ApiPluginPreferenceInitializer.java   |   11 +-
 .../pde/api/tools/internal/IApiCoreConstants.java  |   13 +-
 .../pde/api/tools/internal/IApiXmlConstants.java   |   34 +-
 .../tools/internal/NonApiProjectDescription.java   |    4 +-
 .../tools/internal/WorkspaceDeltaProcessor.java    |   49 +-
 .../internal/builder/AbstractProblemDetector.java  |   76 +-
 .../tools/internal/builder/ApiAnalysisBuilder.java |  297 +-
 .../tools/internal/builder/BaseApiAnalyzer.java    |  214 +-
 .../pde/api/tools/internal/builder/BuildState.java |  178 +-
 .../tools/internal/builder/BuilderMessages.java    |    5 +-
 .../pde/api/tools/internal/builder/Reference.java  |   29 +-
 .../tools/internal/builder/ReferenceAnalyzer.java  |    8 +-
 .../tools/internal/builder/ReferenceExtractor.java |   26 +-
 .../tools/internal/builder/SystemApiDetector.java  |    3 +-
 .../internal/builder/buildermessages.properties    |    5 +-
 .../internal/comparator/ClassFileComparator.java   |   20 +-
 .../pde/api/tools/internal/comparator/Delta.java   |   32 +-
 .../tools/internal/comparator/DeltaXmlVisitor.java |    4 +-
 .../api/tools/internal/comparator/Messages.java    |    6 +-
 .../api/tools/internal/model/ApiModelFactory.java  |  102 +-
 .../api/tools/internal/model/BundleComponent.java  |    9 +-
 .../pde/api/tools/internal/model/Component.java    |   20 +-
 .../pde/api/tools/internal/model/Messages.java     |    3 +
 .../api/tools/internal/model/Messages.properties   |    3 +
 .../api/tools/internal/model/ProjectComponent.java |  193 +-
 .../internal/natures/ApiToolProjectNature.java     |    6 +-
 .../api/tools/internal/problems/ApiProblem.java    |   36 +-
 .../tools/internal/problems/ApiProblemFactory.java |   37 +
 .../internal/problems/problemmessages.properties   |    8 +
 .../api/tools/internal/provisional/ApiPlugin.java  |   50 +-
 .../internal/provisional/IApiMarkerConstants.java  |   31 +-
 .../api/tools/internal/provisional/ISession.java   |    4 +-
 .../provisional/comparator/ApiComparator.java      |   37 +-
 .../comparator/CompareApiScopeVisitor.java         |   31 +-
 .../provisional/comparator/DeltaProcessor.java     |   41 +-
 .../internal/provisional/comparator/IDelta.java    |   25 +-
 .../internal/provisional/model/IApiComponent.java  |    7 +
 .../internal/provisional/model/IApiElement.java    |    4 +-
 .../internal/provisional/problems/IApiProblem.java |   36 +-
 .../provisional/problems/IApiProblemTypes.java     |   21 +-
 .../provisional/search/ApiSearchEngine.java        |    3 +-
 .../provisional/search/IApiSearchReporter.java     |    8 +-
 .../internal/search/ConsumerReportConvertor.java   |  718 ++
 .../internal/search/IReferenceCollection.java      |   54 +
 .../tools/internal/search/MissingRefMetadata.java  |  231 +
 .../tools/internal/search/MissingRefParser.java    |  141 +
 .../internal/search/MissingRefReportConverter.java |  584 ++
 .../internal/search/ReferenceLookupVisitor.java    |   35 +-
 .../api/tools/internal/search/SearchMessages.java  |   51 +-
 .../tools/internal/search/UseReportConverter.java  |  213 +-
 .../api/tools/internal/search/UseScanManager.java  |  395 ++
 .../api/tools/internal/search/UseScanParser.java   |  171 +-
 .../internal/search/UseScanReferenceVisitor.java   |   94 +
 .../tools/internal/search/UseScanReferences.java   |  100 +
 .../api/tools/internal/search/UseScanVisitor.java  |    4 +-
 .../search/XmlReferenceDescriptorWriter.java       |   13 +-
 .../tools/internal/search/XmlSearchReporter.java   |   88 +-
 .../internal/search/searchmessages.properties      |   55 +-
 .../api/tools/internal/util/ExcludedElements.java  |   99 -
 .../api/tools/internal/util/FilteredElements.java  |  103 +
 .../eclipse/pde/api/tools/internal/util/Util.java  |  105 +-
 .../tasks/APIDeprecationReportConversionTask.java  |    2 +-
 .../tools/internal/tasks/APIDeprecationTask.java   |   55 +-
 .../tasks/APIFreezeReportConversionTask.java       |   70 +-
 .../api/tools/internal/tasks/APIFreezeTask.java    |  117 +-
 .../tools/internal/tasks/APIToolsAnalysisTask.java |  153 +-
 .../tasks/AnalysisReportConversionTask.java        |   61 +-
 .../tasks/ApiConsumerUseReportConversionTask.java  |  128 +
 .../internal/tasks/ApiFileGenerationTask.java      |   18 +-
 .../api/tools/internal/tasks/ApiMigrationTask.java |   87 +-
 .../internal/tasks/ApiUseReportConversionTask.java |    2 +-
 .../pde/api/tools/internal/tasks/ApiUseTask.java   |  128 +-
 .../api/tools/internal/tasks/CommonUtilsTask.java  |  131 +-
 .../pde/api/tools/internal/tasks/CompareTask.java  |   53 +-
 .../internal/tasks/ExcludeListDeltaVisitor.java    |  268 -
 .../internal/tasks/FilterListDeltaVisitor.java     |  284 +
 .../pde/api/tools/internal/tasks/Messages.java     |   16 +-
 .../MissingRefProblemsReportConversionTask.java    |   92 +
 .../internal/tasks/MissingRefProblemsTask.java     |  641 ++
 .../api/tools/internal/tasks/messages.properties   |   25 +-
 .../org.eclipse.pde.api.tools/xslt/notsearched.xsl |    5 +-
 .../org.eclipse.pde.build/META-INF/MANIFEST.MF     |   12 +-
 .../buildnotes_pde-build.html                      |  484 --
 .../org.eclipse.pde.build/feature/build.properties |    2 +-
 .../feature/rootfiles/cpl-v10.html                 |  125 -
 eclipse/plugins/org.eclipse.pde.build/plugin.xml   |    5 +
 .../scripts/genericTargets.xml                     |    4 +
 .../internal/build/AbstractScriptGenerator.java    |   14 +-
 .../build/AssembleConfigScriptGenerator.java       |    9 +-
 .../internal/build/AssembleScriptGenerator.java    |    2 +-
 .../pde/internal/build/AssemblyInformation.java    |   12 +-
 .../pde/internal/build/BuildScriptGenerator.java   |   94 +-
 .../eclipse/pde/internal/build/BundleHelper.java   |   23 +-
 .../pde/internal/build/FeatureGenerator.java       |   31 +-
 .../eclipse/pde/internal/build/FeatureWriter.java  |    8 +-
 .../pde/internal/build/FetchScriptGenerator.java   |   37 +-
 .../internal/build/FetchTaskFactoriesRegistry.java |   44 +-
 .../internal/build/IBuildPropertiesConstants.java  |   21 +-
 .../pde/internal/build/IPDEBuildConstants.java     |   17 +-
 .../eclipse/pde/internal/build/IXMLConstants.java  |    4 +-
 .../org/eclipse/pde/internal/build/Messages.java   |    8 +-
 .../internal/build/P2ConfigScriptGenerator.java    |   34 +-
 .../eclipse/pde/internal/build/ProductFile.java    |    4 +-
 .../pde/internal/build/ProductGenerator.java       |   43 +-
 .../eclipse/pde/internal/build/ShapeAdvisor.java   |    4 +-
 .../pde/internal/build/SourceFeatureWriter.java    |    6 +-
 .../src/org/eclipse/pde/internal/build/Utils.java  |   70 +-
 .../eclipse/pde/internal/build/ant/AntScript.java  |   24 +-
 .../eclipse/pde/internal/build/ant/ZipFileSet.java |   28 +-
 .../builder/AbstractBuildScriptGenerator.java      |    4 +-
 .../pde/internal/build/builder/BuildDirector.java  |   34 +-
 .../build/builder/ClasspathComputer3_0.java        |  145 +-
 .../build/builder/FeatureBuildScriptGenerator.java |   75 +-
 .../build/builder/ModelBuildScriptGenerator.java   |   95 +-
 .../internal/build/builder/SourceGenerator.java    |    6 +-
 .../build/fetch/COPYFetchTasksFactory.java         |    2 +-
 .../eclipse/pde/internal/build/messages.properties |    9 +-
 .../internal/build/packager/ElementCollector.java  |    8 +-
 .../build/publisher/BuildPublisherApplication.java |   38 -
 .../build/publisher/FeatureRootAdvice.java         |  126 -
 .../build/publisher/GatherBundleAction.java        |   82 -
 .../build/publisher/GatherFeatureAction.java       |  116 -
 .../build/publisher/GatheringComputer.java         |   70 -
 .../pde/internal/build/site/BuildTimeFeature.java  |    6 +-
 .../build/site/BuildTimeFeatureParser.java         |   21 +-
 .../pde/internal/build/site/BuildTimeSite.java     |   12 +-
 .../eclipse/pde/internal/build/site/PDEState.java  |   34 +-
 .../pde/internal/build/site/ReachablePlugin.java   |    4 +-
 .../internal/build/site/compatibility/Feature.java |  291 -
 .../build/site/compatibility/FeatureEntry.java     |  181 -
 .../build/site/compatibility/FeatureParser.java    |  251 -
 .../build/site/compatibility/FeatureReference.java |    5 +-
 .../build/site/compatibility/IPlatformEntry.java   |   22 -
 .../build/site/compatibility/SiteManager.java      |    3 +-
 .../build/site/compatibility/URLEntry.java         |   43 -
 .../eclipse/pde/internal/swt/tools/IconExe.java    | 3339 ---------
 .../build/publisher/AbstractPublisherTask.java     |    3 +-
 .../build/publisher/GatherFeatureTask.java         |   58 +-
 .../internal/build/tasks/BuildManifestTask.java    |    4 +-
 .../build/tasks/BuildScriptGeneratorTask.java      |   22 +-
 .../pde/internal/build/tasks/FetchTask.java        |    6 +-
 .../internal/build/tasks/LicenseReplaceTask.java   |  366 +
 .../pde/internal/build/tasks/TaskMessages.java     |    3 +
 .../eclipse/pde/internal/build/tasks/Version.java  |    3 +-
 .../pde/internal/build/tasks/messages.properties   |    6 +-
 .../templates/headless-build/build.properties      |   40 +-
 .../templates/headless-build/customAssembly.xml    |    2 +-
 .../templates/headless-build/customTargets.xml     |    2 +-
 .../templates/packager/packager.properties         |   10 +
 .../templates/packager/packaging.properties        |    2 +-
 eclipse/plugins/org.eclipse.pde.core/.options      |    3 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    4 +-
 .../org.eclipse.pde.core/META-INF/MANIFEST.MF      |   23 +-
 .../org.eclipse.pde.core/META-INF/eclipse.inf      |    1 +
 .../plugins/org.eclipse.pde.core/plugin.properties |    5 +-
 eclipse/plugins/org.eclipse.pde.core/plugin.xml    |   13 +-
 .../schema/bundleImporters.exsd                    |  156 -
 .../eclipse/pde/core/plugin/IPluginModelBase.java  |   10 +-
 .../eclipse/pde/core/plugin/PluginRegistry.java    |   29 +
 .../core/project/IBundleProjectDescription.java    |   26 +-
 .../core/BundleManifestSourceLocationManager.java  |    6 +-
 .../internal/core/BundleValidationOperation.java   |   11 +-
 .../eclipse/pde/internal/core/ClasspathHelper.java |    5 +-
 .../pde/internal/core/ClasspathUtilCore.java       |   14 +-
 .../pde/internal/core/ExternalModelManager.java    |  201 +-
 .../eclipse/pde/internal/core/ICoreConstants.java  |    9 +-
 .../src/org/eclipse/pde/internal/core/P2Utils.java |   28 +-
 .../pde/internal/core/PDEAuxiliaryState.java       |   11 +
 .../pde/internal/core/PDEClasspathContainer.java   |    9 +-
 .../src/org/eclipse/pde/internal/core/PDECore.java |   41 +-
 .../pde/internal/core/PDEPreferencesManager.java   |   84 +-
 .../pde/internal/core/PDERegistryStrategy.java     |   18 +-
 .../org/eclipse/pde/internal/core/PDEState.java    |   76 +-
 .../pde/internal/core/PluginModelManager.java      |   48 +-
 .../core/RequiredPluginsClasspathContainer.java    |   28 +-
 .../internal/core/RequiredPluginsInitializer.java  |   35 +-
 .../pde/internal/core/TargetPlatformHelper.java    |   14 +-
 .../internal/core/WorkspacePluginModelManager.java |   23 +-
 .../internal/core/builders/BuildErrorReporter.java |  113 +-
 .../core/builders/BundleErrorReporter.java         |   61 +-
 .../pde/internal/core/builders/ErrorReporter.java  |   22 +-
 .../core/builders/FeatureErrorReporter.java        |    2 +-
 .../core/builders/ManifestConsistencyChecker.java  |    6 +-
 .../core/builders/ManifestErrorReporter.java       |   11 +-
 .../core/builders/SchemaErrorReporter.java         |    9 +-
 .../internal/core/builders/SchemaTransformer.java  |    4 +-
 .../core/builders/SourceEntryErrorReporter.java    |   18 +-
 .../pde/internal/core/bundle/BundleFragment.java   |    7 +-
 .../core/exports/FeatureExportOperation.java       |    3 +-
 .../eclipse/pde/internal/core/feature/Feature.java |   46 +-
 .../pde/internal/core/ifeature/IFeature.java       |   21 +-
 .../pde/internal/core/ifeature/IFeatureInfo.java   |    5 +-
 .../core/importing/BundleImporterExtension.java    |   92 -
 .../core/importing/CvsBundleImportDescription.java |   66 -
 .../core/importing/CvsBundleImporterDelegate.java  |  200 -
 .../internal/core/importing/IBundleImporter.java   |   49 -
 .../provisional/BundleImportDescription.java       |  113 -
 .../provisional/IBundleImporterDelegate.java       |   66 -
 .../core/importing/provisional/package.html        |   23 -
 .../core/iproduct/IConfigurationProperty.java      |   50 +
 .../pde/internal/core/iproduct/IProduct.java       |   25 +-
 .../core/iproduct/IProductModelFactory.java        |    4 +-
 .../core/iproduct/IPropertyConfiguration.java      |   28 -
 .../pde/internal/core/pderesources.properties      |    4 +-
 .../internal/core/plugin/PluginExtensionPoint.java |  242 +-
 .../core/plugin/WorkspacePluginModelBase.java      |   10 +-
 .../core/product/ConfigurationProperty.java        |   83 +
 .../eclipse/pde/internal/core/product/Product.java |   62 +-
 .../internal/core/product/ProductModelFactory.java |   11 +-
 .../core/project/BundleProjectDescription.java     |    9 +-
 .../core/project/BundleProjectService.java         |   41 +-
 .../core/target/AbstractBundleContainer.java       |   55 +-
 .../internal/core/target/AbstractTargetHandle.java |  107 +-
 .../internal/core/target/IUBundleContainer.java    |  908 +--
 .../internal/core/target/LocalTargetHandle.java    |    4 +-
 .../eclipse/pde/internal/core/target/Messages.java |   11 +
 .../pde/internal/core/target/Messages.properties   |   13 +-
 .../pde/internal/core/target/P2TargetUtils.java    | 1393 ++++
 .../pde/internal/core/target/TargetDefinition.java |  267 +-
 .../target/TargetDefinitionPersistenceHelper.java  |    5 +
 .../core/target/TargetPersistence35Helper.java     |   14 +-
 .../core/target/TargetPersistence36Helper.java     |   40 +-
 .../core/target/TargetPlatformService.java         |   76 +-
 .../pde/internal/core/target/UpdateTargetJob.java  |  114 +
 .../core/target/WorkspaceFileTargetHandle.java     |    4 +-
 .../target/provisional/ITargetPlatformService.java |   11 +-
 .../provisional/LoadTargetDefinitionJob.java       |    2 +-
 .../target/provisional/NameVersionDescriptor.java  |   15 +-
 .../pde/internal/core/util/CoreUtility.java        |    2 -
 .../pde/internal/core/ant/BaseExportTask.java      |   16 +-
 .../pde/internal/core/ant/ConvertSchemaToHTML.java |    2 +-
 .../pde/internal/core/ant/FeatureExportTask.java   |    4 +-
 .../pde/internal/core/ant/PluginExportTask.java    |    4 +-
 .../internal/core/text/AbstractEditingModel.java   |    4 +-
 .../core/text/bundle/ImportPackageObject.java      |   10 +-
 .../internal/core/text/bundle/PackageObject.java   |    4 +-
 .../core/text/plugin/PluginDocumentHandler.java    |    6 +-
 .../internal/core/text/plugin/PluginModelBase.java |   46 +-
 .../org.eclipse.pde.doc.user/META-INF/MANIFEST.MF  |    2 +-
 .../plugins/org.eclipse.pde.doc.user/about.html    |    6 +-
 .../org.eclipse.pde.doc.user/about.properties      |    4 +-
 .../org.eclipse.pde.doc.user/apache_style.css      |    4 +
 .../org.eclipse.pde.doc.user/api_contexts.xml      |   39 +-
 .../org.eclipse.pde.doc.user/build.properties      |    3 +-
 .../org.eclipse.pde.doc.user/contexts_PDE.xml      |   26 +-
 .../images/export_wizards/export_wizard_select.png |  Bin 3448 -> 2516 bytes
 .../guide/images/export_wizards/target.png         |  Bin 0 -> 8057 bytes
 .../images/plugin_editor/extension_points.png      |  Bin 8286 -> 7328 bytes
 .../images/preferences/compilers_features.png      |  Bin 14141 -> 3132 bytes
 .../guide/images/preferences/compilers_plugin.png  |  Bin 16163 -> 7975 bytes
 .../guide/images/preferences/compilers_schemas.png |  Bin 17434 -> 3867 bytes
 .../guide/images/preferences/outline.png           |  Bin 2331 -> 1543 bytes
 .../images/preferences/plugin_development.png      |  Bin 94913 -> 11216 bytes
 .../images/preferences/target_preferences.png      |  Bin 14488 -> 10530 bytes
 .../guide/intro/pde_overview.htm                   |   12 +-
 .../editors/ctx_help_editor/ctx_help_editor.htm    |   10 +-
 .../editors/feature_editor/included_features.htm   |    3 +-
 .../tools/editors/manifest_editor/access_rules.htm |  411 +-
 .../manifest_editor/automated_management.htm       |   13 -
 .../tools/editors/manifest_editor/testing.htm      |   18 -
 .../schema_editor/page_schema_definition.htm       |   36 +-
 .../editors/schema_editor/page_schema_overview.htm |    4 +-
 .../guide/tools/editors/site_editor/archives.htm   |   22 +
 .../guide/tools/export_wizards/export_features.htm |    3 +-
 .../guide/tools/export_wizards/export_plugins.htm  |    4 +-
 .../guide/tools/export_wizards/export_product.htm  |    7 +-
 .../guide/tools/export_wizards/export_target.htm   |   36 +
 .../guide/tools/export_wizards/export_wizards.htm  |    3 +-
 .../guide/tools/file_wizards/new_ctx_help.htm      |  106 +-
 .../guide/tools/file_wizards/new_toc.htm           |  106 +-
 .../launchers/eclipse_application_launcher.htm     |    4 +-
 .../guide/tools/launchers/junit_test.htm           |    4 +-
 .../guide/tools/preference_pages/compilers.htm     |    6 +-
 .../guide/tools/preference_pages/editors.htm       |    7 +-
 .../tools/preference_pages/feature_compiler.htm    |    8 +-
 .../tools/preference_pages/osgi_frameworks.htm     |    6 +-
 .../tools/preference_pages/plug_in_development.htm |   48 +-
 .../tools/preference_pages/plugin_compiler.htm     |  148 +-
 .../guide/tools/preference_pages/preferences.htm   |    3 +-
 .../runtime_classpath_properties.htm               |   20 +
 .../tools/preference_pages/schema_compiler.htm     |    7 +-
 .../guide/tools/views/plugin_registry.htm          |    4 +-
 .../guide/tools/views/plugins.htm                  |    4 +-
 .../plugins/org.eclipse.pde.doc.user/notices.html  |    4 +-
 .../org.eclipse.pde.doc.user/pdeOptions.txt        |    5 +-
 .../org.eclipse.pde.doc.user/plugin.properties     |    2 +-
 .../plugins/org.eclipse.pde.doc.user/plugin.xml    |    7 +-
 .../reference/actions/ref-pdetools.htm             |    4 +-
 .../actions/ref-apitooling-setup-action.htm        |   10 +-
 .../api-tooling/ant-tasks/analysis-ant-task.htm    |  119 +-
 .../analysis-reportconversion-ant-task.htm         |  243 +-
 .../apiconsumeruse-reportconversion-ant-task.htm   |  234 +
 .../api-tooling/ant-tasks/apifreeze-ant-task.htm   |  110 +-
 .../apifreeze-reportconversion-ant-task.htm        |  240 +-
 .../ant-tasks/apimigration-ant-task.htm            |  482 +-
 .../apimigration-reportconversion-ant-task.htm     |  351 +-
 .../api-tooling/ant-tasks/apiuse-ant-task.htm      |  195 +-
 .../ant-tasks/apiuse-reportconversion-ant-task.htm |  348 +-
 .../ant-tasks/apiusescan-problems-ant-task.htm     |  186 +
 ...iusescan-problems-reportconversion-ant-task.htm |  174 +
 .../api-tooling/ant-tasks/compare-ant-task.htm     |  203 +
 .../api-tooling/ant-tasks/deprecation-ant-task.htm |  455 +-
 .../deprecation-reportconversion-ant-task.htm      |  234 +-
 .../ant-tasks/filegeneration-ant-task.htm          |  400 +-
 .../reference/api-tooling/api_javadoc_tags.htm     |    6 +-
 .../reference/api-tooling/api_since_tags.htm       |    2 +-
 .../api-tooling/images/api_options_analysis.png    |  Bin 20526 -> 5012 bytes
 .../images/api_options_compatibility.png           |  Bin 17109 -> 9910 bytes
 .../api-tooling/images/api_options_usage.png       |  Bin 25397 -> 12421 bytes
 .../api-tooling/images/api_options_usescans.png    |  Bin 0 -> 4890 bytes
 .../api-tooling/images/api_options_version.png     |  Bin 20968 -> 8578 bytes
 .../reference/api-tooling/images/use-ui.png        |  Bin 49223 -> 14397 bytes
 .../api-tooling/images/usescans-pref-page.png      |  Bin 0 -> 8107 bytes
 .../api-tooling/preferences/ref-baselines.htm      |   13 +-
 .../api-tooling/preferences/ref-errorswarnings.htm |   39 +-
 .../api-tooling/preferences/ref-usescans.htm       |   63 +
 .../api-tooling/propertypages/ref-filters-prop.htm |    2 +-
 .../quickfixes/ref-api-api-filter-qf.htm           |   26 +-
 .../quickfixes/ref-api-missing-baseline-qf.htm     |   26 +-
 .../quickfixes/ref-api-remove-api-filter-qf.htm    |   24 +-
 .../api-tooling/quickfixes/ref-api-sincetag-qf.htm |   26 +-
 .../api-tooling/quickfixes/ref-api-version-qf.htm  |   26 +-
 .../api-tooling/views/ref-api-tooling-view.htm     |   16 +-
 .../api-tooling/wizards/ref-api-compare-wizard.htm |    4 +-
 .../api-tooling/wizards/ref-api-setup-wizard.htm   |   22 +-
 .../api-tooling/wizards/ref-api-use-dialog.htm     |   57 +-
 .../wizards/ref-apiuse-patterns-wizard.htm         |    6 +-
 .../reference/extension-points/index.html          |    2 -
 .../reference/misc/api-usage-rules.html            |    4 +-
 .../reference/pde_feature_generating_build.htm     |    5 +-
 .../tasks/api_tooling_baseline.htm                 |    6 +-
 .../tasks/api_tooling_compare_to_baseline.htm      |    8 +-
 .../tasks/api_tooling_create_filters.htm           |   16 +-
 .../tasks/api_tooling_options.htm                  |    6 +-
 .../tasks/api_tooling_remove_filters.htm           |    6 +-
 .../tasks/api_tooling_setup.htm                    |   16 +-
 .../tasks/pde_compilation_env.htm                  |    9 +-
 .../tasks/pde_custom_callbacks.htm                 |    5 +-
 .../pde_feature_generating_antcommandline.htm      |    5 +-
 .../tasks/pde_p2_buildtasks.htm                    |  603 ++-
 .../tasks/pde_p2_featurebuilds.htm                 |   10 +-
 .../tasks/pde_p2_integration.htm                   |    6 +-
 .../tasks/pde_p2_productbuilds.htm                 |   21 +-
 .../tasks/pde_packager.htm                         |  763 ++-
 .../tasks/pde_product_build.htm                    |    6 +-
 .../tasks/pde_version_qualifiers.htm               |    3 +-
 eclipse/plugins/org.eclipse.pde.doc.user/toc.xml   |   11 +-
 .../org.eclipse.pde.doc.user/topics_Reference.xml  |   46 +-
 .../org.eclipse.pde.doc.user/topics_Tasks.xml      |    8 +-
 .../org.eclipse.pde.doc.user/topics_WhatsNew.xml   |   23 +
 .../whatsNew/images/add-plugins.png                |  Bin 4916 -> 0 bytes
 .../whatsNew/images/add-to-target.png              |  Bin 15745 -> 0 bytes
 .../whatsNew/images/api-deprecation.png            |  Bin 11963 -> 0 bytes
 .../images/api-errors-warning-api-use-scan.png     |  Bin 0 -> 17677 bytes
 .../whatsNew/images/api-filters.png                |  Bin 16482 -> 0 bytes
 .../whatsNew/images/api-scan.png                   |  Bin 21483 -> 0 bytes
 .../images/api-use-scan-preference-page.png        |  Bin 0 -> 12010 bytes
 .../whatsNew/images/application.png                |  Bin 0 -> 2793 bytes
 .../whatsNew/images/archive-wizard.png             |  Bin 17881 -> 0 bytes
 .../whatsNew/images/archive.png                    |  Bin 7853 -> 0 bytes
 .../whatsNew/images/avail.png                      |  Bin 10614 -> 0 bytes
 .../whatsNew/images/build-severities.png           |  Bin 21561 -> 0 bytes
 .../whatsNew/images/buildproperties.png            |  Bin 5153 -> 0 bytes
 .../whatsNew/images/console-menu.png               |  Bin 4114 -> 0 bytes
 .../whatsNew/images/consolelog.png                 |  Bin 5485 -> 0 bytes
 .../whatsNew/images/consumer_configuration.png     |  Bin 0 -> 23213 bytes
 .../images/default-workspace-preference.png        |  Bin 0 -> 3488 bytes
 .../whatsNew/images/description.png                |  Bin 8140 -> 0 bytes
 .../whatsNew/images/edit-default-workspace.png     |  Bin 0 -> 5050 bytes
 .../whatsNew/images/export-target.png              |  Bin 17687 -> 0 bytes
 .../whatsNew/images/feature-launch.png             |  Bin 28203 -> 0 bytes
 .../whatsNew/images/from-repo.png                  |  Bin 3586 -> 0 bytes
 .../whatsNew/images/head-version.png               |  Bin 4072 -> 0 bytes
 .../whatsNew/images/hover-quick-fix.png            |  Bin 13409 -> 0 bytes
 .../whatsNew/images/pattern-wizard.png             |  Bin 21736 -> 0 bytes
 .../whatsNew/images/patterns.png                   |  Bin 7425 -> 0 bytes
 .../whatsNew/images/product-properties.png         |  Bin 0 -> 5747 bytes
 .../whatsNew/images/scandetails.png                |  Bin 16094 -> 0 bytes
 .../whatsNew/images/shared-license.png             |  Bin 0 -> 6503 bytes
 .../whatsNew/images/soft-install.png               |  Bin 2334 -> 0 bytes
 .../whatsNew/images/spell-check.png                |  Bin 6612 -> 0 bytes
 .../whatsNew/images/src-builds.png                 |  Bin 12009 -> 0 bytes
 .../whatsNew/images/synch-settings.png             |  Bin 2496 -> 0 bytes
 .../whatsNew/images/synch-warnings.png             |  Bin 3789 -> 0 bytes
 .../whatsNew/images/target-features.png            |  Bin 43702 -> 0 bytes
 .../whatsNew/images/target-resolution.png          |  Bin 0 -> 8120 bytes
 .../whatsNew/images/target-search.png              |  Bin 3083 -> 0 bytes
 .../whatsNew/images/target_source.png              |  Bin 0 -> 32235 bytes
 .../whatsNew/images/target_update.png              |  Bin 0 -> 31741 bytes
 .../whatsNew/images/teamcvs.png                    |  Bin 0 -> 3198 bytes
 .../whatsNew/images/xml-errors.png                 |  Bin 4184 -> 0 bytes
 .../whatsNew/pde_whatsnew.htm                      |  949 ++--
 .../icons/wizban/defcon_wiz.png                    |  Bin 6820 -> 6820 bytes
 .../org/eclipse/pde/internal/ds/ui/Messages.java   |    6 +-
 .../pde/internal/ds/ui/editor/DSLabelProvider.java |    2 +-
 .../pde/internal/ds/ui/editor/DSSourcePage.java    |   14 +-
 .../ds/ui/editor/DSSourceViewerConfiguration.java  |    2 +-
 .../ds/ui/editor/dialogs/DSEditPropertyDialog.java |    2 +-
 .../ds/ui/editor/dialogs/DSEditProvideDialog.java  |    2 +-
 .../ds/ui/editor/sections/DSComponentSection.java  |   43 +-
 .../ds/ui/editor/sections/DSOptionsSection.java    |   22 +-
 .../ds/ui/editor/sections/DSPropertiesSection.java |   43 +-
 .../eclipse/pde/internal/ds/ui/messages.properties |    6 +-
 .../ds/ui/wizards/DSCreationOperation.java         |   27 +-
 .../internal/ds/ui/wizards/DSFileWizardPage.java   |   51 +-
 .../org.eclipse.pde.junit.runtime/plugin.xml       |    1 +
 .../junit/runtime/NonUIThreadTestApplication.java  |  120 +-
 .../junit/runtime/PlatformUITestHarness.java       |   77 +
 .../internal/junit/runtime/UITestApplication.java  |  109 +-
 .../launching/ILaunchingPreferenceConstants.java   |    6 +-
 .../internal/launching/PreferenceInitializer.java  |   10 +-
 .../launching/launcher/BundleLauncherHelper.java   |   75 +-
 .../launching/launcher/LaunchArgumentsHelper.java  |   20 +-
 .../launcher/LaunchConfigurationHelper.java        |   22 +-
 .../launching/launcher/LaunchListener.java         |   14 +-
 .../internal/launching/launcher/LauncherUtils.java |   19 +-
 .../launching/AbstractPDELaunchConfiguration.java  |    1 +
 .../EclipseApplicationLaunchConfiguration.java     |    4 +-
 .../pde/launching/IPDELauncherConstants.java       |    3 +
 .../JUnitLaunchConfigurationDelegate.java          |    7 +-
 .../icons/obj16/frgmt_obj.gif                      |  Bin 313 -> 313 bytes
 .../icons/obj16/plugins_obj.gif                    |  Bin 214 -> 214 bytes
 .../registry/model/LocalRegistryBackend.java       |    4 +-
 .../runtime/registry/model/ModelObject.java        |    5 +-
 .../runtime/registry/model/ServiceName.java        |  141 +-
 .../registry/model/ServiceRegistration.java        |    5 +-
 .../runtime/spy/dialogs/MenuSpyDialog.java         |    2 +-
 .../org.eclipse.pde.ua.core/build.properties       |   10 +
 .../org.eclipse.pde.ua.core/plugin.properties      |   10 +
 .../core/cheatsheet/simple/ISimpleCSConstants.java |    2 +-
 .../core/cheatsheet/simple/text/SimpleCSIntro.java |    2 +-
 .../plugins/org.eclipse.pde.ua.ui/build.properties |   10 +
 .../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
 .../org.eclipse.pde.ua.ui/plugin.properties        |   10 +
 .../ua/ui/editor/cheatsheet/comp/CompCSPage.java   |    2 +-
 .../cheatsheet/comp/actions/messages.properties    |   10 +
 .../cheatsheet/comp/details/messages.properties    |   10 +
 .../ui/editor/cheatsheet/comp/messages.properties  |   10 +
 .../ua/ui/editor/cheatsheet/messages.properties    |   10 +
 .../cheatsheet/simple/NewCommandKeyEvent.java      |    2 +-
 .../cheatsheet/simple/actions/messages.properties  |   10 +
 .../cheatsheet/simple/details/messages.properties  |   10 +
 .../editor/cheatsheet/simple/messages.properties   |   10 +
 .../ui/editor/ctxhelp/details/messages.properties  |   10 +
 .../ua/ui/editor/ctxhelp/messages.properties       |   10 +
 .../ui/editor/toc/TocFoldingStructureProvider.java |    2 +-
 .../ua/ui/editor/toc/actions/messages.properties   |   10 +
 .../ua/ui/editor/toc/details/messages.properties   |   10 +
 .../internal/ua/ui/editor/toc/messages.properties  |   10 +
 .../wizards/cheatsheet/CSCategoryTrackerUtil.java  |    2 +-
 .../ua/ui/wizards/cheatsheet/CSFileWizardPage.java |    2 +-
 .../ua/ui/wizards/cheatsheet/IRegisterCSData.java  |    2 +-
 .../ua/ui/wizards/cheatsheet/messages.properties   |   10 +
 .../ui/wizards/ctxhelp/NewCtxHelpWizardPage.java   |    9 +-
 .../ua/ui/wizards/ctxhelp/messages.properties      |   10 +
 .../ua/ui/wizards/toc/IRegisterTOCData.java        |    2 +-
 .../internal/ua/ui/wizards/toc/messages.properties |   10 +
 .../META-INF/MANIFEST.MF                           |    5 +-
 .../osgi/HelloServiceComponentTemplate.java        |    2 +-
 .../templates_3.0/mail/bin/icons/mail.ico          |  Bin 26694 -> 0 bytes
 .../templates_3.0/mail/bin/icons/sample.gif        |  Bin 983 -> 0 bytes
 .../templates_3.0/mail/bin/icons/sample.icns       |  Bin 35301 -> 0 bytes
 .../templates_3.0/mail/bin/icons/sample2.gif       |  Bin 318 -> 0 bytes
 .../templates_3.0/mail/bin/icons/sample3.gif       |  Bin 173 -> 0 bytes
 .../templates_3.0/mail/bin/product_lg.gif          |  Bin 9559 -> 0 bytes
 .../mail/java/$applicationClass$.java              |   27 -
 .../mail/java/ApplicationWorkbenchAdvisor.java     |  116 -
 .../templates_3.0/mail/java/ICommandIds.java       |   15 -
 .../mail/java/MessagePopupAction.java              |   25 -
 .../templates_3.0/mail/java/NavigationView.java    |  151 -
 .../templates_3.0/mail/java/OpenViewAction.java    |   36 -
 .../templates_3.0/mail/java/Perspective.java       |   20 -
 .../templates_3.0/mail/java/View.java              |   72 -
 .../perspective/java/$perspectiveClassName$.java   |   10 -
 .../templates_3.1/mail/java/View.java              |   12 +-
 .../templates_3.3/mail/java/View.java              |   12 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    4 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../org.eclipse.pde.ui/META-INF/MANIFEST.MF        |   12 +-
 .../plugins/org.eclipse.pde.ui/plugin.properties   |    2 +-
 eclipse/plugins/org.eclipse.pde.ui/plugin.xml      |   20 +-
 .../schema/bundleImportPages.exsd                  |  147 -
 .../eclipse/pde/internal/ui/IHelpContextIds.java   |    1 +
 .../eclipse/pde/internal/ui/IPDEUIConstants.java   |    8 +-
 .../eclipse/pde/internal/ui/PDEPerspective.java    |    6 +-
 .../src/org/eclipse/pde/internal/ui/PDEPlugin.java |   35 +-
 .../eclipse/pde/internal/ui/PDEPluginImages.java   |    3 +-
 .../org/eclipse/pde/internal/ui/PDEUIMessages.java |   75 +-
 .../ui/compare/PluginContentMergeViewer.java       |   22 +-
 .../ui/correction/AddBuildEntryResolution.java     |    6 +
 .../ui/correction/ResolutionGenerator.java         |   13 +
 .../ui/correction/java/JavaResolutionFactory.java  |   11 +-
 .../ui/correction/java/QuickFixProcessor.java      |   29 +-
 .../ui/editor/ILauncherFormPageHelper.java         |    4 +-
 .../ui/editor/PDEFormTextEditorContributor.java    |    6 +-
 .../ui/editor/StructuredViewerSection.java         |   12 +-
 .../ui/editor/actions/OpenSchemaAction.java        |   29 +-
 .../build/BuildSourceViewerConfiguration.java      |   19 +-
 .../ManifestContentAssistProcessor.java            |    8 +-
 .../ui/editor/context/XMLInputContext.java         |   20 +-
 .../internal/ui/editor/feature/InfoSection.java    |   61 +-
 .../ui/editor/feature/LicenseFeatureSection.java   |  323 +
 .../ui/editor/feature/RequiresSection.java         |   18 +-
 .../ui/editor/plugin/ExtensionPointDetails.java    |  758 ++-
 .../ui/editor/plugin/ExtensionPointsSection.java   |   18 +-
 .../ui/editor/plugin/ImportPackageSection.java     |   61 +-
 .../internal/ui/editor/plugin/ManifestEditor.java  |    4 +
 .../editor/plugin/ManifestEditorContributor.java   |    2 +-
 .../ui/editor/plugin/ManifestSourcePage.java       |    7 +-
 .../ui/editor/plugin/PluginUndoManager.java        |   42 +-
 .../internal/ui/editor/plugin/RequiresSection.java |   37 +-
 .../ui/editor/plugin/rows/ClassAttributeRow.java   |    5 +-
 .../ui/editor/product/ConfigurationPage.java       |   18 +-
 .../ui/editor/product/GeneralInfoSection.java      |   16 +-
 .../editor/product/PluginConfigurationSection.java |    4 +-
 .../ui/editor/product/PropertiesSection.java       |  375 +
 .../ui/editor/schema/SchemaInputContext.java       |   11 +-
 .../ui/editor/targetdefinition/TargetEditor.java   |  282 +-
 .../text/ChangeAwareSourceViewerConfiguration.java |   20 +-
 .../ui/editor/text/ManifestConfiguration.java      |   16 +-
 .../ui/editor/text/PDEQuickAssistAssistant.java    |   22 +-
 .../internal/ui/editor/text/XMLConfiguration.java  |   18 +-
 .../internal/ui/launcher/AbstractPluginBlock.java  |  119 +-
 .../pde/internal/ui/launcher/BaseBlock.java        |   16 +-
 .../pde/internal/ui/launcher/BlockAdapter.java     |   29 +-
 .../ui/launcher/ConfigurationAreaBlock.java        |   39 +-
 .../pde/internal/ui/launcher/FeatureBlock.java     |   12 +-
 .../pde/internal/ui/launcher/LaunchAction.java     |   25 +-
 .../launcher/LaunchTerminationStatusHandler.java   |  177 +-
 .../ui/launcher/LauncherUtilsStatusHandler.java    |   79 +-
 .../pde/internal/ui/launcher/OSGiBundleBlock.java  |   29 +-
 .../pde/internal/ui/launcher/PluginBlock.java      |   24 +-
 .../internal/ui/launcher/PluginStatusDialog.java   |   19 +-
 .../pde/internal/ui/launcher/TracingBlock.java     |   53 +-
 .../internal/ui/launcher/WorkspaceDataBlock.java   |   91 +-
 .../internal/ui/nls/InternationalizeWizard.java    |   14 +-
 .../pde/internal/ui/nls/ModelChangeTable.java      |    4 +-
 .../internal/ui/parts/SharedPartWithButtons.java   |   12 +-
 .../internal/ui/parts/WizardCheckboxTablePart.java |   51 +-
 .../pde/internal/ui/pderesources.properties        |  107 +-
 .../ui/preferences/CompilersPreferencePage.java    |   22 +-
 .../ui/preferences/EditorPreferencePage.java       |    8 +-
 .../ui/preferences/MainPreferencePage.java         |  201 +-
 .../preferences/TargetPlatformPreferencePage.java  |   26 +-
 .../ui/provisional/IBundeImportWizardPage.java     |   58 -
 .../pde/internal/ui/search/PluginSearchPage.java   |   12 +-
 .../internal/ui/search/ShowDescriptionAction.java  |    4 +-
 .../search/dialogs/FilteredIUSelectionDialog.java  |   16 +-
 .../dialogs/TargetRepositorySearchHandler.java     |    8 +-
 .../ui/shared/CachedCheckboxTreeViewer.java        |   22 +-
 .../target/AddBundleContainerSelectionPage.java    |   16 +-
 .../ui/shared/target/AddFeatureContainersPage.java |    3 +-
 .../shared/target/EditBundleContainerWizard.java   |   10 +-
 .../ui/shared/target/EditIUContainerPage.java      |   94 +-
 .../ui/shared/target/EditProfileContainerPage.java |    3 +-
 .../pde/internal/ui/shared/target/Messages.java    |    4 +-
 .../ui/shared/target/TargetContentsGroup.java      |   40 +-
 .../ui/shared/target/TargetLocationsGroup.java     |   87 +-
 .../internal/ui/shared/target/messages.properties  |   14 +-
 .../pde/internal/ui/util/PDEJavaHelperUI.java      |   17 +-
 .../ui/views/dependencies/DependenciesView.java    |   10 +-
 .../views/dependencies/DependenciesViewPage.java   |    5 +-
 .../ui/views/plugins/ImportActionGroup.java        |   10 +-
 .../internal/ui/views/target/StateViewPage.java    |    4 +-
 .../ui/wizards/exports/ExportActiveTargetJob.java  |  161 -
 .../ui/wizards/exports/ExportTargetJob.java        |  235 +
 .../ui/wizards/exports/ExportTargetMetadata.java   |   85 -
 .../exports/TargetDefinitionExportWizard.java      |   55 +-
 .../exports/TargetDefinitionExportWizardPage.java  |  103 +-
 .../ui/wizards/feature/PluginListPage.java         |   27 +-
 .../imports/BaseImportWizardSecondPage.java        |    8 +-
 .../ui/wizards/imports/CVSBundleImportPage.java    |  227 -
 .../ui/wizards/imports/PluginImportOperation.java  |  131 +-
 .../ui/wizards/imports/PluginImportWizard.java     |    7 +-
 .../imports/PluginImportWizardDetailedPage.java    |    1 -
 .../imports/PluginImportWizardExpressPage.java     |   14 +-
 .../imports/PluginImportWizardFirstPage.java       |  107 +-
 .../ui/wizards/imports/RepositoryImportWizard.java |   59 +-
 .../plugin/NewLibraryPluginCreationPage.java       |    4 +-
 .../plugin/NewProjectCreationOperation.java        |   22 +-
 .../ui/wizards/plugin/NewProjectCreationPage.java  |    6 +-
 .../ui/wizards/plugin/PluginContentPage.java       |    4 +-
 .../ui/wizards/plugin/PluginFieldData.java         |    8 +-
 .../target/TargetDefinitionContentPage.java        |    7 +-
 .../ui/launcher/JUnitWorkbenchLaunchShortcut.java  |   19 +-
 .../src/org/eclipse/pde/ui/launcher/MainTab.java   |   19 +-
 .../pde/ui/launcher/PluginJUnitMainTab.java        |   31 +-
 .../plugins/org.eclipse.pde/META-INF/MANIFEST.MF   |    2 +-
 eclipse/plugins/org.eclipse.pde/about.properties   |    4 +-
 .../setup-apitools-existing-projects.xml           |   18 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../org.eclipse.platform.doc.isv/about.html        |    4 +-
 .../org.eclipse.platform.doc.isv/build.properties  |    3 +-
 .../org.eclipse.platform.doc.isv/guide/cnf.htm     |    4 +-
 .../guide/cnf_config.htm                           |    6 +-
 .../guide/cnf_operation.htm                        |    4 +-
 .../guide/cnf_steps.htm                            |    8 +-
 .../guide/cnf_steps_content.htm                    |    6 +-
 .../guide/cnf_steps_general.htm                    |    4 +-
 .../guide/cnf_steps_rn_migration.htm               |    8 +-
 .../guide/cnf_troubleshooting.htm                  |    4 +-
 ...ialogs_FilteredItemsSelectionDialog_example.htm |    5 +-
 ...lteredItemsSelectionDialog_example_advanced.htm |    5 +-
 .../guide/dialogs_wizards_exportWizards.htm        |    6 +-
 .../guide/dialogs_wizards_extensions.htm           |    6 +-
 .../guide/dialogs_wizards_importWizards.htm        |    6 +-
 .../guide/dialogs_wizards_newWizards.htm           |    6 +-
 .../guide/editors_actions.htm                      |    5 +-
 .../guide/editors_annotations.htm                  |   15 +-
 .../guide/editors_utilities.htm                    |    8 +-
 .../guide/firstplugin_create.htm                   |    6 +-
 .../guide/firstplugin_run.htm                      |    8 +-
 .../guide/images/prbfil.png                        |  Bin 0 -> 12836 bytes
 .../guide/images/prob.png                          |  Bin 0 -> 7091 bytes
 .../guide/images/problemsview_groups.png           |  Bin 10267 -> 7200 bytes
 .../guide/images/quickfix.png                      |  Bin 15558 -> 10149 bytes
 .../guide/images/readmeviewcommand.png             |  Bin 2956 -> 2956 bytes
 .../guide/java_web_start.htm                       |    6 +-
 .../guide/jface_resources.htm                      |    4 +-
 .../guide/p2_actions_touchpoints.html              |   96 +-
 .../guide/p2_category_generation.htm               |    4 +-
 .../guide/p2_director.html                         |   13 +-
 .../guide/p2_metadata.html                         |    6 +-
 .../guide/p2_metadata_generator.html               |  213 -
 .../guide/p2_overview.htm                          |   10 +-
 .../guide/p2_publisher.html                        |    5 +-
 .../guide/p2_repositorytasks.htm                   | 1272 +++-
 .../guide/p2_startup.htm                           |    6 +-
 .../org.eclipse.platform.doc.isv/guide/p2_ui.htm   |    6 +-
 .../guide/p2_uipolicy.htm                          |  499 +-
 .../guide/p2_uireuse.htm                           |   16 +-
 .../guide/preferences_prefs_contribute.htm         |    6 +-
 .../guide/product_configproduct.htm                |    6 +-
 .../guide/product_extension.htm                    |    4 +-
 .../guide/rcp_browser.htm                          |    6 +-
 .../org.eclipse.platform.doc.isv/guide/resAdv.htm  |    8 +-
 .../guide/resAdv_buildconfigs.htm                  |  153 +
 .../guide/resAdv_builders.htm                      |  100 +-
 .../guide/runtime_app_model.htm                    |    4 +-
 .../guide/runtime_model_bundles.htm                |   24 +-
 .../guide/secure_storage_architecture.htm          |   10 +-
 .../guide/secure_storage_dev.htm                   |    4 +-
 .../guide/secure_storage_providers.htm             |    4 +-
 .../guide/swt_widgets_events.htm                   |   10 +
 .../guide/team_howto.htm                           |    6 +-
 .../team_synchronize_localhistory_example.htm      |    4 +-
 .../org.eclipse.platform.doc.isv/guide/ua.htm      |    4 +-
 .../guide/ua_cheatsheet.htm                        |    4 +-
 .../guide/ua_cheatsheet_composite.htm              |  334 +-
 .../guide/ua_cheatsheet_composite_content.htm      |   78 +-
 .../guide/ua_cheatsheet_guidelines.htm             |    4 +-
 .../guide/ua_cheatsheet_simple.htm                 |    8 +-
 .../guide/ua_dynamic.htm                           |    2 +-
 .../guide/ua_dynamic_extensions.htm                |  260 +-
 .../guide/ua_dynamic_filters.htm                   |    4 +-
 .../guide/ua_dynamic_includes.htm                  |  137 +-
 .../org.eclipse.platform.doc.isv/guide/ua_help.htm |    4 +-
 .../guide/ua_help_abstract_scope.htm               |  141 +-
 .../guide/ua_help_content.htm                      |    4 +-
 .../guide/ua_help_content_active.htm               |    6 +-
 .../guide/ua_help_content_active_action.htm        |    4 +-
 .../guide/ua_help_content_active_debug.htm         |    4 +-
 .../guide/ua_help_content_active_invoke.htm        |    4 +-
 .../guide/ua_help_content_child_links.htm          |   70 +-
 .../guide/ua_help_content_command.htm              |   26 +-
 .../guide/ua_help_content_command_authoring.htm    |    4 +-
 .../guide/ua_help_content_criteria.htm             |    8 +-
 .../guide/ua_help_content_files.htm                |    4 +-
 .../guide/ua_help_content_manifest.htm             |    4 +-
 .../guide/ua_help_content_nested.htm               |    4 +-
 .../guide/ua_help_content_process.htm              |    4 +-
 .../guide/ua_help_content_remote.htm               |    4 +-
 .../guide/ua_help_content_toc.htm                  |    4 +-
 .../guide/ua_help_content_xhtml.htm                |    4 +-
 .../guide/ua_help_context.htm                      |    4 +-
 .../guide/ua_help_context_dynamic.htm              |    4 +-
 .../guide/ua_help_context_id.htm                   |    4 +-
 .../guide/ua_help_context_infopops.htm             |    4 +-
 .../guide/ua_help_context_xml.htm                  |    4 +-
 .../guide/ua_help_infocenter_preferences.htm       |   12 +-
 .../guide/ua_help_menu.htm                         |    7 +-
 .../guide/ua_help_search.htm                       |    2 +-
 .../guide/ua_help_search_types.htm                 |    4 +-
 .../guide/ua_help_setup.htm                        |    4 +-
 .../guide/ua_help_setup_about.htm                  |   14 +-
 .../guide/ua_help_setup_help_data.htm              |  337 +-
 .../guide/ua_help_setup_infocenter.htm             |   27 +-
 .../guide/ua_help_setup_preferences.htm            |   26 +-
 .../guide/ua_help_setup_preindex.htm               |    4 +-
 .../guide/ua_help_setup_rcp.htm                    |    4 +-
 .../guide/ua_help_setup_standalone.htm             |    4 +-
 .../guide/ua_help_war.htm                          |    4 +-
 .../guide/ua_intro.htm                             |    4 +-
 .../guide/ua_intro_cust_intro_part.htm             |    4 +-
 .../guide/ua_intro_cust_static.htm                 |    4 +-
 .../guide/ua_intro_define_content.htm              |    4 +-
 .../guide/ua_intro_defining.htm                    |    4 +-
 .../guide/ua_intro_defining_config.htm             |    4 +-
 .../guide/ua_intro_ext_custom_url.htm              |    4 +-
 .../guide/ua_intro_ext_standbypart.htm             |    4 +-
 .../guide/ua_intro_ext_theme.htm                   |    6 +-
 .../guide/ua_intro_extending.htm                   |    4 +-
 .../guide/ua_intro_extending_content.htm           |    4 +-
 .../guide/ua_intro_hello_world.htm                 |    4 +-
 .../guide/ua_intro_minimal.htm                     |    4 +-
 .../guide/ua_intro_swt_properties.htm              |  179 +
 .../guide/ua_intro_universal.htm                   |    4 +-
 .../guide/ua_intro_universal_contributing.htm      |    4 +-
 .../guide/ua_intro_universal_defaults.htm          |    4 +-
 .../guide/ua_intro_universal_extending.htm         |    4 +-
 .../guide/ua_intro_universal_links.htm             |    4 +-
 .../guide/ua_intro_universal_preference.htm        |    4 +-
 .../guide/ua_intro_xhtml.htm                       |   41 +-
 .../guide/ua_statushandling.htm                    |    4 +-
 .../guide/ua_statushandling_defining.htm           |    4 +-
 .../guide/ua_statushandling_sample.htm             |    4 +-
 .../guide/workbench_advext_activities.htm          |   18 +-
 .../workbench_advext_perspectiveExtension.htm      |    6 +-
 ...orkbench_basicext_actionSetPartAssociations.htm |    6 +-
 .../guide/workbench_basicext_actionSets.htm        |    6 +-
 .../guide/workbench_basicext_views.htm             |    6 +-
 .../guide/workbench_cmd.htm                        |    6 +-
 .../guide/workbench_cmd_expressions.htm            |    4 +-
 .../guide/workbench_cmd_menus.htm                  |   18 +-
 .../guide/workbench_perspectives.htm               |    6 +-
 .../guide/workbench_statushandling.htm             |    4 +-
 .../guide/workbench_statushandling_defining.htm    |    5 +-
 .../guide/wrkAdv_efs_resources.htm                 |    4 +-
 .../guide/wrkAdv_encoding.htm                      |    6 +-
 .../guide/wrkAdv_keyBindings_accelConfig.htm       |    6 +-
 .../guide/wrkAdv_marker_support.htm                |   16 +-
 .../guide/wrkAdv_markerresolution.htm              |    4 +-
 .../guide/wrkAdv_workingsets.htm                   |    4 +-
 .../org.eclipse.platform.doc.isv/notices.html      |    4 +-
 .../platformOptions.txt                            |   40 +-
 .../org.eclipse.platform.doc.isv/plugin.xml        |    5 +-
 .../porting/3.4/recommended.html                   |    2 +-
 .../porting/3.5/incompatibilities.html             |    6 +-
 .../porting/3.6/incompatibilities.html             |   20 +-
 .../porting/3.6/recommended.html                   |    8 +-
 .../porting/3.7/faq.html                           |   30 +
 .../porting/3.7/incompatibilities.html             |   88 +
 .../porting/3.7/recommended.html                   |   40 +
 .../porting/eclipse_3_7_porting_guide.html         |   35 +
 .../porting/removals.html                          |   35 +-
 .../questions/index.html                           |   16 +-
 .../reference/extension-points/index.html          | 1195 +++-
 .../reference/misc/api-usage-rules.html            |    4 +-
 .../reference/misc/bundle_manifest.html            |   61 +-
 .../reference/misc/feature_manifest.html           |    4 +-
 .../reference/misc/gcj.html                        |    4 +-
 .../reference/misc/launcher.html                   |    4 +-
 .../reference/misc/launcher_ini.html               |    4 +-
 .../reference/misc/message_bundles.html            |    4 +-
 .../reference/misc/naming.html                     |    4 +-
 .../reference/misc/p2_dropins_format.html          |    6 +-
 .../reference/misc/plugin_dtd.html                 |    4 +-
 .../reference/misc/plugin_dtd_30.html              |    4 +-
 .../reference/misc/plugin_manifest.html            |    4 +-
 .../reference/misc/plugin_manifest_30.html         |   15 +-
 .../reference/misc/runtime-options.html            |   34 +-
 .../reference/misc/update_platform_xml.html        |   47 +-
 .../samples/samples.html                           |    6 +-
 .../plugins/org.eclipse.platform.doc.isv/toc.xml   |    6 +-
 .../org.eclipse.platform.doc.isv/topics_Guide.xml  |    7 +-
 .../topics_Porting.xml                             |    6 +
 .../topics_Reference.xml                           |   31 +-
 .../topics_WhatsNew.xml                            |   10 +
 .../whatsNew/images/AppMenuBar.png                 |  Bin 0 -> 101487 bytes
 .../whatsNew/images/NativeToolBar.png              |  Bin 0 -> 21064 bytes
 .../whatsNew/images/browserclose.png               |  Bin 53626 -> 0 bytes
 .../whatsNew/images/cocoadatetime.png              |  Bin 0 -> 13746 bytes
 .../whatsNew/images/cocoartl.PNG                   |  Bin 14883 -> 0 bytes
 .../whatsNew/images/cocoatool.png                  |  Bin 0 -> 59619 bytes
 .../whatsNew/images/duplex-printing-ll.png         |  Bin 0 -> 31778 bytes
 .../whatsNew/images/duplex-printing-ls.png         |  Bin 0 -> 32209 bytes
 .../whatsNew/images/duplex-printing-pl.png         |  Bin 0 -> 32899 bytes
 .../whatsNew/images/duplex-printing-ps.png         |  Bin 0 -> 33370 bytes
 .../whatsNew/images/footer.png                     |  Bin 93716 -> 0 bytes
 .../whatsNew/images/gesture.png                    |  Bin 0 -> 245521 bytes
 .../whatsNew/images/gtk-datetime.png               |  Bin 0 -> 25408 bytes
 .../whatsNew/images/install-history-tag.png        |  Bin 0 -> 51380 bytes
 .../whatsNew/images/menu-mac.png                   |  Bin 174924 -> 0 bytes
 .../whatsNew/images/menu-win32.png                 |  Bin 150303 -> 0 bytes
 .../whatsNew/images/newctab.png                    |  Bin 4691 -> 0 bytes
 .../whatsNew/images/newscope.png                   |  Bin 15719 -> 0 bytes
 .../whatsNew/images/overlayimage.png               |  Bin 27617 -> 0 bytes
 .../whatsNew/images/overlaytext.png                |  Bin 45477 -> 0 bytes
 .../whatsNew/images/progress.png                   |  Bin 31260 -> 0 bytes
 .../whatsNew/images/rss.png                        |  Bin 47547 -> 0 bytes
 .../whatsNew/images/searchprocessorNN.png          |  Bin 0 -> 14269 bytes
 .../whatsNew/images/see.png                        |  Bin 6759 -> 0 bytes
 .../whatsNew/images/segments-chars.png             |  Bin 9242 -> 0 bytes
 .../whatsNew/images/sttabs.png                     |  Bin 22943 -> 0 bytes
 .../whatsNew/images/system-menu.png                |  Bin 0 -> 93624 bytes
 .../whatsNew/images/tablednd.png                   |  Bin 20407 -> 0 bytes
 .../whatsNew/images/text_search.png                |  Bin 7817 -> 0 bytes
 .../whatsNew/images/variable-tab-stops.png         |  Bin 13069 -> 0 bytes
 .../whatsNew/images/webappextn.png                 |  Bin 81421 -> 0 bytes
 .../whatsNew/images/webkitWindows.png              |  Bin 0 -> 52435 bytes
 .../whatsNew/images/webkitgtk.png                  |  Bin 54756 -> 0 bytes
 .../whatsNew/images/wrap-indent.png                |  Bin 20434 -> 0 bytes
 .../whatsNew/images/wrap.png                       |  Bin 0 -> 51652 bytes
 .../whatsNew/platform_isv_whatsnew.html            |  934 ++--
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../org.eclipse.platform.doc.user/about.html       |    4 +-
 .../plugins/org.eclipse.platform.doc.user/book.css |    2 +-
 .../concepts/accessibility/accessmain.htm          |    6 +-
 .../concepts/accessibility/colordialog.htm         |  122 +-
 .../concepts/accessibility/fontsandcolors.htm      |   34 +-
 .../concepts/accessibility/keyboardshortcuts.htm   |    8 +-
 .../concepts/accessibility/navigation.htm          |   26 +-
 .../concepts/accessibility/text_editor.htm         |   78 +-
 .../concepts/cdecorations.htm                      |    6 +-
 .../concepts/cnav.htm                              |    6 +-
 .../concepts/concepts-11.htm                       |   10 +-
 .../concepts/concepts-13.htm                       |    6 +-
 .../concepts/concepts-18.htm                       |    8 +-
 .../concepts/concepts-21.htm                       |   12 +-
 .../concepts/concepts-21a.htm                      |    6 +-
 .../concepts/concepts-22.htm                       |   12 +-
 .../concepts/concepts-4.htm                        |   14 +-
 .../concepts/concepts-5.htm                        |   10 +-
 .../concepts/concepts-6.htm                        |   16 +-
 .../concepts/concepts-6a.htm                       |   10 +-
 .../concepts/concepts-antexttools.htm              |    8 +-
 .../concepts/concepts-antsupport.htm               |    6 +-
 .../concepts/concepts-exttools.htm                 |    8 +-
 .../concepts/coutline.htm                          |    6 +-
 .../concepts/cpathvars.htm                         |    8 +-
 .../concepts/cprbview.htm                          |   10 +-
 .../concepts/cpropview.htm                         |    6 +-
 .../concepts/ctskview.htm                          |    6 +-
 .../concepts/cworkset.htm                          |   33 +-
 .../concepts/help.htm                              |    8 +-
 .../concepts/help_view.htm                         |    4 +-
 .../concepts/resourcefilters.htm                   |    4 +-
 .../concepts/virtualfolders.htm                    |    4 +-
 .../concepts/welcome.htm                           |    4 +-
 .../contexts_AntUI.xml                             |    1 +
 .../contexts_ExternalTools.xml                     |    5 +-
 .../contexts_Team.xml                              |    2 +-
 .../contexts_Team_CVS.xml                          |   19 +-
 .../contexts_UserAssistance.xml                    |    4 +
 .../contexts_Workbench.xml                         |    9 +
 .../gettingStarted/intro/overview.htm              |    4 +-
 .../gettingStarted/qs-02a.htm                      |    8 +-
 .../gettingStarted/qs-02d.xhtml                    |    4 +-
 .../gettingStarted/qs-02e.htm                      |    6 +-
 .../gettingStarted/qs-07b.htm                      |    5 +-
 .../gettingStarted/qs-07d.htm                      |    8 +-
 .../gettingStarted/qs-10b.htm                      |    6 +-
 .../gettingStarted/qs-12b.htm                      |    6 +-
 .../gettingStarted/qs-24a.xhtml                    |    8 +-
 .../gettingStarted/qs-31a.htm                      |    6 +-
 .../gettingStarted/qs-34a.xhtml                    |    4 +-
 .../gettingStarted/qs-34b.xhtml                    |    4 +-
 .../gettingStarted/qs-34c.xhtml                    |    6 +-
 .../gettingStarted/qs-35b.htm                      |    6 +-
 .../gettingStarted/qs-36a.htm                      |    6 +-
 .../gettingStarted/qs-36b.htm                      |    6 +-
 .../gettingStarted/qs-37-3e.htm                    |    4 +-
 .../gettingStarted/qs-37-3f.htm                    |    6 +-
 .../gettingStarted/qs-39c.htm                      |   30 +-
 .../gettingStarted/qs-39g.htm                      |    6 +-
 .../gettingStarted/qs-43.htm                       |   16 +-
 .../gettingStarted/qs-43e.htm                      |    7 +-
 .../gettingStarted/qs-52.htm                       |    5 +-
 .../gettingStarted/qs-60_team.htm                  |   11 +-
 .../gettingStarted/qs-83_edit.htm                  |    6 +-
 .../gettingStarted/qs-92_project_builders.htm      |    3 +-
 .../gettingStarted/qs-93_project_builder.htm       |   17 +-
 .../qs-93a_project_builder_targets.htm             |   77 +
 .../gettingStarted/qs-94_run_pj.htm                |    3 +-
 .../gettingStarted/qs-96_non_ant_pjs.htm           |    9 +-
 .../gettingStarted/qs-97_standalone_ets.htm        |    6 +-
 .../images/Image1.png                              |  Bin 23166 -> 25754 bytes
 .../images/Image11_new_wizard.png                  |  Bin 22393 -> 8225 bytes
 .../images/Image209_workspace.png                  |  Bin 28040 -> 30213 bytes
 .../images/Image216_history_view.png               |  Bin 12174 -> 11700 bytes
 .../images/Image219_pref_cv2.png                   |  Bin 49993 -> 49591 bytes
 .../images/Image223_pref_persp.png                 |  Bin 33474 -> 31651 bytes
 .../images/Image247_projsel_wiz.png                |  Bin 11876 -> 0 bytes
 .../images/Image265_team_project.png               |  Bin 21037 -> 17895 bytes
 .../images/Image274_fonts_preference.png           |  Bin 29548 -> 11491 bytes
 .../images/Image274_fonts_preference2.png          |  Bin 21150 -> 14571 bytes
 .../images/Image2_active_editor.png                |  Bin 27175 -> 23231 bytes
 .../images/Image2_active_view.png                  |  Bin 27737 -> 23286 bytes
 .../images/Image4_showview.png                     |  Bin 30743 -> 32602 bytes
 .../images/Image55_reset.png                       |  Bin 31373 -> 33374 bytes
 .../images/Image5_text_editor.png                  |  Bin 35190 -> 33389 bytes
 .../images/Image610_et_targets_tab.png             |  Bin 34478 -> 0 bytes
 .../images/Image611_et_main_tab.png                |  Bin 31933 -> 0 bytes
 .../images/Image612_et_refresh_tab.png             |  Bin 29081 -> 0 bytes
 .../images/Image613_project_properties.png         |  Bin 19291 -> 0 bytes
 .../images/Image614_et_type_dialog.png             |  Bin 11924 -> 0 bytes
 .../images/Image615_program_builder.png            |  Bin 29215 -> 0 bytes
 .../images/Image617_jar_inspector.png              |  Bin 34451 -> 0 bytes
 .../images/Image83_jane-history.png                |  Bin 11088 -> 10683 bytes
 .../images/Image83_jane3_conflict.png              |  Bin 48472 -> 46455 bytes
 .../images/Image84_replace3.png                    |  Bin 11672 -> 11245 bytes
 .../images/Image91_ant_prefs_1.png                 |  Bin 23545 -> 0 bytes
 .../images/Image91_ant_prefs_2.png                 |  Bin 31527 -> 0 bytes
 .../images/Image91_ant_prefs_3.png                 |  Bin 22209 -> 0 bytes
 .../images/ant_builder_main_tab.png                |  Bin 0 -> 19119 bytes
 .../images/ant_builder_refresh_tab.png             |  Bin 0 -> 18948 bytes
 .../images/ant_builder_targets_tab.png             |  Bin 0 -> 20749 bytes
 .../images/ant_classpath_tab.png                   |  Bin 0 -> 19690 bytes
 .../images/ant_code_assist.png                     |  Bin 20870 -> 0 bytes
 .../images/ant_content_assist.png                  |  Bin 0 -> 12366 bytes
 .../images/ant_editor_appearance.png               |  Bin 23663 -> 12980 bytes
 .../images/ant_editor_folding.png                  |  Bin 24430 -> 14084 bytes
 .../images/ant_editor_problems.png                 |  Bin 28427 -> 19833 bytes
 .../images/ant_editor_syntax.png                   |  Bin 28077 -> 19707 bytes
 .../images/ant_formatter.png                       |  Bin 24956 -> 16836 bytes
 .../images/ant_prefs.png                           |  Bin 26680 -> 27235 bytes
 .../images/ant_run_dialog.png                      |  Bin 30787 -> 18312 bytes
 .../images/ant_runtime_classpath.png               |  Bin 0 -> 17171 bytes
 .../images/ant_runtime_properties.png              |  Bin 35165 -> 24528 bytes
 .../images/ant_runtime_tasks.png                   |  Bin 0 -> 36481 bytes
 .../images/ant_runtime_types.png                   |  Bin 0 -> 18358 bytes
 .../images/ant_tar_assist.png                      |  Bin 0 -> 11446 bytes
 .../images/ant_templates.png                       |  Bin 34201 -> 27319 bytes
 .../images/builder_property_page.png               |  Bin 0 -> 9299 bytes
 .../images/cvs_filter_res_history.png              |  Bin 8840 -> 9696 bytes
 .../images/detachview2.png                         |  Bin 8716 -> 19706 bytes
 .../images/et_builder_main_tab.png                 |  Bin 0 -> 16118 bytes
 .../images/et_dialog.png                           |  Bin 41729 -> 20896 bytes
 .../images/et_dropdown.png                         |  Bin 5226 -> 6515 bytes
 .../images/et_run_dropdown.png                     |  Bin 0 -> 8139 bytes
 .../images/et_standalone.png                       |  Bin 0 -> 17476 bytes
 .../images/external_tools_prefs.png                |  Bin 21074 -> 12728 bytes
 .../images/first_anteditor.png                     |  Bin 33644 -> 10416 bytes
 .../images/help_view_bookmarks.png                 |  Bin 6246 -> 7845 bytes
 .../images/help_view_context.png                   |  Bin 10712 -> 10484 bytes
 .../images/help_view_index.png                     |  Bin 13610 -> 14307 bytes
 .../images/help_view_search.png                    |  Bin 22220 -> 23356 bytes
 .../images/help_view_toc.png                       |  Bin 18308 -> 18975 bytes
 .../images/help_window_external.png                |  Bin 39024 -> 40496 bytes
 .../images/newprj_wiz.gif                          |  Bin 0 -> 574 bytes
 .../images/newprj_wiz.png                          |  Bin 479 -> 0 bytes
 .../images/prb_quickfix.png                        |  Bin 25754 -> 9595 bytes
 .../images/prbfil.png                              |  Bin 22280 -> 12836 bytes
 .../org.eclipse.platform.doc.user/images/prob.png  |  Bin 9592 -> 7091 bytes
 .../images}/quickfix_error_obj.gif                 |  Bin 348 -> 348 bytes
 .../images}/quickfix_warning_obj.gif               |  Bin 559 -> 559 bytes
 .../images/ref-texteditorpref.png                  |  Bin 44596 -> 15101 bytes
 .../org.eclipse.platform.doc.user/notices.html     |    4 +-
 .../org.eclipse.platform.doc.user/plugin.xml       |    9 +-
 .../reference/help_preferences.htm                 |   12 +-
 .../reference/help_preferences_content.htm         |   14 +-
 .../reference/ref-10.htm                           |   15 +-
 .../reference/ref-11.htm                           |   27 +-
 .../reference/ref-12.htm                           |    8 +-
 .../reference/ref-13.htm                           |    6 +-
 .../reference/ref-14.htm                           |    6 +-
 .../reference/ref-14b.htm                          |    6 +-
 .../reference/ref-15.htm                           |    8 +-
 .../reference/ref-16.htm                           |    8 +-
 .../reference/ref-17.htm                           |    8 +-
 .../reference/ref-19.htm                           |    7 +-
 .../reference/ref-19cvs-annotate.htm               |    8 +-
 .../reference/ref-19cvs-commenttemplates.htm       |    8 +-
 .../reference/ref-19cvs-console.htm                |    8 +-
 .../reference/ref-19cvs-decorations.htm            |   10 +-
 .../reference/ref-19cvs-ext.htm                    |    8 +-
 .../reference/ref-19cvs-sync.htm                   |   21 +-
 .../reference/ref-19cvs-updatemerge.htm            |    7 +-
 .../reference/ref-19cvs-watch-edit.htm             |    8 +-
 .../reference/ref-19cvs.htm                        |    8 +-
 .../reference/ref-20-fileContent.htm               |    6 +-
 .../reference/ref-20.htm                           |    7 +-
 .../reference/ref-20team-models.htm                |    6 +-
 .../reference/ref-21.htm                           |    8 +-
 .../reference/ref-22.htm                           |  189 +-
 .../reference/ref-23.htm                           |  648 ++-
 .../reference/ref-24.htm                           |    6 +-
 .../reference/ref-25.htm                           |   24 +-
 .../reference/ref-27.htm                           |    6 +-
 .../reference/ref-28.htm                           |    8 +-
 .../reference/ref-29.htm                           |    6 +-
 .../reference/ref-3.htm                            |    6 +-
 .../reference/ref-30.htm                           |    6 +-
 .../reference/ref-31.htm                           |    6 +-
 .../reference/ref-31a.htm                          |   22 +-
 .../reference/ref-32a.htm                          |    7 +-
 .../reference/ref-33.htm                           |   33 +-
 .../reference/ref-35.htm                           |  279 +-
 .../reference/ref-36.htm                           |  482 +-
 .../reference/ref-37.htm                           |   82 +-
 .../reference/ref-3a.htm                           |    4 +-
 .../reference/ref-42.htm                           |   13 +-
 .../reference/ref-48a.htm                          |   10 +-
 .../reference/ref-5.htm                            |    6 +-
 .../reference/ref-58.htm                           |    7 +-
 .../reference/ref-6.htm                            |    6 +-
 .../reference/ref-65.htm                           |    4 +-
 .../reference/ref-66.htm                           |  157 +-
 .../reference/ref-67.htm                           |    6 +-
 .../reference/ref-68.htm                           |    4 +-
 .../reference/ref-7.htm                            |   16 +-
 .../reference/ref-70.htm                           |   24 +-
 .../reference/ref-71.htm                           |   12 +-
 .../reference/ref-72.htm                           |   24 +-
 .../reference/ref-73.htm                           |    6 +-
 .../reference/ref-8.htm                            |    4 +-
 .../reference/ref-9.htm                            |   78 +-
 .../reference/ref-antcodeassist.htm                |   81 -
 .../reference/ref-antcontentassist.htm             |   76 +
 .../reference/ref-anteditor.htm                    |    3 +-
 .../reference/ref-anteditorprefs.htm               |    6 +-
 .../reference/ref-antformatter.htm                 |    6 +-
 .../reference/ref-antprefs.htm                     |   13 +-
 .../reference/ref-antruntimeprefs.htm              |   12 +-
 .../reference/ref-anttemplates.htm                 |    8 +-
 .../reference/ref-antview.htm                      |    6 +-
 .../reference/ref-capabilitiespref.htm             |    6 +-
 .../reference/ref-cheatsheets.htm                  |    6 +-
 .../reference/ref-composite-cheatsheets.htm        |    6 +-
 .../reference/ref-content-type.htm                 |    8 +-
 .../reference/ref-decorations.htm                  |    6 +-
 .../reference/ref-exttoolsprefs.htm                |    6 +-
 .../reference/ref-fonts.htm                        |    6 +-
 .../reference/ref-keybindings.htm                  |  140 +-
 .../reference/ref-net-preferences.htm              |    8 +-
 .../reference/ref-p2-autoupdate.htm                |    7 +-
 .../reference/ref-p2-installupdate.htm             |    8 +-
 .../reference/ref-p2-siteprefs.htm                 |    7 +-
 .../reference/ref-regex-find-replace.htm           |  229 +-
 .../reference/ref-search.htm                       |    6 +-
 .../reference/ref-securestorage-options.htm        |    8 +-
 .../reference/ref-securestorage-passwd.htm         |   10 +-
 .../reference/ref-securestorage-prefs.htm          |    6 +-
 .../reference/ref-securestorage-recovery.htm       |    6 +-
 .../reference/ref-securestorage-start.htm          |    8 +-
 .../reference/ref-securestorage-works.htm          |   10 +-
 .../reference/ref-ssh2-preferences.htm             |    8 +-
 .../reference/ref-startup-workspaces.htm           |   18 +-
 .../reference/ref-startup.htm                      |   12 +-
 .../reference/ref-templates-view.htm               |    5 +-
 .../reference/ref-texteditorprefs.htm              |  453 +-
 .../reference/ref-workspaceswitch.htm              |   83 +-
 .../reference/welcome_preferences.htm              |    9 +-
 .../org.eclipse.platform.doc.user/tasks/help.xhtml |    6 +-
 .../tasks/help_accessibility.htm                   |    6 +-
 .../tasks/help_context.htm                         |    4 +-
 .../tasks/help_navigate.htm                        |    4 +-
 .../tasks/help_scope.htm                           |    6 +-
 .../tasks/help_search.htm                          |   10 +-
 .../tasks/help_settings.htm                        |    6 +-
 .../tasks/running_eclipse.htm                      |   46 +-
 .../tasks/task-team-cmdlineclient.htm              |    6 +-
 .../tasks/tasks-1.htm                              |    4 +-
 .../tasks/tasks-100d.htm                           |    6 +-
 .../tasks/tasks-100d1.htm                          |    6 +-
 .../tasks/tasks-100d1b.htm                         |    6 +-
 .../tasks/tasks-105.htm                            |    8 +-
 .../tasks/tasks-105b.htm                           |    8 +-
 .../tasks/tasks-107b.htm                           |   14 +-
 .../tasks/tasks-110.htm                            |   12 +-
 .../tasks/tasks-113.htm                            |    4 +-
 .../tasks/tasks-115.htm                            |    6 +-
 .../tasks/tasks-118.htm                            |    8 +-
 .../tasks/tasks-119.htm                            |    4 +-
 .../tasks/tasks-120.htm                            |    8 +-
 .../tasks/tasks-122.htm                            |   14 +-
 .../tasks/tasks-123.htm                            |    6 +-
 .../tasks/tasks-124.htm                            |    6 +-
 .../tasks/tasks-125.htm                            |    6 +-
 .../tasks/tasks-126.htm                            |    6 +-
 .../tasks/tasks-127.htm                            |    6 +-
 .../tasks/tasks-128.htm                            |    6 +-
 .../tasks/tasks-130.htm                            |    6 +-
 .../tasks/tasks-131.htm                            |    4 +-
 .../tasks/tasks-132.htm                            |    4 +-
 .../tasks/tasks-133.htm                            |    4 +-
 .../tasks/tasks-134.htm                            |    6 +-
 .../tasks/tasks-14.htm                             |    6 +-
 .../tasks/tasks-16.htm                             |    6 +-
 .../tasks/tasks-17.htm                             |    6 +-
 .../tasks/tasks-1b.htm                             |  102 +-
 .../tasks/tasks-1c.htm                             |   86 +-
 .../tasks/tasks-1e.htm                             |  110 +-
 .../tasks/tasks-1h.htm                             |   74 +-
 .../tasks/tasks-20.htm                             |   12 +-
 .../tasks/tasks-24.htm                             |   10 +-
 .../tasks/tasks-3.htm                              |    6 +-
 .../tasks/tasks-31.htm                             |    8 +-
 .../tasks/tasks-32.htm                             |    4 +-
 .../tasks/tasks-33.htm                             |    8 +-
 .../tasks/tasks-34.htm                             |    6 +-
 .../tasks/tasks-35.htm                             |    6 +-
 .../tasks/tasks-36.htm                             |    6 +-
 .../tasks/tasks-37.htm                             |   10 +-
 .../tasks/tasks-37a.htm                            |   15 +-
 .../tasks/tasks-38.htm                             |    6 +-
 .../tasks/tasks-3e.htm                             |  287 +-
 .../tasks/tasks-42.htm                             |    4 +-
 .../tasks/tasks-43.htm                             |    6 +-
 .../tasks/tasks-44.htm                             |    6 +-
 .../tasks/tasks-45.htm                             |   12 +-
 .../tasks/tasks-45a.htm                            |    6 +-
 .../tasks/tasks-46ag.htm                           |    8 +-
 .../tasks/tasks-48b.htm                            |    4 +-
 .../tasks/tasks-49.htm                             |    6 +-
 .../tasks/tasks-51.xhtml                           |    8 +-
 .../tasks/tasks-52.htm                             |   12 +-
 .../tasks/tasks-53.xhtml                           |    8 +-
 .../tasks/tasks-55.htm                             |    8 +-
 .../tasks/tasks-55bg.htm                           |    8 +-
 .../tasks/tasks-57.xhtml                           |    8 +-
 .../tasks/tasks-59.htm                             |    8 +-
 .../tasks/tasks-59ag.htm                           |    8 +-
 .../tasks/tasks-68.htm                             |    8 +-
 .../tasks/tasks-68b.htm                            |   18 +-
 .../tasks/tasks-68bg.htm                           |    4 +-
 .../tasks/tasks-81.htm                             |    6 +-
 .../tasks/tasks-81b.htm                            |    6 +-
 .../tasks/tasks-82.htm                             |    6 +-
 .../tasks/tasks-84.htm                             |    8 +-
 .../tasks/tasks-84b.htm                            |    8 +-
 .../tasks/tasks-87.htm                             |    6 +-
 .../tasks/tasks-87b.htm                            |    6 +-
 .../tasks/tasks-88.htm                             |    6 +-
 .../tasks/tasks-9.htm                              |    6 +-
 .../tasks/tasks-92.htm                             |   10 +-
 .../tasks/tasks-94.htm                             |    8 +-
 .../tasks/tasks-95.htm                             |    6 +-
 .../tasks/tasks-95a.htm                            |   10 +-
 .../tasks/tasks-96.htm                             |   10 +-
 .../tasks/tasks-96a.htm                            |    8 +-
 .../tasks/tasks-96b.htm                            |    4 +-
 .../tasks/tasks-97.htm                             |    6 +-
 .../tasks/tasks-9c.htm                             |    7 +-
 .../tasks/tasks-9d.htm                             |    6 +-
 .../tasks/tasks-9f.htm                             |    6 +-
 .../tasks/tasks-9i.htm                             |    6 +-
 .../tasks/tasks-9j.htm                             |    6 +-
 .../tasks/tasks-9k.htm                             |    6 +-
 .../tasks/tasks-9m.htm                             |    6 +-
 .../tasks/tasks-9n.htm                             |    6 +-
 .../tasks/tasks-ant-addtasksandtypes.htm           |    6 +-
 .../tasks/tasks-ant-classpath.htm                  |   18 +-
 .../tasks/tasks-ant-running.htm                    |    6 +-
 .../tasks/tasks-ant-version.htm                    |    8 +-
 .../tasks/tasks-cvs-16.htm                         |    6 +-
 .../tasks/tasks-cvs-passwords.htm                  |    6 +-
 .../tasks/tasks-cvs-project-set.htm                |    8 +-
 .../tasks/tasks-cvs-quickdiff.htm                  |    6 +-
 .../tasks/tasks-cvs-ssh2.htm                       |    8 +-
 .../tasks/tasks-cvs-watch.htm                      |    8 +-
 .../tasks/tasks-exttools-running.htm               |    8 +-
 .../tasks/tasks-importproject.htm                  |    8 +-
 .../tasks/tasks-team-1.htm                         |    6 +-
 .../tasks/timpandexp.htm                           |    8 +-
 .../tasks/tkeybindings.htm                         |    9 +-
 .../tasks/topenmode.htm                            |    8 +-
 .../tasks/ttoolbars.htm                            |    5 +-
 .../tasks/welcome.htm                              |    4 +-
 .../tips/images/separate_derived_encodings.png     |  Bin 0 -> 3675 bytes
 .../tips/platform_tips.html                        |   90 +-
 .../plugins/org.eclipse.platform.doc.user/toc.xml  |    8 +-
 .../topics_GettingStarted.xml                      |    8 +-
 .../topics_Reference.xml                           |    6 +-
 .../org.eclipse.platform.doc.user/topics_Tasks.xml |    4 +-
 .../org.eclipse.platform.doc.user/topics_Tips.xml  |   12 +
 .../topics_WhatsNew.xml                            |   12 +
 .../whatsNew/images/AIX.png                        |  Bin 0 -> 34286 bytes
 .../images/apply-patch-in-sync-view-preference.png |  Bin 18629 -> 0 bytes
 .../whatsNew/images/apply-patch-ws.png             |  Bin 20191 -> 0 bytes
 .../whatsNew/images/author.png                     |  Bin 0 -> 5780 bytes
 .../whatsNew/images/branch-column.png              |  Bin 0 -> 17634 bytes
 .../whatsNew/images/breakpoint-details.png         |  Bin 22941 -> 0 bytes
 .../whatsNew/images/commitWizardLogicalModels.png  |  Bin 23923 -> 0 bytes
 .../whatsNew/images/configure-branches.png         |  Bin 33587 -> 0 bytes
 .../whatsNew/images/default-ssh-dir.png            |  Bin 0 -> 10979 bytes
 .../whatsNew/images/default_style.css              |   21 +
 .../whatsNew/images/disableCapping.png             |  Bin 0 -> 8866 bytes
 .../whatsNew/images/dynamicPathVariables.png       |  Bin 33475 -> 0 bytes
 .../whatsNew/images/edit-button-in-property.png    |  Bin 14076 -> 0 bytes
 .../whatsNew/images/export-plugins.png             |  Bin 0 -> 126357 bytes
 .../whatsNew/images/expressions-columns.png        |  Bin 12470 -> 0 bytes
 .../whatsNew/images/file-attributes-ui.png         |  Bin 6307 -> 0 bytes
 .../whatsNew/images/file-system-import.png         |  Bin 43899 -> 0 bytes
 .../whatsNew/images/hide-fvb.png                   |  Bin 22580 -> 0 bytes
 .../whatsNew/images/hpux.png                       |  Bin 0 -> 27046 bytes
 .../whatsNew/images/import-plugins.png             |  Bin 0 -> 141215 bytes
 .../whatsNew/images/import-type-dialog.png         |  Bin 23236 -> 0 bytes
 .../whatsNew/images/import-zip.png                 |  Bin 18994 -> 0 bytes
 .../whatsNew/images/inaccessible-projects-page.png |  Bin 23233 -> 0 bytes
 .../whatsNew/images/install-history.png            |  Bin 0 -> 38657 bytes
 .../whatsNew/images/installhistory.png             |  Bin 18574 -> 0 bytes
 .../whatsNew/images/lightweight-refresh.png        |  Bin 0 -> 9104 bytes
 .../whatsNew/images/linkedResourcesPropPage.png    |  Bin 28183 -> 0 bytes
 .../whatsNew/images/localHistoryLimitSize.png      |  Bin 19024 -> 0 bytes
 .../whatsNew/images/mac-proxy-icon.png             |  Bin 0 -> 24372 bytes
 .../whatsNew/images/mac-window-menu.png            |  Bin 0 -> 55651 bytes
 .../images/matching-might-not-be-optimal.png       |  Bin 10552 -> 0 bytes
 .../whatsNew/images/open-hyperlink-menu-item.png   |  Bin 0 -> 2822 bytes
 .../whatsNew/images/open-hyperlink-popup.png       |  Bin 0 -> 4396 bytes
 .../whatsNew/images/open-in-compare-editor.png     |  Bin 26432 -> 0 bytes
 .../whatsNew/images/open-resource-boosting.png     |  Bin 16517 -> 0 bytes
 .../images/open-resource-path-relative.png         |  Bin 22075 -> 0 bytes
 .../whatsNew/images/open-resource-path.png         |  Bin 10423 -> 0 bytes
 .../whatsNew/images/open-with-context-menu.png     |  Bin 0 -> 6637 bytes
 .../whatsNew/images/p2-license.png                 |  Bin 118086 -> 0 bytes
 .../whatsNew/images/patch-options-in-sync-view.png |  Bin 18127 -> 0 bytes
 .../whatsNew/images/problems-view-icon.png         |  Bin 0 -> 6969 bytes
 .../whatsNew/images/quickaccess-bindings.png       |  Bin 5430 -> 0 bytes
 .../whatsNew/images/resize-popups-gtk.png          |  Bin 19306 -> 0 bytes
 .../whatsNew/images/resourceFilters.png            |  Bin 31550 -> 0 bytes
 .../whatsNew/images/save-dialog.png                |  Bin 5702 -> 0 bytes
 .../whatsNew/images/searchprocessorNN.png          |  Bin 0 -> 14269 bytes
 .../whatsNew/images/separate-derived-encodings.png |  Bin 0 -> 13681 bytes
 .../images/show-ruler-annotation-tooltip.png       |  Bin 4150 -> 0 bytes
 .../whatsNew/images/show-whitespace-characters.png |  Bin 0 -> 5982 bytes
 .../whatsNew/images/syncViewLinkWithEditor.png     |  Bin 10082 -> 0 bytes
 .../whatsNew/images/taskbarprogress.png            |  Bin 37451 -> 0 bytes
 .../whatsNew/images/taskitem-progress-overlay.png  |  Bin 0 -> 63374 bytes
 .../whatsNew/images/virtual-folder-properties.png  |  Bin 9541 -> 0 bytes
 .../whatsNew/images/virtual-folder.png             |  Bin 26743 -> 0 bytes
 .../whatsNew/images/visible-folded-annotations.png |  Bin 1503 -> 0 bytes
 .../whatsNew/images/webkitgtk.png                  |  Bin 54756 -> 0 bytes
 .../whatsNew/images/wizardstop.png                 |  Bin 16597 -> 0 bytes
 .../whatsNew/platform_whatsnew.html                |  608 +-
 .../EclipseSplash37_Indigo.psd                     |  Bin 0 -> 11169019 bytes
 .../org.eclipse.platform/META-INF/MANIFEST.MF      |    2 +-
 .../intro/whatsnewExtensionContent3.xml            |    4 +-
 .../plugins/org.eclipse.platform/plugin.properties |    4 +-
 eclipse/plugins/org.eclipse.platform/splash.bmp    |  Bin 403614 -> 403616 bytes
 .../plugins/org.eclipse.rcp/META-INF/MANIFEST.MF   |    2 +-
 eclipse/plugins/org.eclipse.rcp/about.properties   |    4 +-
 eclipse/plugins/org.eclipse.rcp/notice.html        |  191 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   67 +-
 .../org.eclipse.releng.tools/META-INF/MANIFEST.MF  |    2 +-
 .../plugins/org.eclipse.releng.tools/plugin.xml    |   45 +-
 .../releng/tools/AdvancedFixCopyrightAction.java   |   53 +-
 .../src/org/eclipse/releng/tools/BatFile.java      |    9 +-
 .../src/org/eclipse/releng/tools/BlockComment.java |    5 +-
 .../src/org/eclipse/releng/tools/CFile.java        |    7 +-
 .../eclipse/releng/tools/CVSCopyrightAdapter.java  |    4 +
 .../src/org/eclipse/releng/tools/CVSTagHelper.java |   32 +-
 .../eclipse/releng/tools/CompareLocalToMap.java    |   77 +-
 .../org/eclipse/releng/tools/CopyrightComment.java |    7 +-
 .../eclipse/releng/tools/FixCopyrightAction.java   |  427 --
 .../eclipse/releng/tools/IBMCopyrightComment.java  |   13 +-
 .../src/org/eclipse/releng/tools/JavaFile.java     |    7 +-
 .../org/eclipse/releng/tools/JavaScriptFile.java   |    7 +-
 .../src/org/eclipse/releng/tools/LoadMap.java      |   28 +-
 .../eclipse/releng/tools/MapContentDocument.java   |   20 +-
 .../src/org/eclipse/releng/tools/MapFile.java      |   59 +-
 .../src/org/eclipse/releng/tools/MapProject.java   |   50 +-
 .../releng/tools/MapProjectSelectionPage.java      |  122 +-
 .../src/org/eclipse/releng/tools/OrderedMap.java   |   15 +-
 .../eclipse/releng/tools/ProjectComparePage.java   |   49 +-
 .../eclipse/releng/tools/ProjectSelectionPage.java |   64 +-
 .../org/eclipse/releng/tools/PropertiesFile.java   |    7 +-
 .../src/org/eclipse/releng/tools/RelEngPlugin.java |   35 +-
 .../org/eclipse/releng/tools/ReleaseWizard.java    |   27 +-
 .../eclipse/releng/tools/ReplaceLocalFromMap.java  |   41 +-
 .../org/eclipse/releng/tools/ShellMakeFile.java    |    9 +-
 .../src/org/eclipse/releng/tools/SourceFile.java   |   32 +-
 .../src/org/eclipse/releng/tools/TagMap.java       |   30 +-
 .../src/org/eclipse/releng/tools/TagPage.java      |    4 +-
 .../src/org/eclipse/releng/tools/XmlFile.java      |    8 +-
 .../org/eclipse/releng/tools/messages.properties   |    4 +-
 .../tools/preferences/CopyrightPreferencePage.java |   31 +-
 .../preferences/MapProjectPreferencePage.java      |  103 +-
 .../preferences/RelEngPreferenceInitializer.java   |   10 +-
 .../plugins/org.eclipse.sdk/META-INF/MANIFEST.MF   |    2 +-
 eclipse/plugins/org.eclipse.sdk/about.properties   |    4 +-
 eclipse/plugins/org.eclipse.sdk/book.css           |    4 +-
 eclipse/plugins/org.eclipse.sdk/plugin.properties  |    2 +-
 .../org.eclipse.search/META-INF/MANIFEST.MF        |    3 +-
 .../icons/full/dlcl16/refresh.gif}                 |  Bin 211 -> 211 bytes
 .../icons/full/elcl16/refresh.gif                  |  Bin 327 -> 327 bytes
 .../eclipse/search/ui/ISearchPageContainer.java    |   21 +-
 .../org/eclipse/search/ui/ISearchQuery.java        |   18 +-
 .../search/ui/text/AbstractTextSearchViewPage.java |    4 +-
 .../search/ui/text/FileTextSearchScope.java        |   14 +-
 .../search/ui/text/TextSearchQueryProvider.java    |    2 +-
 .../internal/ui/OpenSearchPreferencesAction.java   |    8 +-
 .../search2/internal/ui/SearchAgainAction.java     |    5 +-
 .../eclipse/search2/internal/ui/SearchView.java    |   24 +-
 .../ui/text2/TextSearchQueryProviderRegistry.java  |    7 +-
 .../plugins/org.eclipse.search/plugin.properties   |    7 +-
 eclipse/plugins/org.eclipse.search/plugin.xml      |   12 +
 .../core/text/FileNamePatternSearchScope.java      |   15 +-
 .../internal/ui/RemovePotentialMatchesAction.java  |    6 +-
 .../search/internal/ui/RemoveResultAction.java     |    4 +-
 .../org/eclipse/search/internal/ui/ScopePart.java  |   18 +-
 .../eclipse/search/internal/ui/SearchDialog.java   |   62 +-
 .../search/internal/ui/SearchPageDescriptor.java   |    3 +-
 .../eclipse/search/internal/ui/SearchPlugin.java   |    4 +-
 .../search/internal/ui/SearchPluginImages.java     |    5 +-
 .../ui/text/DecoratingFileSearchLabelProvider.java |    7 +-
 .../search/internal/ui/text/FileSearchPage.java    |    6 +-
 .../search/internal/ui/text/ReplaceAction.java     |    9 +-
 .../internal/ui/text/ReplaceRefactoring.java       |  117 +-
 .../search/internal/ui/text/TextSearchPage.java    |   14 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../org.eclipse.swt.carbon.macosx/build.xml        |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../org.eclipse.swt.cocoa.macosx.x86_64/build.xml  |    2 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../plugins/org.eclipse.swt.cocoa.macosx/build.xml |    2 +-
 .../plugins/org.eclipse.swt.gtk.aix.ppc/.project   |   11 +
 .../META-INF/MANIFEST.MF                           |   19 +
 .../org.eclipse.swt.gtk.aix.ppc}/about.html        |    0
 .../about_files/IJG_README                         |    0
 .../about_files/about_cairo.html                   |    0
 .../about_files/lgpl-v21.txt                       |    0
 .../about_files/mpl-v11.txt                        |    0
 .../about_files/pixman-licenses.txt                |    0
 .../about_files/webkit-bsd.txt                     |    0
 .../build.properties                               |    0
 .../plugins/org.eclipse.swt.gtk.aix.ppc/build.xml  |   12 +
 .../fragment.properties                            |    0
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../org.eclipse.swt.gtk.aix.ppc64/build.xml        |    2 +-
 .../org.eclipse.swt.gtk.hpux.ia64_32/.project      |   17 +
 .../META-INF/MANIFEST.MF                           |   19 +
 .../org.eclipse.swt.gtk.hpux.ia64_32/about.html    |  262 +
 .../about_files/IJG_README                         |    0
 .../about_files/lgpl-v21.txt                       |    0
 .../about_files/mpl-v11.txt                        |    0
 .../about_files/pixman-licenses.txt                |    0
 .../build.properties                               |   11 +
 .../org.eclipse.swt.gtk.hpux.ia64_32/build.xml     |   12 +
 .../fragment.properties                            |   12 +
 .../plugins/org.eclipse.swt.gtk.linux.ppc/.project |   28 -
 .../META-INF/MANIFEST.MF                           |   19 -
 .../org.eclipse.swt.gtk.linux.ppc/about.html       |  261 -
 .../about_files/about_cairo.html                   |   48 -
 .../org.eclipse.swt.gtk.linux.ppc/build.xml        |   12 -
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../org.eclipse.swt.gtk.linux.ppc64/build.xml      |    2 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../org.eclipse.swt.gtk.linux.s390/build.xml       |    2 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../org.eclipse.swt.gtk.linux.s390x/build.xml      |    2 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../org.eclipse.swt.gtk.linux.x86/build.xml        |    2 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../org.eclipse.swt.gtk.linux.x86_64/build.xml     |    2 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../org.eclipse.swt.gtk.solaris.sparc/build.xml    |    2 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../org.eclipse.swt.gtk.solaris.x86/build.xml      |    2 +-
 eclipse/plugins/org.eclipse.swt.jmx/.classpath     |    7 -
 eclipse/plugins/org.eclipse.swt.jmx/.options       |    2 -
 eclipse/plugins/org.eclipse.swt.jmx/.project       |   28 -
 .../.settings/org.eclipse.jdt.core.prefs           |  309 -
 .../.settings/org.eclipse.jdt.ui.prefs             |    9 -
 .../org.eclipse.swt.jmx/META-INF/MANIFEST.MF       |   20 -
 eclipse/plugins/org.eclipse.swt.jmx/about.html     |   28 -
 .../plugins/org.eclipse.swt.jmx/build.properties   |   20 -
 .../plugins/org.eclipse.swt.jmx/icons/sleak.png    |  Bin 466 -> 0 bytes
 eclipse/plugins/org.eclipse.swt.jmx/plugin.xml     |   11 -
 .../org/eclipse/swt/jmx/internal/Activator.java    |   37 -
 .../jmx/internal/SleakContributionProvider.java    |  281 -
 .../eclipse/swt/jmx/internal/SleakMessages.java    |   37 -
 .../swt/jmx/internal/SleakMessages.properties      |   21 -
 .../plugins/org.eclipse.swt.motif.aix.ppc/.project |   28 -
 .../META-INF/MANIFEST.MF                           |   19 -
 .../org.eclipse.swt.motif.aix.ppc/about.html       |  152 -
 .../about_files/IJG_README                         |  385 -
 .../org.eclipse.swt.motif.aix.ppc/build.properties |   11 -
 .../org.eclipse.swt.motif.aix.ppc/build.xml        |   12 -
 .../fragment.properties                            |   12 -
 .../org.eclipse.swt.motif.hpux.ia64_32/.project    |   28 -
 .../META-INF/MANIFEST.MF                           |   18 -
 .../org.eclipse.swt.motif.hpux.ia64_32/about.html  |  139 -
 .../about_files/IJG_README                         |  385 -
 .../build.properties                               |   11 -
 .../org.eclipse.swt.motif.hpux.ia64_32/build.xml   |   12 -
 .../fragment.properties                            |   12 -
 .../org.eclipse.swt.motif.linux.x86/.classpath     |    8 -
 .../org.eclipse.swt.motif.linux.x86/.project       |   34 -
 .../META-INF/MANIFEST.MF                           |   19 -
 .../org.eclipse.swt.motif.linux.x86/about.html     |  265 -
 .../about_files/IJG_README                         |  385 -
 .../about_files/about_cairo.html                   |   48 -
 .../about_files/about_open_motif.html              |   38 -
 .../about_files/lgpl-v21.txt                       |  506 --
 .../about_files/mlpl-v10.html                      |  401 --
 .../about_files/mpl-v11.txt                        |  470 --
 .../about_files/pixman-licenses.txt                |   92 -
 .../build.properties                               |   11 -
 .../org.eclipse.swt.motif.linux.x86/build.xml      |   12 -
 .../fragment.properties                            |   12 -
 .../org.eclipse.swt.motif.solaris.sparc/.project   |   28 -
 .../META-INF/MANIFEST.MF                           |   19 -
 .../org.eclipse.swt.motif.solaris.sparc/about.html |  152 -
 .../about_files/IJG_README                         |  385 -
 .../build.properties                               |   11 -
 .../org.eclipse.swt.motif.solaris.sparc/build.xml  |   12 -
 .../fragment.properties                            |   12 -
 .../org.eclipse.swt.photon.qnx.x86/.project        |   28 -
 .../META-INF/MANIFEST.MF                           |   13 -
 .../org.eclipse.swt.photon.qnx.x86/about.html      |  152 -
 .../about_files/IJG_README                         |  385 -
 .../build.properties                               |   11 -
 .../org.eclipse.swt.photon.qnx.x86/build.xml       |   12 -
 .../fragment.properties                            |   12 -
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../org.eclipse.swt.win32.wce_ppc.arm/build.xml    |    2 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../org.eclipse.swt.win32.win32.x86/build.xml      |    2 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../org.eclipse.swt.win32.win32.x86_64/build.xml   |    2 +-
 eclipse/plugins/org.eclipse.swt/.classpath_carbon  |    1 +
 eclipse/plugins/org.eclipse.swt/.classpath_cocoa   |    1 +
 eclipse/plugins/org.eclipse.swt/.classpath_gtk     |    1 +
 eclipse/plugins/org.eclipse.swt/.classpath_motif   |    1 +
 eclipse/plugins/org.eclipse.swt/.classpath_win32   |    1 +
 .../plugins/org.eclipse.swt/.settings/.api_filters | 2058 ++----
 .../.settings/org.eclipse.jdt.core.prefs           |    1 +
 .../.settings/org.eclipse.pde.api.tools.prefs      |    9 +-
 .../cocoa/org/eclipse/swt/awt/SWT_AWT.java         |  436 +-
 .../org/eclipse/swt/accessibility/Accessible.java  |  107 +-
 .../org/eclipse/swt/accessibility/Accessible.java  |  196 +-
 .../swt/accessibility/AccessibleActionEvent.java   |    2 +-
 .../accessibility/AccessibleAttributeAdapter.java  |    6 +-
 .../accessibility/AccessibleAttributeEvent.java    |    2 +-
 .../accessibility/AccessibleAttributeListener.java |    6 +-
 .../AccessibleEditableTextAdapter.java             |  107 +
 .../accessibility/AccessibleEditableTextEvent.java |   90 +
 .../AccessibleEditableTextListener.java            |  110 +
 .../accessibility/AccessibleHyperlinkEvent.java    |    2 +-
 .../accessibility/AccessibleTableCellEvent.java    |    2 +-
 .../swt/accessibility/AccessibleTableEvent.java    |    2 +-
 .../AccessibleTextAttributeEvent.java              |   64 +-
 .../AccessibleTextExtendedListener.java            |    4 +-
 .../swt/accessibility/AccessibleValueEvent.java    |    2 +-
 .../org/eclipse/swt/accessibility/Accessible.java  |  100 +-
 .../org/eclipse/swt/accessibility/Accessible.java  |  107 +-
 .../swt/accessibility/AccessibleFactory.java       |   55 +-
 .../swt/accessibility/AccessibleObject.java        |  341 +
 .../org/eclipse/swt/accessibility/Accessible.java  |  530 +-
 .../org/eclipse/swt/browser/BrowserFactory.java    |   24 +
 .../carbon/org/eclipse/swt/browser/Safari.java     | 2204 ------
 .../org/eclipse/swt/browser/BrowserFactory.java    |   24 +
 .../cocoa/org/eclipse/swt/browser/Safari.java      | 1786 -----
 .../common/org/eclipse/swt/browser/Browser.java    |   56 +-
 .../org/eclipse/swt/browser/BrowserFunction.java   |   19 +-
 .../common/org/eclipse/swt/browser/WebBrowser.java |   16 +-
 .../org/eclipse/swt/browser/BrowserFactory.java    |   22 +
 .../forms/org/eclipse/swt/browser/IE.java          |    4 +-
 .../org/eclipse/swt/browser/BrowserFactory.java    |   41 +
 .../org/eclipse/swt/browser/BrowserFactory.java    |   20 +
 .../org/eclipse/swt/browser/BrowserFactory.java    |   22 +
 .../photon/org/eclipse/swt/browser/Voyager.java    |    4 +-
 .../qt/org/eclipse/swt/browser/QtWebkit.java       |  201 +
 .../org/eclipse/swt/browser/BrowserFactory.java    |   45 +
 .../win32/org/eclipse/swt/browser/IE.java          |  101 +-
 .../win32/org/eclipse/swt/browser/WebSite.java     |   53 +-
 .../org/eclipse/swt/browser/BrowserFactory.java    |   22 +
 .../wpf/org/eclipse/swt/browser/IE.java            |    4 +-
 .../common/org/eclipse/swt/custom/CBanner.java     |    5 +-
 .../common/org/eclipse/swt/custom/CCombo.java      |   51 +-
 .../common/org/eclipse/swt/custom/CTabFolder.java  |   35 +-
 .../org/eclipse/swt/custom/CTabFolderRenderer.java |   69 +-
 .../common/org/eclipse/swt/custom/PopupList.java   |    7 +-
 .../common/org/eclipse/swt/custom/SashForm.java    |   22 +-
 .../common/org/eclipse/swt/custom/StyledText.java  |  143 +-
 .../org/eclipse/swt/custom/StyledTextRenderer.java |    3 +-
 .../common/org/eclipse/swt/custom/TableEditor.java |    9 +-
 .../carbon/org/eclipse/swt/dnd/DragSource.java     |    3 +-
 .../carbon/org/eclipse/swt/dnd/DropTarget.java     |    2 +-
 .../carbon/org/eclipse/swt/dnd/HTMLTransfer.java   |    2 +-
 .../carbon/org/eclipse/swt/dnd/TextTransfer.java   |    2 +-
 .../cocoa/org/eclipse/swt/dnd/DropTarget.java      |   27 +-
 .../org/eclipse/swt/dnd/TableDropTargetEffect.java |   17 +-
 .../org/eclipse/swt/dnd/TreeDropTargetEffect.java  |   17 +-
 .../emulated/org/eclipse/swt/dnd/Clipboard.java    |   78 +-
 .../gtk/org/eclipse/swt/dnd/Clipboard.java         |   30 +-
 .../gtk/org/eclipse/swt/dnd/ClipboardProxy.java    |   24 +-
 .../qt/org/eclipse/swt/dnd/ByteArrayTransfer.java  |  201 +
 .../org/eclipse/swt/dnd/Clipboard.java             |    0
 .../qt/org/eclipse/swt/dnd/DragSource.java         |  593 ++
 .../qt/org/eclipse/swt/dnd/DropTarget.java         |  638 ++
 .../qt/org/eclipse/swt/dnd/FileTransfer.java       |  145 +
 .../org/eclipse/swt/dnd/HTMLTransfer.java          |    0
 .../org/eclipse/swt/dnd/ImageTransfer.java         |    0
 .../org/eclipse/swt/dnd/RTFTransfer.java           |    0
 .../org/eclipse/swt/dnd/TableDragSourceEffect.java |    0
 .../org/eclipse/swt/dnd/TableDropTargetEffect.java |    0
 .../qt/org/eclipse/swt/dnd/TextTransfer.java       |  106 +
 .../qt/org/eclipse/swt/dnd/Transfer.java           |  163 +
 .../qt/org/eclipse/swt/dnd/TransferData.java       |   87 +
 .../org/eclipse/swt/dnd/TreeDragSourceEffect.java  |    0
 .../org/eclipse/swt/dnd/TreeDropTargetEffect.java  |  129 +
 .../org/eclipse/swt/dnd/URLTransfer.java           |    0
 .../org/eclipse/swt/browser/MozillaDelegate.java   |    4 +-
 .../org/eclipse/swt/browser/MozillaDelegate.java   |    4 +-
 .../common/library/xpcom_custom.cpp                |    2 +-
 .../common/library/xpcom_custom.h                  |    2 +-
 .../common/library/xpcominit.cpp                   |   24 +-
 .../common/library/xpcominit_stats.cpp             |    7 +-
 .../common/library/xpcominit_stats.h               |    3 +-
 .../common/library/xpcominit_structs.cpp           |   36 +-
 .../common/library/xpcominit_structs.h             |   14 +-
 .../common/org/eclipse/swt/browser/External.java   |   44 +-
 .../common/org/eclipse/swt/browser/Mozilla.java    |  450 +-
 .../org/eclipse/swt/internal/mozilla/XPCOM.java    |    2 +-
 .../swt/internal/mozilla/init/GREProperty.java     |   37 +
 .../swt/internal/mozilla/init/GREVersionRange.java |   35 +-
 .../swt/internal/mozilla/init/XPCOMInit.java       |    9 +-
 .../internal/mozilla/nsDynamicFunctionLoad.java    |   35 +-
 .../org/eclipse/swt/internal/mozilla/nsID.java     |   21 +-
 .../org/eclipse/swt/browser/MozillaDelegate.java   |    4 +-
 .../org/eclipse/swt/browser/MozillaDelegate.java   |    4 +-
 .../org/eclipse/swt/browser/MozillaDelegate.java   |    4 +-
 .../org/eclipse/swt/ole/win32/OleAutomation.java   |    5 +-
 .../win32/org/eclipse/swt/ole/win32/OleFrame.java  |    2 +-
 .../win32/org/eclipse/swt/ole/win32/Variant.java   |   16 +-
 .../Eclipse SWT PI/cairo/library/cairo.c           |    2 +-
 .../Eclipse SWT PI/cairo/library/cairo.h           |    2 +-
 .../Eclipse SWT PI/cairo/library/cairo_custom.h    |    2 +-
 .../Eclipse SWT PI/cairo/library/cairo_stats.c     |    2 +-
 .../Eclipse SWT PI/cairo/library/cairo_stats.h     |    2 +-
 .../Eclipse SWT PI/cairo/library/cairo_structs.c   |    2 +-
 .../Eclipse SWT PI/cairo/library/cairo_structs.h   |    2 +-
 .../Eclipse SWT PI/carbon/library/build.sh         |    4 +-
 .../Eclipse SWT PI/carbon/library/cocoa_custom.c   |   32 +-
 .../Eclipse SWT PI/carbon/library/make_macosx.mak  |    2 +-
 .../Eclipse SWT PI/carbon/library/os.c             |   34 +-
 .../Eclipse SWT PI/carbon/library/os.h             |    7 +-
 .../Eclipse SWT PI/carbon/library/os_custom.h      |    3 +-
 .../Eclipse SWT PI/carbon/library/os_stats.c       |    8 +-
 .../Eclipse SWT PI/carbon/library/os_stats.h       |    4 +-
 .../carbon/org/eclipse/swt/internal/carbon/OS.java |   14 +-
 .../org/eclipse/swt/internal/cocoa/Cocoa.java      |    4 +-
 .../Eclipse SWT PI/cocoa/library/make_macosx.mak   |    6 +-
 .../Eclipse SWT PI/cocoa/library/os.c              | 1006 +++-
 .../Eclipse SWT PI/cocoa/library/os.h              |    9 +-
 .../Eclipse SWT PI/cocoa/library/os_custom.c       |   29 +-
 .../Eclipse SWT PI/cocoa/library/os_custom.h       |   17 +-
 .../Eclipse SWT PI/cocoa/library/os_stats.c        |   92 +-
 .../Eclipse SWT PI/cocoa/library/os_stats.h        |   88 +-
 .../Eclipse SWT PI/cocoa/library/os_structs.c      |   36 +-
 .../Eclipse SWT PI/cocoa/library/os_structs.h      |   14 +-
 .../internal/cocoa/AppKitFull.bridgesupport.extras |  360 +-
 .../cocoa/CoreGraphicsFull.bridgesupport.extras    |   59 +-
 .../cocoa/FoundationFull.bridgesupport.extras      |   34 +
 .../eclipse/swt/internal/cocoa/NSApplication.java  |   18 +
 .../swt/internal/cocoa/NSAttributedString.java     |    8 +-
 .../org/eclipse/swt/internal/cocoa/NSBundle.java   |    7 +-
 .../eclipse/swt/internal/cocoa/NSButtonCell.java   |   12 +-
 .../org/eclipse/swt/internal/cocoa/NSCell.java     |   10 +-
 .../org/eclipse/swt/internal/cocoa/NSColor.java    |   13 +-
 .../eclipse/swt/internal/cocoa/NSColorPanel.java   |    6 +-
 .../eclipse/swt/internal/cocoa/NSColorSpace.java   |   10 +-
 .../eclipse/swt/internal/cocoa/NSDatePicker.java   |   10 +-
 .../org/eclipse/swt/internal/cocoa/NSEvent.java    |   15 +-
 .../eclipse/swt/internal/cocoa/NSFontPanel.java    |    6 +-
 .../org/eclipse/swt/internal/cocoa/NSImage.java    |   11 +-
 .../org/eclipse/swt/internal/cocoa/NSIndexSet.java |   12 +-
 .../org/eclipse/swt/internal/cocoa/NSLocale.java   |   37 +
 .../org/eclipse/swt/internal/cocoa/NSMenu.java     |    7 +-
 .../org/eclipse/swt/internal/cocoa/NSMenuItem.java |   23 +-
 .../swt/internal/cocoa/NSMutableIndexSet.java      |   11 +-
 .../org/eclipse/swt/internal/cocoa/NSObject.java   |   20 +
 .../eclipse/swt/internal/cocoa/NSOpenPanel.java    |    6 +-
 .../org/eclipse/swt/internal/cocoa/NSPanel.java    |   14 +-
 .../eclipse/swt/internal/cocoa/NSPrintInfo.java    |   27 +-
 .../eclipse/swt/internal/cocoa/NSResponder.java    |   51 +-
 .../eclipse/swt/internal/cocoa/NSSavePanel.java    |    6 +-
 .../eclipse/swt/internal/cocoa/NSScrollView.java   |    6 +-
 .../org/eclipse/swt/internal/cocoa/NSSet.java      |    7 +-
 .../eclipse/swt/internal/cocoa/NSTableView.java    |    6 +-
 .../org/eclipse/swt/internal/cocoa/NSToolbar.java  |   10 +-
 .../eclipse/swt/internal/cocoa/NSToolbarItem.java  |    6 +-
 .../org/eclipse/swt/internal/cocoa/NSTouch.java    |   52 +
 .../org/eclipse/swt/internal/cocoa/NSView.java     |   26 +-
 .../org/eclipse/swt/internal/cocoa/NSWindow.java   |   30 +-
 .../cocoa/org/eclipse/swt/internal/cocoa/OS.java   |  398 +-
 .../eclipse/swt/internal/cocoa/PMResolution.java   |   16 +
 .../swt/internal/cocoa/SFCertificatePanel.java     |    4 +
 .../internal/cocoa/SFCertificateTrustPanel.java    |    4 +
 .../org/eclipse/swt/internal/cocoa/SWTPanel.java   |   15 +
 .../cocoa/org/eclipse/swt/internal/cocoa/id.java   |   10 +-
 .../common/org/eclipse/swt/internal/LONG.java      |    4 +-
 .../org/eclipse/swt/internal/Library.java          |    4 +-
 .../org/eclipse/swt/internal/Library.java          |   38 +-
 .../Eclipse SWT PI/gtk/library/atk.c               |   66 +
 .../Eclipse SWT PI/gtk/library/atk_stats.c         |   16 +-
 .../Eclipse SWT PI/gtk/library/atk_stats.h         |   12 +
 .../Eclipse SWT PI/gtk/library/atk_structs.c       |   49 +
 .../Eclipse SWT PI/gtk/library/atk_structs.h       |   12 +
 .../Eclipse SWT PI/gtk/library/build.sh            |   18 +-
 .../Eclipse SWT PI/gtk/library/make_aix.mak        |    2 +-
 .../Eclipse SWT PI/gtk/library/make_hpux.mak       |  200 +
 .../Eclipse SWT PI/gtk/library/make_linux.mak      |    6 +-
 .../Eclipse SWT PI/gtk/library/make_solaris.mak    |    6 +-
 .../Eclipse SWT PI/gtk/library/os.c                |  362 +-
 .../Eclipse SWT PI/gtk/library/os_custom.c         |   71 +-
 .../Eclipse SWT PI/gtk/library/os_custom.h         |   20 +-
 .../Eclipse SWT PI/gtk/library/os_stats.c          |   39 +-
 .../Eclipse SWT PI/gtk/library/os_stats.h          |   35 +-
 .../gtk/org/eclipse/swt/internal/Lock.java         |    2 +-
 .../swt/internal/accessibility/gtk/ATK.java        |   13 +
 .../accessibility/gtk/AtkEditableTextIface.java    |   32 +
 .../gtk/org/eclipse/swt/internal/gtk/OS.java       |  252 +-
 .../motif/library/make_hpux_ia64_32.mak            |    2 +-
 .../motif/org/eclipse/swt/internal/motif/OS.java   |    1 +
 .../Eclipse SWT PI/win32/library/com.c             |  304 +-
 .../Eclipse SWT PI/win32/library/com.h             |    9 +-
 .../Eclipse SWT PI/win32/library/com_stats.c       |   62 +-
 .../Eclipse SWT PI/win32/library/com_stats.h       |   58 +-
 .../Eclipse SWT PI/win32/library/com_structs.c     |    2 +-
 .../Eclipse SWT PI/win32/library/com_structs.h     |    2 +-
 .../Eclipse SWT PI/win32/library/gdip_custom.cpp   |   24 +-
 .../Eclipse SWT PI/win32/library/make_win32.mak    |   41 +-
 .../Eclipse SWT PI/win32/library/os.c              | 1086 +++-
 .../Eclipse SWT PI/win32/library/os.h              |  165 +-
 .../Eclipse SWT PI/win32/library/os_custom.h       |   12 +-
 .../Eclipse SWT PI/win32/library/os_stats.c        |  124 +-
 .../Eclipse SWT PI/win32/library/os_stats.h        |  120 +-
 .../Eclipse SWT PI/win32/library/os_structs.c      |  633 ++-
 .../Eclipse SWT PI/win32/library/os_structs.h      |  158 +-
 .../Eclipse SWT PI/win32/library/swt.rc            |    4 +-
 .../Eclipse SWT PI/win32/library/swt_gdip.rc       |    4 +-
 .../org/eclipse/swt/internal/ole/win32/COM.java    |   26 +-
 .../org/eclipse/swt/internal/ole/win32/GUID.java   |   22 +-
 .../swt/internal/ole/win32/IPropertyBag.java       |   24 +
 .../eclipse/swt/internal/win32/CERT_CONTEXT.java   |   25 +
 .../org/eclipse/swt/internal/win32/CERT_INFO.java  |   30 +
 .../eclipse/swt/internal/win32/CERT_NAME_BLOB.java |   20 +
 .../swt/internal/win32/CERT_PUBLIC_KEY_INFO.java   |   19 +
 .../internal/win32/CRYPT_ALGORITHM_IDENTIFIER.java |   20 +
 .../eclipse/swt/internal/win32/CRYPT_BIT_BLOB.java |   21 +
 .../swt/internal/win32/CRYPT_INTEGER_BLOB.java     |   20 +
 .../swt/internal/win32/CRYPT_OBJID_BLOB.java       |   20 +
 .../org/eclipse/swt/internal/win32/FLICK_DATA.java |   26 +
 .../eclipse/swt/internal/win32/FLICK_POINT.java    |   17 +
 .../eclipse/swt/internal/win32/GESTURECONFIG.java  |   18 +
 .../eclipse/swt/internal/win32/GESTUREINFO.java    |   29 +
 .../win32/org/eclipse/swt/internal/win32/OS.java   |  276 +-
 .../org/eclipse/swt/internal/win32/TOUCHINPUT.java |   26 +
 .../org/eclipse/swt/printing/PrintDialog.java      |    3 +-
 .../carbon/org/eclipse/swt/printing/Printer.java   |    4 +-
 .../org/eclipse/swt/printing/PrintDialog.java      |   32 +-
 .../cocoa/org/eclipse/swt/printing/Printer.java    |   48 +-
 .../org/eclipse/swt/printing/PrinterData.java      |   66 +-
 .../org/eclipse/swt/printing/PrintDialog.java      |    3 +-
 .../emulated/org/eclipse/swt/printing/Printer.java |    4 +-
 .../gtk/org/eclipse/swt/printing/PrintDialog.java  |   76 +-
 .../gtk/org/eclipse/swt/printing/Printer.java      |  203 +-
 .../org/eclipse/swt/printing/PrintDialog.java      |    3 +-
 .../motif/org/eclipse/swt/printing/Printer.java    |    4 +-
 .../org/eclipse/swt/printing/PrintDialog.java      |    3 +-
 .../photon/org/eclipse/swt/printing/Printer.java   |    4 +-
 .../org/eclipse/swt/printing/PrintDialog.java      |  109 +-
 .../win32/org/eclipse/swt/printing/Printer.java    |   21 +-
 .../wpf/org/eclipse/swt/printing/PrintDialog.java  |    3 +-
 .../wpf/org/eclipse/swt/printing/Printer.java      |    4 +-
 .../cocoa/org/eclipse/swt/program/Program.java     |   15 +-
 .../Eclipse SWT Program/gnome/library/gnome.h      |    2 +-
 .../gtk/org/eclipse/swt/program/Program.java       |   67 +-
 .../eclipse/swt/internal/theme/ButtonDrawData.java |   12 +-
 .../eclipse/swt/internal/theme/ComboDrawData.java  |   13 +-
 .../gtk/org/eclipse/swt/internal/theme/Theme.java  |   10 +-
 .../carbon/org/eclipse/swt/browser/WebKit.java     | 2205 ++++++
 .../cocoa/org/eclipse/swt/browser/WebKit.java      | 1803 +++++
 .../Eclipse SWT WebKit/gtk/library/webkitgtk.h     |    7 +-
 .../gtk/org/eclipse/swt/browser/WebKit.java        |  265 +-
 .../org/eclipse/swt/internal/webkit/WebKitGTK.java |    3 +-
 .../Eclipse SWT WebKit/win32/library/swt_webkit.rc |   45 +
 .../win32/library/webkit_win32.cpp                 |  794 +++
 .../win32/library/webkit_win32.h                   |   26 +
 .../win32/library/webkit_win32_custom.cpp          |  103 +
 .../win32/library/webkit_win32_custom.h            |   16 +
 .../win32/library/webkit_win32_stats.cpp           |  107 +
 .../win32/library/webkit_win32_stats.h             |   93 +
 .../win32/library/webkit_win32_structs.cpp         |   97 +
 .../win32/library/webkit_win32_structs.h           |   29 +
 .../eclipse/swt/browser/WebDownloadDelegate.java   |  249 +
 .../eclipse/swt/browser/WebFrameLoadDelegate.java  |  751 ++
 .../win32/org/eclipse/swt/browser/WebKit.java      | 1310 ++++
 .../org/eclipse/swt/browser/WebPolicyDelegate.java |  207 +
 .../swt/browser/WebResourceLoadDelegate.java       |  369 +
 .../org/eclipse/swt/browser/WebUIDelegate.java     |  657 ++
 .../swt/internal/webkit/IWebCookieManager.java     |   26 +
 .../swt/internal/webkit/IWebDataSource.java        |   38 +
 .../webkit/IWebDocumentRepresentation.java         |   26 +
 .../eclipse/swt/internal/webkit/IWebDownload.java  |   34 +
 .../org/eclipse/swt/internal/webkit/IWebError.java |   46 +
 .../swt/internal/webkit/IWebErrorPrivate.java      |   26 +
 .../org/eclipse/swt/internal/webkit/IWebFrame.java |   38 +
 .../swt/internal/webkit/IWebFramePrivate.java      |   34 +
 .../eclipse/swt/internal/webkit/IWebIBActions.java |   38 +
 .../swt/internal/webkit/IWebMutableURLRequest.java |   46 +
 .../webkit/IWebMutableURLRequestPrivate.java       |   30 +
 .../webkit/IWebOpenPanelResultListener.java        |   29 +
 .../webkit/IWebPolicyDecisionListener.java         |   34 +
 .../swt/internal/webkit/IWebPreferences.java       |   46 +
 .../webkit/IWebURLAuthenticationChallenge.java     |   38 +
 .../IWebURLAuthenticationChallengeSender.java      |   30 +
 .../swt/internal/webkit/IWebURLCredential.java     |   38 +
 .../internal/webkit/IWebURLProtectionSpace.java    |   34 +
 .../swt/internal/webkit/IWebURLRequest.java        |   38 +
 .../swt/internal/webkit/IWebURLResponse.java       |   30 +
 .../org/eclipse/swt/internal/webkit/IWebView.java  |   87 +
 .../swt/internal/webkit/IWebViewPrivate.java       |   34 +
 .../swt/internal/webkit/JSClassDefinition.java     |   51 +
 .../eclipse/swt/internal/webkit/WebKit_win32.java  |  366 +
 .../carbon/org/eclipse/swt/graphics/FontData.java  |    2 +-
 .../carbon/org/eclipse/swt/widgets/Button.java     |    5 +-
 .../carbon/org/eclipse/swt/widgets/Caret.java      |    3 +-
 .../org/eclipse/swt/widgets/ColorDialog.java       |    3 +-
 .../carbon/org/eclipse/swt/widgets/Combo.java      |    4 +-
 .../carbon/org/eclipse/swt/widgets/Composite.java  |   12 +-
 .../carbon/org/eclipse/swt/widgets/Control.java    |  213 +-
 .../org/eclipse/swt/widgets/DirectoryDialog.java   |    5 +-
 .../carbon/org/eclipse/swt/widgets/Display.java    |  106 +-
 .../carbon/org/eclipse/swt/widgets/FileDialog.java |    3 +-
 .../carbon/org/eclipse/swt/widgets/FontDialog.java |    3 +-
 .../carbon/org/eclipse/swt/widgets/Label.java      |    3 +-
 .../carbon/org/eclipse/swt/widgets/Menu.java       |   40 +-
 .../carbon/org/eclipse/swt/widgets/MenuItem.java   |   42 +-
 .../carbon/org/eclipse/swt/widgets/MessageBox.java |   25 +-
 .../org/eclipse/swt/widgets/ProgressBar.java       |    3 +-
 .../carbon/org/eclipse/swt/widgets/Sash.java       |    3 +-
 .../carbon/org/eclipse/swt/widgets/Scale.java      |    3 +-
 .../carbon/org/eclipse/swt/widgets/Scrollable.java |   25 +-
 .../carbon/org/eclipse/swt/widgets/Shell.java      |   36 +-
 .../carbon/org/eclipse/swt/widgets/Table.java      |   15 +-
 .../carbon/org/eclipse/swt/widgets/Text.java       |  112 +-
 .../carbon/org/eclipse/swt/widgets/ToolItem.java   |   11 +-
 .../carbon/org/eclipse/swt/widgets/ToolTip.java    |    3 +-
 .../carbon/org/eclipse/swt/widgets/Tracker.java    |    2 +-
 .../carbon/org/eclipse/swt/widgets/TrayItem.java   |    9 +-
 .../carbon/org/eclipse/swt/widgets/Tree.java       |   15 +-
 .../carbon/org/eclipse/swt/widgets/Widget.java     |   14 +-
 .../cocoa/org/eclipse/swt/graphics/Cursor.java     |    4 +-
 .../cocoa/org/eclipse/swt/graphics/Font.java       |    9 +-
 .../cocoa/org/eclipse/swt/graphics/FontData.java   |    2 +-
 .../org/eclipse/swt/graphics/FontMetrics.java      |   19 +-
 .../cocoa/org/eclipse/swt/graphics/GC.java         |   45 +-
 .../cocoa/org/eclipse/swt/graphics/Image.java      |    2 +-
 .../cocoa/org/eclipse/swt/graphics/Path.java       |   26 +-
 .../cocoa/org/eclipse/swt/graphics/Pattern.java    |    2 +-
 .../cocoa/org/eclipse/swt/graphics/TextLayout.java |  123 +-
 .../cocoa/org/eclipse/swt/widgets/Button.java      |  183 +-
 .../cocoa/org/eclipse/swt/widgets/Canvas.java      |  113 +-
 .../cocoa/org/eclipse/swt/widgets/Caret.java       |    3 +-
 .../cocoa/org/eclipse/swt/widgets/ColorDialog.java |   13 +-
 .../cocoa/org/eclipse/swt/widgets/Combo.java       |    8 +-
 .../cocoa/org/eclipse/swt/widgets/Composite.java   |   89 +-
 .../cocoa/org/eclipse/swt/widgets/Control.java     |  605 ++-
 .../cocoa/org/eclipse/swt/widgets/DateTime.java    |  230 +-
 .../cocoa/org/eclipse/swt/widgets/Decorations.java |    9 +-
 .../org/eclipse/swt/widgets/DirectoryDialog.java   |   15 +-
 .../cocoa/org/eclipse/swt/widgets/Display.java     |  977 ++-
 .../cocoa/org/eclipse/swt/widgets/FileDialog.java  |    9 +-
 .../cocoa/org/eclipse/swt/widgets/FontDialog.java  |   12 +-
 .../cocoa/org/eclipse/swt/widgets/Group.java       |    4 +-
 .../cocoa/org/eclipse/swt/widgets/IME.java         |   22 +-
 .../cocoa/org/eclipse/swt/widgets/Label.java       |    9 +-
 .../cocoa/org/eclipse/swt/widgets/Link.java        |   50 +-
 .../cocoa/org/eclipse/swt/widgets/List.java        |   69 +-
 .../cocoa/org/eclipse/swt/widgets/Menu.java        |  195 +-
 .../cocoa/org/eclipse/swt/widgets/MenuItem.java    |   60 +-
 .../cocoa/org/eclipse/swt/widgets/MessageBox.java  |    3 +-
 .../cocoa/org/eclipse/swt/widgets/ProgressBar.java |    3 +-
 .../cocoa/org/eclipse/swt/widgets/Sash.java        |    3 +-
 .../cocoa/org/eclipse/swt/widgets/Scale.java       |    3 +-
 .../cocoa/org/eclipse/swt/widgets/ScrollBar.java   |    4 +-
 .../cocoa/org/eclipse/swt/widgets/Scrollable.java  |    2 +-
 .../cocoa/org/eclipse/swt/widgets/Shell.java       |  296 +-
 .../cocoa/org/eclipse/swt/widgets/Spinner.java     |    4 +-
 .../cocoa/org/eclipse/swt/widgets/Table.java       |  300 +-
 .../cocoa/org/eclipse/swt/widgets/TableItem.java   |    5 +-
 .../cocoa/org/eclipse/swt/widgets/TaskItem.java    |    2 +-
 .../cocoa/org/eclipse/swt/widgets/Text.java        |  227 +-
 .../cocoa/org/eclipse/swt/widgets/ToolBar.java     |  251 +-
 .../cocoa/org/eclipse/swt/widgets/ToolItem.java    |  243 +-
 .../cocoa/org/eclipse/swt/widgets/Tracker.java     |    2 +-
 .../cocoa/org/eclipse/swt/widgets/Tree.java        |  278 +-
 .../cocoa/org/eclipse/swt/widgets/TreeItem.java    |    3 +-
 .../cocoa/org/eclipse/swt/widgets/Widget.java      |  243 +-
 .../Eclipse SWT/common/library/callback.c          |   16 -
 .../Eclipse SWT/common/library/make_common.mak     |    6 +-
 .../Eclipse SWT/common/library/swt.h               |    2 +-
 .../Eclipse SWT/common/org/eclipse/swt/SWT.java    |  203 +-
 .../org/eclipse/swt/events/GestureEvent.java       |  158 +
 .../org/eclipse/swt/events/GestureListener.java    |   42 +
 .../common/org/eclipse/swt/events/TouchEvent.java  |   93 +
 .../org/eclipse/swt/events/TouchListener.java      |   41 +
 .../org/eclipse/swt/graphics/LineAttributes.java   |   59 +-
 .../common/org/eclipse/swt/graphics/TextStyle.java |    8 +-
 .../eclipse/swt/internal/image/JPEGDecoder.java    |   18 +-
 .../common/org/eclipse/swt/layout/GridData.java    |    2 +-
 .../common/org/eclipse/swt/layout/GridLayout.java  |    5 +-
 .../common/org/eclipse/swt/layout/package.html     |    2 +-
 .../common/org/eclipse/swt/widgets/Event.java      |   41 +-
 .../org/eclipse/swt/widgets/Synchronizer.java      |    5 +-
 .../common/org/eclipse/swt/widgets/Touch.java      |  100 +
 .../org/eclipse/swt/widgets/TouchSource.java       |   89 +
 .../org/eclipse/swt/widgets/TypedListener.java     |   12 +-
 .../org.eclipse.swt/Eclipse SWT/common/version.txt |    2 +-
 .../eclipse/swt/internal/SWTMessages.properties    |   17 +-
 .../swt/internal/SWTMessages_ar._properties        |    9 +-
 .../swt/internal/SWTMessages_bg._properties        |    2 +
 .../swt/internal/SWTMessages_cs._properties        |    9 +-
 .../swt/internal/SWTMessages_da._properties        |    9 +-
 .../swt/internal/SWTMessages_de._properties        |   11 +-
 .../swt/internal/SWTMessages_el._properties        |    9 +-
 .../swt/internal/SWTMessages_es._properties        |    8 +
 .../swt/internal/SWTMessages_et._properties        |    3 +
 .../swt/internal/SWTMessages_fa._properties        |   54 +
 .../swt/internal/SWTMessages_fi._properties        |    9 +-
 .../swt/internal/SWTMessages_fr._properties        |   11 +-
 .../swt/internal/SWTMessages_hi._properties        |    2 +
 .../swt/internal/SWTMessages_hu._properties        |    9 +-
 .../swt/internal/SWTMessages_it._properties        |    9 +-
 .../swt/internal/SWTMessages_iw._properties        |   11 +-
 .../swt/internal/SWTMessages_ja._properties        |   11 +-
 .../swt/internal/SWTMessages_ko._properties        |   11 +-
 .../swt/internal/SWTMessages_mn._properties        |    3 +-
 .../swt/internal/SWTMessages_nl._properties        |    9 +-
 .../swt/internal/SWTMessages_no._properties        |    9 +-
 .../swt/internal/SWTMessages_pl._properties        |    9 +-
 .../swt/internal/SWTMessages_pt._properties        |    9 +-
 .../swt/internal/SWTMessages_pt_BR._properties     |    9 +-
 .../swt/internal/SWTMessages_ro._properties        |    7 +-
 .../swt/internal/SWTMessages_ru._properties        |    8 +
 .../swt/internal/SWTMessages_sl._properties        |   65 +
 .../swt/internal/SWTMessages_sv._properties        |    9 +-
 .../swt/internal/SWTMessages_tr._properties        |    7 +
 .../swt/internal/SWTMessages_uk._properties        |    3 +
 .../swt/internal/SWTMessages_zh._properties        |    9 +
 .../swt/internal/SWTMessages_zh_TW._properties     |   11 +-
 .../coolbar/org/eclipse/swt/widgets/CoolBar.java   |   15 +-
 .../tooltip/org/eclipse/swt/widgets/ToolTip.java   |    3 +-
 .../org/eclipse/swt/widgets/TableItem.java         |    8 +-
 .../org/eclipse/swt/widgets/TreeItem.java          |    6 +-
 .../gtk/org/eclipse/swt/graphics/Device.java       |   23 +-
 .../gtk/org/eclipse/swt/graphics/Font.java         |   12 +-
 .../gtk/org/eclipse/swt/graphics/FontData.java     |    2 +-
 .../gtk/org/eclipse/swt/graphics/GC.java           |    7 +-
 .../gtk/org/eclipse/swt/graphics/Image.java        |    2 +-
 .../gtk/org/eclipse/swt/graphics/TextLayout.java   |  102 +-
 .../gtk/org/eclipse/swt/widgets/Button.java        |  177 +-
 .../gtk/org/eclipse/swt/widgets/Caret.java         |    3 +-
 .../gtk/org/eclipse/swt/widgets/ColorDialog.java   |   12 +-
 .../gtk/org/eclipse/swt/widgets/Combo.java         |  111 +-
 .../gtk/org/eclipse/swt/widgets/Composite.java     |   29 +-
 .../gtk/org/eclipse/swt/widgets/Control.java       |  268 +-
 .../gtk/org/eclipse/swt/widgets/DateTime.java      |  885 ++-
 .../gtk/org/eclipse/swt/widgets/Decorations.java   |    7 +
 .../org/eclipse/swt/widgets/DirectoryDialog.java   |   20 +-
 .../gtk/org/eclipse/swt/widgets/Display.java       |   92 +-
 .../gtk/org/eclipse/swt/widgets/ExpandBar.java     |   11 +-
 .../gtk/org/eclipse/swt/widgets/ExpandItem.java    |   15 +-
 .../gtk/org/eclipse/swt/widgets/FileDialog.java    |   20 +-
 .../gtk/org/eclipse/swt/widgets/FontDialog.java    |   12 +-
 .../gtk/org/eclipse/swt/widgets/Group.java         |   11 +-
 .../gtk/org/eclipse/swt/widgets/IME.java           |    6 +-
 .../gtk/org/eclipse/swt/widgets/Label.java         |   14 +-
 .../gtk/org/eclipse/swt/widgets/Link.java          |    9 +-
 .../gtk/org/eclipse/swt/widgets/List.java          |   25 +-
 .../gtk/org/eclipse/swt/widgets/Menu.java          |   96 +-
 .../gtk/org/eclipse/swt/widgets/MenuItem.java      |   55 +-
 .../gtk/org/eclipse/swt/widgets/MessageBox.java    |   12 +-
 .../gtk/org/eclipse/swt/widgets/ProgressBar.java   |    3 +-
 .../gtk/org/eclipse/swt/widgets/Sash.java          |    3 +-
 .../gtk/org/eclipse/swt/widgets/Scale.java         |    3 +-
 .../gtk/org/eclipse/swt/widgets/ScrollBar.java     |   13 +-
 .../gtk/org/eclipse/swt/widgets/Scrollable.java    |   15 +-
 .../gtk/org/eclipse/swt/widgets/Shell.java         |   79 +-
 .../gtk/org/eclipse/swt/widgets/Slider.java        |   10 +-
 .../gtk/org/eclipse/swt/widgets/Spinner.java       |   20 +-
 .../gtk/org/eclipse/swt/widgets/TabFolder.java     |   11 +-
 .../gtk/org/eclipse/swt/widgets/TabItem.java       |   17 +-
 .../gtk/org/eclipse/swt/widgets/Table.java         |   39 +-
 .../gtk/org/eclipse/swt/widgets/TableColumn.java   |   13 +-
 .../gtk/org/eclipse/swt/widgets/Text.java          |  233 +-
 .../gtk/org/eclipse/swt/widgets/ToolBar.java       |   10 +-
 .../gtk/org/eclipse/swt/widgets/ToolItem.java      |   32 +-
 .../gtk/org/eclipse/swt/widgets/ToolTip.java       |    3 +-
 .../gtk/org/eclipse/swt/widgets/TrayItem.java      |   10 +-
 .../gtk/org/eclipse/swt/widgets/Tree.java          |   57 +-
 .../gtk/org/eclipse/swt/widgets/TreeColumn.java    |   13 +-
 .../gtk/org/eclipse/swt/widgets/Widget.java        |   10 +-
 .../motif/org/eclipse/swt/graphics/TextLayout.java |    6 +-
 .../motif/org/eclipse/swt/widgets/Button.java      |  127 +-
 .../motif/org/eclipse/swt/widgets/Caret.java       |    3 +-
 .../motif/org/eclipse/swt/widgets/ColorDialog.java |    3 +-
 .../motif/org/eclipse/swt/widgets/Composite.java   |   12 +-
 .../motif/org/eclipse/swt/widgets/Control.java     |  208 +-
 .../org/eclipse/swt/widgets/DirectoryDialog.java   |    3 +-
 .../motif/org/eclipse/swt/widgets/Display.java     |   58 +-
 .../motif/org/eclipse/swt/widgets/FileDialog.java  |    3 +-
 .../motif/org/eclipse/swt/widgets/FontDialog.java  |    3 +-
 .../motif/org/eclipse/swt/widgets/Label.java       |    3 +-
 .../motif/org/eclipse/swt/widgets/Menu.java        |   40 +-
 .../motif/org/eclipse/swt/widgets/MenuItem.java    |   38 +-
 .../motif/org/eclipse/swt/widgets/MessageBox.java  |    3 +-
 .../motif/org/eclipse/swt/widgets/ProgressBar.java |    3 +-
 .../motif/org/eclipse/swt/widgets/Sash.java        |    3 +-
 .../motif/org/eclipse/swt/widgets/Scale.java       |    3 +-
 .../motif/org/eclipse/swt/widgets/Shell.java       |   34 +-
 .../motif/org/eclipse/swt/widgets/Text.java        |  109 +-
 .../motif/org/eclipse/swt/widgets/ToolItem.java    |   11 +-
 .../photon/org/eclipse/swt/graphics/FontData.java  |    2 +-
 .../photon/org/eclipse/swt/widgets/Button.java     |    3 +-
 .../photon/org/eclipse/swt/widgets/Caret.java      |    3 +-
 .../org/eclipse/swt/widgets/ColorDialog.java       |    3 +-
 .../photon/org/eclipse/swt/widgets/Composite.java  |   12 +-
 .../photon/org/eclipse/swt/widgets/Control.java    |  209 +-
 .../org/eclipse/swt/widgets/DirectoryDialog.java   |    3 +-
 .../photon/org/eclipse/swt/widgets/Display.java    |   59 +-
 .../photon/org/eclipse/swt/widgets/FileDialog.java |    3 +-
 .../photon/org/eclipse/swt/widgets/FontDialog.java |    3 +-
 .../photon/org/eclipse/swt/widgets/Label.java      |    3 +-
 .../photon/org/eclipse/swt/widgets/Menu.java       |   38 +-
 .../photon/org/eclipse/swt/widgets/MenuItem.java   |   40 +-
 .../photon/org/eclipse/swt/widgets/MessageBox.java |    3 +-
 .../org/eclipse/swt/widgets/ProgressBar.java       |    3 +-
 .../photon/org/eclipse/swt/widgets/Sash.java       |    3 +-
 .../photon/org/eclipse/swt/widgets/Scale.java      |    3 +-
 .../photon/org/eclipse/swt/widgets/Shell.java      |   32 +-
 .../photon/org/eclipse/swt/widgets/Text.java       |   47 +-
 .../photon/org/eclipse/swt/widgets/ToolItem.java   |   11 +-
 .../qt/org/eclipse/swt/graphics/Color.java         |  364 +
 .../qt/org/eclipse/swt/graphics/Cursor.java        |  445 ++
 .../qt/org/eclipse/swt/graphics/Device.java        |  920 +++
 .../qt/org/eclipse/swt/graphics/DeviceData.java    |   23 +
 .../qt/org/eclipse/swt/graphics/Font.java          |  379 +
 .../qt/org/eclipse/swt/graphics/FontData.java      |  722 ++
 .../qt/org/eclipse/swt/graphics/FontMetrics.java   |  165 +
 .../qt/org/eclipse/swt/graphics/GC.java            | 3555 ++++++++++
 .../qt/org/eclipse/swt/graphics/GCData.java        |   53 +
 .../qt/org/eclipse/swt/graphics/Image.java         |  978 +++
 .../qt/org/eclipse/swt/graphics/Region.java        |  776 ++
 .../eclipse/swt/internal/qt/DragNDropListener.java |   28 +
 .../org/eclipse/swt/internal/qt/FontConverter.java |  107 +
 .../qt/org/eclipse/swt/internal/qt/KeyUtil.java    |  120 +
 .../eclipse/swt/internal/qt/QtSWTConverter.java    |  110 +
 .../swt/internal/qt/QtSupplementaryFontData.java   |   28 +
 .../qt/org/eclipse/swt/internal/qt/SWQT.java       |   51 +
 .../eclipse/swt/internal/qt/SignalConnector.java   |   74 +
 .../swt/internal/qt/StylableScrollArea.java        |   60 +
 .../qt/org/eclipse/swt/internal/qt/ToString.java   |   99 +
 .../qt/org/eclipse/swt/widgets/Button.java         |  801 +++
 .../qt/org/eclipse/swt/widgets/Canvas.java         |  355 +
 .../qt/org/eclipse/swt/widgets/Caret.java          |  590 ++
 .../qt/org/eclipse/swt/widgets/ColorDialog.java    |  164 +
 .../qt/org/eclipse/swt/widgets/Combo.java          | 1398 ++++
 .../qt/org/eclipse/swt/widgets/Composite.java      | 1303 ++++
 .../qt/org/eclipse/swt/widgets/Control.java        | 4361 ++++++++++++
 .../qt/org/eclipse/swt/widgets/DateTime.java       |  806 +++
 .../qt/org/eclipse/swt/widgets/Decorations.java    | 1218 ++++
 .../org/eclipse/swt/widgets/DirectoryDialog.java   |  202 +
 .../qt/org/eclipse/swt/widgets/Display.java        | 3246 +++++++++
 .../qt/org/eclipse/swt/widgets/FileDialog.java     |  443 ++
 .../qt/org/eclipse/swt/widgets/FontDialog.java     |  246 +
 .../qt/org/eclipse/swt/widgets/Group.java          |  293 +
 .../qt/org/eclipse/swt/widgets/Label.java          |  456 ++
 .../qt/org/eclipse/swt/widgets/Link.java           |  552 ++
 .../qt/org/eclipse/swt/widgets/List.java           | 1380 ++++
 .../qt/org/eclipse/swt/widgets/Menu.java           | 1423 ++++
 .../qt/org/eclipse/swt/widgets/MenuItem.java       | 1045 +++
 .../qt/org/eclipse/swt/widgets/MessageBox.java     |  312 +
 .../qt/org/eclipse/swt/widgets/ProgressBar.java    |  318 +
 .../qt/org/eclipse/swt/widgets/Sash.java           |  387 +
 .../qt/org/eclipse/swt/widgets/Scale.java          |  494 ++
 .../qt/org/eclipse/swt/widgets/ScrollBar.java      |  876 +++
 .../qt/org/eclipse/swt/widgets/Scrollable.java     |  430 ++
 .../qt/org/eclipse/swt/widgets/Shell.java          | 1510 ++++
 .../qt/org/eclipse/swt/widgets/Slider.java         |  632 ++
 .../qt/org/eclipse/swt/widgets/Spinner.java        |  948 +++
 .../qt/org/eclipse/swt/widgets/TabFolder.java      |  755 ++
 .../qt/org/eclipse/swt/widgets/TabItem.java        |  389 ++
 .../qt/org/eclipse/swt/widgets/Table.java          | 2561 +++++++
 .../qt/org/eclipse/swt/widgets/TableColumn.java    |  664 ++
 .../qt/org/eclipse/swt/widgets/TableItem.java      | 1441 ++++
 .../qt/org/eclipse/swt/widgets/Text.java           | 1875 +++++
 .../qt/org/eclipse/swt/widgets/ToolBar.java        |  530 ++
 .../qt/org/eclipse/swt/widgets/ToolItem.java       |  981 +++
 .../qt/org/eclipse/swt/widgets/ToolTip.java        |  512 ++
 .../qt/org/eclipse/swt/widgets/Tracker.java        |  859 +++
 .../qt/org/eclipse/swt/widgets/TrayItem.java       |  536 ++
 .../qt/org/eclipse/swt/widgets/Tree.java           | 1913 +++++
 .../qt/org/eclipse/swt/widgets/TreeColumn.java     |  714 ++
 .../qt/org/eclipse/swt/widgets/TreeItem.java       | 1573 +++++
 .../qt/org/eclipse/swt/widgets/Widget.java         | 1358 ++++
 .../win32/org/eclipse/swt/graphics/Cursor.java     |    2 +-
 .../win32/org/eclipse/swt/graphics/FontData.java   |    4 +-
 .../win32/org/eclipse/swt/graphics/TextLayout.java |  193 +-
 .../win32/org/eclipse/swt/internal/BidiUtil.java   |    4 +-
 .../win32/org/eclipse/swt/internal/ImageList.java  |    8 +-
 .../win32/org/eclipse/swt/widgets/Button.java      |   83 +-
 .../win32/org/eclipse/swt/widgets/Caret.java       |    5 +-
 .../win32/org/eclipse/swt/widgets/ColorDialog.java |    5 +-
 .../win32/org/eclipse/swt/widgets/Combo.java       |  153 +-
 .../win32/org/eclipse/swt/widgets/Composite.java   |   45 +-
 .../win32/org/eclipse/swt/widgets/Control.java     |  526 ++-
 .../win32/org/eclipse/swt/widgets/DateTime.java    |  260 +-
 .../win32/org/eclipse/swt/widgets/Decorations.java |   14 +-
 .../org/eclipse/swt/widgets/DirectoryDialog.java   |    5 +-
 .../win32/org/eclipse/swt/widgets/Display.java     |  156 +-
 .../win32/org/eclipse/swt/widgets/FileDialog.java  |    5 +-
 .../win32/org/eclipse/swt/widgets/FontDialog.java  |    5 +-
 .../win32/org/eclipse/swt/widgets/IME.java         |    4 +-
 .../win32/org/eclipse/swt/widgets/Label.java       |    5 +-
 .../win32/org/eclipse/swt/widgets/Menu.java        |   53 +-
 .../win32/org/eclipse/swt/widgets/MenuItem.java    |   52 +-
 .../win32/org/eclipse/swt/widgets/MessageBox.java  |    5 +-
 .../win32/org/eclipse/swt/widgets/ProgressBar.java |    5 +-
 .../win32/org/eclipse/swt/widgets/Sash.java        |    5 +-
 .../win32/org/eclipse/swt/widgets/Scale.java       |   30 +-
 .../win32/org/eclipse/swt/widgets/Shell.java       |   33 +-
 .../win32/org/eclipse/swt/widgets/Spinner.java     |   23 +-
 .../win32/org/eclipse/swt/widgets/TabFolder.java   |   73 +-
 .../win32/org/eclipse/swt/widgets/Table.java       |  159 +-
 .../win32/org/eclipse/swt/widgets/TaskBar.java     |   89 +-
 .../win32/org/eclipse/swt/widgets/Text.java        |  122 +-
 .../win32/org/eclipse/swt/widgets/ToolBar.java     |   48 +-
 .../win32/org/eclipse/swt/widgets/ToolItem.java    |   11 +-
 .../win32/org/eclipse/swt/widgets/ToolTip.java     |    5 +-
 .../win32/org/eclipse/swt/widgets/Tree.java        |  196 +-
 .../win32/org/eclipse/swt/widgets/TreeColumn.java  |    7 +-
 .../win32/org/eclipse/swt/widgets/Widget.java      |    3 +-
 .../wpf/org/eclipse/swt/graphics/FontData.java     |    2 +-
 .../wpf/org/eclipse/swt/widgets/Button.java        |    3 +-
 .../wpf/org/eclipse/swt/widgets/Caret.java         |    3 +-
 .../wpf/org/eclipse/swt/widgets/ColorDialog.java   |    3 +-
 .../wpf/org/eclipse/swt/widgets/Composite.java     |   46 +-
 .../wpf/org/eclipse/swt/widgets/Control.java       |  209 +-
 .../org/eclipse/swt/widgets/DirectoryDialog.java   |    3 +-
 .../wpf/org/eclipse/swt/widgets/Display.java       |  101 +-
 .../wpf/org/eclipse/swt/widgets/FileDialog.java    |    3 +-
 .../wpf/org/eclipse/swt/widgets/FontDialog.java    |    3 +-
 .../wpf/org/eclipse/swt/widgets/Label.java         |    3 +-
 .../wpf/org/eclipse/swt/widgets/Menu.java          |   38 +-
 .../wpf/org/eclipse/swt/widgets/MenuItem.java      |   39 +-
 .../wpf/org/eclipse/swt/widgets/MessageBox.java    |    3 +-
 .../wpf/org/eclipse/swt/widgets/ProgressBar.java   |    3 +-
 .../wpf/org/eclipse/swt/widgets/Sash.java          |    3 +-
 .../wpf/org/eclipse/swt/widgets/Scale.java         |    3 +-
 .../wpf/org/eclipse/swt/widgets/Shell.java         |   32 +-
 .../wpf/org/eclipse/swt/widgets/Text.java          |   48 +-
 .../wpf/org/eclipse/swt/widgets/ToolItem.java      |   11 +-
 .../plugins/org.eclipse.swt/META-INF/MANIFEST.MF   |    4 +-
 eclipse/plugins/org.eclipse.swt/build.xml          |    2 +-
 eclipse/plugins/org.eclipse.swt/buildFragment.xml  |   22 +-
 .../plugins/org.eclipse.swt/buildnotes_swt.html    |  322 +-
 .../org.eclipse.swt/components/external.idl        |   15 +-
 eclipse/plugins/org.eclipse.swt/readme_swt.html    |  145 -
 eclipse/plugins/org.eclipse.swt/tasks/build.xml    |  395 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   13 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../org.eclipse.team.core/META-INF/MANIFEST.MF     |    6 +-
 .../org.eclipse.team.core/buildnotes_team.html     |  299 +-
 .../plugins/org.eclipse.team.core/component.xml    |   11 +
 .../org.eclipse.team.core/plugin.properties        |    3 +-
 eclipse/plugins/org.eclipse.team.core/plugin.xml   |   14 +-
 .../schema/bundleImporters.exsd                    |  156 +
 .../schema/defaultFileModificationValidator.exsd   |    4 +-
 .../src/org/eclipse/team/core/ITeamStatus.java     |    4 +-
 .../eclipse/team/core/ProjectSetCapability.java    |   50 +-
 .../eclipse/team/core/ScmUrlImportDescription.java |   99 +
 .../src/org/eclipse/team/core/Team.java            |   95 +-
 .../eclipse/team/core/history/IFileRevision.java   |   12 +-
 .../team/core/history/provider/FileRevision.java   |   13 +-
 .../provisional/BundleImporterDelegate.java        |  105 +
 .../importing/provisional/IBundleImporter.java     |   55 +
 .../provisional/IBundleImporterDelegate.java       |   83 +
 .../team/core/importing/provisional/package.html   |   23 +
 .../src/org/eclipse/team/core/mapping/package.html |    2 +-
 .../team/core/mapping/provider/package.html        |    2 +-
 .../eclipse/team/core/subscribers/Subscriber.java  |    6 +-
 .../eclipse/team/core/synchronize/SyncInfo.java    |   20 +-
 .../variants/ResourceVariantTreeSubscriber.java    |    2 +-
 .../team/core/variants/ThreeWaySynchronizer.java   |    4 +-
 .../org/eclipse/team/internal/core/Messages.java   |    3 +-
 .../eclipse/team/internal/core/StringMatcher.java  |    4 +-
 .../org/eclipse/team/internal/core/TeamPlugin.java |    7 +-
 .../core/importing/BundleImporterExtension.java    |   94 +
 .../core/mapping/AbstractResourceMappingScope.java |    5 +-
 .../eclipse/team/internal/core/messages.properties |    4 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   13 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../org.eclipse.team.cvs.core/META-INF/MANIFEST.MF |    4 +-
 .../org.eclipse.team.cvs.core/plugin.properties    |    3 +-
 .../plugins/org.eclipse.team.cvs.core/plugin.xml   |   20 +-
 .../internal/ccvs/core/CVSCompareSubscriber.java   |    4 +-
 .../team/internal/ccvs/core/CVSMergeSyncInfo.java  |    4 +-
 .../team/internal/ccvs/core/CVSMessages.java       |    6 +-
 .../ccvs/core/CVSProjectSetCapability.java         |    7 +
 .../team/internal/ccvs/core/CVSSyncInfo.java       |   72 +-
 .../eclipse/team/internal/ccvs/core/CVSTag.java    |   29 +-
 .../ccvs/core/CvsBundleImporterDelegate.java       |   58 +
 .../eclipse/team/internal/ccvs/core/ILogEntry.java |    8 +-
 .../ccvs/core/client/CommandOutputListener.java    |    8 +-
 .../team/internal/ccvs/core/client/RTag.java       |   11 +-
 .../team/internal/ccvs/core/client/Request.java    |   16 +-
 .../ccvs/core/client/listeners/DiffListener.java   |    8 +-
 .../core/client/listeners/IMessagePatterns.java    |    4 +-
 .../ccvs/core/client/listeners/LogEntry.java       |   33 +-
 .../ccvs/core/client/listeners/LogListener.java    |   76 +-
 .../ccvs/core/client/listeners/StatusListener.java |    4 +-
 .../core/filehistory/CVSFileHistoryProvider.java   |    5 +-
 .../ccvs/core/filehistory/CVSFileRevision.java     |    7 +-
 .../team/internal/ccvs/core/filesystem/CVSURI.java |   97 +-
 .../team/internal/ccvs/core/messages.properties    |    8 +-
 .../internal/ccvs/core/resources/EclipseFile.java  |    6 +-
 .../ccvs/core/resources/EclipseSynchronizer.java   |   18 +-
 .../ccvs/core/syncinfo/ResourceSyncInfo.java       |   80 +-
 .../internal/ccvs/core/util/KnownRepositories.java |   15 +-
 .../eclipse/team/internal/ccvs/core/util/Util.java |   16 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   13 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../org.eclipse.team.cvs.ssh2/META-INF/MANIFEST.MF |    2 +-
 .../plugins/org.eclipse.team.cvs.ssh2/plugin.xml   |   11 +
 .../.settings/org.eclipse.jdt.core.prefs           |   15 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF   |    2 +-
 eclipse/plugins/org.eclipse.team.cvs.ui/plugin.xml |   24 +
 .../team/internal/ccvs/ui/CVSHistoryFilter.java    |   25 +-
 .../internal/ccvs/ui/CVSHistoryFilterDialog.java   |   18 +-
 .../team/internal/ccvs/ui/CVSHistoryPage.java      |  129 +-
 .../internal/ccvs/ui/CVSHistorySearchFilter.java   |   19 +-
 .../internal/ccvs/ui/CVSHistoryTableProvider.java  |  119 +-
 .../internal/ccvs/ui/CVSProjectPropertiesPage.java |   10 +-
 .../team/internal/ccvs/ui/CVSUIMessages.java       |   15 +-
 .../ccvs/ui/CommentTemplatesPreferencePage.java    |   20 +-
 .../team/internal/ccvs/ui/CommitCommentArea.java   |   32 +-
 .../internal/ccvs/ui/ComparePreferencePage.java    |   13 +-
 .../eclipse/team/internal/ccvs/ui/EditorsView.java |   30 +-
 .../internal/ccvs/ui/HistoryTableProvider.java     |   64 +-
 .../team/internal/ccvs/ui/IHelpContextIds.java     |    5 +-
 .../org/eclipse/team/internal/ccvs/ui/Policy.java  |    8 +-
 .../actions/ReplaceWithLatestRevisionAction.java   |    9 +-
 .../ui/actions/ReplaceWithSelectableTagAction.java |   11 +-
 .../ccvs/ui/actions/ReplaceWithTagAction.java      |   26 +-
 .../ui/actions/RestoreFromRepositoryAction.java    |   46 +-
 .../internal/ccvs/ui/actions/WorkspaceAction.java  |   44 +-
 .../ccvs/ui/actions/WorkspaceTraversalAction.java  |   10 +-
 .../internal/ccvs/ui/actions/actions.properties    |   10 +-
 .../ccvs/ui/mappings/ChangeSetActionProvider.java  |   31 +-
 .../team/internal/ccvs/ui/messages.properties      |   35 +-
 .../internal/ccvs/ui/operations/CVSOperation.java  |    9 +-
 .../internal/ccvs/ui/operations/DiffOperation.java |   24 +-
 .../ui/operations/ProjectMetaFileOperation.java    |    4 +-
 .../ccvs/ui/operations/ReplaceOperation.java       |   21 +-
 .../ccvs/ui/operations/ShareProjectOperation.java  |   10 +-
 .../ui/operations/TagInRepositoryOperation.java    |    8 +-
 .../ui/operations/UpdateOnlyMergableOperation.java |    8 +-
 .../ccvs/ui/repo/CVSRepositoryPropertiesPage.java  |    3 +-
 .../ccvs/ui/repo/PasteConnectionStringAction.java  |    2 +-
 .../ccvs/ui/tags/TagSelectionWizardPage.java       |    8 +-
 .../ccvs/ui/wizards/CVSScmUrlImportWizardPage.java |  255 +
 .../ccvs/ui/wizards/GenerateDiffFileWizard.java    |    8 +-
 .../team/internal/ccvs/ui/wizards/MergeWizard.java |    2 +-
 .../internal/ccvs/ui/wizards/MergeWizardPage.java  |   25 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   13 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../org.eclipse.team.ui/META-INF/MANIFEST.MF       |    4 +-
 .../plugins/org.eclipse.team.ui/plugin.properties  |    3 +-
 eclipse/plugins/org.eclipse.team.ui/plugin.xml     |   21 +-
 .../schema/scmUrlImportPages.exsd                  |  137 +
 .../team/internal/ui/ProjectSetImporter.java       |   87 +-
 .../eclipse/team/internal/ui/TeamUIMessages.java   |    9 +-
 .../org/eclipse/team/internal/ui/TeamUIPlugin.java |   20 +-
 .../src/org/eclipse/team/internal/ui/Utils.java    |   33 +-
 .../team/internal/ui/actions/CompareAction.java    |    2 +-
 .../ui/actions/ImportProjectSetAction.java         |   28 +-
 .../team/internal/ui/actions/actions.properties    |    2 +-
 .../ui/history/CompareFileRevisionEditorInput.java |   30 +-
 .../team/internal/ui/history/LocalHistoryPage.java |   32 +-
 .../ui/mapping/DiffTreeChangesSection.java         |   12 +-
 .../team/internal/ui/mapping/LineComparator.java   |    7 +-
 .../internal/ui/mapping/RemoveFromViewAction.java  |    3 +-
 .../ResourceCompareInputChangeNotifier.java        |   39 +-
 .../ui/mapping/ResourceDiffCompareInput.java       |   53 +-
 .../team/internal/ui/mapping/TeamViewerSorter.java |    7 +-
 .../eclipse/team/internal/ui/messages.properties   |   19 +-
 .../ui/preferences/IgnorePreferencePage.java       |    4 +-
 .../ui/synchronize/ChangeSetModelSorter.java       |    4 +-
 .../internal/ui/synchronize/ChangesSection.java    |   11 +-
 .../ui/synchronize/ForwardingChangesSection.java   |    6 +-
 .../LocalResourceSaveableComparison.java           |   59 +-
 .../ui/synchronize/LocalResourceTypedElement.java  |   50 +
 .../ui/synchronize/NavigationActionGroup.java      |    9 +-
 .../synchronize/SaveablesCompareEditorInput.java   |   72 +-
 .../ui/synchronize/StructuredViewerAdvisor.java    |   30 +-
 .../ui/synchronize/SyncInfoSetChangesSection.java  |   13 +-
 .../synchronize/SynchronizeModelElementSorter.java |   13 +-
 .../internal/ui/synchronize/SynchronizeView.java   |   16 +-
 .../synchronize/actions/ChangeSetActionGroup.java  |   48 +-
 .../synchronize/actions/OpenWithActionGroup.java   |  114 +-
 .../synchronize/actions/RemoveFromViewAction.java  |   12 +-
 .../actions/StatusLineContributionGroup.java       |    2 +-
 .../actions/SynchronizeAndRefreshAction.java       |   65 +
 .../actions/SynchronizePageDropDownAction.java     |    2 +-
 .../ui/wizards/ExportProjectSetLocationPage.java   |    6 +-
 .../ui/wizards/ImportProjectSetMainPage.java       |  190 +-
 .../ui/wizards/ImportProjectSetOperation.java      |   57 +-
 .../ui/wizards/ProjectSetExportWizard.java         |    4 +-
 .../ui/wizards/ProjectSetImportWizard.java         |   21 +-
 .../team/internal/ui/wizards/PsfFilenameStore.java |   99 +-
 .../eclipse/team/internal/ui/wizards/PsfStore.java |   95 +
 .../team/internal/ui/wizards/PsfUrlStore.java      |   47 +
 .../eclipse/team/ui/IScmUrlImportWizardPage.java   |   79 +
 .../src/org/eclipse/team/ui/TeamUI.java            |   72 +-
 .../src/org/eclipse/team/ui/history/package.html   |    2 +-
 .../ui/mapping/SynchronizationContentProvider.java |    4 +-
 .../src/org/eclipse/team/ui/mapping/package.html   |    2 +-
 .../ui/synchronize/SaveableCompareEditorInput.java |    7 +-
 .../plugins/org.eclipse.text/META-INF/MANIFEST.MF  |    2 +-
 .../jface/text/projection/ProjectionMapping.java   |    4 +-
 .../eclipse/jface/text/DefaultPositionUpdater.java |   51 +-
 .../src/org/eclipse/jface/text/Document.java       |   10 +-
 .../eclipse/jface/text/IDocumentExtension2.java    |    4 +-
 .../jface/text/IRepairableDocumentExtension.java   |   16 +-
 .../eclipse/jface/text/ISlaveDocumentManager.java  |   15 +-
 .../src/org/eclipse/jface/text/TextUtilities.java  |    8 +-
 .../org/eclipse/jface/text/TreeLineTracker.java    |   10 +-
 .../jface/text/templates/TemplateContextType.java  |    6 +-
 .../jface/text/templates/TemplateTranslator.java   |   16 +-
 .../org.eclipse.ui.browser/META-INF/MANIFEST.MF    |    2 +-
 eclipse/plugins/org.eclipse.ui.browser/plugin.xml  |    4 +-
 .../browser/BrowserDescriptorWorkingCopy.java      |    3 +-
 .../ui/internal/browser/BrowserLauncher.java       |    6 +-
 .../ui/internal/browser/BrowserManager.java        |    5 +-
 .../ui/internal/browser/DefaultBrowserSupport.java |    2 +-
 .../internal/browser/ExternalBrowserInstance.java  |   17 +-
 .../browser/InternalBrowserViewInstance.java       |   11 +-
 .../ui/internal/browser/SystemBrowserInstance.java |   19 +-
 .../internal/browser/WebBrowserPreferencePage.java |   10 +-
 .../ui/internal/browser/WebBrowserView.java        |   10 +-
 .../internal/browser/browsers/MozillaBrowser.java  |   13 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../ui/internal/cheatsheets/CommandRunner.java     |    7 +-
 .../.settings/org.eclipse.jdt.core.prefs           |  270 +-
 .../.settings/org.eclipse.jdt.ui.prefs             |   57 +
 .../org.eclipse.ui.cocoa/META-INF/MANIFEST.MF      |    2 +-
 .../org.eclipse.ui.cocoa/fragment-cocoa.properties |   11 +-
 eclipse/plugins/org.eclipse.ui.cocoa/fragment.xml  |   45 +-
 .../ui/internal/cocoa/AbstractWindowHandler.java   |   36 +
 .../ui/internal/cocoa/ArrangeWindowsHandler.java   |   48 +
 .../ui/internal/cocoa/CloseDialogHandler.java      |    7 +-
 .../ui/internal/cocoa/CocoaTitlePathUpdater.java   |   34 +
 .../eclipse/ui/internal/cocoa/CocoaUIEnhancer.java |  721 +--
 .../org/eclipse/ui/internal/cocoa/CocoaUtil.java   |  143 +
 .../ui/internal/cocoa/MinimizeWindowHandler.java   |   35 +
 .../ui/internal/cocoa/ZoomWindowHandler.java       |   35 +
 .../.settings/org.eclipse.jdt.core.prefs           |   20 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../org.eclipse.ui.console/META-INF/MANIFEST.MF    |    2 +-
 .../eclipse/ui/internal/console/ConsoleView.java   |    4 +-
 .../org.eclipse.ui.editors/META-INF/MANIFEST.MF    |    9 +-
 .../org.eclipse.ui.editors/plugin.properties       |   18 +-
 eclipse/plugins/org.eclipse.ui.editors/plugin.xml  |    2 +-
 .../text/ConstructedTextEditorMessages.properties  |   20 +-
 .../ui/editors/text/DefaultEncodingSupport.java    |    9 +-
 .../ui/editors/text/FileDocumentProvider.java      |    4 +-
 .../ui/editors/text/TextEditorMessages.java        |    3 +-
 .../ui/editors/text/TextEditorMessages.properties  |    3 +-
 .../ui/editors/text/TextFileDocumentProvider.java  |    8 +-
 .../text/TextSourceViewerConfiguration.java        |    3 +-
 .../text/AnnotationsConfigurationBlock.java        |   11 +-
 .../ui/internal/editors/text/EditorsPlugin.java    |   19 +-
 .../text/RemoveTrailingWhitespaceHandler.java      |   25 +-
 .../editors/text/SelectResourcesBlock.java         |    8 +-
 .../text/TextEditorDefaultsPreferencePage.java     |  418 ++-
 .../internal/editors/text/TextEditorMessages.java  |   17 +-
 .../editors/text/TextEditorMessages.properties     |   28 +-
 .../ui/texteditor/AbstractDecoratedTextEditor.java |  151 +-
 ...ractDecoratedTextEditorPreferenceConstants.java |  179 +-
 .../org/eclipse/ui/texteditor/AddMarkerAction.java |    5 +-
 .../ui/texteditor/MarkerAnnotationPreferences.java |    9 +-
 .../eclipse/ui/texteditor/MarkerRulerAction.java   |    8 +-
 .../eclipse/ui/texteditor/TextEditorMessages.java  |    8 +-
 .../ui/texteditor/TextEditorMessages.properties    |    9 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   38 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 .../ExternalToolsBuilderTab.java                   |    4 +-
 .../launchConfigurations/ExternalToolsMainTab.java |   24 +-
 .../internal/model/ExternalToolsPlugin.java        |    8 +-
 .../internal/ui/BuilderPropertyPage.java           |    4 +-
 .../org.eclipse.ui.forms/META-INF/MANIFEST.MF      |    2 +-
 .../org/eclipse/ui/forms/widgets/ColumnLayout.java |   15 +-
 .../ui/forms/widgets/ExpandableComposite.java      |   29 +-
 .../src/org/eclipse/ui/forms/widgets/FormText.java |   17 +-
 .../org/eclipse/ui/forms/widgets/FormToolkit.java  |   64 +-
 .../eclipse/ui/forms/widgets/ImageHyperlink.java   |    4 +-
 .../src/org/eclipse/ui/forms/widgets/Section.java  |    5 -
 .../ui/forms/widgets/SharedScrolledComposite.java  |    2 +-
 .../org/eclipse/ui/forms/widgets/SizeCache.java    |    5 +-
 .../eclipse/ui/forms/widgets/TableWrapData.java    |   10 +-
 .../eclipse/ui/forms/widgets/TableWrapLayout.java  |   23 +-
 .../forms/widgets/AggregateHyperlinkSegment.java   |   15 +-
 .../internal/forms/widgets/ColumnLayoutUtils.java  |   58 +
 .../ui/internal/forms/widgets/Paragraph.java       |    6 +-
 .../ui/internal/forms/widgets/TextSegment.java     |   44 +-
 .../ui/internal/forms/widgets/TitleRegion.java     |    7 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../icons/full/elcl16/configs.gif                  |  Bin 368 -> 368 bytes
 .../icons/full/elcl16/usearch_obj.gif              |  Bin 586 -> 586 bytes
 .../internal/ide/application/IDEApplication.java   |   45 +-
 .../ide/application/IDEWorkbenchAdvisor.java       |   66 +-
 .../ide/application/IDEWorkbenchWindowAdvisor.java |   53 +-
 .../org.eclipse.ui.ide/META-INF/MANIFEST.MF        |    5 +-
 .../org/eclipse/ui/actions/AddBookmarkAction.java  |   57 +-
 .../org/eclipse/ui/actions/BuildAction.java        |  223 +-
 .../eclipse/ui/actions/DeleteResourceAction.java   |   11 +-
 .../org/eclipse/ui/actions/GlobalBuildAction.java  |    2 +
 .../org/eclipse/ui/actions/NewWizardMenu.java      |   36 +-
 .../org/eclipse/ui/actions/OpenResourceAction.java |   12 +-
 .../org/eclipse/ui/actions/WorkspaceAction.java    |    4 +
 .../dialogs/FilteredResourcesSelectionDialog.java  |   16 +-
 .../org/eclipse/ui/dialogs/WizardExportPage.java   |    5 +-
 .../ui/dialogs/WizardNewProjectReferencePage.java  |    6 +-
 .../icons/full/dtool16/newprj_wiz.gif              |  Bin 222 -> 344 bytes
 .../icons/full/etool16/newprj_wiz.gif              |  Bin 348 -> 574 bytes
 .../icons/full/eview16/problems_view_error.gif     |  Bin 0 -> 1026 bytes
 .../icons/full/eview16/problems_view_warning.gif   |  Bin 0 -> 1037 bytes
 .../icons/full/obj16/quickfix_error_obj.gif        |  Bin 348 -> 348 bytes
 .../icons/full/obj16/quickfix_warning_obj.gif      |  Bin 559 -> 559 bytes
 .../plugins/org.eclipse.ui.ide/plugin.properties   |   11 +-
 eclipse/plugins/org.eclipse.ui.ide/plugin.xml      |   98 +-
 .../org.eclipse.ui.ide/schema/markerSupport.exsd   |   11 +-
 .../ide/dialogs/ResourceEncodingFieldEditor.java   |  110 +-
 .../ui/ide/undo/AbstractMarkersOperation.java      |   21 +-
 .../org/eclipse/ui/ide/undo/WorkspaceUndoUtil.java |   65 +-
 .../internal/ide/IDEInternalWorkbenchImages.java   |   13 +-
 .../ui/internal/ide/IDEWorkbenchMessages.java      |   12 +-
 .../ui/internal/ide/IDEWorkbenchPlugin.java        |   61 +-
 .../ui/internal/ide/LineDelimiterEditor.java       |   35 +-
 .../ui/internal/ide/ResourceWorkingSetUpdater.java |    7 +-
 .../ui/internal/ide/WorkbenchActionBuilder.java    |   63 +-
 .../internal/ide/actions/OpenWorkspaceAction.java  |  185 +-
 .../commands/CopyBuildIdToClipboardHandler.java    |    2 +-
 .../ui/internal/ide/dialogs/CleanDialog.java       |   36 +-
 .../ui/internal/ide/dialogs/FileStatesPage.java    |   31 +-
 .../ide/dialogs/IDEWorkspacePreferencePage.java    |   44 +-
 .../internal/ide/dialogs/LinkedResourceEditor.java |   96 +-
 .../internal/ide/dialogs/OpenResourceDialog.java   |   23 +-
 .../ide/dialogs/ProjectContentsLocationArea.java   |    7 +-
 .../ui/internal/ide/dialogs/ResourceInfoPage.java  |   77 +-
 .../ide/dialogs/ResourceTreeAndListGroup.java      |   10 +-
 .../ui/internal/ide/filesystem/messages.properties |    4 +-
 .../eclipse/ui/internal/ide/messages.properties    |   23 +-
 .../ide/model/WorkbenchAdapterFactory.java         |   15 +-
 .../ui/internal/views/markers/AllMarkersView.java  |   20 +-
 .../ui/internal/views/markers/BookmarksView.java   |   28 +-
 .../views/markers/ConfigureColumnsHandler.java     |    3 +-
 .../ui/internal/views/markers/DeleteHandler.java   |   44 +-
 .../views/markers/ExtendedMarkersView.java         |  283 +-
 .../views/markers/FiltersConfigurationDialog.java  |  924 ++--
 .../views/markers/FiltersContribution.java         |   18 +-
 .../internal/views/markers/GroupsContribution.java |    7 +-
 .../ui/internal/views/markers/MarkerCategory.java  |    9 +-
 .../views/markers/MarkerContentGenerator.java      |  206 +-
 .../views/markers/MarkerFieldFilterGroup.java      |   43 +-
 .../views/markers/MarkerLocationField.java         |    4 +-
 .../views/markers/MarkerPreferencesDialog.java     |  483 --
 .../views/markers/MarkerPreferencesHandler.java    |   38 -
 .../markers/MarkerSupportInternalUtilities.java    |   62 +-
 .../views/markers/MarkerViewerContentProvider.java |   25 +-
 .../eclipse/ui/internal/views/markers/Markers.java |  102 +-
 .../views/markers/MarkersContribution.java         |    6 +-
 .../views/markers/MarkersPropertyPage.java         |    7 +-
 .../views/markers/MarkersViewColumnsDialog.java    |  296 +
 .../ui/internal/views/markers/ProblemsView.java    |   47 +-
 .../ui/internal/views/markers/QuickFixHandler.java |   86 +-
 .../ui/internal/views/markers/QuickFixPage.java    |  105 +-
 .../ui/internal/views/markers/QuickFixWizard.java  |   13 +-
 .../views/markers/SortFieldContribution.java       |    7 +-
 .../ui/internal/views/markers/TasksView.java       |   28 +-
 .../views/markers/TypesConfigurationArea.java      |    4 +-
 .../views/markers/ViewerColumnsDialog.java         |  994 +++
 .../markers/ViewerSettingsAndStatusDialog.java     |  300 +
 .../datatransfer/ArchiveFileExportOperation.java   |   34 +-
 .../wizards/datatransfer/DataTransferMessages.java |    3 +-
 .../WizardFileSystemResourceImportPage1.java       |    4 +-
 .../datatransfer/WizardProjectsImportPage.java     |   34 +-
 .../wizards/datatransfer/messages.properties       |    3 +-
 .../org/eclipse/ui/views/markers/MarkerField.java  |   23 +-
 .../ui/views/markers/MarkerViewHandler.java        |    4 +-
 .../markers/internal/DialogMarkerProperties.java   |    6 +-
 .../markers/internal/DialogProblemProperties.java  |    7 +-
 .../ui/views/markers/internal/MarkerMessages.java  |   29 +-
 .../markers/internal/MarkerSupportRegistry.java    |    6 +
 .../ui/views/markers/internal/messages.properties  |   51 +-
 .../ui/views/navigator/MainActionGroup.java        |    4 +-
 .../ui/views/navigator/NavigatorDropAdapter.java   |   34 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../themes/circles/html/rtl.css                    |    5 +-
 .../themes/purpleMesh/html/rtl.css                 |    5 +-
 .../themes/slate/html/rtl.css                      |   10 +-
 .../org.eclipse.ui.intro/META-INF/MANIFEST.MF      |    2 +-
 .../intro/impl/model/AbstractIntroElement.java     |   14 +-
 .../ui/internal/intro/impl/model/History.java      |    5 +-
 .../ui/internal/intro/impl/model/url/IntroURL.java |    4 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../org.eclipse.ui.navigator.resources/plugin.xml  |    2 +-
 .../resources/ResourceDropAdapterAssistant.java    |   35 +-
 .../org.eclipse.ui.navigator/META-INF/MANIFEST.MF  |    2 +-
 .../schema/navigatorContent.exsd                   |    4 +-
 .../NavigatorContentServiceContentProvider.java    |   12 +-
 .../ui/navigator/INavigatorContentService.java     |   11 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   13 +-
 .../.settings/org.eclipse.jdt.launching.prefs      |    3 +
 eclipse/plugins/org.eclipse.ui.net/plugin.xml      |   11 +
 .../ui/internal/net/NonProxyHostsComposite.java    |   53 +-
 .../ui/internal/net/ProxyEntriesComposite.java     |   39 +-
 .../ui/internal/net/ProxyPreferencePage.java       |    7 +
 .../org.eclipse.ui.views.log/META-INF/MANIFEST.MF  |    2 +-
 .../ui/internal/views/log/EventDetailsDialog.java  |   44 +-
 .../views/log/EventDetailsDialogAction.java        |   18 +-
 .../ui/internal/views/log/FilterDialog.java        |    9 +-
 .../eclipse/ui/internal/views/log/LogReader.java   |   24 +-
 .../org/eclipse/ui/internal/views/log/LogView.java |   57 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../view/OverridableTabListContentProvider.java    |    6 +-
 .../properties/tabbed/view/TabDescriptor.java      |   22 +-
 .../tabbed/view/TabbedPropertyRegistry.java        |   29 +-
 .../tabbed/view/TabbedPropertyRegistryFactory.java |    3 +-
 .../org.eclipse.ui.views/META-INF/MANIFEST.MF      |    2 +-
 .../internal/views/properties/messages.properties  |    4 +-
 .../views/contentoutline/ContentOutlinePage.java   |   19 +-
 .../eclipse/ui/views/properties/PropertySheet.java |   10 +-
 .../META-INF/MANIFEST.MF                           |    4 +-
 .../plugin.properties                              |    4 +-
 .../org.eclipse.ui.workbench.texteditor/plugin.xml |    6 +
 .../schema/spellingEngine.exsd                     |   17 +-
 .../texteditor/HippieCompletionEngine.java         |    8 +-
 .../eclipse/ui/texteditor/AbstractTextEditor.java  |  184 +-
 .../ConstructedEditorMessages.properties           |    7 +-
 .../ui/texteditor/EditorMessages.properties        |    4 +-
 .../eclipse/ui/texteditor/FindReplaceDialog.java   |  118 +-
 .../IAbstractTextEditorHelpContextIds.java         |   11 +-
 .../eclipse/ui/texteditor/IDocumentProvider.java   |   10 +-
 .../ui/texteditor/ITextEditorActionConstants.java  |   11 +-
 .../texteditor/ITextEditorActionDefinitionIds.java |    8 +
 .../src/org/eclipse/ui/texteditor/InfoForm.java    |   26 +-
 .../texteditor/ShowWhitespaceCharactersAction.java |   51 +-
 .../eclipse/ui/texteditor/StatusTextEditor.java    |   22 +-
 .../eclipse/ui/texteditor/TextOperationAction.java |    5 +-
 .../ui/texteditor/templates/MessageLine.java       |   82 -
 .../templates/TemplatePreferencePage.java          |   15 +-
 .../ui/texteditor/templates/TemplatesView.java     |    4 +-
 .../.settings/org.eclipse.jdt.ui.prefs             |    2 +-
 .../Eclipse UI/org/eclipse/ui/IEditorRegistry.java |    4 +-
 .../Eclipse UI/org/eclipse/ui/IMemento.java        |   32 +-
 .../Eclipse UI/org/eclipse/ui/IPageService.java    |   28 +-
 .../Eclipse UI/org/eclipse/ui/IPartListener2.java  |   18 +-
 .../Eclipse UI/org/eclipse/ui/IPartService.java    |    6 +-
 .../Eclipse UI/org/eclipse/ui/ISaveablePart2.java  |    4 +-
 .../org/eclipse/ui/IWorkbenchCommandConstants.java |   18 +-
 .../Eclipse UI/org/eclipse/ui/IWorkbenchPart.java  |    4 +-
 .../org/eclipse/ui/IWorkbenchPartReference.java    |    2 +-
 .../eclipse/ui/IWorkbenchPreferenceConstants.java  |   15 +-
 .../org/eclipse/ui/IWorkbenchPropertyPage.java     |    7 +-
 .../eclipse/ui/IWorkbenchPropertyPageMulti.java    |   34 +
 .../org/eclipse/ui/IWorkingSetManager.java         |   19 +-
 .../Eclipse UI/org/eclipse/ui/XMLMemento.java      |  200 +-
 .../org/eclipse/ui/actions/ActionFactory.java      |  169 +-
 .../ui/application/IWorkbenchWindowConfigurer.java |  100 +-
 .../ui/application/WorkbenchWindowAdvisor.java     |   32 +
 .../org/eclipse/ui/contexts/IContextService.java   |    9 +-
 .../eclipse/ui/dialogs/EditorSelectionDialog.java  |   52 +-
 .../ui/dialogs/FilteredItemsSelectionDialog.java   |   27 +-
 .../eclipse/ui/dialogs/PropertyDialogAction.java   |   25 +-
 .../org/eclipse/ui/dialogs/PropertyPage.java       |   10 +-
 .../eclipse/ui/dialogs/TypeFilteringDialog.java    |    6 +-
 .../org/eclipse/ui/handlers/HandlerUtil.java       |   40 +-
 .../org/eclipse/ui/handlers/ShowViewHandler.java   |   26 +-
 .../ui/internal/AbstractWorkingSetManager.java     |   70 +-
 .../eclipse/ui/internal/ActiveEditorAction.java    |  206 -
 .../org/eclipse/ui/internal/AnimationEngine.java   |    5 +-
 .../ui/internal/ApplicationMenuManager.java        |   83 +
 .../org/eclipse/ui/internal/BaseSaveAction.java    |  235 -
 .../org/eclipse/ui/internal/CycleBaseHandler.java  |   26 +-
 .../org/eclipse/ui/internal/EditorManager.java     |   90 +-
 .../org/eclipse/ui/internal/EditorReference.java   |   12 +-
 .../org/eclipse/ui/internal/EditorStack.java       |    2 +-
 .../org/eclipse/ui/internal/ErrorEditorPart.java   |   18 +-
 .../org/eclipse/ui/internal/ErrorViewPart.java     |   15 +-
 .../eclipse/ui/internal/ExtensionEventHandler.java |    8 +-
 .../org/eclipse/ui/internal/FastViewBar.java       |   21 +-
 .../eclipse/ui/internal/FastViewDnDHandler.java    |    4 +-
 .../org/eclipse/ui/internal/HeapStatus.java        |   65 +-
 .../eclipse/ui/internal/IPreferenceConstants.java  |   15 +-
 .../org/eclipse/ui/internal/IntroAction.java       |  110 -
 .../org/eclipse/ui/internal/JFaceUtil.java         |    5 +-
 .../org/eclipse/ui/internal/LockToolBarAction.java |   78 -
 .../eclipse/ui/internal/OpenPreferencesAction.java |   75 -
 .../org/eclipse/ui/internal/PageLayout.java        |   17 +-
 .../org/eclipse/ui/internal/PartStack.java         |   17 +-
 .../org/eclipse/ui/internal/PerspectiveHelper.java |   25 +-
 .../eclipse/ui/internal/PerspectiveSwitcher.java   |   56 +-
 .../eclipse/ui/internal/RectangleAnimation.java    |    5 -
 .../ui/internal/ResetPerspectiveAction.java        |   63 -
 .../org/eclipse/ui/internal/SaveAction.java        |  116 -
 .../org/eclipse/ui/internal/SaveAllAction.java     |  194 -
 .../org/eclipse/ui/internal/SaveAsAction.java      |   86 -
 .../eclipse/ui/internal/SavePerspectiveAction.java |  107 -
 .../org/eclipse/ui/internal/SaveablesList.java     |   21 +-
 .../org/eclipse/ui/internal/ShowViewMenu.java      |  108 +-
 .../org/eclipse/ui/internal/ViewPane.java          |   33 +-
 .../org/eclipse/ui/internal/WWinPartService.java   |    2 +-
 .../org/eclipse/ui/internal/Workbench.java         |  113 +-
 .../org/eclipse/ui/internal/WorkbenchMessages.java |    6 +
 .../org/eclipse/ui/internal/WorkbenchPage.java     |  112 +-
 .../ui/internal/WorkbenchPartReference.java        |    6 +-
 .../org/eclipse/ui/internal/WorkbenchPlugin.java   |   56 +-
 .../org/eclipse/ui/internal/WorkbenchWindow.java   |  123 +-
 .../org/eclipse/ui/internal/WorkingSetManager.java |   21 +-
 .../ui/internal/actions/DynamicHelpAction.java     |  106 -
 .../ui/internal/actions/HelpContentsAction.java    |   96 -
 .../ui/internal/actions/HelpSearchAction.java      |   96 -
 .../activities/ExtensionActivityRegistry.java      |   87 +-
 .../activities/MutableActivityManager.java         |   54 +-
 .../internal/commands/WorkbenchCommandSupport.java |   30 +-
 .../internal/contexts/WorkbenchContextSupport.java |   22 +-
 .../internal/decorators/DecorationScheduler.java   |    9 +-
 .../eclipse/ui/internal/dialogs/AboutDialog.java   |  167 +-
 .../dialogs/CustomizePerspectiveDialog.java        |    7 +-
 .../ui/internal/dialogs/EditorsPreferencePage.java |    8 +-
 .../dialogs/FileEditorsPreferencePage.java         |   70 +-
 .../internal/dialogs/FilteredPreferenceDialog.java |    4 +-
 .../ui/internal/dialogs/NewWizardNewPage.java      |   10 +
 .../dialogs/PerspectivesPreferencePage.java        |   19 +-
 .../ui/internal/dialogs/PropertyDialog.java        |   34 +-
 .../dialogs/PropertyPageContributorManager.java    |   58 +-
 .../ui/internal/dialogs/PropertyPageNode.java      |    6 +-
 .../internal/dialogs/RegistryPageContributor.java  |  167 +-
 .../ui/internal/dialogs/StartupPreferencePage.java |   26 +-
 .../ui/internal/dialogs/WizardActivityFilter.java  |    7 +-
 .../internal/dialogs/WorkbenchEditorsDialog.java   |   78 +-
 .../dialogs/WorkbenchPreferenceDialog.java         |    8 +-
 .../internal/dialogs/WorkbenchWizardElement.java   |    7 +-
 .../dialogs/WorkingSetSelectionDialog.java         |   10 +-
 .../org/eclipse/ui/internal/dnd/SwtUtil.java       |   64 +-
 .../ui/internal/handlers/AbstractSaveHandler.java  |   86 +
 .../ui/internal/handlers/CloseAllSavedHandler.java |  136 +
 .../ui/internal/handlers/DirtyStateTracker.java    |  166 +
 .../ui/internal/handlers/DynamicHelpHandler.java   |   35 +
 .../ui/internal/handlers/HelpContentsHandler.java  |   35 +
 .../ui/internal/handlers/HelpSearchHandler.java    |   35 +
 .../eclipse/ui/internal/handlers/IntroHandler.java |   75 +
 .../ui/internal/handlers/LockToolBarHandler.java   |   50 +
 .../internal/handlers/ResetPerspectiveHandler.java |   93 +
 .../ui/internal/handlers/SaveAllHandler.java       |   88 +
 .../ui/internal/handlers/SaveAsHandler.java        |   67 +
 .../eclipse/ui/internal/handlers/SaveHandler.java  |   96 +
 .../internal/handlers/SavePerspectiveHandler.java  |  113 +
 .../ui/internal/handlers/WizardHandler.java        |   18 +-
 .../ui/internal/help/WorkbenchHelpSystem.java      |    3 +
 .../ui/internal/keys/BindingPersistence.java       |    5 +-
 .../eclipse/ui/internal/keys/BindingService.java   |   55 +-
 .../internal/keys/KeysPreferenceFiltersDialog.java |   19 +
 .../internal/keys/NewKeysPreferenceMessages.java   |    1 +
 .../ui/internal/keys/NewKeysPreferencePage.java    |   14 +-
 .../internal/keys/NewKeysPreferencePage.properties |    5 +-
 .../ui/internal/keys/model/ContextModel.java       |   30 +-
 .../ui/internal/keys/model/KeyController.java      |    9 +-
 .../eclipse/ui/internal/layout/IWindowTrim.java    |    8 +-
 .../menus/DynamicMenuContributionItem.java         |   72 +
 .../menus/DynamicToolBarContributionItem.java      |   72 +
 .../org/eclipse/ui/internal/messages.properties    |   19 +-
 .../org/eclipse/ui/internal/misc/Policy.java       |    5 +-
 .../org/eclipse/ui/internal/part/StatusPart.java   |   14 +-
 .../AbstractTableInformationControl.java           |   21 +-
 .../ui/internal/presentations/SystemMenuMove.java  |    3 +
 .../defaultpresentation/DefaultPartList.java       |    4 +-
 .../eclipse/ui/internal/progress/FinishedJobs.java |   51 +-
 .../org/eclipse/ui/internal/progress/JobInfo.java  |   15 +
 .../internal/progress/ProgressAnimationItem.java   |   26 +-
 .../progress/ProgressMonitorFocusJobDialog.java    |   26 +-
 .../internal/progress/TaskBarProgressManager.java  |   60 +
 .../internal/quickaccess/PerspectiveProvider.java  |   15 +-
 .../internal/quickaccess/PreferenceProvider.java   |   16 +-
 .../ui/internal/quickaccess/QuickAccessDialog.java |   55 +-
 .../internal/quickaccess/QuickAccessMessages.java  |    3 +-
 .../ui/internal/quickaccess/ViewElement.java       |   82 +-
 .../ui/internal/quickaccess/ViewProvider.java      |   75 +-
 .../ui/internal/quickaccess/WizardProvider.java    |   13 +-
 .../ui/internal/quickaccess/messages.properties    |    3 +-
 .../ui/internal/registry/EditorRegistry.java       |   46 +-
 .../registry/PropertyPagesRegistryReader.java      |   17 +-
 .../eclipse/ui/internal/registry/ViewRegistry.java |   26 +-
 .../internal/services/WorkbenchSourceProvider.java |    7 +-
 .../statushandlers/DefaultDetailsArea.java         |   36 +-
 .../eclipse/ui/internal/themes/CascadingTheme.java |    7 +-
 .../themes/ColorsAndFontsPreferencePage.java       |  434 +-
 .../themes/ColorsAndFontsPreferencePage.properties |    4 +-
 .../eclipse/ui/internal/themes/ThemeRegistry.java  |   20 +-
 .../internal/tweaklets/DummyTitlePathUpdater.java  |   26 +
 .../ui/internal/tweaklets/TabBehaviourMRU.java     |   13 +-
 .../ui/internal/tweaklets/TitlePathUpdater.java    |   35 +
 .../org/eclipse/ui/internal/util/PrefUtil.java     |   18 +-
 .../wizards/preferences/WizardPreferencesPage.java |   14 +-
 .../org/eclipse/ui/intro/IIntroPart.java           |    4 +-
 .../org/eclipse/ui/keys/SWTKeySupport.java         |    5 +-
 .../eclipse/ui/menus/CommandContributionItem.java  |   48 +-
 .../Eclipse UI/org/eclipse/ui/menus/MenuUtil.java  |    9 +
 .../org/eclipse/ui/model/IWorkbenchAdapter3.java   |   37 +
 .../org/eclipse/ui/model/WorkbenchAdapter.java     |   21 +-
 .../eclipse/ui/model/WorkbenchLabelProvider.java   |   67 +-
 .../org/eclipse/ui/part/MultiPageEditorSite.java   |    7 +-
 .../Eclipse UI/org/eclipse/ui/part/PageBook.java   |   32 +-
 .../org/eclipse/ui/part/PageBookView.java          |    2 +-
 .../statushandlers/AbstractStatusAreaProvider.java |   28 +-
 .../org.eclipse.ui.workbench/META-INF/MANIFEST.MF  |    6 +-
 eclipse/plugins/org.eclipse.ui/.options            |    8 +-
 .../plugins/org.eclipse.ui/.settings/.api_filters  |   19 +
 .../plugins/org.eclipse.ui/META-INF/MANIFEST.MF    |    2 +-
 .../org.eclipse.ui/buildnotes_workbench.html       |  597 ++-
 eclipse/plugins/org.eclipse.ui/plugin.properties   |    9 +-
 eclipse/plugins/org.eclipse.ui/plugin.xml          |  106 +-
 .../plugins/org.eclipse.ui/schema/actionSets.exsd  |    4 +-
 .../plugins/org.eclipse.ui/schema/commands.exsd    |    4 +-
 .../plugins/org.eclipse.ui/schema/popupMenus.exsd  |    2 +-
 .../org.eclipse.ui/schema/propertiesView.exsd      |    4 +-
 .../org.eclipse.ui/schema/propertyPages.exsd       |   85 +-
 .../org.eclipse.ui/schema/statusHandlers.exsd      |    4 +-
 eclipse/plugins/org.eclipse.ui/schema/themes.exsd  |    4 +-
 .../plugins/org.eclipse.ui/schema/viewActions.exsd |    4 +-
 .../ui/internal/UIPreferenceInitializer.java       |    4 +-
 .../org.eclipse.update.core/META-INF/MANIFEST.MF   |    7 +-
 .../org.eclipse.update.core/Scrapbook.jpage        |  431 --
 .../org.eclipse.update.core/plugin.properties      |    2 +-
 .../eclipse/update/internal/core/UpdateCore.java   |    4 +-
 .../internal/operations/OperationValidator.java    |  711 ++-
 .../update/internal/verifier/PlanVerifier.java     |   30 -
 .../META-INF/ECLIPSEF.RSA                          |  Bin 5639 -> 5639 bytes
 .../META-INF/ECLIPSEF.SF                           |   10 +-
 .../META-INF/MANIFEST.MF                           |    2 +-
 .../META-INF/ECLIPSEF.RSA                          |  Bin 5639 -> 0 bytes
 .../META-INF/ECLIPSEF.SF                           |   20 -
 .../META-INF/MANIFEST.MF                           |   46 -
 .../about.html                                     |   90 -
 .../about_files/cpl-v10.html                       |  125 -
 .../plugin.properties                              |   13 -
 .../META-INF/ECLIPSEF.RSA                          |  Bin 0 -> 5639 bytes
 .../META-INF/ECLIPSEF.SF                           |   20 +
 .../META-INF/MANIFEST.MF                           |   48 +
 .../META-INF/eclipse.inf                           |    0
 .../about.html                                     |   90 +
 .../about_files}/cpl-v10.html                      |    0
 .../plugin.properties                              |   12 +
 eclipse/sourceReferences.properties                |  538 +-
 efj.sh                                             |    5 +
 generateAdditionalPlatforms.xml                    |    4 +-
 .../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 ++
 jdtnonosgidependencies.properties                  |    2 +-
 nonosgidependencies.properties                     |   40 +-
 patches/bz318912.patch                             |   20 -
 patches/bz319476-compile-jar-in-jar-loader.patch   |  197 -
 patches/donotstorebuildlogsinfiles.patch           |   11 +-
 patches/eclipse-add-archs-executable.patch         |    7 +-
 patches/eclipse-add-archs-filesystem.patch         |   23 +-
 patches/eclipse-add-archs-swt.patch                |   64 +-
 patches/eclipse-add-ppc64-sparc64-s390-s390x.patch |    6 +-
 patches/eclipse-addArchesAnd64bitSWT.patch         |    2 +-
 patches/eclipse-buildswtnatives.patch              |    2 +-
 ...clipse-core-resources-compilation-profile.patch |   10 +
 patches/eclipse-equinox-util.patch                 |    9 +
 patches/eclipse-fix-osgi-compiler-settings.patch   |   13 +
 patches/eclipse-no-jetty5.patch                    |    2 +-
 .../eclipse-nosourcebundlesfordependencies.patch   |   54 +-
 patches/eclipse-swt-buildagainstxulrunner.patch    |    2 +-
 patches/eclipse-swt-compile-xpt.patch              |   31 -
 patches/eclipse-use-newer-commons-codec.patch      |   27 -
 patches/eclipse-xpcom-h.patch                      |   14 +
 patches/java-home.patch                            |   15 -
 patches/junit4-nochecksum.patch                    |   22 -
 patches/no-gnome-vfs.patch                         |   18 +-
 patches/remove-old-ant-plugins.patch               |   14 +
 patches/tests-noequinoxregiontests.patch           |   16 +
 patches/tests-org.eclipse.ant.tests.core.patch     |   20 +-
 patches/tests-org.eclipse.ant.tests.ui.patch       |   21 +-
 patches/webkitgtk.patch                            |   11 -
 pdebuild.properties                                |    6 +-
 pdebuild.xml                                       |    9 +-
 pdebuild/eclipse-copy-platform.sh                  |    4 +-
 pdebuild/eclipse-pdebuild.sh                       |    6 +-
 regenerateBootstrapFiles.sh                        |    6 +-
 runtests.sh                                        |    3 +
 sdkdependencies.properties                         |    2 +-
 .../eclipsebuild/SymlinkInstalledOSGiJars.java     |    2 +-
 .../eclipsebuild/SymlinkNonOSGiJars.java           |    2 +-
 .../linuxtools/eclipsebuild/SymlinkOSGiJars.java   |    2 +-
 9257 files changed, 344668 insertions(+), 210066 deletions(-)

diff --git a/.project b/.project
new file mode 100644
index 0000000..13c5398
--- /dev/null
+++ b/.project
@@ -0,0 +1,11 @@
+<?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 1e78614..99301c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,59 @@
+2011-08-05  Niels Thykier  <niels at thykier.net>
+
+	* build.xml: Re-enabled four patches for adding extra architectures to eclipse.
+	* patches/donotstorebuildlogsinfiles.patch: Refreshed to apply cleanly.
+	* patches/eclipse-add-archs-executable.patch: Ditto
+	* patches/eclipse-add-archs-filesystem.patch: Ditto
+	* patches/eclipse-add-archs-swt.patch: Ditto
+	* patches/eclipse-add-ppc64-sparc64-s390-s390x.patch: Ditto
+	* patches/eclipse-addArchesAnd64bitSWT.patch: Ditto
+	* patches/eclipse-buildswtnatives.patch: Ditto
+	* patches/eclipse-no-jetty5.patch: Ditto
+	* patches/eclipse-swt-buildagainstxulrunner.patch: Ditto, though this patch
+	was not re-enabled.
+
+2011-08-02  Sami Wagiaalla  <swagiaal at redhat.com>
+
+	* build.xml: Check if eclipse-build-config and eclipse-build-feature are present
+	before creating symlinks.
+
+2011-07-22  Sami Wagiaalla  <swagiaal at redhat.com>
+
+	* build.xml: Automatically create symbolic links in the build directory
+	to  eclipse-build-config eclipse-build-feature
+
+2011-07-18  Sami Wagiaalla  <swagiaal at redhat.com>
+
+	* task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkInstalledOSGiJars.java (execute):
+	Trim file names before constructing file objects.
+	* task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java (execute): Ditto.
+	* task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkNonOSGiJars.java (execute): Ditto.
+
+2011-04-08  Alexander Kurtakov  <akurtako at redhat.com>
+
+	* patches/no-gnome-vfs.patch: Fix Program.launch(executable) when libswt-gnome is missing.
+
+2011-04-06  Chris Aniszczyk <zx at redhat.com>
+
+        * patches/eclipse-relax-sat4j-deps.patch: New file.
+        * build.xml: Apply patch to relax sat4j deps.
+
+2011-04-06  Alexander Kurtakov  <akurtako at redhat.com>
+
+	* buildEclipseBuildSource.sh: Make the tarball use xz compression.
+    * patches/remove-old-ant-plugins.patch: New file.
+	* build.xml: Apply patch to remove old ant plugins from ant bundle manifest.
+
+2011-04-05  Alexander Kurtakov  <akurtako at redhat.com>
+	Fix for webkit crash. Thanks to Sami Wagiaalla (bz#341640).
+	* patches/webkit-missing-hearder.patch: New file.
+	* build.xml: Apply new patch to fix webkit crash.
+
+2011-04-04  Alexander Kurtakov  <akurtako at redhat.com>
+
+	* dependencies.properties: Use jsp-api from tomcat6.
+	* nonosgidependencies.properties: Drop ant-trax and ant-nodeps - they are gone since Ant 1.8.2.
+
 2011-03-28  Alexander Kurtakov  <akurtako at redhat.com>
 
 	* patches/webkitgtk.patch: Change patch to use pkg-config instead of hardcoding options.
diff --git a/bootstrap/configuration/config.ini b/bootstrap/configuration/config.ini
index 134afb1..8164013 100644
--- a/bootstrap/configuration/config.ini
+++ b/bootstrap/configuration/config.ini
@@ -27,6 +27,7 @@ osgi.bundles=com.ibm.icu,\
              org.eclipse.equinox.p2.metadata,\
              org.eclipse.equinox.p2.metadata.repository,\
              org.eclipse.equinox.p2.publisher,\
+             org.eclipse.equinox.p2.publisher.eclipse,\
              org.eclipse.equinox.p2.updatesite, \
              org.eclipse.equinox.preferences,\
              org.eclipse.equinox.registry,\
@@ -51,6 +52,7 @@ osgi.bundles=com.ibm.icu,\
              org.eclipse.equinox.http.jetty,\
              org.eclipse.core.expressions,\
              org.eclipse.help,\
+             org.apache.lucene.core,\
              org.apache.lucene.analysis,\
              org.apache.lucene,\
              org.mortbay.jetty.util,\
diff --git a/build.properties b/build.properties
index 96844d8..32143b7 100644
--- a/build.properties
+++ b/build.properties
@@ -1,10 +1,10 @@
 #baseLocation=${basedir}/bootstrap
 # Note:  this is also in pdebuild.properties
-buildId=M20110210-1200
-buildTag=vI20100603-1500
-label=3.6.2
-testsBuildLabel=3.6.2
-testframework=org.eclipse.test_3.3.0
+buildId=I20110613-1736
+buildTag=I20110613-1736
+label=3.7.0
+testsBuildLabel=3.7.0
+testframework=org.eclipse.test_3.3.100
 p2.director.version=${testsBuildLabel}
 testsBuildId=v20100211
 featureToBuild=eclipse-build-feature
diff --git a/build.xml b/build.xml
index cf3d05d..fe87f7c 100644
--- a/build.xml
+++ b/build.xml
@@ -140,15 +140,15 @@
 	</target>
 
 	<target name="fetch" unless="sdkSourceTarballPresent">
-		<fail message="SDK source tarball is not present.  Please either download a file such as eclipse-3.6.1-src.tar.bz2 from http://www.eclipse.org/downloads/download.php?file=/technology/linuxtools/eclipse-build or generate one by running ./buildSDKSource.sh." />
+		<fail message="SDK source tarball is not present.  Please either download a file such as eclipse-3.6.1-src.tar.bz2 from http://download.eclipse.org/technology/linuxtools/eclipse-build/ or generate one by running ./buildSDKSource.sh." />
 	</target>
 
 	<target name="fetchTestSources" unless="testsSourcePresent">
-		<fail message="SDK tests source tarball is not present.  Please either download a file such as eclipse-sdktests-3.6.1-sources.tar.bz2 from http://www.eclipse.org/downloads/download.php?file=/technology/linuxtools/eclipse-build or generate one by running ./buildSDKSource.sh." />
+		<fail message="SDK tests source tarball is not present.  Please either download a file such as eclipse-sdktests-3.6.1-sources.tar.bz2 from http://download.eclipse.org/technology/linuxtools/eclipse-build/ or generate one by running ./buildSDKSource.sh." />
 	</target>
 
 	<target name="fetchTestScripts" unless="testsScriptsPresent">
-		<fail message="Scripts for the SDK tests tarball is not present.  Please either download a file such as eclipse-sdktests-3.6.1-scripts.tar.bz2 from http://www.eclipse.org/downloads/download.php?file=/technology/linuxtools/eclipse-build or generate one by running ./buildSDKSource.sh." />
+		<fail message="Scripts for the SDK tests tarball is not present.  Please either download a file such as eclipse-sdktests-3.6.1-scripts.tar.bz2 from http://download.eclipse.org/technology/linuxtools/eclipse-build/ or generate one by running ./buildSDKSource.sh." />
 	</target>
 
 	<target name="extractBuildXmls" if="scriptsPresent">
@@ -173,7 +173,19 @@
 		</exec>
 	</target>
 
-	<target name="unpack" depends="fetch,setLibDir" unless="unpack.complete">
+	<available file="${basedir}/eclipse-build-feature" property="buildFeaturePresent" value="true" />
+	<target name="symlinkBuildFeature" unless="buildFeaturePresent">
+	  <echo message="creating link to feature dir (../eclipse-build-feature)" />
+	  <symlink link="${basedir}/eclipse-build-feature" resource="${basedir}/../eclipse-build-feature"/>
+	</target>
+
+	<available file="${basedir}/eclipse-build-config" property="buildConfigPresent" value="true" />
+	<target name="symlinkBuildConfig" unless="buildConfigPresent">
+	  <echo message="creating link to config dir (../eclipse-build-config)" />
+	  <symlink link="${basedir}/eclipse-build-config" resource="${basedir}/../eclipse-build-config"/>
+	</target>
+
+	<target name="unpack" depends="fetch,setLibDir,symlinkBuildFeature,symlinkBuildConfig" unless="unpack.complete">
 		<delete dir="${topBuildDir}" />
 		<mkdir dir="${topBuildDir}" />
 
@@ -198,6 +210,7 @@
 		<copy todir="${buildConfigs}/eclipse-build-config">
 			<fileset dir="eclipse-build-config" />
 		</copy>
+
 		<echo message="Copying eclipse-build builder" />
 		<copy todir="${buildDirectory}/features/eclipse-build-feature">
 			<fileset dir="eclipse-build-feature" />
@@ -292,7 +305,9 @@
 	<target name="applyPatches" depends="insertBuildId" unless="patch.complete">
 		<!-- eclipse-build-only patches -->
 		<patch patchfile="${basedir}/patches/eclipse-buildswtnatives.patch" dir="${buildDirectory}" strip="1" />
+		<!--
 		<patch patchfile="${basedir}/patches/eclipse-swt-buildagainstxulrunner.patch" dir="${buildDirectory}" strip="1" />
+		-->
 		<patch patchfile="${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" dir="${buildDirectory}" strip="1" />
 		<patch patchfile="${basedir}/patches/eclipse-add-archs-filesystem.patch" dir="${buildDirectory}" strip="1" />
 		<patch patchfile="${basedir}/patches/eclipse-add-archs-swt.patch" dir="${buildDirectory}" strip="1" />
@@ -304,28 +319,22 @@
 		<patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch" dir="${buildDirectory}" strip="1" />
 		<patch patchfile="${basedir}/patches/eclipse-no-jetty5.patch" dir="${buildDirectory}" strip="1" />
 		<patch patchfile="${basedir}/patches/eclipse-nosourcebundlesfordependencies.patch" dir="${buildDirectory}" strip="1" />
-		<patch patchfile="${basedir}/patches/eclipse-use-newer-commons-codec.patch" dir="${buildDirectory}" strip="1" />
-		<patch patchfile="${basedir}/patches/junit4-nochecksum.patch" dir="${buildDirectory}" strip="0" />
-		<patch patchfile="${basedir}/patches/bz318912.patch" dir="${buildDirectory}" strip="0" />
 		<patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="1" />
-		<patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.patch" dir="${buildDirectory}" strip="1" />
-		<patch patchfile="${basedir}/patches/no-gnome-vfs.patch" dir="${buildDirectory}" strip="0" />
+		<patch patchfile="${basedir}/patches/eclipse-xpcom-h.patch" dir="${buildDirectory}/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library"/>
 		<replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
 		<chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
 		<!-- end eclipse-build-only patches -->
-		<!-- back-ported patches -->
-		<patch patchfile="${basedir}/patches/bz319476-compile-jar-in-jar-loader.patch" dir="${buildDirectory}/plugins/org.eclipse.jdt.ui" strip="0" />
-		<!-- end back-ported patches -->
 		<!-- Only build for one target (bug #293952) -->
 		<copy file="${buildConfigs}/eclipse-build-config/build.properties.in" tofile="${buildConfigs}/eclipse-build-config/build.properties" />
 		<replace file="${buildConfigs}/eclipse-build-config/build.properties" token="@build_arch@" value="${buildArch}" />
-		<patch patchfile="${basedir}/patches/java-home.patch" dir="${buildDirectory}" strip="2" />
-		<patch patchfile="${basedir}/patches/webkitgtk.patch" dir="${buildDirectory}" strip="0" />
+		<patch patchfile="${basedir}/patches/eclipse-core-resources-compilation-profile.patch" dir="${buildDirectory}" strip="0" />
+		<patch patchfile="${basedir}/patches/eclipse-equinox-util.patch" dir="${buildDirectory}" strip="0" />
 		<echo file="patch-stamp" />
 	</target>
 
 	<target name="applyTestPatches" depends="unpackTests" unless="testspatch.complete">
 		<patch patchfile="${basedir}/patches/tests-noapttests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" />
+		<patch patchfile="${basedir}/patches/tests-noequinoxregiontests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" />
 		<patch patchfile="${basedir}/patches/tests-BZ295666.patch" dir="${testsBuildDirectory}" strip="0" />
 		<patch patchfile="${basedir}/patches/tests-org.eclipse.pde.ui.tests-LocalTargetDefinitionTests.patch" dir="${testsBuildDirectory}/plugins/org.eclipse.pde.ui.tests" strip="0" />
 		<patch patchfile="${basedir}/patches/tests-nop2discoverytests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" />
@@ -351,19 +360,27 @@
 		<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" />
-		<replaceregexp file="${buildDirectory}/plugins/org.apache.ant_1.7.1.v20100518-1145/META-INF/MANIFEST.MF" flags="m,g,s">
+		<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="" />
+		</replaceregexp>
+		<replaceregexp file="${buildDirectory}/plugins/org.apache.ant_1.8.2.v20110505-1300/META-INF/MANIFEST.MF" flags="m,g,s">
+			<regexp pattern="^SHA1-Digest.*" />
+			<substitution expression="" />
+		</replaceregexp>
+		<replaceregexp file="${buildDirectory}/plugins/org.junit_3.8.2.v3_8_2_v20100427-1100/META-INF/MANIFEST.MF" flags="m,g,s">
 			<regexp pattern="^Name.*" />
 			<substitution expression="" />
 		</replaceregexp>
-		<replaceregexp file="${buildDirectory}/plugins/org.apache.ant_1.7.1.v20100518-1145/META-INF/MANIFEST.MF" flags="m,g,s">
+		<replaceregexp file="${buildDirectory}/plugins/org.junit_3.8.2.v3_8_2_v20100427-1100/META-INF/MANIFEST.MF" flags="m,g,s">
 			<regexp pattern="^SHA1-Digest.*" />
 			<substitution expression="" />
 		</replaceregexp>
-		<replaceregexp file="${buildDirectory}/plugins/org.junit_3.8.2.v20090203-1005/META-INF/MANIFEST.MF" flags="m,g,s">
+		<replaceregexp file="${buildDirectory}/plugins/org.junit_4.8.2.v4_8_2_v20110321-1705/META-INF/MANIFEST.MF" flags="m,g,s">
 			<regexp pattern="^Name.*" />
 			<substitution expression="" />
 		</replaceregexp>
-		<replaceregexp file="${buildDirectory}/plugins/org.junit_3.8.2.v20090203-1005/META-INF/MANIFEST.MF" flags="m,g,s">
+		<replaceregexp file="${buildDirectory}/plugins/org.junit_4.8.2.v4_8_2_v20110321-1705/META-INF/MANIFEST.MF" flags="m,g,s">
 			<regexp pattern="^SHA1-Digest.*" />
 			<substitution expression="" />
 		</replaceregexp>
@@ -602,6 +619,7 @@
 			<arg line="-Dbasedir=${productFiles}/rcpConfig" />
 			<arg line="-DbuildId=${buildId} " />
 			<arg line="-DbaseBuildPath=${buildDirectory} " />
+			<arg line="-DbaseLocation=${buildDirectory} " />
 			<arg line="-Declipse.pdebuild.scripts=${eclipse.pdebuild.scripts} " />
 			<arg line="-consolelog " />
 			<jvmarg value="-Xmx512M" />
@@ -682,7 +700,7 @@
 	<target name="provision.cvs" depends="p2prep" unless="provision.cvs.complete">
 		<echo message="Installing into:  ${provisionDir}" />
 		<antcall target="provision">
-			<param name="p2.director.installIU" value="org.eclipse.platform.ide,org.eclipse.cvs.feature.group" />
+			<param name="p2.director.installIU" value="org.eclipse.platform.ide,org.eclipse.cvs.feature.group,org.eclipse.equinox.initializer" />
 			<param name="profileName" value="PlatformProfile" />
 		</antcall>
 
@@ -730,12 +748,6 @@
 			<param name="p2.arch" value="${buildArch}" />
 			<param name="p2.repo" value="${reposource}" />
 		</antcall>
-
-		<copy todir="${provisionDir}/plugins">
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.equinox.initializer">
-				<include name="org.eclipse.equinox.initializer*.jar" />
-			</fileset>
-		</copy>
 	</target>
 
 	<target name="provision.installed" depends="p2prep">
@@ -752,12 +764,6 @@
 			<param name="p2.arch" value="${buildArch}" />
 			<param name="p2.repo" value="${reposource}" />
 		</antcall>
-
-		<copy todir="${provisionDir}/plugins">
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.equinox.initializer">
-				<include name="org.eclipse.equinox.initializer*.jar" />
-			</fileset>
-		</copy>
 	</target>
 
 	<target name="checkDebugAndVerbose">
@@ -912,12 +918,38 @@
 			<arg line="-application org.eclipse.equinox.p2.director " />
 			<arg line="-flavor ${p2.flavor}" />
 			<arg line="-installIU ${p2.director.installIU}" />
+			<arg line="-profile ${p2.director.profile}" />
+			<arg line="-destination ${p2.director.install.path}" />
+			<arg line="-p2.os ${p2.os}" />
+			<arg line="-p2.ws ${p2.ws}" />
+			<arg line="-p2.arch ${p2.arch}" />
 			<arg line="${p2.director.extraArgs}" />
 			<arg line="-metadatarepository file:${p2.repo}" />
 			<arg line="-artifactrepository file:${p2.repo}" />
 		</exec>
 	</target>
 
+	<target name="run.installed.director.uninstall">
+                <chmod perm="ugo+rx" file="${directorToRun}" />
+                <exec executable="${directorToRun}">
+                        <arg line="-nosplash " />
+                        <arg line="-consoleLog" />
+                        <arg line="-data ${buildworkspace} " />
+                        <arg line="-application org.eclipse.equinox.p2.director " />
+                        <arg line="-flavor ${p2.flavor}" />
+                        <arg line="-uninstallIU ${p2.director.uninstallIU}" />
+                        <arg line="-profile ${p2.director.profile}" />
+                       	<arg line="-destination ${p2.director.install.path}" />
+                        <arg line="-p2.os ${p2.os}" />
+                        <arg line="-p2.ws ${p2.ws}" />
+                        <arg line="-p2.arch ${p2.arch}" />
+                        <arg line="${p2.director.extraArgs}" />
+                        <arg line="-metadatarepository file:${p2.repo}" />
+                        <arg line="-artifactrepository file:${p2.repo}" />
+                </exec>
+        </target>
+
+
 	<target name="install" depends="provision.sdk">
 		<antcall target="installIntoDestDir">
 			<param name="profile" value="SDKProfile" />
@@ -932,15 +964,23 @@
 
 	<target name="installIntoDestDir">
 		<mkdir dir="${installationDir}" />
-		<exec executable="cp" failonerror="true">
-			<arg value="-rd" />
-			<arg value="--no-target-directory" />
-			<arg value="${provisionDir}" />
-			<arg value="${installationDir}" />
-		</exec>
+                <exec executable="rsync" failonerror="true">
+                       <arg value="-vrpl" />
+                       <arg value="--exclude=dropins" />
+                       <arg value="${provisionDir}/" />
+                       <arg value="${installationDir}/" />
+                </exec>
 
 		<!-- install desktop file -->
 		<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}" />
+	    <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}"/>
 		<!-- 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" />
@@ -952,11 +992,6 @@
 		<!-- eclipse binary -->
 		<mkdir dir="${destDir}${prefix}/bin" />
 		<symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" overwrite="true"/>
-		<!-- FIXME:  we really shouldn't need this anymore but at least pdebuild.sh will need to be updated -->
-		<!-- Create the "startup.jar" symlink -->
-		<fileset dir="${installationDir}/plugins" includes="org.eclipse.equinox.launcher_*" id="startupjar" />
-		<property name="startupjarpath" refid="startupjar" />
-		<symlink link="${installationDir}/startup.jar" resource="plugins/${startupjarpath}" overwrite="true"/>
 		<!-- Create the "swt.jar" and friends symlinks  -->
 		<fileset dir="${installationDir}/plugins" includes="org.eclipse.swt.gtk.linux.${buildArch}_*" id="swtjar" />
 		<property name="swtjarpath" refid="swtjar" />
@@ -988,6 +1023,26 @@
 			<jvmarg value="-Dosgi.sharedConfiguration.area=${installationDir}/configuration" />
 		</java>
 
+		<!-- remove the initializer -->
+		<property name="directorToRun" value="${installationDir}/eclipse" />
+                <antcall target="run.installed.director.uninstall">
+                        <param name="p2.director.uninstallIU" value="org.eclipse.equinox.initializer" />
+                        <param name="p2.director.profile" value="PlatformProfile" />
+                        <param name="p2.director.install.path" value="${installationDir}" />
+                        <param name="p2.director.extraArgs" value="-purgeHistory" />
+			<param name="p2.os" value="linux" />
+                        <param name="p2.ws" value="gtk" />
+                        <param name="p2.arch" value="${buildArch}" />
+                        <param name="p2.repo" value="${installationDir}" />
+                </antcall>
+
+		<!-- copy PDE and JDT to dropins -->
+                <exec executable="rsync" failonerror="true">
+                       <arg value="-vrpl" />
+                       <arg value="${provisionDir}/dropins/" />
+                       <arg value="${installationDir}/dropins/" />
+                </exec>
+
 		<!-- Remove unnecessary configuration data -->
 		<delete dir="${installationDir}/configuration/org.eclipse.core.runtime" />
 		<delete dir="${installationDir}/configuration/org.eclipse.equinox.app" />
@@ -1175,11 +1230,11 @@
 
 	<target name="moveNewStuffToDropins">
 		<property name="dropinsDirectory" value="${orig}/dropins/${dropinsDir}" />		
-		<move todir="${dropinsDirectory}/features" includeemptydirs="true">
-			<fileset dir="${new}/features" id="newFeatures.fileset">
-				<present present="srconly" targetdir="${orig}/features"/>
-			</fileset>
-		</move>
+                <move todir="${dropinsDirectory}/features" includeemptydirs="true">
+                        <fileset dir="${new}/features" id="newFeatures.fileset">
+                                <present present="srconly" targetdir="${orig}/features"/>
+                        </fileset>
+                </move>
 		<move todir="${dropinsDirectory}/plugins" includeemptydirs="true">
 			<fileset dir="${new}/plugins" id="newPlugins.fileset">
 				<present present="srconly" targetdir="${orig}/plugins"/>
diff --git a/buildEclipseBuildSource.sh b/buildEclipseBuildSource.sh
old mode 100644
new mode 100755
index da0fc02..e8b37c8
--- a/buildEclipseBuildSource.sh
+++ b/buildEclipseBuildSource.sh
@@ -45,7 +45,7 @@ rm -fr eclipse-build-${eclipsebuildTag}
 cd ..
 
 
-tar caf eclipse-build-${eclipsebuildTag}.tar.bz2 eclipse-build-${eclipsebuildTag}
+tar caf eclipse-build-${eclipsebuildTag}.tar.xz eclipse-build-${eclipsebuildTag}
 cd "${baseDir}"
 
-echo "Built ${workDirectory}/eclipse-build-${eclipsebuildTag}.tar.bz2"
+echo "Built ${workDirectory}/eclipse-build-${eclipsebuildTag}.tar.xz"
diff --git a/buildSDKSource.sh b/buildSDKSource.sh
old mode 100644
new mode 100755
index 677846c..9f86ca0
--- a/buildSDKSource.sh
+++ b/buildSDKSource.sh
@@ -6,12 +6,11 @@ workDirectory=
 baseBuilder=
 eclipseBuilder=
 
-buildID="R3_6_2"
-baseBuilderTag="R3_6_1"
-eclipseBuilderTag="R3_6_1"
-label="3.6.2"
+buildID="R3_7"
+baseBuilderTag="R3_7"
+eclipseBuilderTag="R3_7"
+label="3.7.0"
 fetchTests="yes"
-ecfTag="R-Release_3_3-sdk_feature-22-2010_09_13"
 
 usage="usage:  <build ID> [-workdir <working directory>] [-baseBuilder <path to org.eclipse.releng.basebuilder checkout>] [-eclipseBuilder <path to org.eclipse.releng.eclipsebuilder checkout>] [-baseBuilderTag <org.eclipse.releng.basebuilder tag to check out>] [-noTests]"
 
@@ -124,17 +123,19 @@ cd "${fetchDirectory}"
 # Extract osgi.util src for rebuilding
 pushd plugins/org.eclipse.osgi.util
   unzip -q -d src src.zip
+  # Remove pre-compiled class files and the source.zip
+  rm -r org/ src.zip
 popd
 
 git clone git://git.eclipse.org/gitroot/ecf/org.eclipse.ecf.git
 cd org.eclipse.ecf
-git archive --format=tar --prefix=ecf-3.4.0/ R-Release_3_4-sdk_feature-8_2010-10-29_09-13-51 | gzip >ecf-3.4.0.tar.gz
-cp ecf-3.4.0.tar.gz ../
+git archive --format=tar --prefix=ecf-3.5.0/ R-Release_HEAD-sdk_feature-19_2011-03-13_18-40-16 | gzip >ecf-3.5.0.tar.gz
+cp ecf-3.5.0.tar.gz ../
 cd ..
 rm -fr org.eclipse.ecf
-tar -xf ecf-3.4.0.tar.gz
-rm -fr ecf-3.4.0.tar.gz
-cd ecf-3.4.0
+tar -xf ecf-3.5.0.tar.gz
+rm -fr ecf-3.5.0.tar.gz
+cd ecf-3.5.0
 
 # Source for ECF bthat aren't part of SDK map files
 for f in \
@@ -155,7 +156,7 @@ for f in \
 mv  providers/bundles/$f ../plugins;
 done
 cd ..
-rm -fr ecf-3.4.0
+rm -fr ecf-3.5.0
 
 cd "${fetchDirectory}"
 # We don't want to re-ship these as those bundles inside will already be
diff --git a/debian/changelog b/debian/changelog
index 5fd3152..2cce738 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ eclipse (3.7~exp-1) UNRELEASED; urgency=low
 
   [ Niels Thykier ]
   * New upstream release.
+    - Built without xulrunner support  (Closes: #631061)
+  * Added Build-Conflicts to ensure xulrunner is not picked up if
+    built in unclean chroots.
+  * B-D on liblucene2-java (>= 2.9.4+ds1-3~) due to #631234.
 
  -- Andres Mejia <amejia at debian.org>  Sun, 17 Jul 2011 13:23:24 -0400
 
diff --git a/debian/control b/debian/control
index aa85719..bca5cc5 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,7 @@ Build-Depends: ant (>= 1.8.2),
                libjasper-java,
                libjetty-java (>= 6.1.24-4~),
                libjsch-java (>= 0.1.37-3),
-               liblucene2-java (>= 2.9.4+ds1),
+               liblucene2-java (>= 2.9.4+ds1-3~),
                liblucene2-java (<< 2.9.5),
                libpango1.0-dev,
                libservlet2.5-java (>= 6.0.20-8),
@@ -46,6 +46,7 @@ Build-Depends: ant (>= 1.8.2),
                sat4j (<< 2.4.0),
                unzip,
                zip
+Build-Conflicts: xulrunner-dev
 Standards-Version: 3.9.2
 DM-Upload-Allowed: yes
 Vcs-Git: git://git.debian.org/git/pkg-java/eclipse.git
@@ -131,7 +132,7 @@ Depends: ant (>= 1.8.2),
          libjasper-java,
          libjetty-java (>= 6.1.24-4~),
          libjsch-java (>= 0.1.37-3),
-         liblucene2-java (>= 2.9.4+ds1),
+         liblucene2-java (>= 2.9.4+ds1-3~),
          liblucene2-java (<< 2.9.5),
          libservlet2.5-java (>= 6.0.20-8),
          sat4j (>= 2.3.0),
diff --git a/debian/eclipse-build-generatedScripts.tar.bz2 b/debian/eclipse-build-generatedScripts.tar.bz2
deleted file mode 100644
index 8b28cfa..0000000
Binary files a/debian/eclipse-build-generatedScripts.tar.bz2 and /dev/null differ
diff --git a/debian/eclipse-platform-data.install b/debian/eclipse-platform-data.install
index c7eff02..9713ae7 100644
--- a/debian/eclipse-platform-data.install
+++ b/debian/eclipse-platform-data.install
@@ -42,6 +42,8 @@ usr/lib/eclipse/plugins/org.eclipse.equinox.p2.reconciler.dropins_*.jar
 usr/lib/eclipse/plugins/org.eclipse.equinox.p2.repository_*.jar
 usr/lib/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse_*.jar
 usr/lib/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.natives_*.jar
+usr/lib/eclipse/plugins/org.eclipse.equinox.p2.transport.ecf_*.jar
+usr/lib/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport_*.jar
 usr/lib/eclipse/plugins/org.eclipse.equinox.p2.ui.sdk.scheduler_*.jar
 usr/lib/eclipse/plugins/org.eclipse.equinox.p2.ui.sdk_*.jar
 usr/lib/eclipse/plugins/org.eclipse.equinox.p2.ui_*.jar
@@ -84,6 +86,10 @@ 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.equinox.p2.core.feature_*
+usr/share/eclipse/features/org.eclipse.equinox.p2.extras.feature_*
+usr/share/eclipse/features/org.eclipse.equinox.p2.rcp.feature_*
 usr/share/eclipse/features/org.eclipse.equinox.p2.user.ui_*
 usr/share/eclipse/features/org.eclipse.help_*
 usr/share/eclipse/features/org.eclipse.platform_*
diff --git a/debian/eclipse-platform.install b/debian/eclipse-platform.install
index 0bd0f84..a9fd40a 100644
--- a/debian/eclipse-platform.install
+++ b/debian/eclipse-platform.install
@@ -8,6 +8,9 @@ usr/lib/eclipse/configuration/config.ini
 usr/lib/eclipse/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
 usr/lib/eclipse/eclipse
 usr/lib/eclipse/eclipse.ini
+usr/lib/eclipse/features/org.eclipse.equinox.p2.core.feature_*
+usr/lib/eclipse/features/org.eclipse.equinox.p2.extras.feature_*
+usr/lib/eclipse/features/org.eclipse.equinox.p2.rcp.feature_*
 usr/lib/eclipse/features/org.eclipse.equinox.p2.user.ui_*
 usr/lib/eclipse/features/org.eclipse.help_*
 usr/lib/eclipse/features/org.eclipse.platform_*
@@ -30,6 +33,7 @@ usr/lib/eclipse/plugins/org.eclipse.equinox.p2.artifact.repository_*.jar
 usr/lib/eclipse/plugins/org.eclipse.equinox.p2.director.app_*.jar
 usr/lib/eclipse/plugins/org.eclipse.equinox.p2.jarprocessor_*.jar
 usr/lib/eclipse/plugins/org.eclipse.equinox.p2.metadata.repository_*.jar
+usr/lib/eclipse/plugins/org.eclipse.equinox.p2.publisher.eclipse_*
 usr/lib/eclipse/plugins/org.eclipse.equinox.p2.publisher_*.jar
 usr/lib/eclipse/plugins/org.eclipse.equinox.p2.repository.tools_*.jar
 usr/lib/eclipse/plugins/org.eclipse.help.base_*.jar
diff --git a/debian/rules b/debian/rules
index 0728912..e892ddc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,6 +28,7 @@ override_dh_shlibdeps:
 			$(SWT_SO_PATH)/libswt-awt-gtk-*.so \
 			$(SWT_SO_PATH)/libswt-cairo-gtk-*.so \
 			$(SWT_SO_PATH)/libswt-pi-gtk-*.so \
+			$(SWT_SO_PATH)/libswt-webkit-gtk-*.so \
 			$(shell find $(JNI_SO_PATH) -name '*.so' | grep -v libswt-) \
 			$(LAUNCHER_LIB) \
 		-dRecommends \
diff --git a/dependencies.properties b/dependencies.properties
index 7b91808..fdd463f 100644
--- a/dependencies.properties
+++ b/dependencies.properties
@@ -1,15 +1,15 @@
-com.ibm.icu_4.2.1.v20100412.jar=/usr/lib/eclipse/plugins/com.ibm.icu_4.2.1.v20100412.jar:/usr/lib64/eclipse/plugins/com.ibm.icu_4.2.1.v20100412.jar:/usr/share/java/com.ibm.icu-4.2.jar:/usr/share/java/com.ibm.icu.jar
+com.ibm.icu_4.4.2.v20110208.jar=/usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar:/usr/lib64/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar:/usr/share/java/com.ibm.icu-4.4.jar:/usr/share/java/com.ibm.icu.jar
 com.jcraft.jsch_0.1.41.v200903070017.jar=/usr/share/java/jsch.jar
-javax.servlet_2.5.0.v200910301333.jar=/usr/share/java/tomcat6-servlet-2.5-api.jar:/usr/share/java/servlet-api-2.5.jar
-javax.servlet.jsp_2.0.0.v200806031607.jar=/usr/share/java/tomcat5-jsp-2.0-api.jar:/usr/share/java/jsp-api-2.0.jar
-org.apache.commons.codec_1.3.0.v20080530-1600.jar=/usr/share/java/commons-codec.jar
+javax.servlet_2.5.0.v201103041518.jar=/usr/share/java/tomcat6-servlet-2.5-api.jar:/usr/share/java/servlet-api-2.5.jar
+javax.servlet.jsp_2.0.0.v201101211617.jar=/usr/share/java/tomcat6-jsp-2.1-api.jar:/usr/share/java/jsp-api-2.0.jar
+org.apache.commons.codec_1.3.0.v201101211617.jar=/usr/share/java/commons-codec.jar
 org.apache.commons.el_1.0.0.v200806031608.jar=/usr/share/java/commons-el.jar
 org.apache.commons.httpclient_3.1.0.v201005080502.jar=/usr/share/java/commons-httpclient.jar
-org.apache.commons.logging_1.0.4.v201005080501.jar=/usr/share/java/commons-logging.jar
+org.apache.commons.logging_1.0.4.v201101211617.jar=/usr/share/java/commons-logging.jar
 org.apache.jasper_5.5.17.v200903231320.jar=/usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar:/usr/share/java/jasper-5.5.26.jar
-org.apache.lucene_1.9.1.v20100518-1140.jar=/usr/share/java/lucene.jar:/usr/share/java/lucene-core.jar
-org.apache.lucene.analysis_1.9.1.v20100518-1140.jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar:/usr/share/java/lucene-analyzers.jar
+org.apache.lucene.core_2.9.1.v201101211721.jar=/usr/share/java/lucene.jar:/usr/share/java/lucene-core.jar
+org.apache.lucene.analysis_2.9.1.v201101211721.jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar:/usr/share/java/lucene-analyzers.jar
 org.mortbay.jetty.util_6.1.23.v201004211559.jar=/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty-util.jar
 org.mortbay.jetty.server_6.1.23.v201004211559.jar=/usr/share/java/jetty/jetty.jar:/usr/share/java/jetty.jar
-org.sat4j.core_2.2.0.v20100429.jar=/usr/share/java/org.sat4j.core.jar:/usr/share/sat4j/org.sat4j.core.jar
-org.sat4j.pb_2.2.0.v20100429.jar=/usr/share/java/org.sat4j.pb.jar:/usr/share/sat4j/org.sat4j.pb.jar
+org.sat4j.core_2.3.0.v20110329.jar=/usr/share/java/org.sat4j.core.jar:/usr/share/sat4j/org.sat4j.core.jar
+org.sat4j.pb_2.3.0.v20110329.jar=/usr/share/java/org.sat4j.pb.jar:/usr/share/sat4j/org.sat4j.pb.jar
diff --git a/dependencyManifests/com.ibm.icu_4.2.1.v20100412.jar/META-INF/MANIFEST.MF b/dependencyManifests/com.ibm.icu_4.2.1.v20100412.jar/META-INF/MANIFEST.MF
deleted file mode 100644
index daeb971..0000000
--- a/dependencyManifests/com.ibm.icu_4.2.1.v20100412.jar/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,4238 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
-Bundle-SymbolicName: com.ibm.icu; singleton:=true
-Eclipse-LazyStart: true
-Bundle-Version: 4.2.1.v20100412
-Export-Package: com.ibm.icu.lang;base=true;full=true;version="4.2.1.1"
- ,com.ibm.icu.math;base=true;full=true;version="4.2.1.1",com.ibm.icu.t
- ext;base=true;full=true;version="4.2.1.1",com.ibm.icu.util;base=true;
- full=true;version="4.2.1.1",com.ibm.icu.impl;x-internal:=true,com.ibm
- .icu.impl.data;x-internal:=true,com.ibm.icu.impl.data.icudt42b;x-inte
- rnal:=true,com.ibm.icu.impl.data.icudt42b.brkitr;x-internal:=true,com
- .ibm.icu.impl.data.icudt42b.coll;x-internal:=true,com.ibm.icu.impl.da
- ta.icudt42b.rbnf;x-internal:=true,com.ibm.icu.impl.data.icudt42b.tran
- slit;x-internal:=true
-Bundle-ClassPath: icu-jse4.jar,icu-data.jar,.
-Bundle-Vendor: %providerName
-Bundle-Name: %pluginName
-Eclipse-ExtensibleAPI: true
-Bundle-Copyright: Licensed Materials - Property of IBM (C) Copyright I
- BM Corp. 2000, 2010. All Rights Reserved. IBM is a registered tradema
- rk of IBM Corp.
-Bundle-ManifestVersion: 2
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/is.res
-SHA1-Digest: j2CvJA3Cm/aqqU6CYhr47wtC2L8=
-
-Name: com/ibm/icu/text/EscapeTransliterator.class
-SHA1-Digest: YXPxHZn0uCu6crcG4IqVG3oVBnU=
-
-Name: com/ibm/icu/impl/data/icudt42b/hu.res
-SHA1-Digest: 3JfUzYiRweroYW/plfnvsLDQb1I=
-
-Name: com/ibm/icu/text/NumberFormat$SimpleNumberFormatFactory.class
-SHA1-Digest: E6rM+nNhOSNMheNR4AiKxfCrgSo=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ar.res
-SHA1-Digest: PwC+9Pf6YSgK3V57C+Sjfqnpr3I=
-
-Name: com/ibm/icu/impl/duration/impl/Utils$ChineseDigits.class
-SHA1-Digest: xbghwuZOvqj0GdC1C/PXv1XcH0I=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/zh.res
-SHA1-Digest: kwZeMD+wckT1m/ZkisNoWScHlHQ=
-
-Name: com/ibm/icu/impl/IllegalIcuArgumentException.class
-SHA1-Digest: 0yNJLTuTzmaf61MWdRlz8OCXFiY=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/nb.res
-SHA1-Digest: XcezM2Ezj9IKqt2x1dUw8UTqXB8=
-
-Name: com/ibm/icu/text/UnicodeCompressor.class
-SHA1-Digest: MamRaHWdqY/NzE+Pr/pRuFcw/k4=
-
-Name: com/ibm/icu/util/TimeZoneTransition.class
-SHA1-Digest: nsjOT2dDaZctakgY5wlp1Cn+ixY=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ar_IQ.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/locale/InternalLocaleBuilder.class
-SHA1-Digest: V7c6Go6aFXvHqvjIGGnfMXDzSp0=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/de_.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/kn_IN.res
-SHA1-Digest: CrX+t/3l7qQ+Iu1abDKV2D7/ZDk=
-
-Name: com/ibm/icu/impl/UCharacterName$AlgorithmName.class
-SHA1-Digest: PYl6PNBKDsuWCPtMTBAej3qiWEs=
-
-Name: com/ibm/icu/impl/data/HolidayBundle_fr_FR.class
-SHA1-Digest: kukMBLawmMI5NEK5Rr8YN8hdz1g=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/af_ZA.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/mk.res
-SHA1-Digest: +16iURHtlT11MXFHeQ5YdVWG9XU=
-
-Name: com/ibm/icu/impl/duration/impl/Utils.class
-SHA1-Digest: gf7gRgQu1u5OgPdlHnExgWFX9Bc=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_8859_1_de.class
-SHA1-Digest: TeJeBzkTwkAFHb/iKE80Zc0XicI=
-
-Name: com/ibm/icu/text/AbsoluteValueSubstitution.class
-SHA1-Digest: ZolTHiOYyGLQwXWY00LnhUJsdME=
-
-Name: com/ibm/icu/text/RBBIDataWrapper$TrieFoldingFunc.class
-SHA1-Digest: Qf62ZKq9AjB9w31sh/QS1De+vpI=
-
-Name: com/ibm/icu/text/Normalizer$NFDMode.class
-SHA1-Digest: xg6Q8tYy7KxwlfYm+Grf+3XV3fM=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/fo.res
-SHA1-Digest: bL+GlmE1Y5OoN/A/uUVVOCpXTKA=
-
-Name: com/ibm/icu/impl/ICUResourceBundleImpl$ResourceInt.class
-SHA1-Digest: PK/s8z+DVKB6V/yZ7axygXLKwrs=
-
-Name: com/ibm/icu/util/CopticCalendar.class
-SHA1-Digest: oRNvFtdVo3HZ2IOcg2AjOGhm9I8=
-
-Name: com/ibm/icu/text/RuleBasedBreakIterator.class
-SHA1-Digest: ge0GS1yzlXkRSC/RdBcTRZNf3og=
-
-Name: com/ibm/icu/impl/data/icudt42b/sr_Cyrl_RS.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/en_ZW.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/CharsetRecog_2022.class
-SHA1-Digest: F0nf0CFBMOFv2vrd0mvZ7OY43mY=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ar_BH.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/sh.res
-SHA1-Digest: 5xIT4uaABWOSZbAPadn5pBVATSA=
-
-Name: com/ibm/icu/impl/duration/impl/DataRecord$EUnitVariant.class
-SHA1-Digest: F2a3jCGNTvPEMDmL8BeOOTEQ1iI=
-
-Name: com/ibm/icu/lang/UCharacter$StringContextIterator.class
-SHA1-Digest: lNpq2qWpIAGB742B0mS87r+hpsQ=
-
-Name: com/ibm/icu/text/NumeratorSubstitution.class
-SHA1-Digest: 7GMpPOT/EuYAKhFUqfg3TQ7pAYA=
-
-Name: com/ibm/icu/impl/data/icudt42b/zh_CN.res
-SHA1-Digest: OqOcERNgY90GdftreFDuBO3TG1M=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/pa_Arab_PK.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/DecimalFormat.class
-SHA1-Digest: U33/Ve3RZCN03mBl06HVLRmJtnU=
-
-Name: com/ibm/icu/text/RuleBasedTransliterator.class
-SHA1-Digest: RIDjkJ3ien3vG4tB1vgS4iuRFP8=
-
-Name: com/ibm/icu/text/DigitList.class
-SHA1-Digest: DbK/2LnHbTcnTDiY4krPxVDuMKw=
-
-Name: com/ibm/icu/util/Holiday.class
-SHA1-Digest: lI3HeWyJdOjBOZRCfPDxmf+FDF4=
-
-Name: com/ibm/icu/impl/data/icudt42b/nl.res
-SHA1-Digest: xy35sFvnPSYIBCf0u3kc01UzIHc=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ko_KR.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/he_IL.res
-SHA1-Digest: xx8x6c6TfbSBUuCgTOFqYfTB9Vs=
-
-Name: com/ibm/icu/lang/UCharacter$EastAsianWidth.class
-SHA1-Digest: BsCL841cISRA8tJI4hy44L/8/XI=
-
-Name: com/ibm/icu/impl/duration/OneOrTwoUnitBuilder.class
-SHA1-Digest: 6vDwEr9CWsHzaKmMdGNTAsFihLM=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/kn.res
-SHA1-Digest: m20WWXMhMf9Jguc91WRlhm7fov0=
-
-Name: com/ibm/icu/text/Bidi.class
-SHA1-Digest: AgMeGBZRm0TYecerF6aysJ7PT9k=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/sr_Latn.res
-SHA1-Digest: njORFhp1f/q+5Iunh8RUfI1YhXs=
-
-Name: com/ibm/icu/impl/data/icudt42b/fr.res
-SHA1-Digest: uLgs0BZfEG5SKg4oCnu7DjddatA=
-
-Name: com/ibm/icu/util/CurrencyServiceShim$CFService.class
-SHA1-Digest: rBBK+/s+rspq0n4MHaBKyH6qgeY=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/it_IT.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/BreakIterator.class
-SHA1-Digest: 1McPZer5dsYHVvftuxv1mulZJCQ=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/de.res
-SHA1-Digest: udXs6mDgaFlXCDLufyFIaPqL0mA=
-
-Name: com/ibm/icu/impl/data/icudt42b/om.res
-SHA1-Digest: kXlJcOU2EYYVZHUnQgPRoNED2jA=
-
-Name: com/ibm/icu/impl/data/icudt42b/sr.res
-SHA1-Digest: tGIJx/BHQmB3/P21GhxRf0tHIck=
-
-Name: com/ibm/icu/impl/data/icudt42b/haw_US.res
-SHA1-Digest: qXwLlsGY/3vEgZHppDA+hTle9kE=
-
-Name: com/ibm/icu/text/BreakCTDictionary$CompactTrieNodeFlags.class
-SHA1-Digest: NHSMsJK1/XaK+qxiN89ct8gnfeM=
-
-Name: com/ibm/icu/impl/TextTrieMap$ResultHandler.class
-SHA1-Digest: NfDOnUJ6MEMaHwTl+N0ovE9ddws=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/pt.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/TransliteratorParser$ParseData.class
-SHA1-Digest: qzjqmwgM41enjJzYKlm1GmSsxVo=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ar_TN.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/lv.res
-SHA1-Digest: FNsqY1pX+nP5Q5tA0F/KTsIeKQs=
-
-Name: com/ibm/icu/text/BidiRun.class
-SHA1-Digest: NVDG2+p7aEOg0Y7eJMKRrGzcIBM=
-
-Name: com/ibm/icu/impl/data/icudt42b/az_Latn.res
-SHA1-Digest: GuGMZSWyJJqxdmm9EzD7CnSl2IU=
-
-Name: com/ibm/icu/impl/data/icudt42b/es_UY.res
-SHA1-Digest: ctg1v3Q44rmRhqm49FQHKrrmIMA=
-
-Name: com/ibm/icu/impl/data/icudt42b/brkitr/sent.brk
-SHA1-Digest: 5QkJZyN+UYeCLr8NqkrhshFfAcQ=
-
-Name: com/ibm/icu/lang/UScript.class
-SHA1-Digest: 5uNMnkZHEDId9P+L36R63jpUhyI=
-
-Name: com/ibm/icu/impl/data/icudt42b/brkitr/en_US_POSIX.res
-SHA1-Digest: beFWtWkxc9Yvx9alkk9FkhNbb+0=
-
-Name: com/ibm/icu/impl/duration/impl/ResourceBasedPeriodFormatterDataS
- ervice.class
-SHA1-Digest: JqOOr2sq7TcizCQJs9oL4g6So4I=
-
-Name: com/ibm/icu/text/CharsetRecog_2022$CharsetRecog_2022CN.class
-SHA1-Digest: DbHd1CyG/Msa9UPMr2wH2DF7trc=
-
-Name: com/ibm/icu/impl/PropsVectors$DefaultGetFoldedValue.class
-SHA1-Digest: Lwmpr2KCuPKMqaGtEnlFLz/wuqo=
-
-Name: com/ibm/icu/text/UppercaseTransliterator$1.class
-SHA1-Digest: G0JYUB6wT8GAYj5owWpsz9/Ftw8=
-
-Name: com/ibm/icu/impl/duration/impl/DataRecord$ETimeLimit.class
-SHA1-Digest: 4ZMtPxvIotXIqFOqbPO7ya0XlMY=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ar_DZ.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/CharsetDetector.class
-SHA1-Digest: gYZx7hbJUm5FKRv7KdQ97H4GweY=
-
-Name: com/ibm/icu/impl/URLHandler.class
-SHA1-Digest: vvqGkYkIa4xQWAeWynhhHrqpw10=
-
-Name: com/ibm/icu/impl/data/icudt42b/fr_MC.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/text/CharsetRecog_UTF8.class
-SHA1-Digest: e0rv0rA2OtgVcjPnmTwV8XCoHvY=
-
-Name: com/ibm/icu/impl/data/icudt42b/brkitr/el.res
-SHA1-Digest: U0c1hk1kb+krIvZR8cJGcxzSWOY=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_8859_1_sv.class
-SHA1-Digest: E4MDrKpNuLO4thhe8eWFznL4mmk=
-
-Name: com/ibm/icu/lang/UCharacterNameIterator.class
-SHA1-Digest: UOMCEcLCGIcaMeDNVQfP5K8B03k=
-
-Name: com/ibm/icu/text/BreakCTDictionary$CompactTrieVerticalNode.class
-SHA1-Digest: FlLd/KEtCwedIf/Im9rWvJ8pkmE=
-
-Name: com/ibm/icu/text/BidiClassifier.class
-SHA1-Digest: jNruu2s6m5HmirvSejWNh5tTzPg=
-
-Name: com/ibm/icu/impl/ICULocaleService.class
-SHA1-Digest: wgOreXadv+Y6G64zD6iDwr3d/MY=
-
-Name: com/ibm/icu/util/DateRule.class
-SHA1-Digest: 9ppWbONa89XFnzd2NUTKAtIj7gs=
-
-Name: com/ibm/icu/text/RemoveTransliterator.class
-SHA1-Digest: otKJ/1nx4yCw6WLjSuLHwvCL2bc=
-
-Name: com/ibm/icu/impl/data/icudt42b/zoneinfo.res
-SHA1-Digest: lyR8PCY1r2O2fwcPzFCmV+03kek=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/de_DE.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/no_NO.res
-SHA1-Digest: AgYfyOH+DuzgYK7m3vioTfRNJGM=
-
-Name: com/ibm/icu/text/BreakTransliterator.class
-SHA1-Digest: 5j+5ezoVKgpv+cDfcyQp8CkSXHM=
-
-Name: com/ibm/icu/impl/UtilityExtensions.class
-SHA1-Digest: QHfN5QTMSujGJ608wEP4hPhWEF0=
-
-Name: com/ibm/icu/impl/data/icudt42b/en_VI.res
-SHA1-Digest: WJudThz/FQIC6MeClH53YjyURrM=
-
-Name: com/ibm/icu/lang/UCharacterEnums$ECharacterDirection.class
-SHA1-Digest: H8qH9/fT9hc7M4JiYaHxEZrAaKY=
-
-Name: com/ibm/icu/impl/ICUData.class
-SHA1-Digest: 3erV0Mc2+xO14bQ2k81EbRknNRw=
-
-Name: com/ibm/icu/impl/data/icudt42b/kw_GB.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/af_NA.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/numberingSystems.res
-SHA1-Digest: CwVj0WaVMbqB1Mpxp0Kqbk2gWKc=
-
-Name: com/ibm/icu/impl/data/icudt42b/es_SV.res
-SHA1-Digest: DqUgxafBny6RSK/5q4mvOxc7iio=
-
-Name: com/ibm/icu/text/DateIntervalFormat$BestMatchInfo.class
-SHA1-Digest: sV0Mx7TGY10SraT/jykvrPl7Q5U=
-
-Name: com/ibm/icu/impl/data/icudt42b/fr_BE.res
-SHA1-Digest: t5kA5x031c55chPP3IyBYNE2tHA=
-
-Name: com/ibm/icu/text/Normalizer$IsNextBoundary.class
-SHA1-Digest: CKZMxdzbwLro2Z+QmdJ/ciVY2PA=
-
-Name: com/ibm/icu/impl/data/icudt42b/ar_SD.res
-SHA1-Digest: 8jPOUtil+92lPKtgn16fuUJT/xs=
-
-Name: com/ibm/icu/impl/data/icudt42b/es_CR.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/fa.res
-SHA1-Digest: 5Bs2cr+U6j+dypoDNaMPSbsUf0I=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/fr_FR.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/NormalizerImpl$CmpEquivLevel.class
-SHA1-Digest: dQTjAcpSF2DECctfvlbSo0KO1aU=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/km.res
-SHA1-Digest: +iJyrhf9PCl28WxihRkDq1Ef6Lw=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/or.res
-SHA1-Digest: InVjaf5clp2rxTeqI9/0JIYSNB8=
-
-Name: com/ibm/icu/text/NameUnicodeTransliterator$1.class
-SHA1-Digest: DpWM8KnhkmbxGZXZFeHCngsH69o=
-
-Name: com/ibm/icu/impl/data/icudt42b/rfc3920node.spp
-SHA1-Digest: 4IYXUODtnB6gfa7RDUKiacm7TG8=
-
-Name: com/ibm/icu/util/Measure.class
-SHA1-Digest: 9mL4N0Vyl9+I6qKvkwVl14lMQkc=
-
-Name: com/ibm/icu/impl/duration/impl/DataRecord$ETimeDirection.class
-SHA1-Digest: N9UUzovPmIuRsQk9R1s/tDmtyIs=
-
-Name: com/ibm/icu/impl/Grego.class
-SHA1-Digest: ByHxVGjXDj6wtd4aKgZcIkKZqQk=
-
-Name: com/ibm/icu/impl/duration/PeriodBuilder.class
-SHA1-Digest: dV/Szp96Rd+0gIGLoutRicRFViU=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/fa_AF.res
-SHA1-Digest: GxFG7kSjMBkfuBfHcrlK9JEMIUk=
-
-Name: com/ibm/icu/impl/UCharacterNameChoice.class
-SHA1-Digest: mMAuTd72u2gcqx8i1UYo0FKAc9w=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/kk_KZ.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/util/RangeDateRule.class
-SHA1-Digest: msIx2SRP5ec64ZXKKDuwMKIaJuY=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/cs.res
-SHA1-Digest: 6ewJaKyRixh1EaHQDrPSPclAH1s=
-
-Name: com/ibm/icu/impl/data/icudt42b/es_PR.res
-SHA1-Digest: XbM/LpRizF51mvHs+PUyZEXY/hQ=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_8859_2_hu.class
-SHA1-Digest: pBbf8rLCbWkUdL2JrvCE8OAp+BQ=
-
-Name: com/ibm/icu/impl/data/icudt42b/en_CA.res
-SHA1-Digest: Q8VylXqubeMUQ0gbkGBmmW5FoW8=
-
-Name: com/ibm/icu/text/SimpleDateFormat$PatternItem.class
-SHA1-Digest: YAu3YeIk7pw3PNa524tZW2WuBIE=
-
-Name: com/ibm/icu/text/CollationRuleParser$IndirectBoundaries.class
-SHA1-Digest: 0AbZRXsqPif5tIO0chF3JJ4YPDo=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/th.res
-SHA1-Digest: h7X9C37HwUru0u4cVd+B3afa9HA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/zh_HK.res
-SHA1-Digest: speOMn/V2KXsedph/5CkSZvBY08=
-
-Name: com/ibm/icu/impl/UCaseProps.class
-SHA1-Digest: uOAVyXrL6DlQ5Sw5t2fW7uXhxDg=
-
-Name: com/ibm/icu/impl/NormalizerImpl$DecomposeArgs.class
-SHA1-Digest: hDKbUGlZBenhxVha4ofAGKYcZvk=
-
-Name: com/ibm/icu/impl/data/HolidayBundle_en.class
-SHA1-Digest: wLcQHijwQPcw+2QLT5p2j7vrFmU=
-
-Name: com/ibm/icu/impl/duration/impl/DataRecord$EGender.class
-SHA1-Digest: J/zw3EDVDp2DIUnLU7Ns1Auk8+s=
-
-Name: com/ibm/icu/text/EscapeTransliterator$1.class
-SHA1-Digest: BmF+vui9JoLsiiWA4fkM9uw0XGw=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/pa_Arab.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/sq.res
-SHA1-Digest: YGEaYRH54BnepCoO05Xr1A89Cjk=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/hi.res
-SHA1-Digest: YESl1anaFaTG/Cg+h8qp06YkSWc=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ps.res
-SHA1-Digest: jcSG2XNQ01J2cSZYHsb3WmuoqpY=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/vi_VN.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/ha_Latn_NG.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/RelativeDateFormat$URelativeString.class
-SHA1-Digest: 4JcRrl0CkaM/+e6/P6hm+woduY0=
-
-Name: com/ibm/icu/util/TaiwanCalendar.class
-SHA1-Digest: seXD8m1jm3Pi1ii97cHCx0DVb5g=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_8859_5.class
-SHA1-Digest: knuUFp80QD6HqAgIaUwvSZ4e2XI=
-
-Name: com/ibm/icu/impl/data/icudt42b/kw.res
-SHA1-Digest: XhDdKpjngOgIwwhY9wzLH08YYF0=
-
-Name: com/ibm/icu/text/NFSubstitution.class
-SHA1-Digest: Tf3idfc3xXqihVo1OfmhIdhv45U=
-
-Name: com/ibm/icu/util/ChineseCalendar.class
-SHA1-Digest: pJlfi7MLmf32IriffIOhnZKxFqg=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_IBM420_ar_rtl.cl
- ass
-SHA1-Digest: Pv7T9lB2nfQWV7y6z+DzAU9ztnw=
-
-Name: com/ibm/icu/impl/CalendarAstronomer$Horizon.class
-SHA1-Digest: tqn4oqVKoLNURBeQA94T77HmV80=
-
-Name: com/ibm/icu/impl/data/icudt42b/ar_QA.res
-SHA1-Digest: f4UrB2kdWt/+ODJfpHLPtXUcdas=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/om_KE.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/pa_Guru.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/ICUService$CacheEntry.class
-SHA1-Digest: lZ0Rre/AW1WALU0phN0pn/Cb1BI=
-
-Name: com/ibm/icu/impl/data/icudt42b/tr.res
-SHA1-Digest: 76WaJA6WKs5PIRKZtCsS4o72LX0=
-
-Name: com/ibm/icu/impl/data/icudt42b/az_Cyrl_AZ.res
-SHA1-Digest: WJudThz/FQIC6MeClH53YjyURrM=
-
-Name: com/ibm/icu/util/Calendar.class
-SHA1-Digest: thvM7e735GDNg3hS2lLIuJRMBV4=
-
-Name: com/ibm/icu/impl/ResourceBundleWrapper.class
-SHA1-Digest: rIKZx1wCuiXfe5QkMHVctB9728E=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/sh_BA.res
-SHA1-Digest: vYOnYIQEmwDnRfySDiGCAZETvgI=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/el.res
-SHA1-Digest: AGQ9gc90hsqcnPV6yQmFHA/1osQ=
-
-Name: com/ibm/icu/impl/data/icudt42b/sr_Latn.res
-SHA1-Digest: uO1DdkPQdwIhPSDZ+yzcrPCwz88=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_windows_1251.cla
- ss
-SHA1-Digest: SXkn/Uww9Gzw7b/Un5t7GkFakCE=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ar_AE.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/HolidayBundle_iw_IL.class
-SHA1-Digest: YUizshYwzLdXoy05Q8wxj4mQut0=
-
-Name: com/ibm/icu/impl/data/icudt42b/bn_IN.res
-SHA1-Digest: bv0pDsctpdozqqzI1wej2hasy9c=
-
-Name: com/ibm/icu/impl/NormalizerImpl$PrevArgs.class
-SHA1-Digest: cOomgZl+/yp6SYjdUoYbL7JbQk8=
-
-Name: com/ibm/icu/text/CharsetRecog_2022$CharsetRecog_2022JP.class
-SHA1-Digest: w2BjrE208VvJdVSAPaTr1kLTqvA=
-
-Name: com/ibm/icu/lang/UScriptRun$ParenStackEntry.class
-SHA1-Digest: hjJuPZ/fOXQd2FMPfdIN4fRyuUI=
-
-Name: com/ibm/icu/impl/data/icudt42b/brkitr/ja.res
-SHA1-Digest: JvSF9gjOLJGjbnDwtW+adnCvW0E=
-
-Name: com/ibm/icu/text/FractionalPartSubstitution.class
-SHA1-Digest: Ynmu31KNNJxNN6NJpdaL6yBfREo=
-
-Name: com/ibm/icu/impl/data/icudt42b/hu_HU.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/HolidayBundle_es.class
-SHA1-Digest: 3SErfzPsT82mvGwkW2uM2+Y+V3g=
-
-Name: com/ibm/icu/impl/data/icudt42b/id.res
-SHA1-Digest: /v6DtD31JMnx4TFGPb1tAs3bJ58=
-
-Name: com/ibm/icu/impl/data/icudt42b/translit/root.res
-SHA1-Digest: W9W31JFWrx9S4rOkkKDBHLnYrmI=
-
-Name: com/ibm/icu/impl/data/icudt42b/el_GR.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/text/NumberFormatServiceShim.class
-SHA1-Digest: 5g5rFy1SGHdAii8w/LXUSFEhh2s=
-
-Name: com/ibm/icu/text/EscapeTransliterator$6.class
-SHA1-Digest: PFEkFXg8eBaBKVeFY55vhS2mLAM=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ru.res
-SHA1-Digest: VXbAmZCJZJeWtwmyerLwaGhkQqk=
-
-Name: com/ibm/icu/text/RuleBasedCollator$UCAConstants.class
-SHA1-Digest: s5CcIsUVxym6jbrYS095b8nqJmI=
-
-Name: com/ibm/icu/impl/data/icudt42b/ru_UA.res
-SHA1-Digest: IXZDpxA+m9jyEDvaDLUtuycklI4=
-
-Name: com/ibm/icu/impl/ICUNotifier.class
-SHA1-Digest: lglpVgoxE78xm+dGjGgI1+vH8Go=
-
-Name: com/ibm/icu/text/TransliteratorRegistry$AliasEntry.class
-SHA1-Digest: VVsoRHCiofSdXgz5txKcKInbG98=
-
-Name: com/ibm/icu/impl/data/icudt42b/eo.res
-SHA1-Digest: kBkTnKWiCx/5QFeXkXT2AXgknWE=
-
-Name: com/ibm/icu/text/UnicodeSet$VersionFilter.class
-SHA1-Digest: a9gj5vKVl+/+AHgbAB0gZ7dN8l8=
-
-Name: com/ibm/icu/impl/data/icudt42b/it.res
-SHA1-Digest: WsShTh/aQbQ/ZhxRGg7Ag7CBx7g=
-
-Name: com/ibm/icu/impl/data/icudt42b/sr_Latn_YU.res
-SHA1-Digest: 63xXzYBbV2uVP5NlLgeUyp8SVsg=
-
-Name: com/ibm/icu/impl/data/icudt42b/zh_Hans_HK.res
-SHA1-Digest: wQNfmmf0h/hyQoWk7DLPyxuDo2U=
-
-Name: com/ibm/icu/text/UnescapeTransliterator$3.class
-SHA1-Digest: 0k60My0lEzUBHKhLLnROQxfwBNQ=
-
-Name: com/ibm/icu/impl/LocaleUtility.class
-SHA1-Digest: BX7DKr4qa3fDsh7bKxjRqrIdN1k=
-
-Name: com/ibm/icu/text/BreakIteratorFactory$1$RBBreakIteratorFactory.c
- lass
-SHA1-Digest: +2C+74R/GkAukYK6BWok4d5+X18=
-
-Name: com/ibm/icu/util/UResourceBundleIterator.class
-SHA1-Digest: IrH/7eAb+2WBO5XParE13Y5/z+k=
-
-Name: com/ibm/icu/impl/data/icudt42b/sk_SK.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/az.res
-SHA1-Digest: ZMWs0VOdiKvJNL4AFWqFkUJSFhs=
-
-Name: com/ibm/icu/impl/data/icudt42b/rfc4013.spp
-SHA1-Digest: kRrkLaCSp2+yZ8BOpLlwwoi02PI=
-
-Name: com/ibm/icu/impl/data/icudt42b/ga_IE.res
-SHA1-Digest: WJudThz/FQIC6MeClH53YjyURrM=
-
-Name: com/ibm/icu/text/RBBIRuleScanner$RBBIRuleChar.class
-SHA1-Digest: J0Y4X3G8nAQ2u1NdqdAgiryBeGs=
-
-Name: com/ibm/icu/text/CollatorServiceShim.class
-SHA1-Digest: hAgfcsXlTzaL/w4/gL0N9iCOUYo=
-
-Name: com/ibm/icu/impl/data/HolidayBundle.class
-SHA1-Digest: eped8S2PIpsw0xNnRZ5/97cXdR4=
-
-Name: com/ibm/icu/impl/data/icudt42b/es_PA.res
-SHA1-Digest: nBhqgNbBYXfEOuIJnwG/Q4teyVM=
-
-Name: com/ibm/icu/impl/data/icudt42b/ro.res
-SHA1-Digest: FOBd+W6c9Uszw+S2FdiRgo7ISJo=
-
-Name: com/ibm/icu/util/Calendar$FormatConfiguration.class
-SHA1-Digest: HMfqjsjj92/mRd+LB6GWlX9Rz8A=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_IBM424_he_rtl.cl
- ass
-SHA1-Digest: J+B9CfPJsTC9wgQE4/ZkMBES4nY=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/kl.res
-SHA1-Digest: 0jsw6UtoVk4zt3ILXicpfV7biTk=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/sv.res
-SHA1-Digest: egUhPtCoHrry2yDZn92p5O6n5N8=
-
-Name: com/ibm/icu/impl/data/icudt42b/brkitr/sent_el.brk
-SHA1-Digest: 8i9iN5U7DqUoIo4MK4oyQZS9P3g=
-
-Name: com/ibm/icu/impl/data/icudt42b/ne_IN.res
-SHA1-Digest: CrX+t/3l7qQ+Iu1abDKV2D7/ZDk=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/en_BW.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/TransliteratorRegistry.class
-SHA1-Digest: A/P7G4aaYuPu5xXL/ZkBbE18hwI=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/nb_NO.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/duration/impl/XMLRecordWriter.class
-SHA1-Digest: PWYSZ4u8g1IfpbLoDoF3ftIAb4Q=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_8859_1_it.class
-SHA1-Digest: cDFTSttIyUcOXqLd9D2T6tp/HZk=
-
-Name: com/ibm/icu/impl/duration/impl/DataRecord$ECountVariant.class
-SHA1-Digest: aJHVQ300aVD+BmC2P8llIq3pg9c=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/et_EE.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/util/CurrencyAmount.class
-SHA1-Digest: PNIjQXIaQ2oYJyUT0ItTyTqEkoU=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_windows_1256.cla
- ss
-SHA1-Digest: DrTHr4sUWIbklSdEgWU28WoUbhA=
-
-Name: com/ibm/icu/impl/data/icudt42b/ti_ET.res
-SHA1-Digest: vLe6xnVtFOY1XQsLbWAyg++v4R8=
-
-Name: com/ibm/icu/util/VTimeZone.class
-SHA1-Digest: 1TPDKEs1DSITvWxMUvckjGndB4Q=
-
-Name: com/ibm/icu/impl/DateNumberFormat.class
-SHA1-Digest: cjx+PVDKOUW7D4ujcB6HlUvHvGs=
-
-Name: com/ibm/icu/text/NumberFormatServiceShim$NFService.class
-SHA1-Digest: tbq28jH7lu6i82zGqfz3TzCU2zw=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/es_PY.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/cy.res
-SHA1-Digest: 19rDUBcwJVut4iH/bVmNX3Q7FOI=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_8859_9_tr.class
-SHA1-Digest: L3qSOBh58ZoDcsPpSVwC2ZJVA70=
-
-Name: com/ibm/icu/impl/data/icudt42b/ga.res
-SHA1-Digest: +eLSqa91+kUpqOvCWHDTWpeia+0=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/fi_FI.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ru_RU.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/CollationRuleParser$OptionSet.class
-SHA1-Digest: NQEcyavf02KCzAUy8eUxp2bm0ik=
-
-Name: com/ibm/icu/impl/data/icudt42b/sh_YU.res
-SHA1-Digest: 63xXzYBbV2uVP5NlLgeUyp8SVsg=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ar_LB.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/CurrencyFormat.class
-SHA1-Digest: BIYocngM/7NiKCWXni1oy8dw6UE=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_8859_1_no.class
-SHA1-Digest: xv4d+++Lz/qnbkyyhqENFT7eu0k=
-
-Name: com/ibm/icu/lang/UCharacter$HangulSyllableType.class
-SHA1-Digest: FX4QLFcLemKiu2KiOmBPbxuoTgA=
-
-Name: com/ibm/icu/impl/NormalizerImpl$RecomposeArgs.class
-SHA1-Digest: JcTG/vr+4vL+lvoLih+JchLOwys=
-
-Name: com/ibm/icu/impl/duration/BasicDurationFormatter.class
-SHA1-Digest: zh16hEdh2ONzmmsS1JDrmJiNlRk=
-
-Name: com/ibm/icu/impl/PropsVectors.class
-SHA1-Digest: wI4264ILYDdbtojBjMmkuDjmmUY=
-
-Name: com/ibm/icu/impl/data/icudt42b/ja_JP.res
-SHA1-Digest: WJudThz/FQIC6MeClH53YjyURrM=
-
-Name: com/ibm/icu/impl/data/icudt42b/es_EC.res
-SHA1-Digest: m0kpaMOPvIMFxZxiXL7bN0HH7wk=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/lt.res
-SHA1-Digest: rb4HPjXWqwrgfjBmwldQmaCBJ9c=
-
-Name: com/ibm/icu/text/TransliteratorIDParser$SingleID.class
-SHA1-Digest: Ufnlmb9l7qkXF0nQiTQKfC0SUN4=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/en_PH.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/CollatorReader$2.class
-SHA1-Digest: VstzQGGxGrBfAGwLsKAmINjoHdE=
-
-Name: com/ibm/icu/impl/data/icudt42b/ta.res
-SHA1-Digest: UIyNBGqa1phd6lRvgnG2rxHojNI=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_8859_6_ar.class
-SHA1-Digest: xn1RXUAMmznOTgrhrUQpwv5QlOQ=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs.class
-SHA1-Digest: QqTdh0CH4Vf7dqv8SgIqkDzUFSU=
-
-Name: com/ibm/icu/impl/data/BreakIteratorRules.class
-SHA1-Digest: gCMOKah34u1kPKbKDFFkZ7q4Yns=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/uk_UA.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/SimpleCache.class
-SHA1-Digest: gkYKNngE0GE4oKeUP2E1tXk1jM8=
-
-Name: com/ibm/icu/text/UnicodeNameTransliterator$1.class
-SHA1-Digest: KaMVjn1QaHf34mD7oxjgwJ5ahIQ=
-
-Name: com/ibm/icu/impl/ZoneMeta.class
-SHA1-Digest: r0glyuuqmD6LFhOLNsnp1xng+pU=
-
-Name: com/ibm/icu/impl/data/icudt42b/es_ES.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/text/ComposedCharIter.class
-SHA1-Digest: rChNG7UYDnRxDj7UbX1y0qWs5dk=
-
-Name: com/ibm/icu/impl/CollectionUtilities$MultiComparator.class
-SHA1-Digest: w+RtoKXIAzU2JSHL2lRzb/vNpkk=
-
-Name: com/ibm/icu/impl/data/icudt42b/pl.res
-SHA1-Digest: ycc7jjxh5sAJ1hGkiVLYLBbGIL4=
-
-Name: com/ibm/icu/impl/ICUBinary.class
-SHA1-Digest: sSY3Nr1xFNDxtMCJmvvgUU8AbJk=
-
-Name: com/ibm/icu/impl/JavaTimeZone.class
-SHA1-Digest: RGmGX6YF1kdSgSbPkP1pPUkdprM=
-
-Name: com/ibm/icu/impl/data/icudt42b/uz_Cyrl.res
-SHA1-Digest: ofu0p2h5HG++q/Yi5O9ZawldKoI=
-
-Name: com/ibm/icu/impl/duration/impl/DataRecord$EHalfPlacement.class
-SHA1-Digest: hXh33TmrbYTnw55gCgxA0u+L1aU=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/af.res
-SHA1-Digest: 6ZZdsbmX402QmyeJfRkOd0UDHiQ=
-
-Name: com/ibm/icu/impl/duration/impl/data/pfd_ko.xml
-SHA1-Digest: eOSUSyUSndb5fF2lk9BJK2jpGXo=
-
-Name: com/ibm/icu/text/PluralRules$BinaryConstraint.class
-SHA1-Digest: 1JkBPbgxMsMN5YV/Rcxbgs+kVXU=
-
-Name: com/ibm/icu/impl/data/icudt42b/hr.res
-SHA1-Digest: WMsS49dfMXa65cAp+IQNie57DAU=
-
-Name: com/ibm/icu/text/CollationParsedRuleBuilder$CEGenerator.class
-SHA1-Digest: /DJVLxMf9OcAzOZjQCcQi63elb8=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/et.res
-SHA1-Digest: gY9889U6aBhiQd1g82sqQbwkwU4=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/zh_.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/vi.res
-SHA1-Digest: fPZhu1BtbXnuJ3eUSAXmbnsSKPk=
-
-Name: com/ibm/icu/text/PluralFormat.class
-SHA1-Digest: rO5A57/apGQ9E2S9YwO746MktFQ=
-
-Name: com/ibm/icu/util/CaseInsensitiveString.class
-SHA1-Digest: rQq82lJnOBEXasFGvZ877r9VDQ4=
-
-Name: com/ibm/icu/impl/data/icudt42b/es_BO.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/ja.res
-SHA1-Digest: JU096ryb1j2ZPt0LeW9mREJ8Pkg=
-
-Name: com/ibm/icu/impl/data/icudt42b/az_AZ.res
-SHA1-Digest: /aK65NhD+NN4VpffHy3dVw5HOJA=
-
-Name: com/ibm/icu/impl/data/icudt42b/mr_IN.res
-SHA1-Digest: CrX+t/3l7qQ+Iu1abDKV2D7/ZDk=
-
-Name: com/ibm/icu/impl/duration/impl/XMLRecordReader.class
-SHA1-Digest: QJMPA09yTVHzesG3SnsuYOZF1gI=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/en_MT.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/pa_Arab.res
-SHA1-Digest: V6CBcJq6TVrLkip5q/d1wIChIZA=
-
-Name: com/ibm/icu/impl/data/HolidayBundle_iw.class
-SHA1-Digest: ToeHtdFUCxUdmrVnWpfyfJZK4PI=
-
-Name: com/ibm/icu/impl/data/icudt42b/ur.res
-SHA1-Digest: pxo8RnCdTUGMw6cWnSY8rLlTodw=
-
-Name: com/ibm/icu/util/TimeZone.class
-SHA1-Digest: Hm32xTzR86BFdisNVSy85b+qs8c=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/no.res
-SHA1-Digest: QKT2L/mn+LtpRofMA4whD6vFbe0=
-
-Name: com/ibm/icu/text/CollationParsedRuleBuilder$BasicContractionTabl
- e.class
-SHA1-Digest: jWsjLfFERZXorGeHalRwZJi4O5I=
-
-Name: com/ibm/icu/impl/data/icudt42b/ur_IN.res
-SHA1-Digest: 79kksnJjwoXz04PonmMn5+6V9E4=
-
-Name: com/ibm/icu/impl/data/icudt42b/de_LU.res
-SHA1-Digest: pmLIFVklW+f3qKAzKg4pvCbRRMw=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/zh_SG.res
-SHA1-Digest: 99MTdXPuizTQKIDtoLc37T5PHW0=
-
-Name: com/ibm/icu/impl/locale/BaseLocale.class
-SHA1-Digest: o6PyMobTa1XPoMEYCtn9erCRJfg=
-
-Name: com/ibm/icu/impl/data/icudt42b/pa_PK.res
-SHA1-Digest: k8xeatwjEZzFAMf4h66cJnIKCRc=
-
-Name: com/ibm/icu/lang/UCharacter$SentenceBreak.class
-SHA1-Digest: v60WgOObH7LMxSp6BLkx12kbK2o=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/bg.res
-SHA1-Digest: FAjQiRZGQsGv60+ineKz2cfWHhA=
-
-Name: com/ibm/icu/text/UnicodeSet$Filter.class
-SHA1-Digest: NBMNANpxG2nLvO2DvN1HxX60dOA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/en_AU.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/duration/impl/data/pfd_zh_Hans_SG.xml
-SHA1-Digest: TJYCrJvOY2vR1NyyLtm2gdpw0fs=
-
-Name: com/ibm/icu/impl/data/icudt42b/sr_Latn_ME.res
-SHA1-Digest: cYLkZ9Z18u/K8BYFefs2WDDNvII=
-
-Name: com/ibm/icu/impl/data/icudt42b/en.res
-SHA1-Digest: qVsjlL/wvdmhN0kYI0qz0fpJpVQ=
-
-Name: com/ibm/icu/impl/data/HolidayBundle_da.class
-SHA1-Digest: jzjS6XsqunKSZ7YAmPaebKHAeQo=
-
-Name: com/ibm/icu/impl/data/icudt42b/is.res
-SHA1-Digest: 5Ryn6dHXd2TJjS6IoT03GIT+kJ8=
-
-Name: com/ibm/icu/util/IllformedLocaleException.class
-SHA1-Digest: CQ4rkK3nOjNNdiw7Fep5cCnsdNA=
-
-Name: com/ibm/icu/impl/data/icudt42b/zh.res
-SHA1-Digest: wBR2aHtqcWVBRNX06qSePIeEmzw=
-
-Name: com/ibm/icu/impl/data/HolidayBundle_en_GB.class
-SHA1-Digest: HXDh6JDRFbipCxMfi/8pXpp5d1k=
-
-Name: com/ibm/icu/impl/data/icudt42b/sw_KE.res
-SHA1-Digest: LVqZFqGyXHp7aC7dpmH9EzAcg5g=
-
-Name: com/ibm/icu/impl/data/icudt42b/bn_BD.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ar_JO.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/pa_Guru.res
-SHA1-Digest: X24m6J85tpyg/p+Y9+fILCxpvbs=
-
-Name: com/ibm/icu/impl/data/icudt42b/pt_PT.res
-SHA1-Digest: g32vD04+VGf7M8VvrjDhUXPsgbQ=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/sl.res
-SHA1-Digest: f5g+aVg5/3/Hq5zwLSZLz0A6zfM=
-
-Name: com/ibm/icu/text/CollationElementIterator.class
-SHA1-Digest: xIVrdY7/w63ttuNlWyMX4Jc3dRo=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ca.res
-SHA1-Digest: /znnLEtvYR7zUSGs2gi6rwMM40s=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/sr_BA.res
-SHA1-Digest: 6q0h04Ey+gEIoBcrzyHzzX1kkzA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/kk.res
-SHA1-Digest: wjaQf987WfInc+RWdb82wWwvJt0=
-
-Name: com/ibm/icu/text/Normalizer.class
-SHA1-Digest: NjfW4+6zne8UcJXRJ/pLy5XfkA4=
-
-Name: com/ibm/icu/impl/data/icudt42b/metazoneInfo.res
-SHA1-Digest: WrI+gjlkpqmXT7L8kiIFL/2lFfc=
-
-Name: com/ibm/icu/impl/data/icudt42b/ar_OM.res
-SHA1-Digest: 8jPOUtil+92lPKtgn16fuUJT/xs=
-
-Name: com/ibm/icu/impl/ICUService$Factory.class
-SHA1-Digest: JjbkqvP4n+0KVYf1xulU5Z4eAl4=
-
-Name: com/ibm/icu/impl/CalendarUtil.class
-SHA1-Digest: mXCxBGek45OV2AToojzS6lWPWwk=
-
-Name: com/ibm/icu/impl/data/icudt42b/sv_SE.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/fo.res
-SHA1-Digest: Gx/55iuk1yQeF8uV3HC9lx8Fawg=
-
-Name: com/ibm/icu/impl/data/icudt42b/om_ET.res
-SHA1-Digest: vLe6xnVtFOY1XQsLbWAyg++v4R8=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/pa.res
-SHA1-Digest: m20WWXMhMf9Jguc91WRlhm7fov0=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/fr_CH.res
-SHA1-Digest: w8kmzHDlCJGcUPey8IvdVJrfvQg=
-
-Name: com/ibm/icu/text/CollationParsedRuleBuilder$InverseUCA.class
-SHA1-Digest: rsj7nP8njlED4xOwiB6ZnMbOh1I=
-
-Name: com/ibm/icu/util/ULocale.class
-SHA1-Digest: yFjDW+f2stg60ntA5KZ4Gd7EU70=
-
-Name: com/ibm/icu/text/DecompData.class
-SHA1-Digest: /NZFm0m+Y3ZTpmzhS3cecFVYHhg=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/es_HN.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/lang/UCharacter$GraphemeClusterBreak.class
-SHA1-Digest: Bp5r7WDyc/oPgoQ4mDo35RSePh4=
-
-Name: com/ibm/icu/text/UForwardCharacterIterator.class
-SHA1-Digest: GWke+hdTckf+I7Ox5eLwBIW2PDk=
-
-Name: com/ibm/icu/impl/data/icudt42b/so.res
-SHA1-Digest: 1d0UHZi+M76i5kcQHo+keHSdnPc=
-
-Name: com/ibm/icu/impl/ICULocaleService$SimpleLocaleKeyFactory.class
-SHA1-Digest: 5JDiO36tIyr7uFW1suvdDYu9k8U=
-
-Name: com/ibm/icu/text/RuleBasedTransliterator$Data.class
-SHA1-Digest: INjgv979MVyDLH/Ok0DXmTUNICo=
-
-Name: com/ibm/icu/text/CollatorReader.class
-SHA1-Digest: hqzCgrVAzf5eo0v1BfYjejlBWvE=
-
-Name: com/ibm/icu/impl/data/icudt42b/ha_Latn_NE.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/pa_Guru_IN.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/sr_Cyrl_ME.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/util/CECalendar.class
-SHA1-Digest: xHdrfhO2lA5NqpJm9kYkfHRoBIY=
-
-Name: com/ibm/icu/lang/UCharacter$NumericType.class
-SHA1-Digest: wwSYkQeTFo9hTCY2UOHS67woY5Y=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/zh_MO.res
-SHA1-Digest: K0sKinko64INKTDfbkgnrEzo0W4=
-
-Name: com/ibm/icu/impl/data/icudt42b/en_TT.res
-SHA1-Digest: Gft7qBQnQOHLgK9veVL4VPW1bLI=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_8859_2_cs.class
-SHA1-Digest: rN+qbASYhwZSvUlobMZ66ntMB8w=
-
-Name: com/ibm/icu/impl/data/icudt42b/ar_LY.res
-SHA1-Digest: PlPVnMH+m0uWLvQE+P1Ghs8d0QU=
-
-Name: com/ibm/icu/impl/ICUData$2.class
-SHA1-Digest: dK5G1/f28l6pLwsD3POwMCuv4gg=
-
-Name: com/ibm/icu/impl/TimeZoneAdapter.class
-SHA1-Digest: 8G41pZZL4p+FC/QCOYTOkk8CMJ8=
-
-Name: com/ibm/icu/impl/data/icudt42b/ha.res
-SHA1-Digest: iXuHivvaoOD4e+oDCXA6ydCmtnI=
-
-Name: com/ibm/icu/impl/CharTrie$FriendAgent.class
-SHA1-Digest: RUX1V8Xjj+l9ekbRAoT+rlLyDgU=
-
-Name: com/ibm/icu/impl/ICUService.class
-SHA1-Digest: aUc+r0p341fLp6N8wsDJkzwlSlU=
-
-Name: com/ibm/icu/text/RBBIDataWrapper.class
-SHA1-Digest: Rz1+//cPD5Auu7G0zvWKasM4qkY=
-
-Name: com/ibm/icu/impl/data/icudt42b/zh_Hans_SG.res
-SHA1-Digest: sVTnOyfR0DUfh+/LCStQmRG02Eg=
-
-Name: com/ibm/icu/impl/data/icudt42b/pt_BR.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/text/Normalizer$QuickCheckResult.class
-SHA1-Digest: 4afP7XvgOX4RQMmvMVq4EjWPFhY=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/mt.res
-SHA1-Digest: 2zzk4SVdV+RHOrFH6uqySBZ4kAs=
-
-Name: com/ibm/icu/impl/duration/TimeUnitConstants.class
-SHA1-Digest: 1ialH7qT9mVU7EXDscwlOkAGYEk=
-
-Name: com/ibm/icu/impl/data/icudt42b/lv.res
-SHA1-Digest: MtixZySEwlk+bBmUgDrZeJ6hJFs=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/es.res
-SHA1-Digest: xm9Nb0xqt7ETfugH1AdIsKD0su0=
-
-Name: com/ibm/icu/text/NormalizationTransliterator$3.class
-SHA1-Digest: KXjxH+Pbhe/oQsKli3FOja0GFZM=
-
-Name: com/ibm/icu/lang/UCharacterEnums.class
-SHA1-Digest: UcwiRTq/PVmX4Q9pROsYy7tIAtA=
-
-Name: com/ibm/icu/impl/TrieIterator.class
-SHA1-Digest: ZF8qBmw9SWQ4xLPigq+ttP0HH5s=
-
-Name: com/ibm/icu/text/SimpleDateFormat.class
-SHA1-Digest: YL3ZxvKdmixMzA5GJ1JYmnyXnH8=
-
-Name: com/ibm/icu/impl/data/icudt42b/sr_YU.res
-SHA1-Digest: 2ii6FCYOQG4t2sunNcYMfTFp8rA=
-
-Name: com/ibm/icu/util/BuddhistCalendar.class
-SHA1-Digest: tpxOhBNizv5BVRDFxPSV1yBYa08=
-
-Name: com/ibm/icu/text/DateTimePatternGenerator.class
-SHA1-Digest: SynHDhMaw6OQEXkI/GQyOn4Ry0s=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/en_IN.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/uz_UZ.res
-SHA1-Digest: I6JdX5ppPd/ts7HMPlhQYE6F6dg=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/bg_BG.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/nn.res
-SHA1-Digest: XcezM2Ezj9IKqt2x1dUw8UTqXB8=
-
-Name: com/ibm/icu/impl/data/icudt42b/ms_BN.res
-SHA1-Digest: 9OEKuI9x6WgXToTg+xw0rxotDZA=
-
-Name: com/ibm/icu/text/TransliteratorRegistry$Spec.class
-SHA1-Digest: Vy2f3Bml0rf/oH9/y62TnIos89M=
-
-Name: com/ibm/icu/text/LowercaseTransliterator$1.class
-SHA1-Digest: WrihvGS3ytjsiLTN9AGLdG5T98c=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/kl_GL.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/da_DK.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/RBBIRuleParseTable.class
-SHA1-Digest: xdkPFmEyodQyRifzCGIsIJUHB6A=
-
-Name: com/ibm/icu/text/DateTimePatternGenerator$DateTimeMatcher.class
-SHA1-Digest: D/0YiLLDTmGNsL98lPRd2ySDzi0=
-
-Name: com/ibm/icu/impl/CalendarAstronomer$3.class
-SHA1-Digest: qnlQ060pQEA1KSYweMl7L+WyYWw=
-
-Name: com/ibm/icu/impl/TrieBuilder$DataManipulate.class
-SHA1-Digest: OCqpw+WLzXMwly6HCsEkd99Kwnc=
-
-Name: com/ibm/icu/impl/data/HolidayBundle_de_AT.class
-SHA1-Digest: mZlLi8ZXE09fTN+C/W91y/Kb70M=
-
-Name: com/ibm/icu/impl/data/HolidayBundle_fr_CA.class
-SHA1-Digest: TFDs6Ohrc//BJh5oVarP/HomTS4=
-
-Name: com/ibm/icu/impl/NormalizerImpl$NextCCArgs.class
-SHA1-Digest: JVR0BDY6pHtaCtJ+yJdL31rn+pQ=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/gu_IN.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/en_BE.res
-SHA1-Digest: d6p6QyamvvXx+48Iwc7Atit9vNg=
-
-Name: com/ibm/icu/impl/data/icudt42b/ar_SA.res
-SHA1-Digest: JlgFRnI4nJlpLF9wvg2ugwSyEA0=
-
-Name: com/ibm/icu/text/UnicodeSet$IntPropertyFilter.class
-SHA1-Digest: nxEUGXEzCiRAnu8lisd33Fq3DoU=
-
-Name: com/ibm/icu/impl/duration/impl/DataRecord$ESeparatorVariant.clas
- s
-SHA1-Digest: 7pGgIgI/YrwXlt9D6TxW9wM4nf8=
-
-Name: com/ibm/icu/impl/data/icudt42b/bo_CN.res
-SHA1-Digest: WJudThz/FQIC6MeClH53YjyURrM=
-
-Name: com/ibm/icu/impl/data/icudt42b/es_CO.res
-SHA1-Digest: JnYWZQ6ke5cRCVbjf8xGaBkF4xQ=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/ka.res
-SHA1-Digest: h6UURuYopfcAy8xyXw2FL3eUQRU=
-
-Name: com/ibm/icu/impl/data/icudt42b/es_GT.res
-SHA1-Digest: ce9Gf1FyWcMT9DFQTVm8ACnzw+c=
-
-Name: com/ibm/icu/impl/data/icudt42b/rfc4011.spp
-SHA1-Digest: +ydyHT5jXvaoMiFf+YNzgsQYXno=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/sk.res
-SHA1-Digest: cIy+1Q8Sk7iWZHnwFFLM5ijFS2s=
-
-Name: com/ibm/icu/impl/data/icudt42b/unorm.icu
-SHA1-Digest: EiYFJ1deC4G7h7B8izp/B42f6tU=
-
-Name: com/ibm/icu/text/PluralRules$Rule.class
-SHA1-Digest: lnr5ZZiLWyfabx3PfQFUQ4kRXag=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_8859_1_en.class
-SHA1-Digest: sdmnpOeq6vHUauAbQhnicxzCi1M=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/gu.res
-SHA1-Digest: L++AewHZn8F7ttXBFwV5flJChn4=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/sr_Cyrl.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/te.res
-SHA1-Digest: 36kvibmsQgAZv0iYQqoLhwXD1K0=
-
-Name: com/ibm/icu/impl/data/icudt42b/ti_ER.res
-SHA1-Digest: KLcLOArdZ8CRPN8SrJMVRiSU8U0=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ar_SY.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/zh_TW.res
-SHA1-Digest: FI8SXUxAHIZ4WAdjGjq/j705WQs=
-
-Name: com/ibm/icu/text/RBBISetBuilder$RangeDescriptor.class
-SHA1-Digest: IYaOR5Li53wz+/ew5LMCgHCEOK8=
-
-Name: com/ibm/icu/text/Bidi$Point.class
-SHA1-Digest: WrjHFUDw+BfBg0zVo+hiO51s+rk=
-
-Name: com/ibm/icu/impl/data/icudt42b/zh_Hans_MO.res
-SHA1-Digest: WJudThz/FQIC6MeClH53YjyURrM=
-
-Name: com/ibm/icu/text/CharsetMatch.class
-SHA1-Digest: ON88NxwVmEi9K6MOVo5BKhXlBeE=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/de__PHONEBOOK.res
-SHA1-Digest: IwSg0o/LpBjuSIHpx4oTw6trYHc=
-
-Name: com/ibm/icu/impl/data/icudt42b/ar_KW.res
-SHA1-Digest: 8jPOUtil+92lPKtgn16fuUJT/xs=
-
-Name: com/ibm/icu/impl/data/HolidayBundle_el.class
-SHA1-Digest: FXpaa3HqUKNZXl0Ip10yyAIvKJE=
-
-Name: com/ibm/icu/util/CalendarServiceShim.class
-SHA1-Digest: Ba0xioCD4rnLV4TjtjW/mDMtZoY=
-
-Name: com/ibm/icu/text/NumberingSystem.class
-SHA1-Digest: LHwENSoYEPnE0QgQuTRPQTYT3ZU=
-
-Name: com/ibm/icu/text/CharsetRecog_mbcs$CharsetRecog_euc$CharsetRecog
- _euc_kr.class
-SHA1-Digest: oJ0ItqPy76y7oJBc0o8ujS8uesY=
-
-Name: com/ibm/icu/impl/data/icudt42b/ha_NG.res
-SHA1-Digest: /Pw+JNU9+Ymdp0EpFOGKcUwuK4o=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/da.res
-SHA1-Digest: lTZX0wyZxIXjbMXSAs28sY5Mkaw=
-
-Name: com/ibm/icu/impl/data/icudt42b/pa_Arab_PK.res
-SHA1-Digest: WJudThz/FQIC6MeClH53YjyURrM=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/id_ID.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/cy_GB.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/text/NumberFormat$NumberFormatFactory.class
-SHA1-Digest: sdLRJildSf87YuWQG6Z+Zu5THvw=
-
-Name: com/ibm/icu/util/HebrewCalendar.class
-SHA1-Digest: ZLiKbjSyHovxTVdRTu827rxk9E8=
-
-Name: com/ibm/icu/text/ChineseDateFormatSymbols.class
-SHA1-Digest: 1ALrkiOxWoANjLRxcz45HYxFRK4=
-
-Name: com/ibm/icu/text/DurationFormat.class
-SHA1-Digest: 4/LajaAa+l1ghTwrDguApZUPRRA=
-
-Name: com/ibm/icu/util/LocaleData.class
-SHA1-Digest: iZPzvsWVCXF02iLV3wufQnrAlXg=
-
-Name: com/ibm/icu/impl/duration/impl/DataRecord$EDecimalHandling.class
-SHA1-Digest: 2SOoR+mng47ZN9oI3av7Xv9KiWY=
-
-Name: com/ibm/icu/impl/UCharacterNameReader.class
-SHA1-Digest: 5p7BvE7VGf5aCt90xzrSojTkzwQ=
-
-Name: com/ibm/icu/text/CaseFoldTransliterator$1.class
-SHA1-Digest: my4KH6UvZH61LmQJ9by169BpIsQ=
-
-Name: com/ibm/icu/text/PluralRules$OrConstraint.class
-SHA1-Digest: pK3u/wijq+F9xqRcXY3lqHdSTCM=
-
-Name: com/ibm/icu/impl/data/BreakIteratorRules_th.class
-SHA1-Digest: nwliB5sJL3Z30p35rPoMRZFxgpY=
-
-Name: com/ibm/icu/impl/data/icudt42b/as_IN.res
-SHA1-Digest: CrX+t/3l7qQ+Iu1abDKV2D7/ZDk=
-
-Name: com/ibm/icu/text/FunctionReplacer.class
-SHA1-Digest: Y59QnXwARkfmXDY5Kx9F88nCa34=
-
-Name: com/ibm/icu/impl/data/icudt42b/az_Cyrl.res
-SHA1-Digest: ZzI6/TgVFKDdc1kW6Ys5cDDLMUU=
-
-Name: com/ibm/icu/text/PluralRules$2.class
-SHA1-Digest: dyLZMC0oL6LAsBLMZtBpQremE4Q=
-
-Name: com/ibm/icu/text/Transliterator$Factory.class
-SHA1-Digest: HlRT/XtlhZKVGY1Pkx98liTP3Es=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_IBM420_ar_ltr.cl
- ass
-SHA1-Digest: Zvm4Bvw3w6cly319y6Cb0g8QW/c=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/zh_Hans_CN.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/ps_AF.res
-SHA1-Digest: Ft7S6n/o3/L7Am77oNmqkNnADP0=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ml.res
-SHA1-Digest: FOVr1j2HVkMtmdpGcqpE6FG3ioQ=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_8859_2_pl.class
-SHA1-Digest: xzeBYxtH9Oi6Ympb/AoJpA+r8Xg=
-
-Name: com/ibm/icu/impl/data/icudt42b/de_CH.res
-SHA1-Digest: iWggUFP9iWQM6vz4u4uvosBlSTw=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ar_MA.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_8859_7_el.class
-SHA1-Digest: lwusdP/j7kumOfUmZXcKVWR9ZuY=
-
-Name: com/ibm/icu/impl/URLHandler$FileURLHandler.class
-SHA1-Digest: Nk3C/NyoD1irVs/E83xe3usluFU=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/ms.res
-SHA1-Digest: zyhWSB/F90DTVxyce1M1kcFjT3w=
-
-Name: com/ibm/icu/util/IslamicCalendar.class
-SHA1-Digest: HPQc24WncyidJMQA7tU0ltnWnCE=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/iw.res
-SHA1-Digest: WZP9bAErSkXNMGcS7Cigt2GwNKw=
-
-Name: com/ibm/icu/impl/data/icudt42b/en_IE.res
-SHA1-Digest: 5T6abhg/OLVnv8VFyHI/P09LHHg=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ar_EG.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/ZoneStringFormat$ZoneStrings.class
-SHA1-Digest: X35OcO7tw/xR4NaU9TTPyAXDMH0=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_8859_1_es.class
-SHA1-Digest: J8bXijecxdlToXRrGS1GjZlmxzI=
-
-Name: com/ibm/icu/impl/data/icudt42b/sr_ME.res
-SHA1-Digest: dcZDvDDLm120rqoRa2rrkl/voxA=
-
-Name: com/ibm/icu/text/StringPrepParseException.class
-SHA1-Digest: 7hwrnIatfmyZ81dOSQRxXm/WgQA=
-
-Name: com/ibm/icu/impl/data/icudt42b/uprops.icu
-SHA1-Digest: 8vLNyqXGunE4QYH2blIKAhRC1JA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/it_CH.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/AnyTransliterator$ScriptRunIterator.class
-SHA1-Digest: J7xT4P19qEBaVUL8ReOU7m5Wmhc=
-
-Name: com/ibm/icu/impl/duration/impl/data/pfd_th.xml
-SHA1-Digest: NP0IwbGJwQJTVPp+VdZ6leVSYjU=
-
-Name: com/ibm/icu/impl/ZoneStringFormat.class
-SHA1-Digest: n3jJDl78ykXRjY9ytbsnH+fUwDA=
-
-Name: com/ibm/icu/text/EscapeTransliterator$4.class
-SHA1-Digest: NOPq/bUbsneMkFbx2hOqAYvNdiw=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/be.res
-SHA1-Digest: EU4hzpM72nJWgBnQtxdAF/Sqvrs=
-
-Name: com/ibm/icu/impl/duration/impl/data/pfd_hi.xml
-SHA1-Digest: x48QdYWUXtpPWcdQKeU/uQwWBkg=
-
-Name: com/ibm/icu/impl/locale/LocaleExtensions.class
-SHA1-Digest: YEytk8PbUUmLkD5IxZtRfgy8ua8=
-
-Name: com/ibm/icu/impl/data/icudt42b/el.res
-SHA1-Digest: Qfral1uhzYOA18MgSYiOUVffZgI=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/bn.res
-SHA1-Digest: cxctNEMzXGKFExa+BKr81cP6bTk=
-
-Name: com/ibm/icu/impl/NormalizerImpl$FCDTrieImpl.class
-SHA1-Digest: mnwJsoHXLlYPybUU9/TYlZBsois=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/sr_Latn_BA.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_8859_8.class
-SHA1-Digest: 5kkX0Pb1WfSU60ydJwyKCr5ko8c=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/fr_BE.res
-SHA1-Digest: PGu/zJ5BoapgXVlTTdEaIZ32IRc=
-
-Name: com/ibm/icu/text/UnescapeTransliterator$1.class
-SHA1-Digest: Vf971NEaFuoVyyRUPsqjQ9QqHts=
-
-Name: com/ibm/icu/text/TitlecaseTransliterator$1.class
-SHA1-Digest: ekTC9gWzv3dYRBtoQqNHqbKkuCc=
-
-Name: com/ibm/icu/impl/data/icudt42b/so_KE.res
-SHA1-Digest: vLe6xnVtFOY1XQsLbWAyg++v4R8=
-
-Name: com/ibm/icu/text/CharsetRecog_mbcs.class
-SHA1-Digest: zb96ltRlnZu1B4er1dwcZW9Eeno=
-
-Name: com/ibm/icu/impl/data/icudt42b/so_SO.res
-SHA1-Digest: vLe6xnVtFOY1XQsLbWAyg++v4R8=
-
-Name: com/ibm/icu/impl/data/HolidayBundle_fr.class
-SHA1-Digest: 9O29pqbYd82G8WZDF65YDtjKYYU=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/pl_PL.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/hi_IN.res
-SHA1-Digest: CrX+t/3l7qQ+Iu1abDKV2D7/ZDk=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_IBM424_he_ltr.cl
- ass
-SHA1-Digest: tVJXdjtBCoXEFZOxSH6FEtwZ3gY=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/sr_RS.res
-SHA1-Digest: 2ii6FCYOQG4t2sunNcYMfTFp8rA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/cs_CZ.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/TransliterationRule.class
-SHA1-Digest: utxfpe1JXSDmAHVABKr61kRepHo=
-
-Name: com/ibm/icu/impl/data/icudt42b/sq_AL.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/brkitr/word_POSIX.brk
-SHA1-Digest: H+ArIep4Jx2N4RbYEuTJCwNYzYs=
-
-Name: com/ibm/icu/impl/ICULocaleService$ICUResourceBundleFactory.class
-SHA1-Digest: tQphcQBErAwyMomKnr3pUKqj+Zc=
-
-Name: com/ibm/icu/text/UnicodeReplacer.class
-SHA1-Digest: Y0PfDc+j6xXLIk74hykjzB1JKC4=
-
-Name: com/ibm/icu/impl/data/icudt42b/en_GB.res
-SHA1-Digest: ZIcHjRFXCXCsVODe36+7mgA4Vbk=
-
-Name: com/ibm/icu/impl/data/icudt42b/no_NO_NY.res
-SHA1-Digest: 2NYID4Vq+YppdI5emYl/jXROPPs=
-
-Name: com/ibm/icu/impl/data/icudt42b/brkitr/line.brk
-SHA1-Digest: ZVQKdnj8YFefqEk0OYpqSafj4NY=
-
-Name: com/ibm/icu/text/TransliteratorParser$RuleHalf.class
-SHA1-Digest: uSw9Oxx+Uh9GJR8BTp4E/cqeF5A=
-
-Name: com/ibm/icu/text/LowercaseTransliterator.class
-SHA1-Digest: u+1+BuvXsLbtGmHL1x9ql9YS2eA=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_IBM424_he.class
-SHA1-Digest: DxswcWySGwwfX1xRpMeBtysMgms=
-
-Name: com/ibm/icu/impl/locale/LanguageTag.class
-SHA1-Digest: n1pLB+RCZsWN6sqpa1jkFKt3xVU=
-
-Name: com/ibm/icu/impl/data/icudt42b/es_DO.res
-SHA1-Digest: DqUgxafBny6RSK/5q4mvOxc7iio=
-
-Name: com/ibm/icu/impl/data/icudt42b/mt_MT.res
-SHA1-Digest: WJudThz/FQIC6MeClH53YjyURrM=
-
-Name: com/ibm/icu/text/TransliteratorIDParser$Specs.class
-SHA1-Digest: z/LW93onXArAMvnRSrRW2DAb8FQ=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/he.res
-SHA1-Digest: m20WWXMhMf9Jguc91WRlhm7fov0=
-
-Name: com/ibm/icu/util/SimpleDateRule.class
-SHA1-Digest: myCDNTkS4hL2rfFvE1xyost/B2c=
-
-Name: com/ibm/icu/impl/CalendarAstronomer$Equatorial.class
-SHA1-Digest: 5Vz1H3GN/CL7MoCyC4MwaiglnEM=
-
-Name: com/ibm/icu/impl/duration/impl/data/pfd_ru.xml
-SHA1-Digest: +MhXs1pUJCowfzBjMIxV5Y7SOd0=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/hu.res
-SHA1-Digest: 1CzulnzZCBDXuQhyvA3QUmTBzKU=
-
-Name: com/ibm/icu/text/StringTransform.class
-SHA1-Digest: 87UqNV3vGCvS/7/a4HFvPbzqBx0=
-
-Name: com/ibm/icu/text/CollatorServiceShim$1$CollatorFactory.class
-SHA1-Digest: G9MKwe3Z6MWx5EgeoOjvxQzJzsA=
-
-Name: com/ibm/icu/impl/ZoneMeta$OlsonToMetaMappingEntry.class
-SHA1-Digest: hTd2gMHlAkWuHlqds37sqFpn75s=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/iw_IL.res
-SHA1-Digest: Ndcrw5xpVXzCNkJpNiv+lI2hixc=
-
-Name: com/ibm/icu/impl/data/HolidayBundle_en_CA.class
-SHA1-Digest: JDt2Epln27M6w0EISNH/fPRsNUA=
-
-Name: com/ibm/icu/util/EasterHoliday.class
-SHA1-Digest: gU3zJqbUJQ0nepfR/f0MSnuGU5Y=
-
-Name: com/ibm/icu/text/CollationRuleParser.class
-SHA1-Digest: QOwn/ESmdLXciNhbTTbM9Z9oyUo=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/en_HK.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/cy.res
-SHA1-Digest: IjwvDB8dPSFSrF+1EmdSfxUkbQw=
-
-Name: com/ibm/icu/text/CompoundTransliterator.class
-SHA1-Digest: 5OVDmXwjxdOHAtd2CYFA+uBa9B4=
-
-Name: com/ibm/icu/text/UnescapeTransliterator$6.class
-SHA1-Digest: i9ZJrC+QqcKPKdQWsfHcPqq+Vig=
-
-Name: com/ibm/icu/text/CharsetRecog_mbcs$CharsetRecog_gb_18030.class
-SHA1-Digest: iC854J7dr3cHe4KoWoNTPy9TBe8=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/fr_LU.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/util/IndianCalendar.class
-SHA1-Digest: 3XPNa9IES+iIV8QeLY7IhVDwa94=
-
-Name: com/ibm/icu/impl/data/icudt42b/es_VE.res
-SHA1-Digest: 4VOwBf/mE6cdbFyqhsrKCRr/XOo=
-
-Name: com/ibm/icu/impl/duration/SingleUnitBuilder.class
-SHA1-Digest: 7Lbd45pTs05yTZT6LHsAVLwrDUk=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/mk.res
-SHA1-Digest: NK/D6puvIc4L5KgtFCBg8xnqYgU=
-
-Name: com/ibm/icu/text/NumberFormatServiceShim$1$RBNumberFormatFactory
- .class
-SHA1-Digest: KWv7WM8vztOPnESv5qbk99bAZIU=
-
-Name: com/ibm/icu/text/PluralRules$RuleChain.class
-SHA1-Digest: xY33n67OiMo6cmfx7GzC+Nxam70=
-
-Name: com/ibm/icu/impl/data/icudt42b/lt.res
-SHA1-Digest: RCVCO7vMMVR7mU3BXzP2jYRCrcg=
-
-Name: com/ibm/icu/impl/duration/BasicPeriodBuilderFactory.class
-SHA1-Digest: N8R3x3V8zFVPD8VcvNKR+AaxYfE=
-
-Name: com/ibm/icu/impl/data/icudt42b/sr_Cyrl.res
-SHA1-Digest: ofu0p2h5HG++q/Yi5O9ZawldKoI=
-
-Name: com/ibm/icu/impl/ICUResourceBundleImpl$ResourceTable.class
-SHA1-Digest: I6khLCo2DaxntrU0S6DIrA+yfWg=
-
-Name: com/ibm/icu/text/CollationParsedRuleBuilder$CombinClassTable.cla
- ss
-SHA1-Digest: 62or7OA9Pd50cK/U9LRAwN+8qfc=
-
-Name: com/ibm/icu/util/BasicTimeZone.class
-SHA1-Digest: IZl/327nYe0DJhVM90gOKrGT8Js=
-
-Name: com/ibm/icu/impl/ICULocaleService$LocaleKeyFactory.class
-SHA1-Digest: TGAXraAIjv/MY/Qk5GpoVe6jtYw=
-
-Name: com/ibm/icu/lang/UCharacter.class
-SHA1-Digest: yl1/93oXbkl3h1CO6QPdj6BsQB4=
-
-Name: com/ibm/icu/impl/data/icudt42b/en_US.res
-SHA1-Digest: qXwLlsGY/3vEgZHppDA+hTle9kE=
-
-Name: com/ibm/icu/impl/ImplicitCEGenerator.class
-SHA1-Digest: mDdS1NF/0Pa0Skz4/d5y0u6v/W0=
-
-Name: com/ibm/icu/impl/data/icudt42b/brkitr/res_index.res
-SHA1-Digest: bL+dIdb2KUnRa93fXxewvMLJI2I=
-
-Name: com/ibm/icu/text/RBBISymbolTable$RBBISymbolTableEntry.class
-SHA1-Digest: h641TWqk5EPYgd6C7RW3Gr+tqdg=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/in_ID.res
-SHA1-Digest: 8zlBXCvSDwjZG5pjJeRB/oOjkYQ=
-
-Name: com/ibm/icu/util/JapaneseCalendar.class
-SHA1-Digest: DoUUa2voWgbgoPWcSB/MgDkeYMU=
-
-Name: com/ibm/icu/text/CharsetRecog_mbcs$iteratedChar.class
-SHA1-Digest: nsKXKdueSf7brr92FCIhz1Qsm3I=
-
-Name: com/ibm/icu/text/CollationRuleParser$ParsedToken.class
-SHA1-Digest: 7qAThOKZIWiUm2sHRH0bGr5atnY=
-
-Name: com/ibm/icu/impl/data/icudt42b/ro_RO.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/sl_SI.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/en_ZA.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/nl.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/duration/MultiUnitBuilder.class
-SHA1-Digest: pjtW/QoFrwOxa/rvRgfkavI1GTQ=
-
-Name: com/ibm/icu/impl/ICUNotifier$NotifyThread.class
-SHA1-Digest: 0r/5F6NJvmNs1rsa4kEJrpfpDd8=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_8859_1_da.class
-SHA1-Digest: 1AUxaJOgwtqynl88sHyX8dyqaMI=
-
-Name: com/ibm/icu/impl/data/icudt42b/si_LK.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/brkitr/thaidict.ctd
-SHA1-Digest: HlyfpuQK4BpjbhSyj4gjqbruK+s=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/fi.res
-SHA1-Digest: npbQkpd8AZHPoLRmfuzowEfTFzc=
-
-Name: com/ibm/icu/impl/locale/AsciiUtil.class
-SHA1-Digest: 3b1TgQKu1k/RPxuKUd3w6/zig7A=
-
-Name: com/ibm/icu/impl/data/icudt42b/af.res
-SHA1-Digest: 52DLxOkAYfg0y4pBFgFNe3IQyxg=
-
-Name: com/ibm/icu/impl/data/icudt42b/el_CY.res
-SHA1-Digest: 8jQYdbnXrngEdw2KPXMdGZG6DyA=
-
-Name: com/ibm/icu/util/GregorianCalendar.class
-SHA1-Digest: hZTv4c+Oq9tB7TFdrSEav8ryhNQ=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/fr.res
-SHA1-Digest: oJNZ0c5MEQBKMUWuJvOmIDoeLmI=
-
-Name: com/ibm/icu/util/TimeUnitAmount.class
-SHA1-Digest: pu+pMpTaGhmoBMq6unPA0qA2BA0=
-
-Name: com/ibm/icu/impl/ICURWLock.class
-SHA1-Digest: rfmo0U2aNAWxwkb5eqhh/tH4YIo=
-
-Name: com/ibm/icu/impl/UPropertyAliases$Builder.class
-SHA1-Digest: k9NaPB5XdTlDku/+HPGL7fC6Gm4=
-
-Name: com/ibm/icu/impl/ICUService$SimpleFactory.class
-SHA1-Digest: 40JBDsy4Y4/ocfF1VsvWDCiXbeA=
-
-Name: com/ibm/icu/impl/data/icudt42b/eu_ES.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/ja.res
-SHA1-Digest: Cbc5IhZH1+duwYviZZEpgIFYZoE=
-
-Name: com/ibm/icu/impl/data/icudt42b/lt_LT.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/util/TimeZoneRule.class
-SHA1-Digest: CVj+0zrNL5CgUOnjhErAPxD+Qew=
-
-Name: com/ibm/icu/impl/data/icudt42b/zu.res
-SHA1-Digest: W4VI0r+O7mZMeiYpDq0vxwobosM=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/om.res
-SHA1-Digest: fajgkySjDcJyt/T3YaC1+UuLCTI=
-
-Name: com/ibm/icu/text/CharsetRecog_Unicode$CharsetRecog_UTF_16_BE.cla
- ss
-SHA1-Digest: I9kxMzXZX9R/Bv0nFXJfzDaoVNQ=
-
-Name: com/ibm/icu/impl/ICUResourceBundle$2.class
-SHA1-Digest: ZIsBMVavHvGZF9ZX1DYO/P56qpU=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/sr.res
-SHA1-Digest: NK/D6puvIc4L5KgtFCBg8xnqYgU=
-
-Name: com/ibm/icu/impl/data/icudt42b/en_NZ.res
-SHA1-Digest: jCgI1jet1172J3Hh2GIFozz94S4=
-
-Name: com/ibm/icu/util/InitialTimeZoneRule.class
-SHA1-Digest: mp5EGBn+TXpMfmVdHm8bpsRyC/Y=
-
-Name: com/ibm/icu/text/TimeUnitFormat.class
-SHA1-Digest: ViP9oKJVDmPPCKcmLxc6ZeyoGl4=
-
-Name: com/ibm/icu/impl/duration/DurationFormatter.class
-SHA1-Digest: 7rl/7uxutvms1EpNIkEwbDLA8dk=
-
-Name: com/ibm/icu/impl/PropsVectors$DefaultGetFoldingOffset.class
-SHA1-Digest: 86s/fZUL0lJFgEsOlUHS5f95Uv8=
-
-Name: com/ibm/icu/text/DateIntervalFormat$SkeletonAndItsBestMatch.clas
- s
-SHA1-Digest: 6wwt+Vn3RzhR7U9CnMWVzVP9DLQ=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/es_PE.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/CharacterIteratorWrapper.class
-SHA1-Digest: quQ/R+xXqDAhzjuDqhIFhHv2obo=
-
-Name: com/ibm/icu/impl/data/icudt42b/bg.res
-SHA1-Digest: tNkdCAZjNp729CWY3Sryb1QYBtY=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/ko.res
-SHA1-Digest: evbr5I+KAhPVScEH+fkA3JSA8/I=
-
-Name: com/ibm/icu/impl/data/icudt42b/de_AT.res
-SHA1-Digest: 5pyTTAp1eNGel5widQkojp7s/BU=
-
-Name: com/ibm/icu/impl/data/icudt42b/fr_CA.res
-SHA1-Digest: c+Rn5vM/x0zcQS45Lxndnn6EitQ=
-
-Name: com/ibm/icu/impl/data/icudt42b/te_IN.res
-SHA1-Digest: CrX+t/3l7qQ+Iu1abDKV2D7/ZDk=
-
-Name: com/ibm/icu/util/UResourceBundle$ResourceCacheKey.class
-SHA1-Digest: GqXyodIg+d1ra8syzVxhyeATfP8=
-
-Name: com/ibm/icu/impl/ByteBuffer.class
-SHA1-Digest: DSdhbgYfq3wv3eGhF781djGuoNQ=
-
-Name: com/ibm/icu/impl/ICUResourceBundleReader.class
-SHA1-Digest: hcTMaVt1ZwyR3u8r5PKnJGdAA1E=
-
-Name: com/ibm/icu/text/NullTransliterator.class
-SHA1-Digest: vK7McK9EiV3VXgWmey860vIG26U=
-
-Name: com/ibm/icu/impl/ICUService$LocaleRef.class
-SHA1-Digest: D8+zmtHUjnAaTkgfBK27ykkjH+E=
-
-Name: com/ibm/icu/impl/data/icudt42b/ha_NE.res
-SHA1-Digest: 4952wbbl9STSZr19VAGXk33hPag=
-
-Name: com/ibm/icu/impl/data/icudt42b/sl.res
-SHA1-Digest: XnoEYlBTMvQ2fq/7rNoqSzA+ops=
-
-Name: com/ibm/icu/impl/CalendarAstronomer$MoonAge.class
-SHA1-Digest: vqyfPuE8UInzHXP7zsDHkL/+0jY=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/invuca.icu
-SHA1-Digest: nV2nXv49GlRcOAAkPjQ+2jd2Pyg=
-
-Name: com/ibm/icu/impl/data/icudt42b/de_BE.res
-SHA1-Digest: csz++MM2eyh0NxqWiki+7CJowF4=
-
-Name: com/ibm/icu/impl/duration/Period.class
-SHA1-Digest: ru7kTkDzjLIia6nozhpZsvwQYmE=
-
-Name: com/ibm/icu/text/Normalizer$NFKCMode.class
-SHA1-Digest: TWOmWft4uNIwIw/VnhPk2RWCIeg=
-
-Name: com/ibm/icu/impl/data/icudt42b/ne_NP.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_8859_1_pt.class
-SHA1-Digest: O1Ekqzlef6BbkYYhHKYFTuXZaZI=
-
-Name: com/ibm/icu/impl/data/icudt42b/uz_Arab.res
-SHA1-Digest: KmaUQEJGKBgyBCSQZqT0GbCojcc=
-
-Name: com/ibm/icu/impl/data/icudt42b/es_US.res
-SHA1-Digest: NbniVg0+hlwZgs9vL21zvZKZ8ZY=
-
-Name: com/ibm/icu/impl/data/icudt42b/rfc4518ci.spp
-SHA1-Digest: jwS5uyK3B8J+UxFK0NWKcqWhWuQ=
-
-Name: com/ibm/icu/text/BreakCTDictionary$CompactTrieNodes.class
-SHA1-Digest: WxDBuCTnfcAYbQPXgF1zvrAkLyU=
-
-Name: com/ibm/icu/impl/data/icudt42b/be_BY.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/ICUResourceBundle.class
-SHA1-Digest: z9RbTjSpZ57D2J3yOMhnscmHC/0=
-
-Name: com/ibm/icu/impl/CalendarData.class
-SHA1-Digest: oKetVzyIxB1uqfYeKJcCRe00iCo=
-
-Name: com/ibm/icu/math/BigDecimal.class
-SHA1-Digest: bmlV5Au0e6B9r/dnfVMTXXrdnKE=
-
-Name: com/ibm/icu/text/DateTimePatternGenerator$VariableField.class
-SHA1-Digest: 7NVd830iC3dxssfuPtPgddVNpsw=
-
-Name: com/ibm/icu/impl/duration/impl/DataRecord$EPluralization.class
-SHA1-Digest: QAZDpJnhDQNiCMJAw3YezWa1OFU=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/en_US_POSIX.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/uk.res
-SHA1-Digest: m1LMujAxbn500RtZ2EOHgHrtZFE=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_8859_8_he.class
-SHA1-Digest: NrYU4M6ztrXzPGifXzmNojF6CwE=
-
-Name: com/ibm/icu/util/AnnualTimeZoneRule.class
-SHA1-Digest: KS0yZPziZiVKPTAtBKFClJu/iiU=
-
-Name: com/ibm/icu/impl/data/icudt42b/mk_MK.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/util/UniversalTimeScale$TimeScaleData.class
-SHA1-Digest: Go0JjviIig8ojaJuujyCC7l68A0=
-
-Name: com/ibm/icu/text/RBNFPostProcessor.class
-SHA1-Digest: q/ZhdtLQ26/YmVXQIltghNEEnR0=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ur_PK.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/locale/LocaleObjectCache.class
-SHA1-Digest: Rs3T4xei1iQRxNEvWL2gpUbSR64=
-
-Name: com/ibm/icu/impl/data/icudt42b/uz_Latn_UZ.res
-SHA1-Digest: WJudThz/FQIC6MeClH53YjyURrM=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/nl_NL.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/tr_TR.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/nl_BE.res
-SHA1-Digest: e3Jm+rsG7JODkDrlMvj2AKGDp0U=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/es_AR.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/ms_MY.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/text/CollationParsedRuleBuilder$WeightRange.class
-SHA1-Digest: 7IwnBaT3SvD2aSO6KJcD8ska5Vo=
-
-Name: com/ibm/icu/impl/data/HolidayBundle_el_GR.class
-SHA1-Digest: 6Du4+mKi2hTN7hFK2dVFi+jEGhs=
-
-Name: com/ibm/icu/text/RuleBasedCollator$contContext.class
-SHA1-Digest: DiHfrfKH4NQKbzm6WgPo0oG+3VA=
-
-Name: com/ibm/icu/text/RuleBasedCollator$ContractionInfo.class
-SHA1-Digest: c9vy2P2kVLvYjvx+whU6+tmThIM=
-
-Name: com/ibm/icu/impl/data/icudt42b/sr_Cyrl_YU.res
-SHA1-Digest: 2ii6FCYOQG4t2sunNcYMfTFp8rA=
-
-Name: com/ibm/icu/impl/data/icudt42b/en_MH.res
-SHA1-Digest: WJudThz/FQIC6MeClH53YjyURrM=
-
-Name: com/ibm/icu/text/NormalizationTransliterator$1.class
-SHA1-Digest: cZMNujQoi0deKyrTfzaAbqu4xBM=
-
-Name: com/ibm/icu/text/CollatorServiceShim$1$CFactory.class
-SHA1-Digest: gBfd+RD2EyDVs8x+UvpPSNkqlHs=
-
-Name: com/ibm/icu/impl/data/icudt42b/res_index.res
-SHA1-Digest: j/Y5C0w9IN1smPiYvtAALi7EP1I=
-
-Name: com/ibm/icu/impl/CollectionUtilities.class
-SHA1-Digest: bnviw1N7SbN1CA9YpbdHFo0i34c=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/ar.res
-SHA1-Digest: mxn+DOdoFnY8cE6VINsu1sWF6k8=
-
-Name: com/ibm/icu/text/StringSearch.class
-SHA1-Digest: 2/qKN8gDomjJplfZWowovT9UiWc=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/nb.res
-SHA1-Digest: pC1VnSBS4uAHkkfeBfRT14btvFc=
-
-Name: com/ibm/icu/util/Currency.class
-SHA1-Digest: Vd+sQ7K38RWwBzmQDfPjZymtDgM=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/fa.res
-SHA1-Digest: lP6J92JPZzTjZeQqTriXh3t7pwc=
-
-Name: com/ibm/icu/text/UTF16.class
-SHA1-Digest: Q4h4K07luaFe7fKxRKOTAJkrdGI=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/fo_FO.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/TextTrieMap$LongestMatchHandler.class
-SHA1-Digest: X2PVGUt63YZq67tVXXkc1NhcBOE=
-
-Name: com/ibm/icu/impl/data/icudt42b/mt.res
-SHA1-Digest: f6x9Y8U63J6N4ZfylHTnFiUrpt4=
-
-Name: com/ibm/icu/util/SimpleHoliday.class
-SHA1-Digest: fnGw7XmpwBT8phMTJdA9jyQHhD4=
-
-Name: com/ibm/icu/impl/CalendarAstronomer$1.class
-SHA1-Digest: a5usj8Vu8lcl6yCFt3nQYfGh6Is=
-
-Name: com/ibm/icu/text/CollationParsedRuleBuilder$MaxExpansionTable.cl
- ass
-SHA1-Digest: LG8DbaGsK2TfOuSxhSzlNE8uGNA=
-
-Name: com/ibm/icu/impl/duration/PeriodBuilderFactory.class
-SHA1-Digest: enn/L+fRJf2sKmAFxTbtz3YDP1A=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/sr_Latn_RS.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/rfc3530csci.spp
-SHA1-Digest: hT8tQfqBYuaf33sYa1GreAYgtv0=
-
-Name: com/ibm/icu/impl/UCharacterPropertyReader.class
-SHA1-Digest: LVkg/Qc9VbHmjBZ1icn4Ig+BrrQ=
-
-Name: com/ibm/icu/impl/PropsVectors$1.class
-SHA1-Digest: 5FqEUvWVuM7lLyDsjCUgEe9FjZo=
-
-Name: com/ibm/icu/impl/data/icudt42b/es_CL.res
-SHA1-Digest: obu9OW7kMF1Nx3L0IM98PGbHXeo=
-
-Name: com/ibm/icu/impl/data/icudt42b/ne.res
-SHA1-Digest: duMJizZp8RorX2N+3+Zjso72SfI=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/pt_PT.res
-SHA1-Digest: kCSqbmr0loDY9alATTUHZXexntk=
-
-Name: com/ibm/icu/impl/data/icudt42b/th_TH.res
-SHA1-Digest: WJudThz/FQIC6MeClH53YjyURrM=
-
-Name: com/ibm/icu/impl/data/icudt42b/ucase.icu
-SHA1-Digest: NbsONvF25QGxx3Uj+0gDMZjJwUs=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/sq.res
-SHA1-Digest: ZciRWcJ84VGX656FvAxiXm1eMRM=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/sv_FI.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/nn_NO.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/duration/impl/PeriodFormatterData.class
-SHA1-Digest: QHSkfrspxJbAlPznfeeS/ZL3KY4=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/en_SG.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/fa_IR.res
-SHA1-Digest: Ft7S6n/o3/L7Am77oNmqkNnADP0=
-
-Name: com/ibm/icu/impl/data/icudt42b/en_BZ.res
-SHA1-Digest: gNiSAh8b/u1Z0rqHV3hhBfBfN3g=
-
-Name: com/ibm/icu/impl/data/icudt42b/ca_ES.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: about_files/license.html
-SHA1-Digest: qgmm4hdKqgmltFsQdToOx+7jQq4=
-
-Name: com/ibm/icu/impl/data/icudt42b/pa_IN.res
-SHA1-Digest: aABsNcBcPMaMcFhBGb0doQYhb68=
-
-Name: com/ibm/icu/text/AnyTransliterator.class
-SHA1-Digest: vtTVdzD2QPGEGb0k2+llmPwTDoM=
-
-Name: com/ibm/icu/text/UnicodeMatcher.class
-SHA1-Digest: FT3g8JBh7zBjeL0/HM+DZ5NKiS8=
-
-Name: com/ibm/icu/text/CollationParsedRuleBuilder$BuildTable.class
-SHA1-Digest: j0lpHNvFTFZ5kI2HSuuOmOUaLnI=
-
-Name: com/ibm/icu/impl/data/icudt42b/brkitr/th.res
-SHA1-Digest: PrgXwx6kvPd60L7cLcZM/Q2JxO0=
-
-Name: com/ibm/icu/impl/duration/impl/data/pfd_es.xml
-SHA1-Digest: MwvLXsR3TbSMZUVdFeyCStptuqE=
-
-Name: com/ibm/icu/text/CollationRuleParser$TokenListHeader.class
-SHA1-Digest: zmfkMc1gnmRjkVm1DPXnpDrjaFc=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ta_IN.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/fr_CH.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/ka.res
-SHA1-Digest: IkWJQAKvj+7KlPqpDS7It99krKk=
-
-Name: com/ibm/icu/text/ArabicShapingException.class
-SHA1-Digest: aXkH6QCASAmw0W1Yryw5kjrwtmY=
-
-Name: com/ibm/icu/text/MultiplierSubstitution.class
-SHA1-Digest: m2h61dS2htdkYl1Vz01v6HsmrWU=
-
-Name: com/ibm/icu/text/CharsetRecog_mbcs$CharsetRecog_sjis.class
-SHA1-Digest: n60qSSB7U+3PM5pNZ4wiPRV2y/k=
-
-Name: com/ibm/icu/impl/data/icudt42b/sk.res
-SHA1-Digest: 8VrUr5n/mwDmSvfsNJT3z93GLG0=
-
-Name: com/ibm/icu/impl/NormalizerDataReader.class
-SHA1-Digest: P3mxrBlY1iY4G5WbZubfkQTbcjg=
-
-Name: com/ibm/icu/text/DateIntervalInfo.class
-SHA1-Digest: qfnul6lLpgX/VCWKk/J7uy85KM8=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/tr.res
-SHA1-Digest: GfEOcunXuaSfRHU0te0gfJt0pkI=
-
-Name: com/ibm/icu/util/GlobalizationPreferences.class
-SHA1-Digest: LWxbbuIZxeJxmE+lpITnkWw4LMQ=
-
-Name: com/ibm/icu/impl/duration/impl/RecordWriter.class
-SHA1-Digest: v/lue5U+YnhX5R+ax7Lkrub9gbs=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/de.res
-SHA1-Digest: 0x3/6f5+CvSAa9mRWPvA62HPxKY=
-
-Name: com/ibm/icu/text/PluralRules.class
-SHA1-Digest: hHCiObLK9UFKzwKst1WWs3zt/QA=
-
-Name: com/ibm/icu/impl/data/icudt42b/so_DJ.res
-SHA1-Digest: vLe6xnVtFOY1XQsLbWAyg++v4R8=
-
-Name: com/ibm/icu/impl/UBiDiProps$IsAcceptable.class
-SHA1-Digest: 1ur4xU6L4zqknyOmC8MbBZC6ljk=
-
-Name: com/ibm/icu/impl/data/icudt42b/gl.res
-SHA1-Digest: cD6A+WwrV1sCc9Q66vd6zzqw5DE=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/pt.res
-SHA1-Digest: ZUY8ahQ/8zCngGEBaPCKQdmtBb0=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_8859_1.class
-SHA1-Digest: Jrl1xlYN8m4PHJ0Rg3ZRATbFmGw=
-
-Name: com/ibm/icu/text/PluralRules$Constraint.class
-SHA1-Digest: rJu0vOah/TG2QnsK0fyVM3oMlQc=
-
-Name: com/ibm/icu/impl/UCaseProps$IsAcceptable.class
-SHA1-Digest: XLBgMJUK+hW8gwWAPk6GJb5ZEac=
-
-Name: com/ibm/icu/text/UnicodeNameTransliterator.class
-SHA1-Digest: eqMuvZwA/4Wp1OxCC8BiAZ64Wqc=
-
-Name: com/ibm/icu/impl/data/icudt42b/en_PK.res
-SHA1-Digest: 4TV69vD1W7j1+XOtCT7MJ3bMN4k=
-
-Name: com/ibm/icu/impl/NormalizerImpl.class
-SHA1-Digest: rNltEt8QQ+yHyIbAJdq/ikmt5fI=
-
-Name: com/ibm/icu/text/MessageFormat.class
-SHA1-Digest: Xiw7CkMW5rwz2Yio5gZnLrxNK4w=
-
-Name: com/ibm/icu/impl/NormalizerImpl$NextCombiningArgs.class
-SHA1-Digest: YXiOb8g3mw7ovg7aVwC2WPly75U=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/zh_Hant_HK.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/util/SimpleTimeZone.class
-SHA1-Digest: i6ayoQBb7deeWACvzugp6qhZ8tM=
-
-Name: com/ibm/icu/impl/data/icudt42b/brkitr/title.brk
-SHA1-Digest: 3DcL4WBfEzn6DVCGWNU8f+H7wD4=
-
-Name: com/ibm/icu/text/CharsetRecog_Unicode$CharsetRecog_UTF_16_LE.cla
- ss
-SHA1-Digest: ii9bW2z/WhsUtyQfhc5yIR27ZXI=
-
-Name: com/ibm/icu/impl/duration/BasicPeriodFormatterFactory$Customizat
- ions.class
-SHA1-Digest: uwx71FwrVlYiNlMCHBsf/Pcfb2U=
-
-Name: com/ibm/icu/impl/data/icudt42b/ar_YE.res
-SHA1-Digest: JlgFRnI4nJlpLF9wvg2ugwSyEA0=
-
-Name: com/ibm/icu/text/BreakCTDictionary.class
-SHA1-Digest: pn7slJgjKRKLtEMgior12sDz1ak=
-
-Name: com/ibm/icu/impl/data/icudt42b/es_MX.res
-SHA1-Digest: av934CdFdzvgow13hWU6wmuLg1w=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/id.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/hr_HR.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/lv_LV.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/is_IS.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/ZoneStringFormat$ZoneStringInfo.class
-SHA1-Digest: pbsSMUYtHO4Id/0apErFc7LK2xs=
-
-Name: com/ibm/icu/impl/ICUConfig.class
-SHA1-Digest: i6brhWFD1e9foqBetYHQjtW99Fg=
-
-Name: com/ibm/icu/lang/UCharacterEnums$ECharacterCategory.class
-SHA1-Digest: kq95RgOd7C81QGqvQ9TDGG7vGus=
-
-Name: com/ibm/icu/impl/Trie.class
-SHA1-Digest: faI/WsgoUlZyHaMpB9pbgiXR8jQ=
-
-Name: com/ibm/icu/impl/data/icudt42b/ka_GE.res
-SHA1-Digest: WJudThz/FQIC6MeClH53YjyURrM=
-
-Name: com/ibm/icu/text/Normalizer$FCDMode.class
-SHA1-Digest: cxxYxkX9o5W0IvoRzvKlbNaztGk=
-
-Name: com/ibm/icu/text/BreakDictionary.class
-SHA1-Digest: UP8ASYdqL29Glsr8/OQKevINEb4=
-
-Name: com/ibm/icu/impl/data/icudt42b/pa_Guru_IN.res
-SHA1-Digest: CrX+t/3l7qQ+Iu1abDKV2D7/ZDk=
-
-Name: com/ibm/icu/text/CollationParsedRuleBuilder$Elements.class
-SHA1-Digest: f4elhHsP3zglY0Jy2yfnI9kTrSs=
-
-Name: com/ibm/icu/impl/data/icudt42b/es_NI.res
-SHA1-Digest: DqUgxafBny6RSK/5q4mvOxc7iio=
-
-Name: com/ibm/icu/text/CollationParsedRuleBuilder$ContractionTable.cla
- ss
-SHA1-Digest: 8fuUD6JzPWZqtbTsPDfOVKtHiws=
-
-Name: com/ibm/icu/impl/data/icudt42b/sr_Cyrl_ME.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/eo.res
-SHA1-Digest: +oVARzO29K91tHbe3FnahinyelY=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/it.res
-SHA1-Digest: Y1cpTHeoNVfdEXGVZ93BmxkHEHM=
-
-Name: com/ibm/icu/text/DictionaryBasedBreakIterator.class
-SHA1-Digest: KeNnKYC6BsmOvho5Y6DchAtPgCA=
-
-Name: com/ibm/icu/text/Transliterator$Position.class
-SHA1-Digest: Jkv3rNTZsJ+xkVJJUBpOaTT76s8=
-
-Name: com/ibm/icu/impl/data/icudt42b/ha_Latn_GH.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/text/DecimalFormatSymbols.class
-SHA1-Digest: 0mxMIxZUhCv/Q2ygAhwk0UEP9a8=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/es_.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/ar_IQ.res
-SHA1-Digest: PlPVnMH+m0uWLvQE+P1Ghs8d0QU=
-
-Name: com/ibm/icu/impl/data/icudt42b/brkitr/en_US.res
-SHA1-Digest: +/LVRKi4A8LFr24NwK7dKO0oWpw=
-
-Name: com/ibm/icu/util/CompactByteArray.class
-SHA1-Digest: cc6CYflTyn7tNMxUw4ASBITqJMY=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/az.res
-SHA1-Digest: H2uhvCqKkzlwlK8rnknx1A78Q/E=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_KOI8_R.class
-SHA1-Digest: riRX0XvAPQb+UDxa7TzhQ5BTOhA=
-
-Name: com/ibm/icu/util/Calendar$PatternData.class
-SHA1-Digest: QvNuOomKswixg40xWPLtLjJ7Tx4=
-
-Name: com/ibm/icu/impl/data/HolidayBundle_es_MX.class
-SHA1-Digest: aJj0AuIV6cPRpCUHraAMoiitYAE=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ro.res
-SHA1-Digest: l9Mio86mPE7IXVIwDYesBpvvuaY=
-
-Name: com/ibm/icu/text/EscapeTransliterator$2.class
-SHA1-Digest: 7pXr2tZ5BIPS54TSTMYnCxzJ9ds=
-
-Name: com/ibm/icu/impl/data/icudt42b/af_ZA.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/duration/impl/DataRecord$EFractionHandling.clas
- s
-SHA1-Digest: w8RJoRmgHZR1YWbZyKBeT/G8z2I=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/kn_IN.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/DecimalFormat$AffixForCurrency.class
-SHA1-Digest: YM0iVPOvosSdWPkdTjvpaFgBaG8=
-
-Name: com/ibm/icu/text/TransliteratorParser$RuleArray.class
-SHA1-Digest: 9+5ONRBkEMeDc+pM08gGAlFKUPM=
-
-Name: com/ibm/icu/impl/duration/BasicDurationFormat.class
-SHA1-Digest: udccTJD6aKauWEMAQrpFdBqZbE8=
-
-Name: com/ibm/icu/impl/data/icudt42b/in.res
-SHA1-Digest: 4yHeO3OZURAGnQ+2Akh1AsFcJ6M=
-
-Name: com/ibm/icu/text/UnescapeTransliterator.class
-SHA1-Digest: HSvMH1HFNAHlDiIhMPqbMqRlkc0=
-
-Name: com/ibm/icu/impl/data/icudt42b/ms.res
-SHA1-Digest: gDIEZDP6L8ZZEta2qRcYp4hWuOk=
-
-Name: com/ibm/icu/text/StringReplacer.class
-SHA1-Digest: 7NR3/R3qL7pu/FLsNhafHAXzpRE=
-
-Name: com/ibm/icu/text/CollationRuleParser$Token.class
-SHA1-Digest: 2pGTO1X0k52exJqKxvbIByhLPzQ=
-
-Name: com/ibm/icu/util/UResourceBundle.class
-SHA1-Digest: GZeE/aPMAyoTiFXvkI4KS+TWO7M=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_8859_6.class
-SHA1-Digest: 7DtfuirDtGTVCrV0L0bnydon7G4=
-
-Name: com/ibm/icu/impl/data/icudt42b/en_ZW.res
-SHA1-Digest: FgBSoPD44rFUuOLPQRCrOHAc3tk=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_8859_1_fr.class
-SHA1-Digest: q3zdWAt/DWCYaQCMAZ1T2gEJAK0=
-
-Name: com/ibm/icu/impl/PropsVectors$CompactHandler.class
-SHA1-Digest: ggK2FbvQCDVeXFFIwoX/ew6A1+E=
-
-Name: com/ibm/icu/impl/data/icudt42b/ar_BH.res
-SHA1-Digest: PlPVnMH+m0uWLvQE+P1Ghs8d0QU=
-
-Name: com/ibm/icu/impl/duration/impl/RecordReader.class
-SHA1-Digest: otdlfBIBwfQJI/LpPGORqmfxHAY=
-
-Name: com/ibm/icu/impl/duration/impl/DataRecord$ScopeData.class
-SHA1-Digest: CUN2vXzRoglrcSJRSshk6n63o0s=
-
-Name: com/ibm/icu/impl/data/icudt42b/hy_AM.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/text/BreakIteratorFactory.class
-SHA1-Digest: C9b/3h/+ymneQJsc7NRtmTZidrE=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ga.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/zh_CN.res
-SHA1-Digest: OqOcERNgY90GdftreFDuBO3TG1M=
-
-Name: com/ibm/icu/util/DateTimeRule.class
-SHA1-Digest: 6Y2wXwNKzW42QtQFndLjZ5eA2Vs=
-
-Name: com/ibm/icu/text/BreakCTDictionary$CompactTrieHeader.class
-SHA1-Digest: Lvk8zfGOkbWKdXgHfCdB/5w8qhg=
-
-Name: com/ibm/icu/lang/UCharacterDirection.class
-SHA1-Digest: mzsqJB3oC2e9hT9G3B+QQ8lNOvo=
-
-Name: com/ibm/icu/impl/data/icudt42b/ko_KR.res
-SHA1-Digest: WJudThz/FQIC6MeClH53YjyURrM=
-
-Name: com/ibm/icu/impl/CalendarAstronomer$SolarLongitude.class
-SHA1-Digest: C+U0AZa67vUwMns4qF4TRna4Qw0=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/root.res
-SHA1-Digest: AckNe2H2q3g8FCoDvSBSbO+kme4=
-
-Name: com/ibm/icu/impl/data/icudt42b/rfc3722.spp
-SHA1-Digest: O+oXDpXLu3SpyBxRnC5bJn+JZKc=
-
-Name: com/ibm/icu/text/CharsetRecog_Unicode$CharsetRecog_UTF_32_BE.cla
- ss
-SHA1-Digest: TwM3Y0RU/24b0vY2ND6aAzh5IOU=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/he_IL.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/be.res
-SHA1-Digest: 52+8V1switFgz1JwlTRd9TU5AY0=
-
-Name: com/ibm/icu/impl/data/icudt42b/zu_ZA.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/text/TransliteratorIDParser.class
-SHA1-Digest: gIkT1ALBXArAjCoC5O6xiugzImo=
-
-Name: com/ibm/icu/text/BreakIterator$BreakIteratorCache.class
-SHA1-Digest: phLZKKu4L32+t3q5BhoPs59gUSM=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ta.res
-SHA1-Digest: m20WWXMhMf9Jguc91WRlhm7fov0=
-
-Name: com/ibm/icu/impl/locale/LanguageTag$Extension.class
-SHA1-Digest: hP1cjTyvX4J0MRjxpyyrEDzCJQ4=
-
-Name: com/ibm/icu/impl/OlsonTimeZone.class
-SHA1-Digest: 79gXZSUmqX9nyoCpNAVgO+DWdZE=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/cs.res
-SHA1-Digest: uSebe78HXFnRtd479ROo8v36RzU=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ucadata.icu
-SHA1-Digest: Q0NSXQYbhwdZrWPlvg7mwKfQqzM=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/th.res
-SHA1-Digest: E5WgEa5K8Jv2uSWGq8c6bmuy7RA=
-
-Name: com/ibm/icu/impl/RelativeDateFormat.class
-SHA1-Digest: oMXqzEz0mVQhGcIkNs9yjZBB+rc=
-
-Name: com/ibm/icu/impl/duration/BasicPeriodFormatter.class
-SHA1-Digest: YQxVtZg5JGrmmU+2ORW4dsAnhhY=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/pl.res
-SHA1-Digest: M0bmX8ggP1RA4n9g+mfeuf4w2vI=
-
-Name: com/ibm/icu/impl/data/icudt42b/it_IT.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/UPropertyAliases$NameToEnum.class
-SHA1-Digest: 1UWDuuszFPV1T89n2Vlmt+eGCmc=
-
-Name: com/ibm/icu/text/CollationParsedRuleBuilder.class
-SHA1-Digest: SybX4sTXAEHaYJdYogcpBmeDHFE=
-
-Name: com/ibm/icu/impl/duration/PeriodFormatterFactory.class
-SHA1-Digest: Gz2jDCMozbAi0EtSygOfpwiDEaU=
-
-Name: com/ibm/icu/impl/data/icudt42b/ml_IN.res
-SHA1-Digest: CrX+t/3l7qQ+Iu1abDKV2D7/ZDk=
-
-Name: com/ibm/icu/text/EscapeTransliterator$7.class
-SHA1-Digest: Z7n+wBbeA8TUZHsmYBlqk13sMzY=
-
-Name: com/ibm/icu/impl/data/icudt42b/ar_TN.res
-SHA1-Digest: 9ITuE03Z0uIKcoax3BwbvIc/tT0=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/hi.res
-SHA1-Digest: zbX53lArZJM2PBtNDPSPxrjs/Y0=
-
-Name: com/ibm/icu/lang/UScriptRun.class
-SHA1-Digest: w95JD/6qCUnxRZfmQTKPmPKrvWM=
-
-Name: com/ibm/icu/util/MeasureUnit.class
-SHA1-Digest: Lm2xF6VH+OjPTxITaAOlgBpG12k=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/hr.res
-SHA1-Digest: XuzR5SbWs2nW9osDEAfha6cGa2M=
-
-Name: com/ibm/icu/text/RuleBasedCollator$shiftValues.class
-SHA1-Digest: iqFJFznuvJ8QiNSRh8boK5ca34c=
-
-Name: com/ibm/icu/util/ULocale$Builder.class
-SHA1-Digest: aCQyYl7o/IWttOB6d9NmA+DJhQA=
-
-Name: com/ibm/icu/impl/data/icudt42b/unames.icu
-SHA1-Digest: E/oDzXc4m34RIDn+MkqvTruEPkM=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/es_UY.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/hy.res
-SHA1-Digest: VIG9x5xgEQ9Whs1CREdMyHneEdc=
-
-Name: com/ibm/icu/text/CharsetRecog_2022$CharsetRecog_2022KR.class
-SHA1-Digest: uIlFjt23o0muOFs/AzAwDT/30n8=
-
-Name: com/ibm/icu/text/UnescapeTransliterator$4.class
-SHA1-Digest: VbbBBBlf7X8KBWgLvQAzkycRwTM=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ur.res
-SHA1-Digest: M3vpShSeTW+pZKWO1dTIOU1PiQM=
-
-Name: com/ibm/icu/text/Collator.class
-SHA1-Digest: LRS6CYoxVdosNtHhOcqxwUunut0=
-
-Name: com/ibm/icu/text/CurrencyPluralInfo.class
-SHA1-Digest: mI9XG4Gzqdj+U1kyn6hVFIT1GmI=
-
-Name: com/ibm/icu/impl/data/icudt42b/ar_DZ.res
-SHA1-Digest: IDE7op9Yf3rbmNaFIehSXw7XkZ4=
-
-Name: com/ibm/icu/impl/data/icudt42b/sr_Latn_CS.res
-SHA1-Digest: 63xXzYBbV2uVP5NlLgeUyp8SVsg=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/az_Latn_AZ.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/rfc3920res.spp
-SHA1-Digest: FOk27XPxxzqY/o7PdaVE9NkudcM=
-
-Name: com/ibm/icu/text/UnicodeFilter.class
-SHA1-Digest: my9i+rgEySYx94ptWNTO7DEK0CI=
-
-Name: com/ibm/icu/text/CharsetRecog_mbcs$CharsetRecog_euc.class
-SHA1-Digest: JyXQVNCIPLJ3ETcNa/dGzQw07Jg=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/en.res
-SHA1-Digest: Y1cpTHeoNVfdEXGVZ93BmxkHEHM=
-
-Name: com/ibm/icu/impl/UCharacterName.class
-SHA1-Digest: juBrLaL8p8sCuOOVHQ1TnJMsUlY=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/is.res
-SHA1-Digest: 6hK47oZwKTuGT9iPhseedM8jlF8=
-
-Name: com/ibm/icu/text/ReplaceableContextIterator.class
-SHA1-Digest: uh1kGQxSFFvCdOfvwtMV/RFp+eM=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/zh.res
-SHA1-Digest: 6jCCDw85GO2YKFjyVbmJrz3CiPA=
-
-Name: com/ibm/icu/impl/PatternTokenizer.class
-SHA1-Digest: gs1cCTRtoRWvrb+oFfectqAAqKM=
-
-Name: com/ibm/icu/text/UnicodeDecompressor.class
-SHA1-Digest: P0CxO6PopQd9eYsRcbgFjhhJAAo=
-
-Name: com/ibm/icu/impl/duration/impl/DataRecord.class
-SHA1-Digest: yQwxbsPMAMJZtW92px2Azs09o+k=
-
-Name: com/ibm/icu/util/DateInterval.class
-SHA1-Digest: +yUQ3agmmyHDT5HONUXlJWwUCug=
-
-Name: com/ibm/icu/impl/data/icudt42b/de_DE.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/no_NO.res
-SHA1-Digest: AgYfyOH+DuzgYK7m3vioTfRNJGM=
-
-Name: com/ibm/icu/impl/data/icudt42b/zh_Hans_CN.res
-SHA1-Digest: WJudThz/FQIC6MeClH53YjyURrM=
-
-Name: com/ibm/icu/impl/UCharacterUtility.class
-SHA1-Digest: RYgGg5aVfygChVLyTQtG7xXr5wE=
-
-Name: com/ibm/icu/text/RemoveTransliterator$1.class
-SHA1-Digest: adHlF+kCdJ8Wpc4GRnP5ZOoybWY=
-
-Name: com/ibm/icu/lang/UCharacter$WordBreak.class
-SHA1-Digest: zJGbZhxPqMpVRK0/corQLR+o4dY=
-
-Name: com/ibm/icu/text/RuleBasedCollator$Attribute.class
-SHA1-Digest: 8sK3ftAAk+yvM8ElgkX7lH50YuU=
-
-Name: com/ibm/icu/impl/data/icudt42b/root.res
-SHA1-Digest: /jAvBLb66EQZJz5i6Gq4tq6HSvI=
-
-Name: com/ibm/icu/impl/data/icudt42b/translit/en.res
-SHA1-Digest: lOD2KZjZY+4pQnEyWvgj0DI4RDk=
-
-Name: com/ibm/icu/util/CurrencyServiceShim$1$CurrencyFactory.class
-SHA1-Digest: BKDqfNuidFYkbVc2arHWlh4IrPg=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/ru.res
-SHA1-Digest: iRI+TvON4CitbxJC2tml5Gwbm24=
-
-Name: com/ibm/icu/impl/data/icudt42b/mr.res
-SHA1-Digest: UHvxkZBfSMdipoSIt5zozq5bjl0=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/fo.res
-SHA1-Digest: vbVaz1xXlVn5yEQRlonKgJvyGWM=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/en_VI.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/af_NA.res
-SHA1-Digest: ZJhpBjdCUjCGufR3nIYX3msnGzU=
-
-Name: com/ibm/icu/text/RuleBasedCollator$DataManipulate.class
-SHA1-Digest: hn7tPwffVpqHMlzCJTK0MvHPNu4=
-
-Name: com/ibm/icu/text/DateTimePatternGenerator$FormatParser.class
-SHA1-Digest: vMY8S4QsTo3/NkiuMAfJlS/FmHY=
-
-Name: com/ibm/icu/text/RawCollationKey.class
-SHA1-Digest: 3p8QSf4RMy7FWuzJxVK0vTyzxm8=
-
-Name: com/ibm/icu/impl/data/icudt42b/ja_JP_TRADITIONAL.res
-SHA1-Digest: DCIG4K+9A5S+ggUNe8mClIrukoo=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/es_SV.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/as.res
-SHA1-Digest: kNF0lmyepvyJY1OATWVPOyN5cuQ=
-
-Name: com/ibm/icu/impl/StringPrepDataReader.class
-SHA1-Digest: 5+x+D/q2Tfss85/OnRNjggZLa+8=
-
-Name: com/ibm/icu/text/PluralRules$AndConstraint.class
-SHA1-Digest: 7JpT5jTip4AmnvLsoq0vkCgsH2U=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/fr_BE.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/util/ULocale$Type.class
-SHA1-Digest: NsX83h5T3oxdnE9NRCaf11wzYAw=
-
-Name: com/ibm/icu/impl/data/icudt42b/sh_CS.res
-SHA1-Digest: 63xXzYBbV2uVP5NlLgeUyp8SVsg=
-
-Name: com/ibm/icu/impl/data/icudt42b/fr_FR.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/duration/BasicPeriodFormatterFactory.class
-SHA1-Digest: 93Ha1HovBfFi0sXu/RlW024g4qQ=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ar_SD.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/es_CR.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/kl.res
-SHA1-Digest: +XCe59JTx811cO0BnIbor0pY4oU=
-
-Name: com/ibm/icu/impl/data/icudt42b/fa_AF.res
-SHA1-Digest: MCUzt2dbZquysJJ9Wyftv1v2Aw0=
-
-Name: com/ibm/icu/impl/data/icudt42b/fi.res
-SHA1-Digest: egnljVIZU7/PrmmGTn7xPIB5vYQ=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/sv.res
-SHA1-Digest: 1GxvJ+dugNpfnkBvZhyhTVjIhz8=
-
-Name: com/ibm/icu/impl/PVecToTrieCompactHandler.class
-SHA1-Digest: jagBKk3dAK8PALAgc9WB+CemdWU=
-
-Name: com/ibm/icu/impl/data/icudt42b/kk_KZ.res
-SHA1-Digest: Pv1X4jlPvVlxVZcgVveM6ghr16s=
-
-Name: com/ibm/icu/text/RuleBasedCollator.class
-SHA1-Digest: 2HzBICFjeZ8/8lk1GXdwZU41tlU=
-
-Name: com/ibm/icu/impl/duration/impl/data/pfd_ar_EG.xml.escaped
-SHA1-Digest: 89IJ4u72v6STQ+GkOaiPXvgvl4s=
-
-Name: com/ibm/icu/impl/data/icudt42b/zh_HK.res
-SHA1-Digest: speOMn/V2KXsedph/5CkSZvBY08=
-
-Name: com/ibm/icu/impl/data/icudt42b/sr_Latn_BA.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/es_PR.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/TransliteratorRegistry$IDEnumeration.class
-SHA1-Digest: 74amdxMNJNhmTUp/bulLHwa6i2c=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/en_CA.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/si.res
-SHA1-Digest: 6M3GODokvo4JZ45IPc4pyGHIYEY=
-
-Name: com/ibm/icu/text/BidiLine.class
-SHA1-Digest: jKOX3AurU/M65CYpHs3YvYETEek=
-
-Name: com/ibm/icu/impl/StringUCharacterIterator.class
-SHA1-Digest: ekMX227GRJphyERiR/umNms9kM4=
-
-Name: com/ibm/icu/impl/data/icudt42b/sw_TZ.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/util/ValueIterator$Element.class
-SHA1-Digest: Z/T9wKiHNB+APS2ppz/rMGcZNDM=
-
-Name: com/ibm/icu/impl/data/icudt42b/vi_VN.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/ICUDebug.class
-SHA1-Digest: SspfDg59S2oDuGoH8+SkpBx8s90=
-
-Name: com/ibm/icu/impl/ZoneStringFormat$ZoneStringSearchResultHandler.
- class
-SHA1-Digest: BYPDhs+w8cmo9wAbabRKm1NFmC0=
-
-Name: com/ibm/icu/util/ULocale$1.class
-SHA1-Digest: L5DCd7IW6ovpmPR11P7CCnuArHo=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_8859_5_ru.class
-SHA1-Digest: a/FsoaP2fh5J5wU2qkxQBUWJb/4=
-
-Name: com/ibm/icu/impl/data/icudt42b/ko.res
-SHA1-Digest: tOu85iYUlfDaTDxuuVMYkyJYoHk=
-
-Name: com/ibm/icu/impl/CalendarCache.class
-SHA1-Digest: 978G+98m5Rh9L1p42o178Ly9eKs=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/lv.res
-SHA1-Digest: 4SzArVsgHZrdCIIUzut2PY4nrj8=
-
-Name: com/ibm/icu/impl/ICUResourceBundleImpl$ResourceTable32.class
-SHA1-Digest: WPNlKMDc2Tuy/gugJ/bvNQR8L0w=
-
-Name: com/ibm/icu/impl/duration/impl/data/pfd_fr.xml
-SHA1-Digest: q6GC/B2UeKvgMaDcH227hHVFGZY=
-
-Name: com/ibm/icu/text/DateIntervalInfo$PatternInfo.class
-SHA1-Digest: 4/oklHbdHf13PMYRQkAzk38U1tk=
-
-Name: com/ibm/icu/impl/data/icudt42b/om_KE.res
-SHA1-Digest: vLe6xnVtFOY1XQsLbWAyg++v4R8=
-
-Name: com/ibm/icu/text/RBBIRuleBuilder.class
-SHA1-Digest: lg7MPOym9rNtMJUUA8ulzJGlDS8=
-
-Name: com/ibm/icu/text/CharsetRecog_Unicode$CharsetRecog_UTF_32_LE.cla
- ss
-SHA1-Digest: X95uQTiQ2wmoXpevIRmZTrG3YRQ=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ar_QA.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/TransliteratorParser$RuleBody.class
-SHA1-Digest: Xong52pzaxRFJy7oUm3qakdrrWU=
-
-Name: com/ibm/icu/impl/data/icudt42b/sh_BA.res
-SHA1-Digest: vYOnYIQEmwDnRfySDiGCAZETvgI=
-
-Name: com/ibm/icu/util/CompactCharArray.class
-SHA1-Digest: HTvkUkdGiggb8cA8jgTTErrJDKY=
-
-Name: com/ibm/icu/lang/UCharacter$JoiningGroup.class
-SHA1-Digest: RFbRF6cgexKGY8nzvWunz1c+lRs=
-
-Name: com/ibm/icu/impl/data/HolidayBundle_ja_JP.class
-SHA1-Digest: 94Q//J7nEmgNgIHchnp3upyZK80=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/sr_Cyrl_BA.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/rfc3530cs.spp
-SHA1-Digest: X/hcRTFL9xucSczvJdQ5nhEtyjY=
-
-Name: com/ibm/icu/impl/data/icudt42b/ar_AE.res
-SHA1-Digest: xB4LS1AXeLApkNRYIagiSn8fWm8=
-
-Name: com/ibm/icu/text/TransformTransliterator.class
-SHA1-Digest: Bp5EzBliTjSPluXDEnQ2DTLVlSY=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/zh_Hant_MO.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/et.res
-SHA1-Digest: 5sefqgiyK6TsRUJsBZNq6rdoSFo=
-
-Name: com/ibm/icu/text/PluralRules$ConstrainedRule.class
-SHA1-Digest: mwS5RQX34YK/F18R/1DjGO5s3yk=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/vi.res
-SHA1-Digest: SKKBSmXiXjkfCso9m0wB8fcRO0k=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/bn_IN.res
-SHA1-Digest: cxctNEMzXGKFExa+BKr81cP6bTk=
-
-Name: com/ibm/icu/text/IntegralPartSubstitution.class
-SHA1-Digest: TpSmcVNsIPtTQutvMY/1h5r0QF8=
-
-Name: com/ibm/icu/impl/data/icudt42b/uk.res
-SHA1-Digest: t0VnKz31Xa+/q0TbAqWqkzNO0ek=
-
-Name: com/ibm/icu/text/RBBIRuleScanner.class
-SHA1-Digest: OE2CMGT9R6AY2Vy88H38N3iSw38=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/hu_HU.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/RBBIRuleScanner$RBBISetTableEl.class
-SHA1-Digest: rEFw4whXXbI9r6JfLgXUytOyvv4=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/el_GR.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/translit/res_index.txt
-SHA1-Digest: ccDO61RRoZeVanV00Bh3R8N3sAM=
-
-Name: com/ibm/icu/impl/UCharArrayIterator.class
-SHA1-Digest: fD55q09R46pQmMVkSx1qnl6ZwK4=
-
-Name: com/ibm/icu/impl/Punycode.class
-SHA1-Digest: 33Cw/TgF+Vpe0qFLg9EfQzF/TqE=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ru_UA.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/kk_Cyrl.res
-SHA1-Digest: ofu0p2h5HG++q/Yi5O9ZawldKoI=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/zh_Hant.res
-SHA1-Digest: BUFDOhxml2zt0sarXan2QbEgDVI=
-
-Name: com/ibm/icu/text/TitlecaseTransliterator.class
-SHA1-Digest: tXpjeR9ROFwNlV9dZ/7tyGMxxzE=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_8859_8_I_he.clas
- s
-SHA1-Digest: HwGee4XXYIs8h31ApYcJg+M2AGg=
-
-Name: com/ibm/icu/impl/data/icudt42b/brkitr/char.brk
-SHA1-Digest: 24ckRQ8bFjANmi7CJB+e3SdfxOo=
-
-Name: com/ibm/icu/impl/ICUResourceBundleImpl.class
-SHA1-Digest: eY4eVJw+5MgftU/m31xLoSUdVEo=
-
-Name: com/ibm/icu/impl/UPropertyAliases$ContiguousEnumToShort.class
-SHA1-Digest: sJi+BMHZTNNTiJrR7+adqFkrbK4=
-
-Name: com/ibm/icu/impl/data/HolidayBundle_en_US.class
-SHA1-Digest: mfCx2hYc8gNROIoHOAWQvReUKBk=
-
-Name: com/ibm/icu/impl/data/icudt42b/ar.res
-SHA1-Digest: kdMpoz4d3X5Q0VX7vpBMTpahZHo=
-
-Name: com/ibm/icu/impl/locale/BaseLocale$BaseLocaleKey.class
-SHA1-Digest: y3N56aqGeOurXb25ANv5Lpv+JZM=
-
-Name: com/ibm/icu/impl/data/icudt42b/nb.res
-SHA1-Digest: P1WTbgYJCRRiiqBeiKzVSgyfN+M=
-
-Name: com/ibm/icu/util/RuleBasedTimeZone.class
-SHA1-Digest: Hz3GJvEjL+DaZg4d7cV1ykMvJCU=
-
-Name: com/ibm/icu/text/BreakCTDictionary$CompactTrieHorizontalNode.cla
- ss
-SHA1-Digest: 8ubK2FFiCZ8rL211dzKm7vhqZw4=
-
-Name: com/ibm/icu/impl/duration/PeriodFormatter.class
-SHA1-Digest: fgmgm7tQREqM8kA9uECAJQvWXcA=
-
-Name: com/ibm/icu/impl/ICUData$3.class
-SHA1-Digest: SNoX0DZtpC0NoTAfFC8Skxnk19c=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/sk_SK.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/TransliteratorRegistry$CompoundRBTEntry.class
-SHA1-Digest: EPnpi9TAxVaO3NeV1adWIdFgrYk=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ga_IE.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/es_PA.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/ca.res
-SHA1-Digest: NttIT6YBvTg34r7iqmE6HXsLm2Y=
-
-Name: com/ibm/icu/impl/ICUBinary$Authenticate.class
-SHA1-Digest: L3EQHZn7xcd114K4mUWT1FJmgiM=
-
-Name: com/ibm/icu/impl/data/icudt42b/en_BW.res
-SHA1-Digest: yPOqHpP+lfKjwqoLwMj9q+MFsh4=
-
-Name: com/ibm/icu/impl/data/icudt42b/nb_NO.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/InvalidFormatException.class
-SHA1-Digest: KQj97EUEqC/UjllyMtFzgCozy9s=
-
-Name: about_files/ucdterms.txt
-SHA1-Digest: VSl7MUMAroQl6WS17r4Mov82WGE=
-
-Name: com/ibm/icu/impl/data/icudt42b/et_EE.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/text/SCSU.class
-SHA1-Digest: gtL+Jw2NeLaYqamDE4o+5Mj8fwI=
-
-Name: com/ibm/icu/text/NormalizationTransliterator$4.class
-SHA1-Digest: zxwhI6zKlhVTIwG+EoxHm5GuwsI=
-
-Name: com/ibm/icu/impl/duration/TimeUnit.class
-SHA1-Digest: +J6ylhxAa9t5D3hJsleaDIcefRo=
-
-Name: com/ibm/icu/impl/UCharacterProperty.class
-SHA1-Digest: wkAjE+pktFKGcDpWVWaZJkrTEaA=
-
-Name: com/ibm/icu/impl/duration/impl/data/pfd_zh_Hant.xml
-SHA1-Digest: oqiUHHJv27k8wMntxWNJWm5cuyU=
-
-Name: com/ibm/icu/impl/data/icudt42b/es_PY.res
-SHA1-Digest: 2ELEXjaQo8G5C0a6Hy/Hkz7rMSU=
-
-Name: com/ibm/icu/impl/data/icudt42b/sh.res
-SHA1-Digest: 5xIT4uaABWOSZbAPadn5pBVATSA=
-
-Name: com/ibm/icu/impl/ICUResourceBundleImpl$ResourceArray.class
-SHA1-Digest: n20Yw5n5uQ+BIumrifw1rJ+ib4Y=
-
-Name: com/ibm/icu/util/OverlayBundle.class
-SHA1-Digest: VA09j//ouBzZfRljhs43EWH1UWg=
-
-Name: com/ibm/icu/impl/UPropertyAliases$EnumToShort.class
-SHA1-Digest: qCCoaX1zSCkCReWgxReTup/2G44=
-
-Name: com/ibm/icu/impl/data/icudt42b/ru_RU.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/fi_FI.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/res_index.txt
-SHA1-Digest: zMIWnk6WM/vR2hqXFYMQNXNgZOA=
-
-Name: com/ibm/icu/impl/data/icudt42b/ar_LB.res
-SHA1-Digest: y01P6EzYLLwoVlSjXJeuBgiLjCM=
-
-Name: com/ibm/icu/util/Range.class
-SHA1-Digest: Gdt1lwgw36pXsWkU5+00HqS3QIg=
-
-Name: com/ibm/icu/impl/data/icudt42b/gl_ES.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/sh_YU.res
-SHA1-Digest: 63xXzYBbV2uVP5NlLgeUyp8SVsg=
-
-Name: com/ibm/icu/impl/data/icudt42b/kn.res
-SHA1-Digest: SVYFAxtKC+g1SO17ypdtiXirQ+U=
-
-Name: com/ibm/icu/text/CollationParsedRuleBuilder$MaxJamoExpansionTabl
- e.class
-SHA1-Digest: Eok++JuBprd94P5XKo5qwmWXWrU=
-
-Name: com/ibm/icu/impl/duration/DateFormatter.class
-SHA1-Digest: oJjB/+u4BmY6gz/1nLFC/kPqZwk=
-
-Name: com/ibm/icu/impl/data/icudt42b/en_PH.res
-SHA1-Digest: 6BW6lipgAJqQsAKKGoMdtSasfBY=
-
-Name: com/ibm/icu/text/Normalizer$NFCMode.class
-SHA1-Digest: WfCJwh7saeRB031INtF1nyrY/eA=
-
-Name: com/ibm/icu/impl/data/icudt42b/sr_CS.res
-SHA1-Digest: aduEqkdKeplfC5eiWemPKHmW34A=
-
-Name: com/ibm/icu/text/TransliteratorParser.class
-SHA1-Digest: uTVZldbPwZNIfoTa/80LFyt47jg=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ja_JP.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/es_EC.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/IntTrie.class
-SHA1-Digest: Emz1DpkrwDLpkWJrLwen4ogwy38=
-
-Name: com/ibm/icu/impl/data/icudt42b/uk_UA.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/CalendarAstronomer$4.class
-SHA1-Digest: TWFpivaDmTZyNPWR0TZvAtsI/nQ=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/zh_Hant_TW.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/rfc3530mixp.spp
-SHA1-Digest: k7n909A1REAMmV/8LzfjYnuVV9E=
-
-Name: com/ibm/icu/util/LocaleData$MeasurementSystem.class
-SHA1-Digest: dTfJgF/KG451ruH4/XBUID8h6vI=
-
-Name: com/ibm/icu/impl/data/icudt42b/ro_MD.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/text/UppercaseTransliterator.class
-SHA1-Digest: K65rOhkHFPPJvTXVS2GDDskDrTw=
-
-Name: com/ibm/icu/lang/UCharacter$LineBreak.class
-SHA1-Digest: WedFMmAGGCS+5uNafKaQHQNgmb4=
-
-Name: com/ibm/icu/impl/data/icudt42b/ti.res
-SHA1-Digest: WLeTLbxjrlBE8fDMGACkk1zylsk=
-
-Name: com/ibm/icu/util/TimeUnit.class
-SHA1-Digest: YYv+j0u/3WBB/3MsB5Up+pODuoU=
-
-Name: about.html
-SHA1-Digest: rVxS5BfocAAiJOoDz/y0EGBqWJQ=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/es_ES.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/th_TH_TRADITIONAL.res
-SHA1-Digest: dm/VvqW10ZR3pUBSFUpvtHbOtyM=
-
-Name: com/ibm/icu/impl/data/icudt42b/de.res
-SHA1-Digest: r2YFTqYDh43kuN8P+52svTSa2QM=
-
-Name: com/ibm/icu/impl/data/icudt42b/ha_GH.res
-SHA1-Digest: UpQPUoCUtlF8gu6zJzaxTmrcrd4=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/el.res
-SHA1-Digest: m20WWXMhMf9Jguc91WRlhm7fov0=
-
-Name: com/ibm/icu/impl/data/icudt42b/pt.res
-SHA1-Digest: PIlKrQuWNHvwerC93IMwogMB2w8=
-
-Name: com/ibm/icu/util/TimeArrayTimeZoneRule.class
-SHA1-Digest: JrMCVEvM6EXDzfMLF4hLxx/UTu8=
-
-Name: com/ibm/icu/impl/BOCU.class
-SHA1-Digest: 5zGkejToe99lZmFfgN60Aw1CGLg=
-
-Name: com/ibm/icu/util/RangeValueIterator.class
-SHA1-Digest: C7gsvse8Hi7kFuiOsp6IH6N6LZs=
-
-Name: com/ibm/icu/impl/duration/impl/YMDDateFormatter.class
-SHA1-Digest: 04ea5xJyxIHWp8noFNHjcF8WY/M=
-
-Name: com/ibm/icu/text/TransliteratorRegistry$ResourceEntry.class
-SHA1-Digest: enFBOMFozjzH7zQDyyzk5JQMSyI=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/es.res
-SHA1-Digest: 2+qJ2wsZOqcH8UavAC/5OT+BWN0=
-
-Name: com/ibm/icu/impl/data/icudt42b/ubidi.icu
-SHA1-Digest: 8PG8LlE9FD31PSbCFlqH8ikBN/E=
-
-Name: com/ibm/icu/impl/data/icudt42b/en_MT.res
-SHA1-Digest: Pcke7lFGpfc23L9mplirDz06oEU=
-
-Name: com/ibm/icu/impl/NormalizerImpl$NormTrieImpl.class
-SHA1-Digest: GBex0A5HCO3NbnOqR1hsq7uCKdM=
-
-Name: com/ibm/icu/text/PluralRules$RangeConstraint.class
-SHA1-Digest: q40jS31nQeUuwXHCU/LJExfrtBQ=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/es_BO.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/mr_IN.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/CaseFoldTransliterator.class
-SHA1-Digest: SZ9RH9iVqmQKyXe+4EodLH2yFJE=
-
-Name: com/ibm/icu/text/NFRuleSet.class
-SHA1-Digest: YOae4QHYvx66WmYCpkPIjpXAgSE=
-
-Name: com/ibm/icu/impl/data/icudt42b/zh_SG.res
-SHA1-Digest: 99MTdXPuizTQKIDtoLc37T5PHW0=
-
-Name: com/ibm/icu/impl/ICUBinaryStream.class
-SHA1-Digest: hwmYmhWRwl1SLll0fs1fViSKoKk=
-
-Name: com/ibm/icu/impl/data/icudt42b/translit/el.res
-SHA1-Digest: 8pcLhZA5frBXKUIf3AD59p6DT2o=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/nn.res
-SHA1-Digest: 3MUK/nZAIdYhsFmqdH72FN13NGo=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/de_LU.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ur_IN.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/en_AU.res
-SHA1-Digest: RyQf0wElkKbRCCBLJXA8u2TsY50=
-
-Name: com/ibm/icu/impl/data/icudt42b/uz.res
-SHA1-Digest: N3L5iQmIl1raILWLrrGf95ussYk=
-
-Name: com/ibm/icu/lang/UCharacterCategory.class
-SHA1-Digest: DKoDFXBwKD0rTGW0gmri0Gv1V1M=
-
-Name: com/ibm/icu/text/Transliterator.class
-SHA1-Digest: qEg4h7YGt0qhMDM74Imk2Wxc7ik=
-
-Name: com/ibm/icu/impl/data/icudt42b/ar_JO.res
-SHA1-Digest: NNqZL3oR7R1bDqOqiHpw7PObhUw=
-
-Name: com/ibm/icu/impl/Assert.class
-SHA1-Digest: 7EflTLK1aav09w+8J9byWrzxwJ8=
-
-Name: com/ibm/icu/impl/data/icudt42b/supplementalData.res
-SHA1-Digest: iHFo2qpbPrI0GGNg8gDE+iognNA=
-
-Name: com/ibm/icu/impl/duration/impl/DataRecord$EHalfSupport.class
-SHA1-Digest: xaZ+Li5POYKVmpZR06xzhQbgAYA=
-
-Name: com/ibm/icu/text/SearchIterator.class
-SHA1-Digest: eSteDarFySmrnoW7QrhHbfS2eiU=
-
-Name: com/ibm/icu/impl/duration/DurationFormatterFactory.class
-SHA1-Digest: e6pCRwBCGl1NmEZzElE0lt+Tf5Q=
-
-Name: com/ibm/icu/impl/data/icudt42b/en_US_POSIX.res
-SHA1-Digest: uhAY7D8tk/T13H2LeMxceizSn2M=
-
-Name: com/ibm/icu/text/NameUnicodeTransliterator.class
-SHA1-Digest: xKXUkrHKrAt4N+ALLEuv/LRumKw=
-
-Name: com/ibm/icu/impl/duration/impl/data/pfd_ar_EG.xml
-SHA1-Digest: oIUIfYHf6QfubBGuBMOOiC8BhKo=
-
-Name: com/ibm/icu/impl/duration/impl/data/pfd_zh_Hant_HK.xml
-SHA1-Digest: CC3kTS07LVUlBxSGdrmbKrxeHT4=
-
-Name: com/ibm/icu/impl/TextTrieMap.class
-SHA1-Digest: i01hKmZ+v9n2opn7bBp8Ekh4DmI=
-
-Name: com/ibm/icu/impl/data/icudt42b/sr_BA.res
-SHA1-Digest: 6q0h04Ey+gEIoBcrzyHzzX1kkzA=
-
-Name: com/ibm/icu/impl/data/ResourceReader.class
-SHA1-Digest: KvaIhFKr51gH4b5+O0z6jeVOxKQ=
-
-Name: com/ibm/icu/lang/UProperty.class
-SHA1-Digest: twc3qgeSyXtpY7eshpN6PrAr9Eo=
-
-Name: com/ibm/icu/text/Bidi$LevState.class
-SHA1-Digest: 0UyGHDenyloCdjPmWuzEhGzlGaY=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/pt_PT.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/CalendarAstronomer$Ecliptic.class
-SHA1-Digest: fpxm9HdwYfU8XsM2YRX/Ez8LqHU=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ar_OM.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/plurals.res
-SHA1-Digest: AMk9el/59ihFhiQR5IwA4pDu4YA=
-
-Name: com/ibm/icu/impl/duration/PeriodFormatterService.class
-SHA1-Digest: AMUsoC/LowGM8ijioxYAKxEAi7c=
-
-Name: com/ibm/icu/impl/NormalizerImpl$ComposePartArgs.class
-SHA1-Digest: JECwXa9jCR5hR94sygRyPH+MfiY=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/sv_SE.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/util/Freezable.class
-SHA1-Digest: Nett7+AkkXCiNnrJnxflPvqpmL8=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/om_ET.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/duration/impl/data/pfd_it.xml
-SHA1-Digest: 7xCHchUQRlpLbS/+eVSne7fiYyA=
-
-Name: com/ibm/icu/impl/data/icudt42b/sr_Latn_RS.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/es_HN.res
-SHA1-Digest: hbFcqJVXRt+6y3H4Ur0GA+QDhkA=
-
-Name: com/ibm/icu/impl/duration/impl/data/pfd_zh_Hans.xml
-SHA1-Digest: BIlCGllGabqtfsLAKABjzjniGb0=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/cy.res
-SHA1-Digest: cxctNEMzXGKFExa+BKr81cP6bTk=
-
-Name: com/ibm/icu/impl/URLHandler$JarURLHandler.class
-SHA1-Digest: 0VxcRVI+Vxl9YOEnZcJsyz8HxkM=
-
-Name: com/ibm/icu/text/BreakTransliterator$ReplaceableCharacterIterato
- r.class
-SHA1-Digest: cwcoXguflrDaGjAiatJfM62U/So=
-
-Name: com/ibm/icu/text/Normalizer$IsNextNFDSafe.class
-SHA1-Digest: HjqQUnj1PZDJ6LWbo4bH4Dy/Nmc=
-
-Name: com/ibm/icu/text/StringPrep.class
-SHA1-Digest: r2/v9NTIfI7t6heL+JGrJrnGlX8=
-
-Name: com/ibm/icu/text/SameValueSubstitution.class
-SHA1-Digest: I0Yb/iaWoL/Q9SmDdVKSI2PDow8=
-
-Name: com/ibm/icu/text/BidiWriter.class
-SHA1-Digest: A55m2XvTflUUWjb06MWmUIQZ/r4=
-
-Name: com/ibm/icu/util/CalendarServiceShim$1$RBCalendarFactory.class
-SHA1-Digest: 2YX6s5iEVSM09fEEo9af6TIxI8w=
-
-Name: com/ibm/icu/text/NumberFormat.class
-SHA1-Digest: r4oRPG04+89iIchE/IRijGjG3Hg=
-
-Name: com/ibm/icu/impl/data/icudt42b/uz_Cyrl_UZ.res
-SHA1-Digest: WJudThz/FQIC6MeClH53YjyURrM=
-
-Name: com/ibm/icu/text/Replaceable.class
-SHA1-Digest: P9D/42FBm3mI1gq3AcY65zHa1Z0=
-
-Name: com/ibm/icu/text/NullSubstitution.class
-SHA1-Digest: GYmVmxF/d4gycD7IaPPH3ue7oW8=
-
-Name: com/ibm/icu/text/EscapeTransliterator$5.class
-SHA1-Digest: hgNOnYM6NClu2fcKurTQsExqArw=
-
-Name: com/ibm/icu/impl/RuleCharacterIterator.class
-SHA1-Digest: sBDGFbddtrFMZ+nuE/bOogHcYGo=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/da.res
-SHA1-Digest: SQhrgOFBLruGpF1nEAx0nghlEPE=
-
-Name: com/ibm/icu/impl/data/icudt42b/kk_Cyrl_KZ.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/util/CurrencyServiceShim.class
-SHA1-Digest: Ryy1dcxGmbqQSMzOmlzsIwBwo8Q=
-
-Name: com/ibm/icu/impl/data/icudt42b/km.res
-SHA1-Digest: scC5i45GluFETfMFwK1q6dVLqJA=
-
-Name: com/ibm/icu/impl/ICUResourceBundle$AvailEntry.class
-SHA1-Digest: tceD5Z5nfKTPImhuz0s3aCBQlRM=
-
-Name: com/ibm/icu/impl/data/icudt42b/or.res
-SHA1-Digest: NZx4uyUBm4F3N8JBtgqNShVHVwA=
-
-Name: com/ibm/icu/impl/data/icudt42b/sw.res
-SHA1-Digest: bCl8PqEwPU6p4brWqdea4WicFAI=
-
-Name: com/ibm/icu/impl/TrieBuilder.class
-SHA1-Digest: swpyE6nI4Sr7KpJbd42Y0cERBzs=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/lt.res
-SHA1-Digest: U6Kwjj5lfZ28Tt7BX0tmcXZ4E+s=
-
-Name: com/ibm/icu/impl/data/icudt42b/gsw.res
-SHA1-Digest: GL/X7TK/JJbVmM9jS3+u2HYHpjU=
-
-Name: com/ibm/icu/impl/locale/InternalLocaleBuilder$FieldHandler.class
-SHA1-Digest: ssy5lCqgMOaIKIYOIYrXDrURwNU=
-
-Name: com/ibm/icu/impl/data/icudt42b/zh_MO.res
-SHA1-Digest: K0sKinko64INKTDfbkgnrEzo0W4=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_8859_9.class
-SHA1-Digest: qoKPPirLpeq2ZK0FxFiMzSfPAxE=
-
-Name: com/ibm/icu/impl/data/icudt42b/likelySubtags.res
-SHA1-Digest: 9YPzb4vut3wWJCZNsmHTdNra3IM=
-
-Name: com/ibm/icu/impl/data/icudt42b/cs.res
-SHA1-Digest: 1JJ0+mG6GvYpDOZx8HrpvRXc9Lo=
-
-Name: com/ibm/icu/impl/data/icudt42b/bo_IN.res
-SHA1-Digest: CrX+t/3l7qQ+Iu1abDKV2D7/ZDk=
-
-Name: com/ibm/icu/text/RBBINode.class
-SHA1-Digest: oR1BJYBbEC9i1uC84s7oLN237ZU=
-
-Name: com/ibm/icu/text/UnescapeTransliterator$2.class
-SHA1-Digest: bo4DZ9p24LQ5XQYJVaZxkWr/JJ0=
-
-Name: com/ibm/icu/impl/data/icudt42b/th.res
-SHA1-Digest: MTUh6AsBSzgZqIBn4ktBHyNSRSc=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ar_LY.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/haw.res
-SHA1-Digest: NP6/LJllJv4b3gO3iY93kXOjiTo=
-
-Name: com/ibm/icu/text/CollationRuleParser$TokenOption.class
-SHA1-Digest: X5GQBJR2uKMv0v6z9Ni79EHUiZ0=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_8859_2_ro.class
-SHA1-Digest: 5qkdYEq4AOVDGPc5TWqPRUyNw8g=
-
-Name: com/ibm/icu/lang/UProperty$NameChoice.class
-SHA1-Digest: yFtZ9Irist4OxZVIo2vlmVFMR+o=
-
-Name: com/ibm/icu/impl/data/icudt42b/hi.res
-SHA1-Digest: X4CpJX4+Li9pyDS8x9tzZmCPCLg=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/af.res
-SHA1-Digest: oR99rVvv+PeTWvs0iCiGEd0dFV0=
-
-Name: com/ibm/icu/impl/data/icudt42b/ps.res
-SHA1-Digest: 2/K9VtxxLDzS0u3szgd5VtFR7Dc=
-
-Name: com/ibm/icu/impl/data/icudt42b/ii_CN.res
-SHA1-Digest: WJudThz/FQIC6MeClH53YjyURrM=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/pt_BR.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/TokenIterator.class
-SHA1-Digest: aVl9NEiavWU3YjMYXsmRqECSMcA=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/res_index.res
-SHA1-Digest: uHnJT3lzNstJ+buwWlS+sOdWFSA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/sr_Cyrl_RS.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/am.res
-SHA1-Digest: kfAb0g/do/S4zkVbGOq95YiBdAc=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/res_index.res
-SHA1-Digest: 1qlBKagoG9eeh1jKNQ+iO9OTzgM=
-
-Name: com/ibm/icu/impl/data/icudt42b/hy.res
-SHA1-Digest: NOel2U/i+2WvxpGEd3vzPQlspgY=
-
-Name: com/ibm/icu/text/CanonicalIterator.class
-SHA1-Digest: xnw2H+5eqcNRKWtbdizobk+l3cw=
-
-Name: com/ibm/icu/impl/data/icudt42b/zh_Hant_HK.res
-SHA1-Digest: tDBSVpaxCAkm5VCMjAMGx7lKjsQ=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ja.res
-SHA1-Digest: nYn3Ybdhw+lhVbLhXx5qDlUiCj4=
-
-Name: com/ibm/icu/impl/data/icudt42b/en_IN.res
-SHA1-Digest: ypWKEdk5Rt3Nr8XEnGYHLR8Yjlo=
-
-Name: com/ibm/icu/impl/data/icudt42b/bg_BG.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/IntTrieBuilder.class
-SHA1-Digest: ZR3vLaX/II6ocmZnF1dab3EX7jo=
-
-Name: com/ibm/icu/impl/data/icudt42b/kl_GL.res
-SHA1-Digest: WJudThz/FQIC6MeClH53YjyURrM=
-
-Name: com/ibm/icu/text/CharsetRecognizer.class
-SHA1-Digest: ULmVva2M/Asi4KaInjapEMNfMvg=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/bg.res
-SHA1-Digest: NK/D6puvIc4L5KgtFCBg8xnqYgU=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ms_BN.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/RBBITableBuilder$RBBIStateDescriptor.class
-SHA1-Digest: 5CbyXkVPOCRgvm43RVB1fSE8vdk=
-
-Name: com/ibm/icu/text/Normalizer$NFKDMode.class
-SHA1-Digest: hGcahPb4PoOii4Nm7MUVXKgV3Pg=
-
-Name: com/ibm/icu/impl/data/icudt42b/da_DK.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/text/BreakIteratorFactory$BFService.class
-SHA1-Digest: trG7yIeZRtCmuuC+oW1rJ3ILKi8=
-
-Name: com/ibm/icu/impl/data/icudt42b/brkitr/word_ja.brk
-SHA1-Digest: tceghqHRl7z9Gx4ul5FP7AtQCys=
-
-Name: com/ibm/icu/impl/duration/BasicPeriodFormatterService.class
-SHA1-Digest: /IhFZk0vqWB/qEymixjz0UUB6XU=
-
-Name: com/ibm/icu/text/TransliterationRuleSet.class
-SHA1-Digest: z9OCJccykmEAzuzoAQwJy/ZwmTE=
-
-Name: com/ibm/icu/util/Calendar$CalendarFactory.class
-SHA1-Digest: hAO3/qAyMaCOjNMsf/1xDvyDlxw=
-
-Name: com/ibm/icu/text/CollatorReader$1.class
-SHA1-Digest: XfneLo+da605Z0T7kr87N0IzpzM=
-
-Name: com/ibm/icu/ICUConfig.properties
-SHA1-Digest: SCRFZaOrbKPIS/W7+VFVzS5d3nQ=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/zh_Hant.res
-SHA1-Digest: Vzijs9UOpZ0iyXvC+RIPDtTey2E=
-
-Name: com/ibm/icu/impl/duration/impl/DataRecord$ENumberSystem.class
-SHA1-Digest: fnqsq9Lfsiorohk0u/wBJwmRCVM=
-
-Name: com/ibm/icu/impl/data/icudt42b/eu.res
-SHA1-Digest: yE58IZubFCmb2mUi71FPTddERCo=
-
-Name: com/ibm/icu/impl/data/icudt42b/gu_IN.res
-SHA1-Digest: CrX+t/3l7qQ+Iu1abDKV2D7/ZDk=
-
-Name: com/ibm/icu/impl/data/icudt42b/en_BE.res
-SHA1-Digest: zof7Bj2xRNFP0GiZuuIlf4V020s=
-
-Name: com/ibm/icu/text/CollationElementIterator$Backup.class
-SHA1-Digest: QTiFlEWotNTTMe1M31LxBytjQ8s=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/sl.res
-SHA1-Digest: xWu0zgcmdp3t9avBdcWj8WpO0VA=
-
-Name: com/ibm/icu/impl/data/icudt42b/uz_Arab_AF.res
-SHA1-Digest: Ft7S6n/o3/L7Am77oNmqkNnADP0=
-
-Name: com/ibm/icu/text/UnescapeTransliterator$7.class
-SHA1-Digest: 1COLbKa0Athi2T/UgjA7hFrBhfs=
-
-Name: com/ibm/icu/text/DateTimePatternGenerator$DistanceInfo.class
-SHA1-Digest: wjoYmQEQ09veIvhZYWHApPNDtNA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ar_SA.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/es_CO.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/es_GT.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/RBBISetBuilder$RBBIDataManipulate.class
-SHA1-Digest: Po1bvO+0klNcFrP5dy8s3h307p8=
-
-Name: com/ibm/icu/impl/TextTrieMap$CharacterNode.class
-SHA1-Digest: s1XpJZR+JPGA7ecglSnL42531qo=
-
-Name: com/ibm/icu/impl/duration/FixedUnitBuilder.class
-SHA1-Digest: HSbqvtuBILCgbZTCDtUgG5WDFeg=
-
-Name: com/ibm/icu/impl/data/icudt42b/ru.res
-SHA1-Digest: 2tpiQqm9vibO03vrWglGYayiVfs=
-
-Name: com/ibm/icu/text/Collator$ServiceShim.class
-SHA1-Digest: VBfc7pG0uiVRhlFmGqm+C7kR4eQ=
-
-Name: com/ibm/icu/text/CharsetRecog_mbcs$CharsetRecog_big5.class
-SHA1-Digest: z/Onqges6+n2jM8mPFe65NmKmU8=
-
-Name: com/ibm/icu/impl/duration/impl/data/pfd_en.xml
-SHA1-Digest: yhRPJdLgfaPae0/Oq7Pnf/JEu+4=
-
-Name: com/ibm/icu/impl/data/icudt42b/zh_TW.res
-SHA1-Digest: FI8SXUxAHIZ4WAdjGjq/j705WQs=
-
-Name: com/ibm/icu/impl/data/icudt42b/ar_SY.res
-SHA1-Digest: 84JDwhg4qOWQWIAPO46GEkV0i64=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/es__TRADITIONAL.res
-SHA1-Digest: FmpAb3TmF+UYaintHRcBMM2MgOc=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ar_KW.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/id_ID.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/kok_IN.res
-SHA1-Digest: CrX+t/3l7qQ+Iu1abDKV2D7/ZDk=
-
-Name: com/ibm/icu/impl/UPropertyAliases$NonContiguousEnumToShort.class
-SHA1-Digest: syk6fjKZM2e9hx/QajWdR9zWcbk=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/he.res
-SHA1-Digest: 5g/JP/rIqxKTtDBuAn7T9oKOJBQ=
-
-Name: com/ibm/icu/util/Currency$ServiceShim.class
-SHA1-Digest: ZLvnyC+Wx1tf5IkKTyW6cTGag9U=
-
-Name: com/ibm/icu/impl/data/icudt42b/kl.res
-SHA1-Digest: qEj3QAIRkho3t0RhL0CPP1RJY74=
-
-Name: com/ibm/icu/impl/data/icudt42b/kok.res
-SHA1-Digest: 0Cq49xx+kBa1hTzjtrV5Ml3qEhA=
-
-Name: com/ibm/icu/util/Currency$CurrencyNameResultHandler.class
-SHA1-Digest: P+l9cS7yf4SjldSpTgQrZbqIk5c=
-
-Name: com/ibm/icu/impl/data/icudt42b/sv.res
-SHA1-Digest: t7f2hjU7Bu0g5ZvKa/TDCURG4Ts=
-
-Name: com/ibm/icu/text/ModulusSubstitution.class
-SHA1-Digest: ejqkE7UO4iF3YILImA3/n3UKwPY=
-
-Name: com/ibm/icu/text/DateIntervalFormat.class
-SHA1-Digest: hQsyM1rFuioogc6Dr9YOB7rELdc=
-
-Name: com/ibm/icu/text/UnicodeSet$GeneralCategoryMaskFilter.class
-SHA1-Digest: csLBiNOv8bCRCxNEY4c82QWb3Bs=
-
-Name: com/ibm/icu/impl/RelativeDateFormat$1.class
-SHA1-Digest: c6NqvKh9OBRUelKlq4M5mpxy/co=
-
-Name: com/ibm/icu/text/DateFormatSymbols.class
-SHA1-Digest: To1yZxWJc+Z4aax1Nj00KjMZUq0=
-
-Name: com/ibm/icu/impl/locale/InternalLocaleBuilder$FieldType.class
-SHA1-Digest: aefyDKK0a/KKJ+zqgrAGcH//F0E=
-
-Name: com/ibm/icu/text/NumberFormat$NumberFormatShim.class
-SHA1-Digest: k/tLYkRBt9Uh0ohxoe1VGXZR6XU=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/hu.res
-SHA1-Digest: o2xBye9kIqHcld2KlMZVqRy1Nko=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/as_IN.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/Trie$DataManipulate.class
-SHA1-Digest: NjCImLHFdiP4sIuw4t+T3gauSsY=
-
-Name: com/ibm/icu/impl/ReplaceableUCharacterIterator.class
-SHA1-Digest: SCfl0/ZO54BfqdOBp++1QT4rfpI=
-
-Name: com/ibm/icu/util/CalendarServiceShim$CalFactory.class
-SHA1-Digest: BLNj+HZvoR2oJ1GngEFz2M+5/dc=
-
-Name: com/ibm/icu/impl/data/icudt42b/ar_MA.res
-SHA1-Digest: MFQlFcLk5eSGKWIWSDw3N8mg35Q=
-
-Name: com/ibm/icu/impl/UPropertyAliases$ValueMap.class
-SHA1-Digest: i9yakyznF+uxdpcjA324oR7y9tQ=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ps_AF.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/mk.res
-SHA1-Digest: FAjQiRZGQsGv60+ineKz2cfWHhA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/de_CH.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/cnvalias.icu
-SHA1-Digest: MQcDdLr4J2MXhjRPlVmJxHtaqNg=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/zh_TW_STROKE.res
-SHA1-Digest: nTng09tRvciGRT5csduFwNCuFMw=
-
-Name: com/ibm/icu/util/Calendar$CalendarShim.class
-SHA1-Digest: fnvc55VsYKwsxpqvv6JBeX6/cVo=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/mt.res
-SHA1-Digest: FtyaJu5NPuKD6jpdEs08AbHnvgI=
-
-Name: com/ibm/icu/impl/duration/PeriodBuilderImpl.class
-SHA1-Digest: AqUSShdrzMMa6z7Un+uub3tI4R0=
-
-Name: com/ibm/icu/util/Currency$CurrencyStringInfo.class
-SHA1-Digest: g9WFvoeBrb7FGiGOdzUItwknUMU=
-
-Name: com/ibm/icu/text/RBBISetBuilder.class
-SHA1-Digest: hOwxqGfQ9WZ+C+1viKYFlquVJ6Y=
-
-Name: com/ibm/icu/impl/data/icudt42b/ar_EG.res
-SHA1-Digest: CGs2xVIS8J7/2gE7N9P/54X0p7A=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_IBM420_ar.class
-SHA1-Digest: AOyK/U3m5/aFbRqi1LDp2saonus=
-
-Name: com/ibm/icu/impl/UCaseProps$ContextIterator.class
-SHA1-Digest: +nY8j0+ipna4v+xfK1dGRgOkPps=
-
-Name: com/ibm/icu/impl/URLHandler$URLVisitor.class
-SHA1-Digest: M6++xkYESTi5/TwYg71K8EXraas=
-
-Name: com/ibm/icu/util/EthiopicCalendar.class
-SHA1-Digest: cZlXcHpU7yDDQrivFoycnC++BFo=
-
-Name: com/ibm/icu/text/ReplaceableString.class
-SHA1-Digest: UxYu+CpdztHGbYqnZGrVLnZl12Y=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/en_IE.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/ICUResourceBundleImpl$ResourceBinary.class
-SHA1-Digest: f3nrmF+ItqGshFfYle9KMXxQVsU=
-
-Name: com/ibm/icu/util/LocaleData$PaperSize.class
-SHA1-Digest: EEQ1lZiV9UtR4+v4CHhD4oSr6uE=
-
-Name: com/ibm/icu/impl/UCharacterProperty$BinaryProperties.class
-SHA1-Digest: 88MTxoOMUU86d/+Rc+zp/hlpn90=
-
-Name: com/ibm/icu/impl/data/icudt42b/it_CH.res
-SHA1-Digest: VZ5J7mHHX7dBZ/OyTYm/qSJ4rfQ=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/sr_ME.res
-SHA1-Digest: oXaqBhMExiV5rKnE2flXWVVHyzM=
-
-Name: com/ibm/icu/text/Normalizer$IsPrevNFDSafe.class
-SHA1-Digest: FEvTne7AOYLR7yBDdbToaG5OzNs=
-
-Name: com/ibm/icu/impl/duration/impl/PeriodFormatterDataService.class
-SHA1-Digest: NlLuVww7FdYnMgZsWlql28eWh+E=
-
-Name: com/ibm/icu/impl/ICUResourceBundleImpl$ResourceString.class
-SHA1-Digest: NyTmwv3AMT6t/Sdgv0HU1yhA47g=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/nl.res
-SHA1-Digest: kF6Z/y1F/oCaBRK2OFjLSCKoce0=
-
-Name: com/ibm/icu/impl/data/icudt42b/ii.res
-SHA1-Digest: UBcD2E0maByd3NeIqAsFZSv6EIY=
-
-Name: com/ibm/icu/text/ChineseDateFormat.class
-SHA1-Digest: yAfgPqcBendEMrN5CAkQhg+5Mbg=
-
-Name: com/ibm/icu/impl/data/icudt42b/az_Latn_AZ.res
-SHA1-Digest: WJudThz/FQIC6MeClH53YjyURrM=
-
-Name: com/ibm/icu/impl/data/icudt42b/en_RH.res
-SHA1-Digest: hX7gbcKf4kxMliOSk1FTXIZlq6o=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/zh_Hans.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/fr.res
-SHA1-Digest: MGwC1Tjcpsv7MdNJwx1cF5yqU+g=
-
-Name: com/ibm/icu/text/NFRule.class
-SHA1-Digest: Rx9mug/qARQn0CQx6EgEv3p9sXY=
-
-Name: com/ibm/icu/impl/data/HolidayBundle_de.class
-SHA1-Digest: ygZcTpEeS+fUbX2LmGkujQog71U=
-
-Name: META-INF/eclipse.inf
-SHA1-Digest: 6mDW8kS/T9pK7w1by/wcxy21Z20=
-
-Name: com/ibm/icu/impl/data/icudt42b/et.res
-SHA1-Digest: N67CbxU4QoG5hjGVdgzrhPwDM2U=
-
-Name: com/ibm/icu/text/StringMatcher.class
-SHA1-Digest: xITSJP51+Xr6DNo/i7rkfcjYb5M=
-
-Name: com/ibm/icu/impl/data/icudt42b/vi.res
-SHA1-Digest: IvGtt5n71/Q5+lcboUp9t20/jg4=
-
-Name: com/ibm/icu/text/CharsetRecog_Unicode.class
-SHA1-Digest: TEkDt3CyBmLK35HAONcI0Z4Oq0M=
-
-Name: com/ibm/icu/impl/CalendarAstronomer$CoordFunc.class
-SHA1-Digest: sDrz6H27/DjBw7a5xhBZ5SnIung=
-
-Name: com/ibm/icu/impl/UCharacterIteratorWrapper.class
-SHA1-Digest: BHZVRNGt4elX2sQxXvP4T0j31Sk=
-
-Name: com/ibm/icu/impl/ICUData$1.class
-SHA1-Digest: PvBDMlt+QLDywoMQsAuPVV2o0OU=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/sk.res
-SHA1-Digest: kipbhMMMAsrPAg578s6fieZ/kT4=
-
-Name: com/ibm/icu/impl/data/icudt42b/pl_PL.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/sr_RS.res
-SHA1-Digest: 2ii6FCYOQG4t2sunNcYMfTFp8rA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/haw.res
-SHA1-Digest: bzZfFLhZ0XFaoPpbkBhyr5xxIr8=
-
-Name: com/ibm/icu/text/UCharacterIterator.class
-SHA1-Digest: 7eshEISwTUGWA0M1JbdxsxvKOjg=
-
-Name: com/ibm/icu/impl/duration/impl/data/index.txt
-SHA1-Digest: MNpQEGeqnTio7sP8urAKSdbCCDA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/hi_IN.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/cs_CZ.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/sr.res
-SHA1-Digest: 5q4QgJkmNbD3r8nJxAw9e2fb5iY=
-
-Name: com/ibm/icu/impl/data/icudt42b/no.res
-SHA1-Digest: QKT2L/mn+LtpRofMA4whD6vFbe0=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/fa_AF.res
-SHA1-Digest: egzqOqtIj9Z4IANVn7nmOPmrOTA=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/root.res
-SHA1-Digest: usraVU9nl82Tjj7gaVTZGlt2WiM=
-
-Name: com/ibm/icu/text/Bidi$InsertPoints.class
-SHA1-Digest: U4tvL3b5yD6lGG7VqbG9pdd4YlY=
-
-Name: com/ibm/icu/impl/SortedSetRelation.class
-SHA1-Digest: hJ7h15Rga71Xh6ytr9ebvNoujrc=
-
-Name: com/ibm/icu/text/MeasureFormat.class
-SHA1-Digest: G+oN8QPH7T64tfQ/PzVyNIkuMI0=
-
-Name: com/ibm/icu/impl/data/icudt42b/fr_SN.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/sq_AL.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/NormalizationTransliterator$2.class
-SHA1-Digest: QZdmY3bzdbLEBYzqdo7YflZk3D4=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/en_GB.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/ICUResourceBundleImpl$ResourceIntVector.class
-SHA1-Digest: 0rFrR7ZGQyhwiGAo8HUbmBl8sEg=
-
-Name: com/ibm/icu/impl/ICUCache.class
-SHA1-Digest: jro2JA35cDczsxETdBk2XDQbGs8=
-
-Name: com/ibm/icu/text/CollationKey.class
-SHA1-Digest: wkX8AB6BlSkkeVbdYd2rqCecDQw=
-
-Name: com/ibm/icu/impl/data/icudt42b/pnames.icu
-SHA1-Digest: gyIxR5pJTCsfhNix+jeZk17v24M=
-
-Name: com/ibm/icu/text/StringPrep$Values.class
-SHA1-Digest: VoXm2UjTrNPtQCTomlkmDgo4c/8=
-
-Name: plugin.properties
-SHA1-Digest: TOPBr3CgISdwU5nKSIJc674x0oY=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/es_DO.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/RBBIDataWrapper$RBBIDataHeader.class
-SHA1-Digest: s2SFgLptUnyHVB4j6qLUvpCVLHQ=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/mt_MT.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/ca.res
-SHA1-Digest: Y1b8+7d7xRxE0/4BvMsJ0ROnlVw=
-
-Name: com/ibm/icu/impl/data/icudt42b/sr_Cyrl_CS.res
-SHA1-Digest: 2ii6FCYOQG4t2sunNcYMfTFp8rA=
-
-Name: com/ibm/icu/impl/data/icudt42b/kk.res
-SHA1-Digest: ZeMQZ0ZpJ9wpELJbCXgVCkxeKT4=
-
-Name: com/ibm/icu/impl/data/icudt42b/brkitr/word.brk
-SHA1-Digest: 4Qm9wAWKejtKem4xRAJwpzpim+o=
-
-Name: com/ibm/icu/text/SymbolTable.class
-SHA1-Digest: 0PXEovA8ijSuu464CTlOg2PiB9E=
-
-Name: com/ibm/icu/impl/data/icudt42b/zh_Hant.res
-SHA1-Digest: 4a6oYxgReRIfuwClplCK/M3LeY8=
-
-Name: com/ibm/icu/impl/CalendarAstronomer$2.class
-SHA1-Digest: oEcFAH9NQgt9Z7aF8UWcLS4MS20=
-
-Name: com/ibm/icu/impl/data/icudt42b/iw_IL.res
-SHA1-Digest: Ndcrw5xpVXzCNkJpNiv+lI2hixc=
-
-Name: com/ibm/icu/impl/data/icudt42b/gv.res
-SHA1-Digest: 2rOn4o47ACz+j6XYLqt0C+MXTFM=
-
-Name: com/ibm/icu/impl/data/icudt42b/pa.res
-SHA1-Digest: x7pO0zURQuIhsuA/yVI4yuI3Q9A=
-
-Name: com/ibm/icu/impl/data/icudt42b/en_HK.res
-SHA1-Digest: tmRVbpRLOdnIjYsMrH4S9Ez8IQI=
-
-Name: com/ibm/icu/lang/UCharacterTypeIterator.class
-SHA1-Digest: F3yCHVIRgN27D/vKNqVvRmrf+qY=
-
-Name: com/ibm/icu/impl/data/icudt42b/fr_LU.res
-SHA1-Digest: 73jNcohlNN3z53Gm4lMn64LoR8k=
-
-Name: com/ibm/icu/text/CharsetRecog_mbcs$CharsetRecog_euc$CharsetRecog
- _euc_jp.class
-SHA1-Digest: nuKNP2brqweBc9DnIoDug0H4sYs=
-
-Name: com/ibm/icu/impl/CharTrie.class
-SHA1-Digest: o1fM6Qeko2xGz/44ni7MO/fjnsI=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/es_VE.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/util/HebrewHoliday.class
-SHA1-Digest: 9plTcLM/MHJX1jTdVZ+N2JNniRs=
-
-Name: com/ibm/icu/text/UnicodeSet.class
-SHA1-Digest: /I6RzJ+st33nq/itiDGvBbi3QKc=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/in.res
-SHA1-Digest: 4yHeO3OZURAGnQ+2Akh1AsFcJ6M=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ms.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/rfc4518.spp
-SHA1-Digest: bqdXrbNNNrdbz/hbrFTh9vv0QmY=
-
-Name: com/ibm/icu/impl/data/HolidayBundle_da_DK.class
-SHA1-Digest: Z8EQ9WVNleLLPUzQl8VVuq7qWZw=
-
-Name: com/ibm/icu/impl/ICURWLock$Stats.class
-SHA1-Digest: ex/PVbI1KYmkp/ut40s2yE7A/gI=
-
-Name: com/ibm/icu/util/VersionInfo.class
-SHA1-Digest: 1AZUnfjAsd39Pm7SfAkIh8nphUs=
-
-Name: com/ibm/icu/text/UnicodeSetIterator.class
-SHA1-Digest: 6Yk5bfw7+mwdkskhZOJpZ63pebo=
-
-Name: com/ibm/icu/impl/duration/BasicDurationFormatterFactory.class
-SHA1-Digest: D9izOXoz72xnd0nFgm6gR68YR5Y=
-
-Name: com/ibm/icu/impl/data/icudt42b/in_ID.res
-SHA1-Digest: 8zlBXCvSDwjZG5pjJeRB/oOjkYQ=
-
-Name: com/ibm/icu/lang/UCharacter$UnicodeBlock.class
-SHA1-Digest: PckbIWeAkjlzTlI1d7wfxFOrbpY=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/en_US.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/BreakIterator$BreakIteratorServiceShim.class
-SHA1-Digest: 5eN/bw4J8zmQ8FofuCoTNWqhqwY=
-
-Name: com/ibm/icu/impl/CalendarAstronomer$AngleFunc.class
-SHA1-Digest: rVdjYM+4RcFjXlXZUO1mGuF27OQ=
-
-Name: com/ibm/icu/impl/data/icudt42b/brkitr/char_th.brk
-SHA1-Digest: F33yOBJlUAalrd9ZWRXhvmhdgsU=
-
-Name: com/ibm/icu/impl/data/icudt42b/sl_SI.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/en_ZA.res
-SHA1-Digest: layRKBnE4SCKRdgDL9oXO0wk8SQ=
-
-Name: com/ibm/icu/impl/duration/impl/DataRecord$EMilliSupport.class
-SHA1-Digest: tHYpjRBpYkW31F2S300nGvCtDPs=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ro_RO.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/fa.res
-SHA1-Digest: eaVRU4NKYc2t26hjrI20QFR+HCg=
-
-Name: com/ibm/icu/text/Normalizer$IsNextTrueStarter.class
-SHA1-Digest: JJyfbs5ohjCnNyKqCGbQmeau1ZI=
-
-Name: com/ibm/icu/text/Collator$CollatorFactory.class
-SHA1-Digest: rZ0lb5hRMGSFoEX1r4A+7i0xDrk=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/be.res
-SHA1-Digest: NK/D6puvIc4L5KgtFCBg8xnqYgU=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/kok.res
-SHA1-Digest: cxctNEMzXGKFExa+BKr81cP6bTk=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/si_LK.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/hi__DIRECT.res
-SHA1-Digest: MSzM/HDeF/P11vq8UxQLYalDeoo=
-
-Name: com/ibm/icu/text/ThaiBreakIterator$PossibleWord.class
-SHA1-Digest: wRfuI08KGbivEoAkKDjOwaAyXsI=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_8859_2.class
-SHA1-Digest: ewwtpG9RmVUT4ermxD6Lr54k/os=
-
-Name: com/ibm/icu/impl/ICULocaleService$LocaleKey.class
-SHA1-Digest: rtnL7+tkntl4p4b+lMDlqJ1bzL8=
-
-Name: com/ibm/icu/text/CharsetRecog_Unicode$CharsetRecog_UTF_32.class
-SHA1-Digest: ZDq8dtsVIcaonxiUBRmdxF4B7jc=
-
-Name: com/ibm/icu/text/UnicodeSet$NumericValueFilter.class
-SHA1-Digest: m+azrsC1VjWHpLoit1Rl0xcF7oE=
-
-Name: com/ibm/icu/util/STZInfo.class
-SHA1-Digest: XsJezh5Etql7hjL6GCfZwp0r1hc=
-
-Name: com/ibm/icu/impl/locale/LocaleObjectCache$WeakValueRef.class
-SHA1-Digest: LasoYp/1je+O3xMGvD9QiraiAJY=
-
-Name: com/ibm/icu/impl/data/icudt42b/sr_Cyrl_BA.res
-SHA1-Digest: gfZbK6gGbnv2WGwmT9G5nQ0kvR4=
-
-Name: com/ibm/icu/impl/data/icudt42b/es.res
-SHA1-Digest: hjABJWCM10eYZ22psOFsL0XZG0U=
-
-Name: com/ibm/icu/util/ULocale$1$ULocaleAcceptLanguageQ.class
-SHA1-Digest: 319gxxl65USHkgzy55fh+IyQNOc=
-
-Name: com/ibm/icu/text/Quantifier.class
-SHA1-Digest: AUgzA371mdcIosAD/wJDlI0QPmM=
-
-Name: com/ibm/icu/text/PluralRules$1.class
-SHA1-Digest: CZKMS2w946JZMZvLui0l7aHObIE=
-
-Name: com/ibm/icu/impl/data/icudt42b/zh_Hant_MO.res
-SHA1-Digest: Ad5HFg6bkw7I9xN38HtDOY3lZes=
-
-Name: com/ibm/icu/impl/data/icudt42b/en_JM.res
-SHA1-Digest: KfuFrcCWLYbRLAnUqTrJRbq6tXM=
-
-Name: com/ibm/icu/util/UniversalTimeScale.class
-SHA1-Digest: MGfU9oOVqd37uvK6hN3Z+jIBLqM=
-
-Name: com/ibm/icu/text/UTF16$StringComparator.class
-SHA1-Digest: gJ11UGOVR5t9/WQJPS9XJei+NM4=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/lt_LT.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/NormalizationTransliterator.class
-SHA1-Digest: ffPUES6DbpwiMALn5Cs1HUgIXQk=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/en_NZ.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/brkitr/root.res
-SHA1-Digest: paZntOH7lwqnm4ngkmma5eBXYqs=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/sq.res
-SHA1-Digest: 5rzM45UdCmsolf7m4jjmMZPruh8=
-
-Name: com/ibm/icu/impl/data/icudt42b/es_PE.res
-SHA1-Digest: cWoAMJRdJUPrsVkh6oOUl2Vn4/w=
-
-Name: com/ibm/icu/impl/data/icudt42b/nn.res
-SHA1-Digest: J/5BC/ijGvdPFXzC02frRPSuFwc=
-
-Name: com/ibm/icu/impl/duration/impl/DataRecord$EZeroHandling.class
-SHA1-Digest: KA1jBtQJdKV5Lx+5fOCRDAjIVSg=
-
-Name: com/ibm/icu/text/RBBIRuleParseTable$RBBIRuleTableElement.class
-SHA1-Digest: uy3Kqj72GGl03zzgGLDnj4+75Nw=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/sr_Latn.res
-SHA1-Digest: Vpk/OA4qSNayFgrZpomjWEZymAg=
-
-Name: com/ibm/icu/impl/PluralRulesLoader.class
-SHA1-Digest: ceOZDqspRg5TuJ18WiU7VCsiRwc=
-
-Name: com/ibm/icu/util/EasterRule.class
-SHA1-Digest: ekwooe0stj5lYCyIKQSfFnDc9ms=
-
-Name: com/ibm/icu/impl/data/icudt42b/bo.res
-SHA1-Digest: hfuL5b5bB3UDf65XjgurbrhPWsE=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/fr_CA.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/de_AT.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/te_IN.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/Normalizer$Mode.class
-SHA1-Digest: dY9mIdzi0rOgMGZeH459HuJvVrQ=
-
-Name: com/ibm/icu/impl/data/icudt42b/rfc3491.spp
-SHA1-Digest: tqFgaA9mZKzEeyVBJHP3C3fLH5w=
-
-Name: com/ibm/icu/impl/UBiDiProps.class
-SHA1-Digest: /G+eUk2x84zjN580BezPQmrQWIA=
-
-Name: com/ibm/icu/text/EscapeTransliterator$3.class
-SHA1-Digest: jK9CaWfYl+SP8pxqsfoOhg4zVlc=
-
-Name: com/ibm/icu/impl/ICUService$Key.class
-SHA1-Digest: U0MKQCZGOZoIrEzDrP4hJ8+iNtk=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/de_BE.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/StringSearch$Pattern.class
-SHA1-Digest: HSW2Lzu4JdDg9c2c8JMprLBkFis=
-
-Name: com/ibm/icu/impl/CalendarAstronomer.class
-SHA1-Digest: FblwZDonS/4z+RAlvXI72Y7ppAM=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/tr.res
-SHA1-Digest: p0GdQBs8tCYpyEPEMfpEarAxfAg=
-
-Name: com/ibm/icu/text/CollatorServiceShim$CService.class
-SHA1-Digest: Ra7UApcf6HkIRW2eQjAkdvYL+kY=
-
-Name: com/ibm/icu/impl/locale/LocaleSyntaxException.class
-SHA1-Digest: ON+fieCZRXGgMeeQo+eaoS2hWzg=
-
-Name: com/ibm/icu/impl/NormalizerImpl$AuxTrieImpl.class
-SHA1-Digest: LBKL8Eh9I/jq5YmSou5JFNUu+PU=
-
-Name: com/ibm/icu/util/UResourceTypeMismatchException.class
-SHA1-Digest: xOMv05bQxowTViXu5xAHut1jm8Q=
-
-Name: com/ibm/icu/util/Calendar$WeekData.class
-SHA1-Digest: BQEs7Sf+cjEPvf/VnjyCHik1Kw8=
-
-Name: com/ibm/icu/impl/duration/impl/data/pfd_he_IL.xml
-SHA1-Digest: zELCMUyNNl4RO9SlMdqwBaDlUZQ=
-
-Name: com/ibm/icu/impl/data/icudt42b/zh_Hans.res
-SHA1-Digest: R8wwL8X3XtJKhsKArcmfuZsjt4U=
-
-Name: com/ibm/icu/util/StringTokenizer.class
-SHA1-Digest: UPYT3yD30H3/E28l/qTiVVS06lg=
-
-Name: com/ibm/icu/lang/UCharacter$DecompositionType.class
-SHA1-Digest: euqzd0lb9CphqzkruwZwZuFLra8=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/es_US.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_8859_7.class
-SHA1-Digest: G/9IaxKk9myd90vftVBa6QfX12U=
-
-Name: com/ibm/icu/impl/data/icudt42b/gu.res
-SHA1-Digest: MidOcLpsKiTWmzxP0lyKQqZtqEk=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/be_BY.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/te.res
-SHA1-Digest: ul4UuJ0VZj6SHZeVet3JTN2pTJQ=
-
-Name: com/ibm/icu/impl/data/icudt42b/km_KH.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/ur_PK.res
-SHA1-Digest: WJudThz/FQIC6MeClH53YjyURrM=
-
-Name: com/ibm/icu/impl/data/icudt42b/tr_TR.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/nl_NL.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/mk_MK.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/es_AR.res
-SHA1-Digest: rMqZU2Hdymr8o4Uys7XNvdwq0/8=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/id.res
-SHA1-Digest: c8WvrfkePrOoWwGwNSrTz97NqGU=
-
-Name: com/ibm/icu/impl/data/icudt42b/da.res
-SHA1-Digest: XjFoTQRV7RGgYA439j7U7tXbVlU=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/nl_BE.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/mr.res
-SHA1-Digest: m20WWXMhMf9Jguc91WRlhm7fov0=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ms_MY.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/uz_Latn.res
-SHA1-Digest: aQm/BzP4r1t4WUuWQd832zW1CAI=
-
-Name: com/ibm/icu/text/PluralRules$RuleList.class
-SHA1-Digest: macoH+mfZLvQ9L4VCb1xPOWT75c=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/sr_Latn_ME.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/brkitr/en.res
-SHA1-Digest: +/LVRKi4A8LFr24NwK7dKO0oWpw=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/eo.res
-SHA1-Digest: eo5kYmGw83lHMVAq9bnVf+k51C8=
-
-Name: com/ibm/icu/impl/data/icudt42b/so_ET.res
-SHA1-Digest: vLe6xnVtFOY1XQsLbWAyg++v4R8=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/it.res
-SHA1-Digest: iTRdh/vkBMgOPp2DXDXSDZW9oRY=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/as.res
-SHA1-Digest: 9NRwXg3YwS7RznQrHB4Ev20w3ZU=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$NGramParser.class
-SHA1-Digest: Jvlt1Yg4aigxvvrUN+VLovmImfY=
-
-Name: com/ibm/icu/impl/data/icudt42b/zh_Hant_TW.res
-SHA1-Digest: WJudThz/FQIC6MeClH53YjyURrM=
-
-Name: com/ibm/icu/impl/ResourceBundleWrapper$1.class
-SHA1-Digest: kCsDjJuZOKWBBdcjq1EL7cRJ6TQ=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/zh__PINYIN.res
-SHA1-Digest: UxTeb9sqoN5EU+1Sec5WMwnCfNA=
-
-Name: com/ibm/icu/impl/data/icudt42b/de_LI.res
-SHA1-Digest: f5YAC+BLQHRMdRQW9Z41LfU46nE=
-
-Name: com/ibm/icu/impl/data/icudt42b/uz_AF.res
-SHA1-Digest: 3kSYT3BSkfVCuxqLdPwlECtg5XA=
-
-Name: com/ibm/icu/impl/data/icudt42b/fo_FO.res
-SHA1-Digest: WJudThz/FQIC6MeClH53YjyURrM=
-
-Name: com/ibm/icu/impl/data/icudt42b/gsw_CH.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/text/RuleBasedCollator$AttributeValue.class
-SHA1-Digest: p/R33glIBQNiZM4jz/a2dwFPdxk=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/az.res
-SHA1-Digest: ZXg9H4iW+xC+iLzF4uLY7bNY/qM=
-
-Name: com/ibm/icu/lang/UCharacter$JoiningType.class
-SHA1-Digest: j4VycQg9ZS1LiXpE9k5QyO67S8s=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/hi_.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/UPropertyAliases.class
-SHA1-Digest: Kar/z1VDskzA6mFIGaJLR3CPe3c=
-
-Name: com/ibm/icu/impl/data/icudt42b/or_IN.res
-SHA1-Digest: CrX+t/3l7qQ+Iu1abDKV2D7/ZDk=
-
-Name: com/ibm/icu/text/UFormat.class
-SHA1-Digest: zBnM/5aT4hYiJW62XsmCv2f4f+U=
-
-Name: com/ibm/icu/text/RBBITableBuilder.class
-SHA1-Digest: JLRKP3X5o6AhLZ3hKTpisqonWTI=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/ro.res
-SHA1-Digest: 3HwDNE8cqTvVBlwJk03kNJOZ/eg=
-
-Name: com/ibm/icu/impl/data/icudt42b/ml.res
-SHA1-Digest: OC5hDnqlCQJyZq9SkmhhfpJIbm0=
-
-Name: com/ibm/icu/text/CharsetRecog_sbcs$CharsetRecog_8859_1_nl.class
-SHA1-Digest: 784pJZ3/LPRarW7umQ2WmURh6+0=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/fi.res
-SHA1-Digest: JjSueyJ2R6YL3OPfZ3gjbiCmsSQ=
-
-Name: com/ibm/icu/text/ThaiBreakIterator.class
-SHA1-Digest: 4uoicVPzfT9RZueI6JhB2wtnPX0=
-
-Name: com/ibm/icu/impl/data/icudt42b/en_NA.res
-SHA1-Digest: GjW9A44EB13F1Q3P5nlS02U5AEY=
-
-Name: com/ibm/icu/util/ValueIterator.class
-SHA1-Digest: Szw1uZNxy/0e7SH/zkTJofhQrFo=
-
-Name: com/ibm/icu/text/RuleBasedNumberFormat.class
-SHA1-Digest: RPWy9pa6wgfdPiotqqYrCumgiYI=
-
-Name: com/ibm/icu/text/IDNA.class
-SHA1-Digest: p+yyMwf8VbEuiBTiIYmS2507xNI=
-
-Name: com/ibm/icu/impl/data/icudt42b/am.res
-SHA1-Digest: CsWaIrKfED9xWRbpmw3hksrKjoo=
-
-Name: com/ibm/icu/text/UnicodeSet$XSymbolTable.class
-SHA1-Digest: zADve81mpe9lI1D/iMHpggNB54k=
-
-Name: com/ibm/icu/impl/data/icudt42b/iw.res
-SHA1-Digest: WZP9bAErSkXNMGcS7Cigt2GwNKw=
-
-Name: com/ibm/icu/impl/data/icudt42b/ha_Latn.res
-SHA1-Digest: GuGMZSWyJJqxdmm9EzD7CnSl2IU=
-
-Name: com/ibm/icu/text/DateTimePatternGenerator$PatternInfo.class
-SHA1-Digest: nASsxWb5tR5jQDzIry/ep3HPvf0=
-
-Name: com/ibm/icu/math/MathContext.class
-SHA1-Digest: h8rJ4mm+Brut7OkxEQd1s364ks8=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/az_Latn.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/si.res
-SHA1-Digest: mt7l6JWbY0adEfwsfBz1tGz/qB4=
-
-Name: com/ibm/icu/text/UnescapeTransliterator$5.class
-SHA1-Digest: 8623ohgLqGOBZAm9/nGxM2W4dWI=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/es_CL.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/sv_FI.res
-SHA1-Digest: EI2GVWEnzehzEvkpFlQJ+eJdN3w=
-
-Name: com/ibm/icu/impl/data/icudt42b/nn_NO.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/ga.res
-SHA1-Digest: yxKFFNoEoM6o+wZMx7ZpFw8ERxU=
-
-Name: com/ibm/icu/impl/data/HolidayBundle_it_IT.class
-SHA1-Digest: YEn8aLHR6KvomlHHNjAtWP3vtwA=
-
-Name: com/ibm/icu/impl/data/icudt42b/am_ET.res
-SHA1-Digest: vLe6xnVtFOY1XQsLbWAyg++v4R8=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/th_TH.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/TransliteratorRegistry$LocaleEntry.class
-SHA1-Digest: 3f73aUODZzYwa/TNAVoZMf5oQkg=
-
-Name: com/ibm/icu/util/RangeValueIterator$Element.class
-SHA1-Digest: 0mSf5xDlhcy2OMrOuhwQYFSuhMI=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ko.res
-SHA1-Digest: S8mHQ8DFrNEUyRtewLid8Yn89xQ=
-
-Name: com/ibm/icu/impl/data/icudt42b/hy_AM_REVISED.res
-SHA1-Digest: lm7DmdHMLEkr9zC2PWR1fkLDaJ4=
-
-Name: com/ibm/icu/impl/data/icudt42b/en_SG.res
-SHA1-Digest: ZAwUZU8vXFPu1hfLcvD7Y3YautA=
-
-Name: com/ibm/icu/impl/data/icudt42b/gv_GB.res
-SHA1-Digest: vqZaev/jL0MbnAu0zgdP7py0gng=
-
-Name: com/ibm/icu/text/RBNFChinesePostProcessor.class
-SHA1-Digest: WgnI0I67l+vetDYBGLSTp5umIBc=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/fa_IR.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ca_ES.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/bn.res
-SHA1-Digest: sWgBOeggQMgNfyEhTT4wVx57d50=
-
-Name: com/ibm/icu/text/CollationKey$BoundMode.class
-SHA1-Digest: dHIdMHMrCLK+OKR3yTl5uq7EQYI=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/ta.res
-SHA1-Digest: Wu0FVc6oWUdNse9LmU5JYc6gHTQ=
-
-Name: com/ibm/icu/text/RBBISymbolTable.class
-SHA1-Digest: petb00eGDCm6DASsXqEnEwQdXeo=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/pa_IN.res
-SHA1-Digest: aABsNcBcPMaMcFhBGb0doQYhb68=
-
-Name: com/ibm/icu/impl/data/icudt42b/ta_IN.res
-SHA1-Digest: CrX+t/3l7qQ+Iu1abDKV2D7/ZDk=
-
-Name: com/ibm/icu/impl/data/icudt42b/fr_CH.res
-SHA1-Digest: IldwcfKtl7UR9+npadXkIc9MS/c=
-
-Name: com/ibm/icu/impl/data/HolidayBundle_it.class
-SHA1-Digest: qg5xRQpUKRpo+/D+hBCn72ZllJ4=
-
-Name: com/ibm/icu/impl/duration/impl/data/pfd_ja.xml
-SHA1-Digest: qh+Yqa1vTI+OXIkNGUpSsPd0gPI=
-
-Name: com/ibm/icu/impl/Trie$DefaultGetFoldingOffset.class
-SHA1-Digest: Vsf8DJGMroq9xMLyeGulHzkntoU=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/res_index.txt
-SHA1-Digest: 0TAI7vdTd1uyMm6olP7g9gLNlsg=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/pl.res
-SHA1-Digest: Ad/7wwraaDLUa78yiU1lUPzLkkc=
-
-Name: com/ibm/icu/text/Normalizer$IsPrevTrueStarter.class
-SHA1-Digest: DTUl+dkJai1Yq1ApIspI756Oaz0=
-
-Name: com/ibm/icu/util/CalendarServiceShim$CalService.class
-SHA1-Digest: 6oWTNuffqEEvVsd3WO+sreuPZQs=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/res_index.txt
-SHA1-Digest: wkQnar8Thb5Bt07mzBSVvEE2OqY=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/zh_Hans_SG.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/text/ArabicShaping.class
-SHA1-Digest: XZ637UBwbDJxDqnmrFiEZWHzXXM=
-
-Name: com/ibm/icu/impl/data/icudt42b/rfc4505.spp
-SHA1-Digest: lced9aQC6CKcBNAOUdswjJV5a3o=
-
-Name: com/ibm/icu/util/ByteArrayWrapper.class
-SHA1-Digest: ZVPa0b5L3JXdi2ciMfStGq8GxCE=
-
-Name: com/ibm/icu/impl/duration/BasicPeriodBuilderFactory$Settings.cla
- ss
-SHA1-Digest: wFb1STxQpexvv9kY98DOJ6pLcas=
-
-Name: com/ibm/icu/text/Bidi$ImpTabPair.class
-SHA1-Digest: JtJVWt+BIGkanGetL2Gy3tBYpIc=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/hr.res
-SHA1-Digest: zqFkwdSPOIWYVmNwaGrje8EPrEw=
-
-Name: com/ibm/icu/text/NumberFormatServiceShim$NFFactory.class
-SHA1-Digest: 5AuziSUiCTjGZgz2iYJ2kxS67RE=
-
-Name: com/ibm/icu/impl/ZoneMeta$MetaToOlsonMappingEntry.class
-SHA1-Digest: uuyCy9JX3+tbs+0dxZoqB9LlyRM=
-
-Name: com/ibm/icu/impl/Utility.class
-SHA1-Digest: lIuCLUW7/AO3EOWjrcN/5/jsoA8=
-
-Name: com/ibm/icu/impl/USerializedSet.class
-SHA1-Digest: YVXfT+4kECAxhhBblpeLPbs7r/E=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/uk.res
-SHA1-Digest: 4bMeR4aqC2oC52qXHLjKto3XRcU=
-
-Name: com/ibm/icu/util/ULocale$IDParser.class
-SHA1-Digest: mHlXMwt76mZ0TRLLKNgk8DhPzdc=
-
-Name: com/ibm/icu/text/StringCharacterIterator.class
-SHA1-Digest: FX1SK52aDgBrcnluC7wnMDSpmPo=
-
-Name: com/ibm/icu/text/Normalizer$IsPrevBoundary.class
-SHA1-Digest: sNtIavcqXEl7v91qG5y1zkLKI2s=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/ar_YE.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/es_MX.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/is_IS.res
-SHA1-Digest: WJudThz/FQIC6MeClH53YjyURrM=
-
-Name: com/ibm/icu/impl/ICUResourceBundle$1.class
-SHA1-Digest: u9NgLyd+lX4ZbAXONIfOE+S34/U=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/hr_HR.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/HolidayBundle_de_DE.class
-SHA1-Digest: VWQHfSEyMLKcSvN5ziecgQLn7U4=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/lv_LV.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/he.res
-SHA1-Digest: aaZFRs5PYKUa91qL/ii/KXbrSYY=
-
-Name: com/ibm/icu/text/DateFormat.class
-SHA1-Digest: xbpnpqFm/gb1+B3C+NVJc6sHjVo=
-
-Name: com/ibm/icu/impl/ICUService$ServiceListener.class
-SHA1-Digest: 4WpmZStQ2bjgfg3tSpEaxW2muNU=
-
-Name: com/ibm/icu/impl/data/icudt42b/coll/es_NI.res
-SHA1-Digest: sToAZL21NCHxRINlvBFxo19BefA=
-
-Name: com/ibm/icu/impl/data/icudt42b/rbnf/en.res
-SHA1-Digest: Qnn0ucolCR9FEek9/220U2OiUHg=
-
diff --git a/dependencyManifests/com.ibm.icu_4.4.2.v20110208.jar/META-INF/MANIFEST.MF b/dependencyManifests/com.ibm.icu_4.4.2.v20110208.jar/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..75a21b8
--- /dev/null
+++ b/dependencyManifests/com.ibm.icu_4.4.2.v20110208.jar/META-INF/MANIFEST.MF
@@ -0,0 +1,28 @@
+Manifest-Version: 1.0
+Export-Package: com.ibm.icu.lang;base=true;full=true;version="4.4.2.1"
+ ,com.ibm.icu.math;base=true;full=true;version="4.4.2.1",com.ibm.icu.t
+ ext;base=true;full=true;version="4.4.2.1",com.ibm.icu.util;base=true;
+ full=true;version="4.4.2.1",com.ibm.icu.impl;x-internal:=true,com.ibm
+ .icu.impl.data;x-internal:=true,com.ibm.icu.impl.data.icudt44b;x-inte
+ rnal:=true,com.ibm.icu.impl.data.icudt44b.brkitr;x-internal:=true,com
+ .ibm.icu.impl.data.icudt44b.coll;x-internal:=true,com.ibm.icu.impl.da
+ ta.icudt44b.curr;x-internal:=true,com.ibm.icu.impl.data.icudt44b.lang
+ ;x-internal:=true,com.ibm.icu.impl.data.icudt44b.rbnf;x-internal:=tru
+ e,com.ibm.icu.impl.data.icudt44b.region;x-internal:=true,com.ibm.icu.
+ impl.data.icudt44b.translit;x-internal:=true,com.ibm.icu.impl.data.ic
+ udt44b.zone;x-internal:=true,com.ibm.icu.impl.duration;x-internal:=tr
+ ue,com.ibm.icu.impl.locale;x-internal:=true
+Bundle-ClassPath: icu-data.jar,.
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-Copyright: Licensed Materials - Property of IBM (C) Copyright I
+ BM Corp. 2000, 2011. All Rights Reserved. IBM is a registered tradema
+ rk of IBM Corp.
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Vendor: %providerName
+Eclipse-LazyStart: true
+Bundle-Version: 4.4.2.v20110208
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: com.ibm.icu; singleton:=true
+Eclipse-ExtensibleAPI: true
+
diff --git a/dependencyManifests/com.jcraft.jsch_0.1.41.v200903070017.jar/META-INF/MANIFEST.MF b/dependencyManifests/com.jcraft.jsch_0.1.41.v200903070017.jar/META-INF/MANIFEST.MF
index 246591c..77d7be5 100644
--- a/dependencyManifests/com.jcraft.jsch_0.1.41.v200903070017.jar/META-INF/MANIFEST.MF
+++ b/dependencyManifests/com.jcraft.jsch_0.1.41.v200903070017.jar/META-INF/MANIFEST.MF
@@ -13,363 +13,3 @@ Export-Package: com.jcraft.jsch;version="0.1.41",com.jcraft.jsch.jce;v
 Bundle-Version: 0.1.41.v200903070017
 Bundle-ManifestVersion: 2
 
-Name: com/jcraft/jsch/jce/ARCFOUR128.class
-SHA1-Digest: 7QDIqzgSoTLENRdhCIgMovwM5Uk=
-
-Name: com/jcraft/jsch/Request.class
-SHA1-Digest: dsey0oAyJGStClcHM98rcleu8Po=
-
-Name: com/jcraft/jsch/Channel$1.class
-SHA1-Digest: 7GRGfX0nS59j5XHL5VqPoWfkqro=
-
-Name: com/jcraft/jsch/SignatureRSA.class
-SHA1-Digest: jzulmFABJqCW6NuSBHyHOKVslFE=
-
-Name: com/jcraft/jsch/DHGEX.class
-SHA1-Digest: 4JBGUS5bYrf8PAQY5GyOwab3AKo=
-
-Name: com/jcraft/jsch/HostKey.class
-SHA1-Digest: 4nxVUli7ioyVcgkb+mvIIx1Fgh8=
-
-Name: com/jcraft/jsch/RequestSignal.class
-SHA1-Digest: 2IXgG0/Fd9iQzjUF3rVRcEWECIo=
-
-Name: com/jcraft/jsch/SocketFactory.class
-SHA1-Digest: +z3wkl/BLCfqXZDXHi5XYcSzBCw=
-
-Name: com/jcraft/jsch/RequestPtyReq.class
-SHA1-Digest: as3YclrKYiVS3r5vz1acvs+gJI4=
-
-Name: com/jcraft/jsch/ChannelSftp$LsEntry.class
-SHA1-Digest: 1DEldnXw3zPmQ6qJqiqjMDHFpIQ=
-
-Name: com/jcraft/jsch/HASH.class
-SHA1-Digest: i61Ai7qZVztXBZg2MLYT25u7yXc=
-
-Name: com/jcraft/jsch/jce/AES256CTR.class
-SHA1-Digest: DvxpZ2u7w3pLluGHjtVe8GXcTV0=
-
-Name: com/jcraft/jsch/JSchException.class
-SHA1-Digest: wxSNQgjaHdWr0+Ba5CfFpU/bCPs=
-
-Name: com/jcraft/jsch/UserAuthKeyboardInteractive.class
-SHA1-Digest: HO6CWlZNNNuBYgrHPM0jkvVfAzw=
-
-Name: com/jcraft/jsch/jce/ARCFOUR256.class
-SHA1-Digest: 0KzxcxWdMglU7SIn9RNsDW0xsi8=
-
-Name: com/jcraft/jsch/Channel$MyPipedInputStream.class
-SHA1-Digest: fwndgndebZATg5glTRp1JHxaHUA=
-
-Name: com/jcraft/jsch/Proxy.class
-SHA1-Digest: 5zZjb/Vj3uhhI1Mg1fvmoYAdtpU=
-
-Name: com/jcraft/jsch/Util.class
-SHA1-Digest: Gb0ar38XuwpeQdUtk7z6HlMfGlQ=
-
-Name: com/jcraft/jsch/jce/HMACMD596.class
-SHA1-Digest: 817MeHbki4pxUrVY4bAYGzDPX3o=
-
-Name: com/jcraft/jsch/jce/KeyPairGenDSA.class
-SHA1-Digest: OOPlQecN4IEpvNCllU6kTRGZCtg=
-
-Name: com/jcraft/jsch/jce/AES128CBC.class
-SHA1-Digest: NUEs091bkLCjtAOEE9GZAToDGNc=
-
-Name: com/jcraft/jsch/jce/HMACSHA1.class
-SHA1-Digest: d+gj7YXiXf62Ur/PhDeiT9Yix7I=
-
-Name: com/jcraft/jsch/UserAuthGSSAPIWithMIC.class
-SHA1-Digest: aGEyIxgeSOXGOb3IZmi1+YZhH9s=
-
-Name: com/jcraft/jsch/jce/TripleDESCTR.class
-SHA1-Digest: pKRuDrxlKhJVfBZzpdn4XtKUM5w=
-
-Name: com/jcraft/jsch/RequestAgentForwarding.class
-SHA1-Digest: 0b/7WOMiIhCnunqKpJ9xBAm7FC8=
-
-Name: com/jcraft/jsch/jcraft/HMAC.class
-SHA1-Digest: ohhf0p2s2knWmi58jiSwKIE4BOg=
-
-Name: com/jcraft/jsch/SftpException.class
-SHA1-Digest: ijrr386qYQPamYMobTl+xtOdeQQ=
-
-Name: com/jcraft/jsch/jcraft/HMACSHA196.class
-SHA1-Digest: 69tgvy3stTxzld9HxUw8H2paR94=
-
-Name: com/jcraft/jsch/jce/AES192CTR.class
-SHA1-Digest: 1tjAFhrE3M5Ezfb3/6hGzt5yCpE=
-
-Name: com/jcraft/jsch/jce/KeyPairGenRSA.class
-SHA1-Digest: QGGx3Ekb2rGgMNRGujeg8hhvfs0=
-
-Name: com/jcraft/jsch/JSch$1.class
-SHA1-Digest: i+dHlov1IBMbZ60GVIofyt4Hsbg=
-
-Name: com/jcraft/jsch/ChannelAgentForwarding.class
-SHA1-Digest: hkOxvzXM8idMJ+7zbTc5xXgkht4=
-
-Name: com/jcraft/jsch/RequestSubsystem.class
-SHA1-Digest: 5yVL86Q0JcV4WCwCoSPXtz5eMGA=
-
-Name: com/jcraft/jsch/jce/HMACMD5.class
-SHA1-Digest: C6YAyxg7TYLabiGIiqRRiTNCeNI=
-
-Name: com/jcraft/jsch/ForwardedTCPIPDaemon.class
-SHA1-Digest: CpRSIKlX7hhyt6HFZhWUdhgdWKY=
-
-Name: com/jcraft/jsch/ServerSocketFactory.class
-SHA1-Digest: PuY/1pkahCL2E+jMBKGgz0ggh+I=
-
-Name: com/jcraft/jsch/UserAuthNone.class
-SHA1-Digest: H5hKs2T7jG8/vbBG2/TEL8a2WnA=
-
-Name: com/jcraft/jsch/jce/HMACSHA196.class
-SHA1-Digest: LshAuQFNb7KYwnFPjOqQOMzUNrU=
-
-Name: com/jcraft/jsch/ChannelSubsystem.class
-SHA1-Digest: QMGf7zaaEjMn96JDKCwzLGPJ2MM=
-
-Name: com/jcraft/jsch/KnownHosts$HashedHostKey.class
-SHA1-Digest: WU+oH+xQb/ryvvkaLlvjKQFYiKE=
-
-Name: com/jcraft/jsch/DHG1.class
-SHA1-Digest: QnxLk7cfSdVLHDbVetfuXjIcVoA=
-
-Name: com/jcraft/jsch/UserAuthPublicKey.class
-SHA1-Digest: HGO/EfMu1eK5KosBpgNTvg9pPkU=
-
-Name: com/jcraft/jsch/UIKeyboardInteractive.class
-SHA1-Digest: +1tYanrpdqGs0Ra6y43Wlr3K+qE=
-
-Name: com/jcraft/jsch/Buffer.class
-SHA1-Digest: TWCnm5ry0Ox4YyqNCkEtvlAKNfo=
-
-Name: com/jcraft/jsch/RequestWindowChange.class
-SHA1-Digest: /W3B/ImikQdWKYdqw9WxFVUEp+E=
-
-Name: com/jcraft/jsch/ProxySOCKS4.class
-SHA1-Digest: 9XQ3e3yAmzUu/1xMMab4sLBSbjQ=
-
-Name: com/jcraft/jsch/jgss/GSSContextKrb5.class
-SHA1-Digest: tB7kq1Z5RE7s2jDWniR49A04kE4=
-
-Name: com/jcraft/jsch/KnownHosts.class
-SHA1-Digest: 9oZo76NlGar0O7yC8/WrQM3B0q4=
-
-Name: about.html
-SHA1-Digest: N87hfpEXgq5TZuvNcFpP7GhEJr8=
-
-Name: com/jcraft/jsch/JSch.class
-SHA1-Digest: c0g4EvvwHdAEY0KT6oeMWK05pvQ=
-
-Name: com/jcraft/jsch/KeyPairGenDSA.class
-SHA1-Digest: O1lE5dThmh443TE83guKL+JmU4Q=
-
-Name: com/jcraft/jsch/PortWatcher.class
-SHA1-Digest: VjxtxVYDUN/exU9dotQnzFU2Zv8=
-
-Name: com/jcraft/jsch/RequestSftp.class
-SHA1-Digest: oTyAjtlVMMH+5GNGK8+U2L2S7/A=
-
-Name: com/jcraft/jsch/JSchAuthCancelException.class
-SHA1-Digest: jXId8e203lTBX/GhY7sLta0jGHU=
-
-Name: com/jcraft/jsch/UserAuth.class
-SHA1-Digest: oSasKRbMm6tK2rA0MJfHC6R8gxo=
-
-Name: com/jcraft/jsch/RequestExec.class
-SHA1-Digest: 6uk5Kno7PEZEvb8cfWbESb5jRto=
-
-Name: com/jcraft/jsch/Channel.class
-SHA1-Digest: qejgVhGhaeao4iIGapa9H/2vt7A=
-
-Name: com/jcraft/jsch/KeyPairDSA.class
-SHA1-Digest: v8EIhwQAKCthbVVR9cu0fkOJCiA=
-
-Name: com/jcraft/jsch/IdentityFile.class
-SHA1-Digest: l9Z1QdEnsYhrutQFzvNzcFa5ta4=
-
-Name: com/jcraft/jsch/ChannelDirectTCPIP.class
-SHA1-Digest: fSIU5oRHLbZL0WmnKzPOkmL0W8c=
-
-Name: com/jcraft/jsch/KeyPairGenRSA.class
-SHA1-Digest: wXEOurCPw9RRxZnp20GRRCCQNwE=
-
-Name: com/jcraft/jsch/RequestEnv.class
-SHA1-Digest: Wo39kFyPc4l8/JsRu20Yt3JC5Hg=
-
-Name: com/jcraft/jsch/DH.class
-SHA1-Digest: l2Jc5QHNzyBQeGJ4BUFCYey0RJg=
-
-Name: com/jcraft/jsch/jce/Random.class
-SHA1-Digest: iYm+frfAfcP7yePHEgQvfT5k2yo=
-
-Name: com/jcraft/jsch/KeyPairRSA.class
-SHA1-Digest: brWaCOzlj27mCk+w910wOngyFME=
-
-Name: com/jcraft/jsch/jce/SHA1.class
-SHA1-Digest: 2cygYVVn0r2gC34Nrkvs2KxXlNA=
-
-Name: com/jcraft/jsch/jce/AES256CBC.class
-SHA1-Digest: EVC1/HasmKohoXgiLVXWv8+CsEY=
-
-Name: com/jcraft/jsch/SftpProgressMonitor.class
-SHA1-Digest: XFAjku26gqI2GHC7qSMZL+jqCIQ=
-
-Name: com/jcraft/jsch/JSchPartialAuthException.class
-SHA1-Digest: 5bvwzz1hRFD7IN708Ngd1lg1f8M=
-
-Name: com/jcraft/jsch/Session$1.class
-SHA1-Digest: g1edNkFyanvFykmZ1hYx8uL/law=
-
-Name: com/jcraft/jsch/jcraft/HMACSHA1.class
-SHA1-Digest: rvIKrl6Izjr8LrmwhD0zpLqSMYU=
-
-Name: com/jcraft/jsch/Compression.class
-SHA1-Digest: 4zZ9LYvlnSU0/vemnL8Zt8r48Dw=
-
-Name: com/jcraft/jsch/jce/SignatureDSA.class
-SHA1-Digest: UX89S4bsSjsaQ+/2IroesigKptI=
-
-Name: com/jcraft/jsch/jcraft/HMACMD5.class
-SHA1-Digest: XK0DD0fPrt62xBCJNfVbuWKAn+E=
-
-Name: com/jcraft/jsch/Random.class
-SHA1-Digest: c57POxL1e9hQnXqzKqFpOzmAeqg=
-
-Name: META-INF/eclipse.inf
-SHA1-Digest: KyT9FF7C7t86NoBoa2kZT3ZJBfw=
-
-Name: com/jcraft/jsch/IO.class
-SHA1-Digest: 6vfKQ8gdz/xQrxSJh7MHF6qajMs=
-
-Name: com/jcraft/jsch/Packet.class
-SHA1-Digest: aXPfOTpybgkcRd85Ag5ELo/EAaU=
-
-Name: com/jcraft/jsch/ProxySOCKS5.class
-SHA1-Digest: LaottFiSRfcLlmdBeBW2/6YzKmQ=
-
-Name: com/jcraft/jsch/jce/ARCFOUR.class
-SHA1-Digest: XmWkgmd7edUhI0xJJo3DeW0X1jg=
-
-Name: com/jcraft/jsch/ProxyHTTP.class
-SHA1-Digest: kV3NyT9sh5oXN08R6123lsWmHYI=
-
-Name: com/jcraft/jsch/jce/AES128CTR.class
-SHA1-Digest: 1A57gyL5rWyryLhNuai52AeAKXA=
-
-Name: com/jcraft/jsch/jce/SignatureRSA.class
-SHA1-Digest: Xe6OAPt33IY3u941TyJ8sNid8eI=
-
-Name: com/jcraft/jsch/jce/BlowfishCBC.class
-SHA1-Digest: 9h8fbPDaEg1KNqGLJypyGe+yGfk=
-
-Name: com/jcraft/jsch/Logger.class
-SHA1-Digest: gZVksblwQezTfyTV1HXlFdd5tRM=
-
-Name: com/jcraft/jsch/jce/TripleDESCBC.class
-SHA1-Digest: zApPhxtBaUntV9s77LrH2uwlT2s=
-
-Name: com/jcraft/jsch/ChannelSftp$1.class
-SHA1-Digest: VsOa+YEtZY9Q7V0J1kzwTcwj34w=
-
-Name: com/jcraft/jsch/HostKeyRepository.class
-SHA1-Digest: W9fhHievhKPIBCtEehgYFpNI+jM=
-
-Name: com/jcraft/jsch/jce/AES192CBC.class
-SHA1-Digest: 9DGFK+dWsvlg+FbrTY2Zz3GJhVI=
-
-Name: com/jcraft/jsch/ChannelSftp$Header.class
-SHA1-Digest: gmNq5wWrasX0kB4m49htRLczB8U=
-
-Name: com/jcraft/jsch/RequestShell.class
-SHA1-Digest: EZ+wo7IUKLx+qJQGMqN3FiCXwJU=
-
-Name: com/jcraft/jsch/CipherNone.class
-SHA1-Digest: wSopA/3woBNifNGoDsTVBl+pDOw=
-
-Name: com/jcraft/jsch/MAC.class
-SHA1-Digest: wprEI0Ov+Pjt7f/OMRwUxcau68o=
-
-Name: com/jcraft/jsch/Channel$PassiveInputStream.class
-SHA1-Digest: 2VU5L64rpIEH73bdlDUdrTESuo0=
-
-Name: com/jcraft/jsch/SftpATTRS.class
-SHA1-Digest: MzX0kMcwvhydhXV1LQtlbGIJwh8=
-
-Name: com/jcraft/jsch/GSSContext.class
-SHA1-Digest: WAZpgz4zrxXyS8UG/pNP+Wwy8Oo=
-
-Name: com/jcraft/jsch/Session.class
-SHA1-Digest: 4R56ThRguuRVnikCTsO8MNjkHiE=
-
-Name: com/jcraft/jsch/KeyPair.class
-SHA1-Digest: MF/UhYtDvwP1z15OIbJ4p2dcTiM=
-
-Name: com/jcraft/jsch/ChannelShell.class
-SHA1-Digest: sQk1yVlZESgJfCRadDnVUD9Ldf0=
-
-Name: plugin.properties
-SHA1-Digest: lQpUwKiiN/9XBoeo1tfG5Qy4ijM=
-
-Name: com/jcraft/jsch/jce/MD5.class
-SHA1-Digest: iegJNROBI8bUcxzjL67Bz5THeHM=
-
-Name: com/jcraft/jsch/KeyExchange.class
-SHA1-Digest: wCyVABtSMzFogOFNsXIdG/Tz4XA=
-
-Name: com/jcraft/jsch/ChannelForwardedTCPIP.class
-SHA1-Digest: c2GiL5URd23FAR1cd8iaZWKwV/M=
-
-Name: com/jcraft/jsch/Channel$PassiveOutputStream.class
-SHA1-Digest: /XGaINStNZ9n6ilhJdELI/ecVxU=
-
-Name: com/jcraft/jsch/Identity.class
-SHA1-Digest: Rjux+JV7g7FB5Y/usX1EmkLRKcU=
-
-Name: com/jcraft/jsch/ChannelSftp.class
-SHA1-Digest: 5plUhN+ZMSgzzu4dW0XCMd0Xagk=
-
-Name: com/jcraft/jsch/jce/DH.class
-SHA1-Digest: N6KI/KxRYKS2/6lFox3taXMWJQY=
-
-Name: com/jcraft/jsch/ChannelExec.class
-SHA1-Digest: ylRj62Ir4J6qWPI6qK2VXs91oiY=
-
-Name: com/jcraft/jsch/RequestX11.class
-SHA1-Digest: NUwJOAuP0h4B6SUSwk7ZKp06ZEc=
-
-Name: com/jcraft/jsch/Cipher.class
-SHA1-Digest: 48peEfWeG3i/Y7cSsRt0atkr6y4=
-
-Name: com/jcraft/jsch/Session$GlobalRequestReply.class
-SHA1-Digest: bLcqszVP5pcbjalpgf15xlDoXz4=
-
-Name: com/jcraft/jsch/jcraft/Compression.class
-SHA1-Digest: pea8wIclLfcRgIdp7CsRFN1DT/c=
-
-Name: com/jcraft/jsch/UserAuthPassword.class
-SHA1-Digest: 3rn3oMhCjrds4FOOQGO4TCtgCUs=
-
-Name: com/jcraft/jsch/Util$1.class
-SHA1-Digest: uCDlLQFurjRo7O9DEuZ5+0Wq9Vw=
-
-Name: com/jcraft/jsch/ChannelSession.class
-SHA1-Digest: 1likx84O0wggJdJCLnsstfxQFfI=
-
-Name: com/jcraft/jsch/ChannelSftp$2.class
-SHA1-Digest: XvR883TJnVChKejEede8zEesOLk=
-
-Name: com/jcraft/jsch/ChannelX11.class
-SHA1-Digest: FpswTJpqUjqPmg5kl+ChL2+B78o=
-
-Name: com/jcraft/jsch/UserInfo.class
-SHA1-Digest: P23BxkmU7R6rKju+g2EaKJufdTc=
-
-Name: com/jcraft/jsch/SignatureDSA.class
-SHA1-Digest: pQ4p8Ylw9vurPgvxRzTlrPRIIdU=
-
-Name: com/jcraft/jsch/jcraft/HMACMD596.class
-SHA1-Digest: Ts6zdQ7O2YB2RgvQYZECQxmIOC0=
-
diff --git a/dependencyManifests/javax.servlet.jsp_2.0.0.v200806031607.jar/META-INF/MANIFEST.MF b/dependencyManifests/javax.servlet.jsp_2.0.0.v200806031607.jar/META-INF/MANIFEST.MF
deleted file mode 100644
index 796cd50..0000000
--- a/dependencyManifests/javax.servlet.jsp_2.0.0.v200806031607.jar/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,173 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Vendor: %bundleProvider
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
-Bundle-Name: %bundleName
-Bundle-SymbolicName: javax.servlet.jsp
-Export-Package: javax.servlet.jsp; version=2.0,javax.servlet.jsp.el; v
- ersion=2.0,javax.servlet.jsp.resources; version=2.0,javax.servlet.jsp
- .tagext; version=2.0
-Bundle-Version: 2.0.0.v200806031607
-Bundle-ManifestVersion: 2
-Import-Package: javax.servlet; version=2.4,javax.servlet.http; version
- =2.4,javax.servlet.resources; version=2.4
-
-Name: javax/servlet/jsp/el/FunctionMapper.class
-SHA1-Digest: tHKaOXUSuKM255d1Jq7afeOP7zU=
-
-Name: javax/servlet/jsp/tagext/DynamicAttributes.class
-SHA1-Digest: rN33r15KA1rLSORnBU0p2xo9uPk=
-
-Name: javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd
-SHA1-Digest: RiEZu4pl582v/Eb6heYlqooyznw=
-
-Name: javax/servlet/jsp/tagext/BodyContent.class
-SHA1-Digest: MS38esQNJC87evOaSuxIq8eEiwM=
-
-Name: javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd
-SHA1-Digest: BbqrVlnQuegg+9J2y+mTUTEyUWs=
-
-Name: javax/servlet/jsp/tagext/TagExtraInfo.class
-SHA1-Digest: WKSJl906ZUldWekhtuk+jGc+vxs=
-
-Name: META-INF/LICENSE.txt
-SHA1-Digest: BL3F38sZ375Y3kbjIoGPp//9FWI=
-
-Name: javax/servlet/jsp/tagext/SimpleTagSupport.class
-SHA1-Digest: 9uCHzpC1h2TIbmHoOwc1LXbxVUU=
-
-Name: javax/servlet/jsp/resources/jsp_2_0.xsd
-SHA1-Digest: gjhhIJg1PHUuQyGIZ6LYu35sKJw=
-
-Name: javax/servlet/jsp/JspPage.class
-SHA1-Digest: rzYtnFXHBqN/eoGudWIkOcVMODk=
-
-Name: javax/servlet/jsp/tagext/SimpleTag.class
-SHA1-Digest: KhrP+sS4xnkR7cm+bwkj0UsRYcg=
-
-Name: javax/servlet/jsp/tagext/TagAttributeInfo.class
-SHA1-Digest: 2/t1e1opXFrAbYrfKxMGIlG21r4=
-
-Name: javax/servlet/jsp/tagext/TagLibraryValidator.class
-SHA1-Digest: KH3C/dDlMY4hDAM7eDiIuT9qIgs=
-
-Name: javax/servlet/jsp/el/Expression.class
-SHA1-Digest: vDEu/T7gI/P6fMH7t+YilsNC/XM=
-
-Name: javax/servlet/jsp/resources/jspxml.xsd
-SHA1-Digest: 3QpNYRv/y1YSk4Nw6mSWIUQIOwY=
-
-Name: META-INF/eclipse.inf
-SHA1-Digest: KyT9FF7C7t86NoBoa2kZT3ZJBfw=
-
-Name: javax/servlet/jsp/resources/jspxml.dtd
-SHA1-Digest: OPBfViTXEtifFsvEavfHNBzYOig=
-
-Name: javax/servlet/jsp/tagext/TryCatchFinally.class
-SHA1-Digest: UXWUVgv3t2LsMNoA9M7lN+QX8yk=
-
-Name: javax/servlet/jsp/ErrorData.class
-SHA1-Digest: n9tlN5/1mMcw+e3A+CFJrEwTASc=
-
-Name: javax/servlet/jsp/tagext/TagData.class
-SHA1-Digest: tA9rT9usGJMLFms/W/GtX2ot6dU=
-
-Name: javax/servlet/jsp/el/ELException.class
-SHA1-Digest: htEW4LIzF9N6IE3Nx6EScde5dvk=
-
-Name: javax/servlet/jsp/tagext/TagInfo.class
-SHA1-Digest: WrO8SquYx4FaOB0WaW8sVKae2gU=
-
-Name: javax/servlet/jsp/tagext/TagLibraryInfo.class
-SHA1-Digest: Tt6a5S3kqgazw1gcvtyCZBlBe5Y=
-
-Name: javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd
-SHA1-Digest: vVLZQqoqY/QBxg9m/mJLSFO2Nn4=
-
-Name: javax/servlet/jsp/JspContext.class
-SHA1-Digest: UOzuth+AROsExCfyQUn7iYaO7Os=
-
-Name: javax/servlet/jsp/tagext/BodyTagSupport.class
-SHA1-Digest: mHHJ4WxpuF9SsHPrI+kaOOUlppA=
-
-Name: javax/servlet/jsp/PageContext.class
-SHA1-Digest: cqJW8sUfYL8MjEx3idc/P2Hnn2o=
-
-Name: javax/servlet/jsp/tagext/PageData.class
-SHA1-Digest: /JhtW3HLJdtFI4UrZ0GXVUWcJV0=
-
-Name: javax/servlet/jsp/tagext/JspFragment.class
-SHA1-Digest: L5TUrwJQDI9NbCwHdoabTQzMyRk=
-
-Name: javax/servlet/jsp/el/ELParseException.class
-SHA1-Digest: yMq3u5fd04SrVNPOTNj1eoH26F4=
-
-Name: javax/servlet/jsp/tagext/FunctionInfo.class
-SHA1-Digest: pZA7QooEMI/sNABR3fyIokpmpOU=
-
-Name: plugin.properties
-SHA1-Digest: SaiCrNlOfavzz16ICeW7pew2bZ8=
-
-Name: javax/servlet/jsp/tagext/TagFileInfo.class
-SHA1-Digest: CqekVZM9F9K3p7UL1Ey7m84i6gE=
-
-Name: javax/servlet/jsp/tagext/TagVariableInfo.class
-SHA1-Digest: 06isMUB7L+QcrnOSLgNwBAe+Q+w=
-
-Name: javax/servlet/jsp/JspEngineInfo.class
-SHA1-Digest: Dya4oUwKuQe/9/uQbdcIK6e2rGs=
-
-Name: javax/servlet/jsp/JspFactory.class
-SHA1-Digest: zTeo63ZROM8FTPlWS6R8LXwDZ2E=
-
-Name: about_files/LICENSE.txt
-SHA1-Digest: K4uBUimqimHkg/tLoFiLi2xJGJA=
-
-Name: javax/servlet/jsp/tagext/ValidationMessage.class
-SHA1-Digest: W8lMSnkNy94HHvD/JWqsYnCrzEg=
-
-Name: javax/servlet/jsp/JspTagException.class
-SHA1-Digest: MtedXdWqQZEOROk5dhQK2ZN3ohc=
-
-Name: javax/servlet/jsp/JspException.class
-SHA1-Digest: 9SNsR2LiQn2+Z7oBa7P9EnAa9SY=
-
-Name: javax/servlet/jsp/SkipPageException.class
-SHA1-Digest: H3oSbH7DU3tGy1PkWi9OLZ4FJX4=
-
-Name: javax/servlet/jsp/el/ExpressionEvaluator.class
-SHA1-Digest: df77Zowy7fqSbj839PhLNXGRXO4=
-
-Name: javax/servlet/jsp/tagext/IterationTag.class
-SHA1-Digest: tq+UrJ1wfY1xQTc1xfdM4wbMIpQ=
-
-Name: javax/servlet/jsp/tagext/BodyTag.class
-SHA1-Digest: Aun4t2IwiXhe3h7ozAesB4WrRg8=
-
-Name: javax/servlet/jsp/tagext/Tag.class
-SHA1-Digest: pbya+FWrBbRY4Jw36mpk5XGlWdk=
-
-Name: javax/servlet/jsp/el/VariableResolver.class
-SHA1-Digest: bc+eGYmiWNs5w9KW6HvKySzxURI=
-
-Name: about.html
-SHA1-Digest: kevvjujybBSJ3dBq5jXTAem0V/c=
-
-Name: javax/servlet/jsp/HttpJspPage.class
-SHA1-Digest: BPQOvyLrO7DiBuUWK12sN+G+EAA=
-
-Name: javax/servlet/jsp/tagext/VariableInfo.class
-SHA1-Digest: V6ql0peh++/jrPu9+tEXiUO9ftM=
-
-Name: javax/servlet/jsp/JspWriter.class
-SHA1-Digest: ni5t3CGJ/DGC0Pp/2o0qbYDnPXc=
-
-Name: javax/servlet/jsp/tagext/JspTag.class
-SHA1-Digest: j5Y2diXQrVO1Qqp62pAn4pbW8EA=
-
-Name: javax/servlet/jsp/tagext/TagAdapter.class
-SHA1-Digest: 0C6XvKMZWwbZOgbH/KPVaysdzx8=
-
-Name: javax/servlet/jsp/tagext/TagSupport.class
-SHA1-Digest: jZ3/LXUvgpyJisi9jaSbFZKfQD8=
-
diff --git a/dependencyManifests/javax.servlet.jsp_2.0.0.v201101211617.jar/META-INF/MANIFEST.MF b/dependencyManifests/javax.servlet.jsp_2.0.0.v201101211617.jar/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..d5ecf7e
--- /dev/null
+++ b/dependencyManifests/javax.servlet.jsp_2.0.0.v201101211617.jar/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-Vendor: %bundleProvider
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
+Bundle-Name: %bundleName
+Bundle-SymbolicName: javax.servlet.jsp
+Export-Package: javax.servlet.jsp; version=2.0,javax.servlet.jsp.el; v
+ ersion=2.0,javax.servlet.jsp.resources; version=2.0,javax.servlet.jsp
+ .tagext; version=2.0
+Bundle-Version: 2.0.0.v200806031607
+Bundle-ManifestVersion: 2
+Import-Package: javax.servlet; version=2.4,javax.servlet.http; version
+ =2.4,javax.servlet.resources; version=2.4
diff --git a/dependencyManifests/javax.servlet_2.5.0.v200910301333.jar/META-INF/MANIFEST.MF b/dependencyManifests/javax.servlet_2.5.0.v200910301333.jar/META-INF/MANIFEST.MF
deleted file mode 100644
index 3a2a76a..0000000
--- a/dependencyManifests/javax.servlet_2.5.0.v200910301333.jar/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,209 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Vendor: %bundleProvider
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,J2SE-1.4
-Bundle-Name: %bundleName
-Bundle-SymbolicName: javax.servlet
-Export-Package: javax.servlet;version="2.5",javax.servlet.http;version
- ="2.5",javax.servlet.resources;version="2.5"
-Bundle-Version: 2.5.0.v200910301333
-Bundle-ManifestVersion: 2
-
-Name: javax/servlet/http/HttpServletRequest.class
-SHA1-Digest: cZEqv/EjAPpg1GIqtRM4yyXo24c=
-
-Name: javax/servlet/resources/web-jsptaglibrary_2_0.xsd
-SHA1-Digest: OPBaWTFgVdgYhf/G/Ihgm8bbqjU=
-
-Name: javax/servlet/resources/xml.xsd
-SHA1-Digest: 67xOpsC5yFOUU4W1NU08KubpNkw=
-
-Name: javax/servlet/Filter.class
-SHA1-Digest: PscRB6zod5A5KQvErg2zFbjV6ys=
-
-Name: javax/servlet/LocalStrings.properties
-SHA1-Digest: lJgZQAtOACfwT0+fdtYj115M8UQ=
-
-Name: javax/servlet/http/HttpServletRequestWrapper.class
-SHA1-Digest: XP2MXG+OiQW7Is05dQqtRSOdMos=
-
-Name: javax/servlet/http/HttpSessionListener.class
-SHA1-Digest: hvG5fYCqYV6bUuWZcGObyxtNpRE=
-
-Name: javax/servlet/ServletContextListener.class
-SHA1-Digest: hlbWgriGorzKKV/6N+P9HJOZ1HI=
-
-Name: javax/servlet/ServletResponse.class
-SHA1-Digest: 4O6Jr097CpG3QgWbytJq6q605kE=
-
-Name: javax/servlet/http/HttpUtils.class
-SHA1-Digest: 631+g1izaxXD5RXqAwT2CsGLIp0=
-
-Name: javax/servlet/http/LocalStrings_es.properties
-SHA1-Digest: pVaN8pbLEEEn0cTQGOlztbq6x/k=
-
-Name: javax/servlet/ServletRequestWrapper.class
-SHA1-Digest: KNqRnt2oqkkRyBo1nLsN3llAYL0=
-
-Name: javax/servlet/ServletRequestEvent.class
-SHA1-Digest: vK64h8xobSZTJYdNjiSgaKhCe2o=
-
-Name: javax/servlet/ServletRequest.class
-SHA1-Digest: vNuxheE5jLqSw4XpmtS0P5yo2Zk=
-
-Name: javax/servlet/http/HttpSessionBindingListener.class
-SHA1-Digest: q/L8u16/BwGgjEZUnPizyWXd7fM=
-
-Name: javax/servlet/http/HttpSessionEvent.class
-SHA1-Digest: wd8x2VwBGYg2faQtsa+MVKE9LHc=
-
-Name: javax/servlet/http/HttpServlet.class
-SHA1-Digest: RQhdmVq8CCOBGOi5rVnsK2a79Is=
-
-Name: META-INF/eclipse.inf
-SHA1-Digest: KyT9FF7C7t86NoBoa2kZT3ZJBfw=
-
-Name: javax/servlet/http/LocalStrings.properties
-SHA1-Digest: aGOtTdQmrTuCfVrU6UDSktcCKPA=
-
-Name: javax/servlet/FilterConfig.class
-SHA1-Digest: 3q3TV3p6e56g88k6my7HATU3fdo=
-
-Name: javax/servlet/http/HttpSessionBindingEvent.class
-SHA1-Digest: 8s6euhxgb6XbT27OD9hEuXf4KPU=
-
-Name: javax/servlet/ServletOutputStream.class
-SHA1-Digest: C04Rw7AFY/HSEAQTyNth7l2HrU8=
-
-Name: javax/servlet/LocalStrings_fr.properties
-SHA1-Digest: 8gKJTnm8gx2uvTCh5KChJmoqnJU=
-
-Name: javax/servlet/resources/XMLSchema.dtd
-SHA1-Digest: 9RaoC7SKJ0yiTvz0jmFl+EhFKEY=
-
-Name: javax/servlet/http/LocalStrings_fr.properties
-SHA1-Digest: t7YF68xQ6ow8Zpp3h7LuZaKo7lc=
-
-Name: javax/servlet/resources/j2ee_web_services_1_1.xsd
-SHA1-Digest: IzKI/p9spq2Wldjs7QIhm0+omA0=
-
-Name: javax/servlet/http/NoBodyResponse.class
-SHA1-Digest: GQ7qm3xR+yDst0jZqM+SAbX0Zb8=
-
-Name: javax/servlet/ServletInputStream.class
-SHA1-Digest: ua3sPNmcO20TTkNlXjBDhl7hYcY=
-
-Name: javax/servlet/http/Cookie.class
-SHA1-Digest: 814NxBOAi6tFirMlovn4iyo5v8A=
-
-Name: javax/servlet/http/HttpSession.class
-SHA1-Digest: SjKVkHc0ykZO/HLzQ87otNRm9wE=
-
-Name: javax/servlet/resources/j2ee_1_4.xsd
-SHA1-Digest: c8kzVWpPNCgLHRWyPv1i4NELaXI=
-
-Name: javax/servlet/ServletContext.class
-SHA1-Digest: JQhgC8zgRchLxCPmLZLEn/i2LHk=
-
-Name: javax/servlet/RequestDispatcher.class
-SHA1-Digest: VtTooRyxQcLz6OibT+6V2TXSKdQ=
-
-Name: javax/servlet/resources/web-app_2_4.xsd
-SHA1-Digest: sptEiMDlwibb6o6ALbYzFxH+p3I=
-
-Name: javax/servlet/SingleThreadModel.class
-SHA1-Digest: nGe2xtSCDI5nOuQGQcgVL5h7tQg=
-
-Name: javax/servlet/http/HttpSessionActivationListener.class
-SHA1-Digest: bNruhJ6ZbTPgDO0tM/4nXw7aBR4=
-
-Name: javax/servlet/resources/web-app_2_5.xsd
-SHA1-Digest: gReNDd6zWih2Z4/n8tI7UdaKzvE=
-
-Name: javax/servlet/http/HttpServletResponseWrapper.class
-SHA1-Digest: GqvyqkJxdmAdjdw1CJsLLJcWSBI=
-
-Name: javax/servlet/http/HttpServletResponse.class
-SHA1-Digest: gkD7wj625s1DIMvChaV3zSEbJ8A=
-
-Name: javax/servlet/resources/web-app_2_2.dtd
-SHA1-Digest: CsTOp3Fqc11szliK2GRigMk9kaA=
-
-Name: javax/servlet/resources/web-app_2_3.dtd
-SHA1-Digest: PSOL4NYWvQiqx/Z4dd50wweluIk=
-
-Name: javax/servlet/resources/datatypes.dtd
-SHA1-Digest: negXBG4KrEM4DWsA6UixiG75o+4=
-
-Name: javax/servlet/ServletContextAttributeListener.class
-SHA1-Digest: u95pwjMLiOsuv2G/NLarwR8JLTc=
-
-Name: plugin.properties
-SHA1-Digest: JtGYoCHNOhBEWT6RKg2GmaW/WHQ=
-
-Name: javax/servlet/ServletConfig.class
-SHA1-Digest: AM1umCP9IBTU0wsUYicpsId8tDI=
-
-Name: javax/servlet/FilterChain.class
-SHA1-Digest: 1XdxRcxMp8mUi8Tp2pM128cIiHE=
-
-Name: javax/servlet/http/NoBodyOutputStream.class
-SHA1-Digest: 80hWgv50daD9O4JPxZLiBumvEOU=
-
-Name: javax/servlet/ServletRequestAttributeEvent.class
-SHA1-Digest: YTeP3O+o1o/24K/bDclWimcMzuA=
-
-Name: javax/servlet/resources/j2ee_web_services_client_1_1.xsd
-SHA1-Digest: tjC+1adG43GwDqyo+1Rui04RxpA=
-
-Name: javax/servlet/ServletException.class
-SHA1-Digest: OdGKjU8KYnKyBSC6gp84VnGnVSA=
-
-Name: javax/servlet/resources/jspxml.xsd
-SHA1-Digest: 8RLiUK0701Mes80qw1V0d2zjlOo=
-
-Name: javax/servlet/resources/jsp_2_0.xsd
-SHA1-Digest: 3AmjZ0u0APIuuAB0cez9iK53QdI=
-
-Name: about_files/LICENSE.txt
-SHA1-Digest: K4uBUimqimHkg/tLoFiLi2xJGJA=
-
-Name: javax/servlet/ServletResponseWrapper.class
-SHA1-Digest: /nW0NAMS27Gp9B1fSCu4TxbqPtY=
-
-Name: javax/servlet/LocalStrings_ja.properties
-SHA1-Digest: fWcC0+8BY/is7Mz+ifqv+xn3YWk=
-
-Name: javax/servlet/http/LocalStrings_ja.properties
-SHA1-Digest: CkWj6ZiL0tmjIdivjxbZXbw1kwE=
-
-Name: javax/servlet/ServletRequestListener.class
-SHA1-Digest: Kl7zeOGhl4GL9mVLC6Nf+H8jndY=
-
-Name: about.html
-SHA1-Digest: DOXgjdJkCfshjNaMxgtw+S1kFxQ=
-
-Name: javax/servlet/Servlet.class
-SHA1-Digest: S596bI4xC+N2r87RPWKe202ztJQ=
-
-Name: javax/servlet/UnavailableException.class
-SHA1-Digest: O+Wm6u4FMTD2mod58+6vvI4GFLY=
-
-Name: javax/servlet/ServletRequestAttributeListener.class
-SHA1-Digest: VVGi6p/vaccOjQHVmKUF4eTBWZk=
-
-Name: javax/servlet/http/HttpSessionContext.class
-SHA1-Digest: tSXw8uG5shVb9ms8rgkvZleYKbQ=
-
-Name: javax/servlet/http/HttpSessionAttributeListener.class
-SHA1-Digest: ePuZtdVoakXZflRHli3dWYFqjbU=
-
-Name: javax/servlet/ServletContextAttributeEvent.class
-SHA1-Digest: I1VRvE2SczWAzUq4id+dC+h/XjI=
-
-Name: javax/servlet/ServletContextEvent.class
-SHA1-Digest: aZJ4fTxTddNe3L2OWUCBW12q5LQ=
-
-Name: javax/servlet/GenericServlet.class
-SHA1-Digest: e0c6/5OOiebOSXd/d8x1hPgqi9c=
-
diff --git a/dependencyManifests/javax.servlet_2.5.0.v201103041518.jar/META-INF/MANIFEST.MF b/dependencyManifests/javax.servlet_2.5.0.v201103041518.jar/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..2fc0d0c
--- /dev/null
+++ b/dependencyManifests/javax.servlet_2.5.0.v201103041518.jar/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,J2SE-1.4
+Bundle-SymbolicName: javax.servlet
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-Localization: plugin
+Bundle-Version: 2.5.0.v200806031605
+Bundle-Vendor: %bundleProvider
+Export-Package: javax.servlet;version="2.5",javax.servlet.http;version
+ ="2.5",javax.servlet.resources;version="2.5"
+
diff --git a/dependencyManifests/org.apache.commons.codec_1.3.0.v20080530-1600.jar/META-INF/MANIFEST.MF b/dependencyManifests/org.apache.commons.codec_1.3.0.v20080530-1600.jar/META-INF/MANIFEST.MF
deleted file mode 100644
index 739fa0f..0000000
--- a/dependencyManifests/org.apache.commons.codec_1.3.0.v20080530-1600.jar/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,119 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Vendor: %bundleProvider
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
-Bundle-Name: %bundleName
-Bundle-SymbolicName: org.apache.commons.codec
-Export-Package: org.apache.commons.codec;version="1.3.0",org.apache.co
- mmons.codec.binary;version="1.3.0",org.apache.commons.codec.digest;ve
- rsion="1.3.0",org.apache.commons.codec.language;version="1.3.0",org.a
- pache.commons.codec.net;version="1.3.0"
-Bundle-Version: 1.3.0.v20100518-1140
-Bundle-ManifestVersion: 2
-
-Name: org/apache/commons/codec/language/DoubleMetaphone.class
-SHA1-Digest: bjBTI/BDV1z8+z3hEVApJvwkVM8=
-
-Name: org/apache/commons/codec/digest/DigestUtils.class
-SHA1-Digest: wq18yMHHBd1moTQ8AtyCMsGj95k=
-
-Name: org/apache/commons/codec/net/BCodec.class
-SHA1-Digest: ZJMl6QGO7uOd9kINQd85uxh0eTM=
-
-Name: org/apache/commons/codec/StringDecoder.class
-SHA1-Digest: RVPBToocCwWd/DUTajCAJgVGE30=
-
-Name: org/apache/commons/codec/binary/BinaryCodec.class
-SHA1-Digest: X+G48+0rT74WoI2DlI/Xq7F7PVw=
-
-Name: org/apache/commons/codec/net/QuotedPrintableCodec.class
-SHA1-Digest: pmfEzso5XtCeWq0S7qtZ9FY7oXY=
-
-Name: org/apache/commons/codec/binary/package.html
-SHA1-Digest: 5QhuWhHiab81vS0aJeia/Z8M1Mc=
-
-Name: org/apache/commons/codec/language/Soundex.class
-SHA1-Digest: 2oHgbHLMUtt0mwiCIkBWVv4Ww+o=
-
-Name: org/apache/commons/codec/binary/Hex.class
-SHA1-Digest: 3HCzfhHisCVj80SpQp9ocGLzQo0=
-
-Name: plugin.properties
-SHA1-Digest: 5MZzEYQvuEeJGsdwKs9rkvRxvis=
-
-Name: org/apache/commons/codec/net/StringEncodings.class
-SHA1-Digest: qf4vuSsKwlYm8Pp74YiPdoYk3Yc=
-
-Name: org/apache/commons/codec/language/Metaphone.class
-SHA1-Digest: fqhTV44h+rFjtb4CZkhnGQTgIBc=
-
-Name: org/apache/commons/codec/EncoderException.class
-SHA1-Digest: 6noEPjvRMiZV64IvGDHX6rBE0wQ=
-
-Name: org/apache/commons/codec/language/package.html
-SHA1-Digest: NkP/cavbTwKhLLejSUFP7DxqVAU=
-
-Name: org/apache/commons/codec/StringEncoderComparator.class
-SHA1-Digest: IRFEQ/kBsYm/i70e2RJJ8QHpVgo=
-
-Name: org/apache/commons/codec/language/RefinedSoundex.class
-SHA1-Digest: 3zKeZeLMAzK9BXSEvumfEuwXsdI=
-
-Name: org/apache/commons/codec/net/QCodec.class
-SHA1-Digest: Qd4NFXllW2C1jmXCa0LRFG7iYis=
-
-Name: org/apache/commons/codec/BinaryDecoder.class
-SHA1-Digest: qzHigNqM9xLBAccuCZ5d7FSUgNI=
-
-Name: org/apache/commons/codec/Decoder.class
-SHA1-Digest: VZVllcafY4XPvWeVcKdNa3j9kB0=
-
-Name: org/apache/commons/codec/net/URLCodec.class
-SHA1-Digest: D5bYH0ZSxv78UFtvjj9Kf07WWDA=
-
-Name: about_files/LICENSE.txt
-SHA1-Digest: K4uBUimqimHkg/tLoFiLi2xJGJA=
-
-Name: org/apache/commons/codec/net/package.html
-SHA1-Digest: VPMJgkNKnhh/cdySG2xI+oBE8aY=
-
-Name: org/apache/commons/codec/StringEncoder.class
-SHA1-Digest: LH1NpQjcaYBGa1mUBbq8SNdPVGQ=
-
-Name: META-INF/eclipse.inf
-SHA1-Digest: KyT9FF7C7t86NoBoa2kZT3ZJBfw=
-
-Name: org/apache/commons/codec/digest/package.html
-SHA1-Digest: e9kZxTv+uxZfkn+xNcwp6XvJ+xA=
-
-Name: org/apache/commons/codec/package.html
-SHA1-Digest: IM3/K5MCXeG4gEjw3nDQyCI6Lic=
-
-Name: org/apache/commons/codec/overview.html
-SHA1-Digest: QIM760pmca/cNoXqOCkv3BESON4=
-
-Name: org/apache/commons/codec/DecoderException.class
-SHA1-Digest: XmTXvmZg0gnoiV5/nWkQrPG1Z6E=
-
-Name: about.html
-SHA1-Digest: +9ps3k00taYIS03ey1LoHmjQtUE=
-
-Name: org/apache/commons/codec/BinaryEncoder.class
-SHA1-Digest: GXKY4EGy4ZV/R0yj0BIuWDZUepo=
-
-Name: org/apache/commons/codec/Encoder.class
-SHA1-Digest: kAKKHUbN9ODIY2/yPFQL2X5sYZY=
-
-Name: org/apache/commons/codec/binary/Base64.class
-SHA1-Digest: UvrnxMTHeDSMHkjKqEWMD25OiDM=
-
-Name: org/apache/commons/codec/language/DoubleMetaphone$DoubleMetaphon
- eResult.class
-SHA1-Digest: 2+fCLSjosqyBEQq/lRPCGAbQvZc=
-
-Name: org/apache/commons/codec/net/RFC1522Codec.class
-SHA1-Digest: ENgYuGeeCM+X1163jrpijwtBb6w=
-
-Name: org/apache/commons/codec/language/SoundexUtils.class
-SHA1-Digest: 1Yk9BLhjHuXvhtjAY/gtm5zGKKI=
-
diff --git a/dependencyManifests/org.apache.commons.codec_1.3.0.v201101211617.jar/META-INF/MANIFEST.MF b/dependencyManifests/org.apache.commons.codec_1.3.0.v201101211617.jar/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..e9f2c7d
--- /dev/null
+++ b/dependencyManifests/org.apache.commons.codec_1.3.0.v201101211617.jar/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-Vendor: %bundleProvider
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.apache.commons.codec
+Bundle-Version: 1.3.0.v201101211617
+Export-Package: org.apache.commons.codec;version="1.3.0",org.apache.co
+ mmons.codec.binary;version="1.3.0",org.apache.commons.codec.digest;ve
+ rsion="1.3.0",org.apache.commons.codec.language;version="1.3.0",org.a
+ pache.commons.codec.net;version="1.3.0"
+Bundle-ManifestVersion: 2
+
diff --git a/dependencyManifests/org.apache.commons.logging_1.0.4.v201005080501.jar/META-INF/MANIFEST.MF b/dependencyManifests/org.apache.commons.logging_1.0.4.v201005080501.jar/META-INF/MANIFEST.MF
deleted file mode 100644
index 4f4290f..0000000
--- a/dependencyManifests/org.apache.commons.logging_1.0.4.v201005080501.jar/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,86 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Vendor: %bundleProvider
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
-Bundle-Name: %bundleName
-Bundle-SymbolicName: org.apache.commons.logging
-Export-Package: org.apache.commons.logging;version="1.0.4",org.apache.
- commons.logging.impl;version="1.0.4"
-Bundle-Version: 1.0.4.v201005080501
-Bundle-ManifestVersion: 2
-
-Name: org/apache/commons/logging/package.html
-SHA1-Digest: jsD27d4EQN9p+MEqH9rxe+TqY6k=
-
-Name: org/apache/commons/logging/LogFactory$1.class
-SHA1-Digest: whsbEKcn7vZ+LwmHJKw87HJFY0Y=
-
-Name: org/apache/commons/logging/impl/NoOpLog.class
-SHA1-Digest: 7muE+A0Hp5h9Ldjb3A17zUL+DcI=
-
-Name: org/apache/commons/logging/LogFactory$2.class
-SHA1-Digest: XhxoQexG77inagakRQpY47nf2Hw=
-
-Name: org/apache/commons/logging/LogFactory$3.class
-SHA1-Digest: cP92Yy4h/3//T+eQKhYs4o+/kxA=
-
-Name: org/apache/commons/logging/impl/LogKitLogger.class
-SHA1-Digest: JgEBM/Zjn++pJ3QCDczXs8t1uCM=
-
-Name: plugin.properties
-SHA1-Digest: MvpejpigNq4m1El2Z+t2IL06PUk=
-
-Name: org/apache/commons/logging/impl/LogFactoryImpl.class
-SHA1-Digest: L9ELLQHx5ta6lwQNphKvXoMlDHE=
-
-Name: org/apache/commons/logging/impl/package.html
-SHA1-Digest: ETgtEWz0bVC946lreSXMDxD/W/M=
-
-Name: org/apache/commons/logging/impl/Log4JCategoryLog.class
-SHA1-Digest: dyjRTsIYBaFNOMWnkoM9H1vtbXI=
-
-Name: about_files/LICENSE.txt
-SHA1-Digest: K4uBUimqimHkg/tLoFiLi2xJGJA=
-
-Name: org/apache/commons/logging/impl/SimpleLog.class
-SHA1-Digest: zJhWPvXEZO1vevxyXNhCOy6cz8A=
-
-Name: org/apache/commons/logging/impl/AvalonLogger.class
-SHA1-Digest: nKHbAlItxYHJfrTWYkuuygYlrBs=
-
-Name: org/apache/commons/logging/LogSource.class
-SHA1-Digest: Z9b0alPnXvv2DwtG48Rf5+WEwA8=
-
-Name: org/apache/commons/logging/impl/Log4jFactory.class
-SHA1-Digest: yy8M0J5SMcx9NBTEzXk+aftfq3M=
-
-Name: org/apache/commons/logging/impl/LogFactoryImpl$1.class
-SHA1-Digest: FFwXrpZdN6g84E23AGrHbw7ZG7g=
-
-Name: org/apache/commons/logging/Log.class
-SHA1-Digest: nrLaPNgvcs4drS/+jOOCSUhxDYw=
-
-Name: META-INF/eclipse.inf
-SHA1-Digest: KyT9FF7C7t86NoBoa2kZT3ZJBfw=
-
-Name: about_files/NOTICE.txt
-SHA1-Digest: BZ6V8A2KQoLkbfaPI0+XTqMx4MM=
-
-Name: org/apache/commons/logging/impl/SimpleLog$1.class
-SHA1-Digest: ObQShIwqwR5yN6YOSoB1mHZ/yQE=
-
-Name: org/apache/commons/logging/impl/Jdk14Logger.class
-SHA1-Digest: YJYHNRBcu9a9Yn34fN7zno3JKfc=
-
-Name: about.html
-SHA1-Digest: t52DM/J1zwDrpXQH8P8uu5iW66c=
-
-Name: org/apache/commons/logging/impl/Log4JLogger.class
-SHA1-Digest: byCy5cx2pB4Q5vIPEs3vyhx/W/w=
-
-Name: org/apache/commons/logging/LogConfigurationException.class
-SHA1-Digest: zFgkyDpbQCooU2Hk4XaYIe9gdSo=
-
-Name: org/apache/commons/logging/LogFactory.class
-SHA1-Digest: 9VDDUlKvp2ogMQxPqj/IuTZxuyA=
-
diff --git a/dependencyManifests/org.apache.commons.logging_1.0.4.v201101211617.jar/META-INF/MANIFEST.MF b/dependencyManifests/org.apache.commons.logging_1.0.4.v201101211617.jar/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..7ec0e4b
--- /dev/null
+++ b/dependencyManifests/org.apache.commons.logging_1.0.4.v201101211617.jar/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-Vendor: %bundleProvider
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.apache.commons.logging
+Bundle-Version: 1.0.4.v201101211617
+Export-Package: org.apache.commons.logging;version="1.0.4",org.apache.
+ commons.logging.impl;version="1.0.4"
+Bundle-ManifestVersion: 2
+
diff --git a/dependencyManifests/org.apache.lucene.analysis_1.9.1.v20100518-1140.jar/META-INF/MANIFEST.MF b/dependencyManifests/org.apache.lucene.analysis_1.9.1.v20100518-1140.jar/META-INF/MANIFEST.MF
deleted file mode 100644
index 5257126..0000000
--- a/dependencyManifests/org.apache.lucene.analysis_1.9.1.v20100518-1140.jar/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,111 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.apache.lucene.analysis
-Require-Bundle: org.apache.lucene;bundle-version="[1.9.1,2.0.0)";visib
- ility:=reexport
-Export-Package: org.apache.lucene.analysis.br,org.apache.lucene.analys
- is.cjk,org.apache.lucene.analysis.cn,org.apache.lucene.analysis.cz,or
- g.apache.lucene.analysis.de,org.apache.lucene.analysis.el,org.apache.
- lucene.analysis.fr,org.apache.lucene.analysis.nl,org.apache.lucene.an
- alysis.ru
-Bundle-Version: 1.9.1.v20100518-1140
-Bundle-ManifestVersion: 2
-
-Name: org/apache/lucene/analysis/de/GermanStemmer.class
-SHA1-Digest: ptBFhWqh4Jodi0WL7cvcHf+gqg0=
-
-Name: org/apache/lucene/analysis/fr/FrenchStemFilter.class
-SHA1-Digest: oJgrpubIKl6KO78NKNmR2Uxn/Tw=
-
-Name: org/apache/lucene/analysis/cjk/CJKAnalyzer.class
-SHA1-Digest: cZLarbfuVj5fFLiVIFJ5/zEnrHc=
-
-Name: plugin.properties
-SHA1-Digest: CAra4G4ycNGtrROzydO/KFuDwEo=
-
-Name: org/apache/lucene/analysis/ru/RussianStemFilter.class
-SHA1-Digest: XH17jc0ZSkA7sGsQ4fkCEfjWcEY=
-
-Name: org/apache/lucene/analysis/fr/FrenchAnalyzer.class
-SHA1-Digest: lh3UVyTKYGQXRQYg2et8QYJCwl8=
-
-Name: org/apache/lucene/analysis/ru/RussianAnalyzer.class
-SHA1-Digest: ENqDGbUqFOGnyiWtRbo/qZdx3I8=
-
-Name: org/apache/lucene/analysis/ru/RussianCharsets.class
-SHA1-Digest: d6+ABztO/n24mFIvpQj5rhFCNXE=
-
-Name: org/apache/lucene/analysis/br/BrazilianStemmer.class
-SHA1-Digest: dnN9Z2ziWywplrbDAiWLnTM7bFA=
-
-Name: org/apache/lucene/analysis/cn/ChineseAnalyzer.class
-SHA1-Digest: HXr1adnRJCVPIUBqY4/8qyMZ3BE=
-
-Name: org/apache/lucene/analysis/ru/RussianLetterTokenizer.class
-SHA1-Digest: /jA513fmbCxx0ZJ+bgOrTuJ1pQc=
-
-Name: about_files/asl-v20.txt
-SHA1-Digest: K4uBUimqimHkg/tLoFiLi2xJGJA=
-
-Name: org/apache/lucene/analysis/nl/WordlistLoader.class
-SHA1-Digest: JJlnPmIXmcCGlubr3x30DRAVVUM=
-
-Name: org/apache/lucene/analysis/cn/ChineseTokenizer.class
-SHA1-Digest: 3BZaKVGa4mY4fVTzkEdcRFxFkZE=
-
-Name: org/apache/lucene/analysis/nl/DutchStemFilter.class
-SHA1-Digest: 2R8MjLYtGSRIZvArk+DRnZyiKog=
-
-Name: org/apache/lucene/analysis/de/GermanStemFilter.class
-SHA1-Digest: 31FkswsN6rEUF8UdnfTJ1f2yLKI=
-
-Name: org/apache/lucene/analysis/nl/DutchAnalyzer.class
-SHA1-Digest: QoYJvdmTFCaVhK1TOpOtlzEyQB4=
-
-Name: META-INF/eclipse.inf
-SHA1-Digest: KyT9FF7C7t86NoBoa2kZT3ZJBfw=
-
-Name: org/apache/lucene/analysis/cjk/CJKTokenizer.class
-SHA1-Digest: 3hykOUinkCYzhl6qAvrriUdHp6k=
-
-Name: org/apache/lucene/analysis/el/GreekAnalyzer.class
-SHA1-Digest: J/5GtD7Iw9xW1ehdZath/nPdq+M=
-
-Name: org/apache/lucene/analysis/el/GreekCharsets.class
-SHA1-Digest: 27NfiUKlK8EG53cXiX8dXDoayvI=
-
-Name: org/apache/lucene/analysis/cz/CzechAnalyzer.class
-SHA1-Digest: xQEEXYR6PzPb4/EU0uNj/7tcgvA=
-
-Name: org/apache/lucene/analysis/cn/ChineseFilter.class
-SHA1-Digest: EN1IENyubAQsCv/lqFWSRxJEm2k=
-
-Name: org/apache/lucene/analysis/de/GermanAnalyzer.class
-SHA1-Digest: PgbAbqwnxNURMLJFk9eFiqXzYXM=
-
-Name: org/apache/lucene/analysis/nl/DutchStemmer.class
-SHA1-Digest: kzgHYabhNmHxYCcBtVXP24Che3Y=
-
-Name: about.html
-SHA1-Digest: Fq88jcaAsG48Z06Ru60Co9116aM=
-
-Name: org/apache/lucene/analysis/ru/RussianLowerCaseFilter.class
-SHA1-Digest: D1g5fHlksdj+sl+TeVsYOJ2fvwg=
-
-Name: org/apache/lucene/analysis/br/BrazilianStemFilter.class
-SHA1-Digest: ZbW+hV1dQ6owqowfCKOMJfU9oSM=
-
-Name: org/apache/lucene/analysis/br/BrazilianAnalyzer.class
-SHA1-Digest: 8Uwcd7gNQuNT8l3aIWPCRxhzbjQ=
-
-Name: org/apache/lucene/analysis/ru/RussianStemmer.class
-SHA1-Digest: RTaA5IcFEgMR/QJ3OGkWW58SjNE=
-
-Name: org/apache/lucene/analysis/fr/FrenchStemmer.class
-SHA1-Digest: zn2DJflYMf2jhP3i7+F2uN26i8A=
-
-Name: org/apache/lucene/analysis/el/GreekLowerCaseFilter.class
-SHA1-Digest: wQMLA/syAU5Q4LVMPkJFLvmCQvY=
-
diff --git a/dependencyManifests/org.apache.lucene.analysis_2.9.1.v201101211721.jar/META-INF/MANIFEST.MF b/dependencyManifests/org.apache.lucene.analysis_2.9.1.v201101211721.jar/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..af15e25
--- /dev/null
+++ b/dependencyManifests/org.apache.lucene.analysis_2.9.1.v201101211721.jar/META-INF/MANIFEST.MF
@@ -0,0 +1,462 @@
+Manifest-Version: 1.0
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.apache.lucene.analysis
+Require-Bundle: org.apache.lucene.core;bundle-version="[2.9.1,3.0.0)"
+Bundle-Version: 2.9.1.v201101211721
+Export-Package: org.apache.lucene.analysis.ar;version="2.9.1",org.apac
+ he.lucene.analysis.br;version="2.9.1",org.apache.lucene.analysis.cjk;
+ version="2.9.1",org.apache.lucene.analysis.cn;version="2.9.1",org.apa
+ che.lucene.analysis.compound;version="2.9.1",org.apache.lucene.analys
+ is.compound.hyphenation;version="2.9.1",org.apache.lucene.analysis.cz
+ ;version="2.9.1",org.apache.lucene.analysis.de;version="2.9.1",org.ap
+ ache.lucene.analysis.el;version="2.9.1",org.apache.lucene.analysis.fa
+ ;version="2.9.1",org.apache.lucene.analysis.fr;version="2.9.1",org.ap
+ ache.lucene.analysis.miscellaneous;version="2.9.1",org.apache.lucene.
+ analysis.ngram;version="2.9.1",org.apache.lucene.analysis.nl;version=
+ "2.9.1",org.apache.lucene.analysis.payloads;version="2.9.1",org.apach
+ e.lucene.analysis.position;version="2.9.1",org.apache.lucene.analysis
+ .query;version="2.9.1",org.apache.lucene.analysis.reverse;version="2.
+ 9.1",org.apache.lucene.analysis.ru;version="2.9.1",org.apache.lucene.
+ analysis.shingle;version="2.9.1",org.apache.lucene.analysis.sinks;ver
+ sion="2.9.1",org.apache.lucene.analysis.th;version="2.9.1"
+Bundle-ManifestVersion: 2
+
+Name: org/apache/lucene/analysis/sinks/TokenRangeSinkFilter.class
+SHA1-Digest: IYSkXIoY7RqtDtYwhYejJMA0ldw=
+
+Name: org/apache/lucene/analysis/br/BrazilianAnalyzer$1.class
+SHA1-Digest: ZCE9jyHJdetmn6rWv5DQkGeSn/M=
+
+Name: org/apache/lucene/analysis/shingle/ShingleMatrixFilter$TwoDimens
+ ionalNonWeightedSynonymTokenSettingsCodec.class
+SHA1-Digest: QkciOjnjWf1mbzPQQZ4bVYcgUig=
+
+Name: org/apache/lucene/analysis/reverse/ReverseStringFilter.class
+SHA1-Digest: DH5TCSkJ+WBQ3WrpSVeB6Rc2Ie4=
+
+Name: org/apache/lucene/analysis/cjk/CJKAnalyzer.class
+SHA1-Digest: hPJVLUqol3n2ZK+kDH7qK/CBtO8=
+
+Name: org/apache/lucene/analysis/shingle/ShingleMatrixFilter$Matrix$Co
+ lumn$Row.class
+SHA1-Digest: ZMxlC8iHE2lEEBkxRbL7OBIzO9M=
+
+Name: org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.
+ class
+SHA1-Digest: v3DL9TODz/8SUdM3hV11KXlXJfI=
+
+Name: org/apache/lucene/analysis/ru/RussianCharsets.class
+SHA1-Digest: JrjbD9uKcNmfKU2ePN0nqlcHMcg=
+
+Name: org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.
+ class
+SHA1-Digest: fZ1UlL3uU0MhSbTPLuVldYnXoLU=
+
+Name: org/apache/lucene/analysis/compound/hyphenation/HyphenationDTDGe
+ nerator.class
+SHA1-Digest: xpI6VdJ5cQm8xr12iTirGnhvKMs=
+
+Name: org/apache/lucene/analysis/cjk/CJKAnalyzer$1.class
+SHA1-Digest: ELe7faKQtE+1A0J3TlYImzEo1HU=
+
+Name: org/apache/lucene/analysis/payloads/IdentityEncoder.class
+SHA1-Digest: 7XfC/VT65eHFTOFNACgsOsEREBg=
+
+Name: org/apache/lucene/analysis/nl/DutchStemFilter.class
+SHA1-Digest: Mah+5WkEZRPB0xjv1tpCpeDt6Sw=
+
+Name: org/apache/lucene/analysis/sinks/TokenRangeSinkTokenizer.class
+SHA1-Digest: dWCqf6pNvv/IUDLeFAJbvJdxAAQ=
+
+Name: org/apache/lucene/analysis/el/GreekAnalyzer$SavedStreams.class
+SHA1-Digest: Jk41r3LRD6naJ8Zd6Whfo1WzgTI=
+
+Name: org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper$1.clas
+ s
+SHA1-Digest: x8SfHrhLleJ0+sxeDfbqKiC7uyM=
+
+Name: org/apache/lucene/analysis/nl/DutchAnalyzer.class
+SHA1-Digest: T2t8EmS9ieIVMDtpxiGOVJiyvmI=
+
+Name: org/apache/lucene/analysis/compound/hyphenation/PatternParser.cl
+ ass
+SHA1-Digest: c3/hKEGIcCqEBXfOwDsQlYQW9ec=
+
+Name: org/apache/lucene/analysis/el/GreekCharsets.class
+SHA1-Digest: olzjpRQ0+vUrdfdBO5R7JI/cTJc=
+
+Name: org/apache/lucene/analysis/cz/CzechAnalyzer.class
+SHA1-Digest: WFVEsFkdHyK3xjGimTW9Mge9xzQ=
+
+Name: org/apache/lucene/analysis/compound/hyphenation/ByteVector.class
+SHA1-Digest: Txh72kt0IICr/kNva2xu6sokP00=
+
+Name: org/apache/lucene/analysis/el/GreekAnalyzer$1.class
+SHA1-Digest: YXmR2Zf8ISy3uyFf58uLH58pPWc=
+
+Name: org/apache/lucene/analysis/ngram/EdgeNGramTokenFilter$Side.class
+SHA1-Digest: nAXETQAuK7/dOEpOgtT92UmHLZs=
+
+Name: org/apache/lucene/analysis/payloads/AbstractEncoder.class
+SHA1-Digest: 83eOWbG2sVroAYSNGqAlajVUMUE=
+
+Name: org/apache/lucene/analysis/payloads/IntegerEncoder.class
+SHA1-Digest: 2iOuv/C6TNL5r4QKO/4NrSULmTw=
+
+Name: org/apache/lucene/analysis/ar/ArabicNormalizer.class
+SHA1-Digest: T0FKq6wo1I4HlVxuw9fwGU3EJWw=
+
+Name: org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer$1.cla
+ ss
+SHA1-Digest: c0uwz7WlAD57r/SwMwuBWTXBKYs=
+
+Name: org/apache/lucene/analysis/nl/DutchAnalyzer$SavedStreams.class
+SHA1-Digest: 91dTXXetrCmexcI/3/OS8JgvRw0=
+
+Name: org/apache/lucene/analysis/de/GermanStemmer.class
+SHA1-Digest: OgRnkpGtKBm7W40F9PODI86hkog=
+
+Name: org/apache/lucene/analysis/miscellaneous/PrefixAndSuffixAwareTok
+ enFilter$1.class
+SHA1-Digest: /6CGnicPo85s7bhQMvy7vaKH0zY=
+
+Name: org/apache/lucene/analysis/shingle/ShingleMatrixFilter.class
+SHA1-Digest: jOHs3Rm2Muk4c2Qyt/JVl6Z3H18=
+
+Name: org/apache/lucene/analysis/miscellaneous/PrefixAwareTokenFilter.
+ class
+SHA1-Digest: tUfKpgCxzenLGA7aGKjHt8sMI8I=
+
+Name: org/apache/lucene/analysis/miscellaneous/SingleTokenTokenStream.
+ class
+SHA1-Digest: /s7ZQ1NYGxQaNVwRN2yNT7Di/jI=
+
+Name: org/apache/lucene/analysis/fr/FrenchAnalyzer.class
+SHA1-Digest: DIk4cprwmHwjsXMWRCiafMd1frA=
+
+Name: org/apache/lucene/analysis/compound/hyphenation/TernaryTree$Iter
+ ator$Item.class
+SHA1-Digest: KYXK6tUGspYQh2GaZqtV9jgBn9M=
+
+Name: org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.class
+SHA1-Digest: GGPPur1aepME7VKr/HJXnJGVjuc=
+
+Name: org/apache/lucene/analysis/fa/PersianNormalizationFilter.class
+SHA1-Digest: Hgk9JkUk+kwmqbo3hzDRTBFW7xg=
+
+Name: org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilter.
+ class
+SHA1-Digest: NQ61hQTVn2j2A2RNhRzIe/YVwIk=
+
+Name: org/apache/lucene/analysis/payloads/FloatEncoder.class
+SHA1-Digest: sBDFxwzxbNJvagtYuDNWPAO+1Ec=
+
+Name: org/apache/lucene/analysis/compound/hyphenation/Hyphenation.clas
+ s
+SHA1-Digest: WN6itUN7eYkyBuj41Q10Or9NZFw=
+
+Name: org/apache/lucene/analysis/fr/FrenchAnalyzer$1.class
+SHA1-Digest: ACKWhhpKSBsgNEFrDlOfgwdSn7Q=
+
+Name: org/apache/lucene/analysis/ru/RussianAnalyzer$1.class
+SHA1-Digest: Fr5RQD5JaBS9xNjRzHH/RhmbWM4=
+
+Name: org/apache/lucene/analysis/de/GermanStemFilter.class
+SHA1-Digest: 1nxH9T4IjNfAs2s7uQuFqJ5UDAs=
+
+Name: org/apache/lucene/analysis/cn/ChineseFilter.class
+SHA1-Digest: DNJgaPL3HL749Mn+z6w8hCo7skA=
+
+Name: org/apache/lucene/analysis/nl/DutchStemmer.class
+SHA1-Digest: 5s5JnVm8Pg4AukJufk7VS9YhdaU=
+
+Name: org/apache/lucene/analysis/compound/HyphenationCompoundWordToken
+ Filter.class
+SHA1-Digest: T7Bb2WPP5jCKGG7D6K3CG2klhyI=
+
+Name: org/apache/lucene/analysis/ar/ArabicAnalyzer$1.class
+SHA1-Digest: VK94y6lLWuu1yeT/TfIqIe9AkFE=
+
+Name: about.html
+SHA1-Digest: OmsDvddzBqB/aRJ4557xqfUKSt4=
+
+Name: org/apache/lucene/analysis/br/BrazilianAnalyzer$SavedStreams.cla
+ ss
+SHA1-Digest: X1BAYKEaeHl6TBuIuTpgXzLDZFU=
+
+Name: org/apache/lucene/analysis/br/BrazilianStemFilter.class
+SHA1-Digest: K6qZY3Yh3wFWXxxUfeYIaWYgGmg=
+
+Name: org/apache/lucene/analysis/miscellaneous/PrefixAndSuffixAwareTok
+ enFilter.class
+SHA1-Digest: 4jD7Sbl0lTU5aNPo11FjeMcwwGo=
+
+Name: org/apache/lucene/analysis/compound/hyphenation/CharVector.class
+SHA1-Digest: VMkZ6DjGE7Ewknhed1fzjcZzNc0=
+
+Name: org/apache/lucene/analysis/br/BrazilianAnalyzer.class
+SHA1-Digest: G6bRxqwiWGGXkN/4IY08Oe6VdXY=
+
+Name: org/apache/lucene/analysis/th/ThaiAnalyzer$1.class
+SHA1-Digest: 0inCcNf8E3Wie7Vc9OBa5ARDc2U=
+
+Name: org/apache/lucene/analysis/payloads/PayloadHelper.class
+SHA1-Digest: b+3cHsQZ+THsMMI/kpO6xzPf6PE=
+
+Name: org/apache/lucene/analysis/th/ThaiAnalyzer$SavedStreams.class
+SHA1-Digest: oRZYLkylr1jiPV5C5U2sjQb8Q4I=
+
+Name: org/apache/lucene/analysis/fr/FrenchStemmer.class
+SHA1-Digest: RK8/beJfAA+ANX2lcoAgmQAuJKI=
+
+Name: org/apache/lucene/analysis/ngram/NGramTokenFilter.class
+SHA1-Digest: XWIarBCEvBL8BCiEfzHvIhiLimo=
+
+Name: org/apache/lucene/analysis/ngram/NGramTokenizer.class
+SHA1-Digest: 8NQ0zBnoCCRjhxIGK7XkHoDpzkU=
+
+Name: org/apache/lucene/analysis/miscellaneous/PrefixAndSuffixAwareTok
+ enFilter$2.class
+SHA1-Digest: /pkFY6I5h/R7jsCP29LmGiKEzYY=
+
+Name: org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilter.cla
+ ss
+SHA1-Digest: 6nOZbl9Aq5Ze0mrzydLzYwuNoSs=
+
+Name: org/apache/lucene/analysis/compound/hyphenation/HyphenationExcep
+ tion.class
+SHA1-Digest: JhBqCL/EKWMTdS5eWat8CZquk4M=
+
+Name: org/apache/lucene/analysis/ar/ArabicStemmer.class
+SHA1-Digest: YMf7Vxs74NtXenMlNS/aNUOftqQ=
+
+Name: org/apache/lucene/analysis/shingle/ShingleMatrixFilter$TokenSett
+ ingsCodec.class
+SHA1-Digest: HYWP1Cq6lfUwcpn+wgMtsqtzHok=
+
+Name: org/apache/lucene/analysis/ru/RussianAnalyzer$SavedStreams.class
+SHA1-Digest: 7gqUIYq4xaJX95Si6yj58LA6GVw=
+
+Name: org/apache/lucene/analysis/ar/ArabicNormalizationFilter.class
+SHA1-Digest: tGtq4dfrbSJuSp4WgfJnsE+fBlg=
+
+Name: org/apache/lucene/analysis/shingle/ShingleMatrixFilter$SimpleThr
+ eeDimensionalTokenSettingsCodec.class
+SHA1-Digest: belbSLkLQEKtppgr8vQ1xhQz/v4=
+
+Name: org/apache/lucene/analysis/shingle/ShingleMatrixFilter$OneDimens
+ ionalNonWeightedTokenSettingsCodec.class
+SHA1-Digest: UmlGMpsArjtjX1Bf9BpFHFjApAE=
+
+Name: org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer$Saved
+ Streams.class
+SHA1-Digest: /R7KqmDgF03fTBOSaUBFCAm+zP4=
+
+Name: org/apache/lucene/analysis/br/BrazilianStemmer.class
+SHA1-Digest: B1R7/h4XiszneHz04ZtNo4QzKEI=
+
+Name: org/apache/lucene/analysis/cjk/CJKAnalyzer$SavedStreams.class
+SHA1-Digest: QSC2Bzg7JeivSvyzi6K825YiIkU=
+
+Name: org/apache/lucene/analysis/fa/PersianAnalyzer.class
+SHA1-Digest: qz0ZNSd3Cv3NFRyjrhMlFVmnwEE=
+
+Name: about_files/asl-v20.txt
+SHA1-Digest: K4uBUimqimHkg/tLoFiLi2xJGJA=
+
+Name: org/apache/lucene/analysis/ngram/EdgeNGramTokenFilter.class
+SHA1-Digest: Jq1mMhgXOxepjcc8Y7LlUwmqswM=
+
+Name: org/apache/lucene/analysis/ar/ArabicAnalyzer.class
+SHA1-Digest: VDR2nmQRgzI9FPfcDQ4BCcxWiew=
+
+Name: org/apache/lucene/analysis/shingle/ShingleFilter.class
+SHA1-Digest: 2QAVAuw3+6HmYOPcbfGBFmtw0mg=
+
+Name: META-INF/eclipse.inf
+SHA1-Digest: KyT9FF7C7t86NoBoa2kZT3ZJBfw=
+
+Name: org/apache/lucene/analysis/cjk/CJKTokenizer.class
+SHA1-Digest: 1Y4wJ7K/1TyMUL+k3cP/8V8ObWk=
+
+Name: org/apache/lucene/analysis/sinks/TokenTypeSinkTokenizer.class
+SHA1-Digest: QrRT5SSc3DN5cX6uBx7GSJz5X5w=
+
+Name: org/apache/lucene/analysis/ar/ArabicAnalyzer$SavedStreams.class
+SHA1-Digest: OLAiMM6daX7EwRDCJZ0c0zJuojE=
+
+Name: org/apache/lucene/analysis/th/ThaiWordFilter.class
+SHA1-Digest: JGxzIFLeT0WSsogoWOvErtpnlFY=
+
+Name: org/apache/lucene/analysis/ar/stopwords.txt
+SHA1-Digest: 3aAgsrbzdtxNWmYmnrNiE/+KllA=
+
+Name: org/apache/lucene/analysis/de/GermanAnalyzer.class
+SHA1-Digest: 8pK6yBj2b6NGQWJnAi3ZOtT2Qk4=
+
+Name: org/apache/lucene/analysis/ar/ArabicLetterTokenizer.class
+SHA1-Digest: EaeKbQgc0VKa8uZo92uJfm1EP6Q=
+
+Name: org/apache/lucene/analysis/shingle/ShingleMatrixFilter$TokenPosi
+ tioner.class
+SHA1-Digest: hXIXojkuz5AbYnKjBuFcAC6mhLE=
+
+Name: org/apache/lucene/analysis/compound/hyphenation/Hyphen.class
+SHA1-Digest: WRVgdB51p6aNpZMkuH3MfnW2iAs=
+
+Name: org/apache/lucene/analysis/ngram/EdgeNGramTokenizer$Side.class
+SHA1-Digest: arLwy7hiIF77nKQtdZ+6RdE6e1M=
+
+Name: org/apache/lucene/analysis/nl/DutchAnalyzer$1.class
+SHA1-Digest: o/32PCe9xnvmCE/VgaRgKI0/kUM=
+
+Name: org/apache/lucene/analysis/sinks/DateRecognizerSinkTokenizer.cla
+ ss
+SHA1-Digest: wXTxUAAnxuspQ5aFQN9qzFCrjdI=
+
+Name: org/apache/lucene/analysis/fa/stopwords.txt
+SHA1-Digest: Of9BFZTvbIdzO+d4+9CyAsvh2xE=
+
+Name: org/apache/lucene/analysis/sinks/DateRecognizerSinkFilter.class
+SHA1-Digest: Vtp+IutLdFwkxuE44LfEQrYreYs=
+
+Name: org/apache/lucene/analysis/fr/ElisionFilter.class
+SHA1-Digest: 5DZ5sPt3HXF3wdhy/+krcoTrLTw=
+
+Name: org/apache/lucene/analysis/cz/CzechAnalyzer$1.class
+SHA1-Digest: 6X8bXvCWO5naDJsNkU01QLCrDTw=
+
+Name: org/apache/lucene/analysis/fa/PersianNormalizer.class
+SHA1-Digest: 8JvERHY98oR4MzmDlSuYg0dvuHk=
+
+Name: org/apache/lucene/analysis/ru/RussianStemmer.class
+SHA1-Digest: qyMwGzaWIqaLh89c1awUCuaRgY4=
+
+Name: org/apache/lucene/analysis/compound/hyphenation/PatternConsumer.
+ class
+SHA1-Digest: UqzmH17oepqIPI3aUyskZEXIqj8=
+
+Name: org/apache/lucene/analysis/cz/CzechAnalyzer$SavedStreams.class
+SHA1-Digest: nCGiEWUYUwcAx9v3tsK4AvUW9KY=
+
+Name: org/apache/lucene/analysis/el/GreekLowerCaseFilter.class
+SHA1-Digest: /6Ze8iiaTA+yYM5SYuyI6LfulFo=
+
+Name: org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilte
+ r.class
+SHA1-Digest: rSDJh1JmZGVlVWOFGFTl3BCFFQ4=
+
+Name: org/apache/lucene/analysis/fr/FrenchStemFilter.class
+SHA1-Digest: GVKuAMqe4ROFrS/+AaDonRpQWwE=
+
+Name: plugin.properties
+SHA1-Digest: he49LYXfrPXWS2rjzfaroeTNG0U=
+
+Name: org/apache/lucene/analysis/ru/RussianStemFilter.class
+SHA1-Digest: WPTS7x+rJgzxz0KwWUBowkmVrNE=
+
+Name: org/apache/lucene/analysis/cn/ChineseAnalyzer$SavedStreams.class
+SHA1-Digest: hSpi4JsdNBq9aFXJJwxh+udJjSg=
+
+Name: org/apache/lucene/analysis/ru/RussianAnalyzer.class
+SHA1-Digest: 9btkA8tyXV89eCTybHLeno/Y50k=
+
+Name: org/apache/lucene/analysis/fr/FrenchAnalyzer$SavedStreams.class
+SHA1-Digest: BW0tQxwxXjkg+TreSnM1fHlqx90=
+
+Name: org/apache/lucene/analysis/miscellaneous/EmptyTokenStream.class
+SHA1-Digest: 9a2RP9+NfvVyhkkLut0jC3SPWRI=
+
+Name: org/apache/lucene/analysis/shingle/ShingleMatrixFilter$Matrix.cl
+ ass
+SHA1-Digest: Q8woa+V1+PcNQBFk7boJcV8GNb0=
+
+Name: org/apache/lucene/analysis/cn/ChineseAnalyzer.class
+SHA1-Digest: 2mdwKzHBw2FQorCvhwQgjU+FY4U=
+
+Name: org/apache/lucene/analysis/ru/RussianLetterTokenizer.class
+SHA1-Digest: q5XQYHr4RwTNGcHLh1EJHM7FZEQ=
+
+Name: org/apache/lucene/analysis/ar/ArabicStemFilter.class
+SHA1-Digest: QQqF4dGIVHfcLt2+orrRWIy4Oso=
+
+Name: org/apache/lucene/analysis/nl/WordlistLoader.class
+SHA1-Digest: SpmNPaUd8O8IvXjsmZ1rOmh3jc0=
+
+Name: org/apache/lucene/analysis/de/GermanAnalyzer$SavedStreams.class
+SHA1-Digest: XIboLCF3DWL/sf6X3Dbj+jnx7Uw=
+
+Name: org/apache/lucene/analysis/cn/ChineseTokenizer.class
+SHA1-Digest: PB8JaO61Zt/ObmuYEWjtMXdib8Q=
+
+Name: org/apache/lucene/analysis/miscellaneous/SingleTokenTokenStream$
+ 1.class
+SHA1-Digest: NuPvnpsgrSQry7GzVn6k6wC0S9U=
+
+Name: org/apache/lucene/analysis/sinks/TokenTypeSinkFilter.class
+SHA1-Digest: D6tHjWhRHVuixfAZ+6Qi/g0zoPE=
+
+Name: org/apache/lucene/analysis/ngram/EdgeNGramTokenizer.class
+SHA1-Digest: aIRq20difhY7zIUR1WJt/W5jCsw=
+
+Name: org/apache/lucene/analysis/shingle/ShingleMatrixFilter$Matrix$1.
+ class
+SHA1-Digest: Ma9F48hryo4BFY60ywxoXPboPGk=
+
+Name: org/apache/lucene/analysis/cn/ChineseAnalyzer$1.class
+SHA1-Digest: PQFNt/Qr/ykIUMUEmmZNxOhgoBs=
+
+Name: org/apache/lucene/analysis/el/GreekAnalyzer.class
+SHA1-Digest: O0rg1AGFUN4X+bQRUaCEsppTBEs=
+
+Name: org/apache/lucene/analysis/fa/PersianAnalyzer$1.class
+SHA1-Digest: znNuCwhYzjWKMQRlq6VDMs529O4=
+
+Name: org/apache/lucene/analysis/payloads/PayloadEncoder.class
+SHA1-Digest: HKgu6Xrq+my3W0gGfH5Eph9t0X8=
+
+Name: org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenF
+ ilter.class
+SHA1-Digest: ofS8Rzy/ltf2vidGPB1yiMTMfaY=
+
+Name: org/apache/lucene/analysis/th/ThaiAnalyzer.class
+SHA1-Digest: 0sv8+9b2xC1D813Uj4I0dZUSyRE=
+
+Name: org/apache/lucene/analysis/fa/PersianAnalyzer$SavedStreams.class
+SHA1-Digest: TZrtG+Ri1Ua19bCaxkW0l5ultSw=
+
+Name: org/apache/lucene/analysis/payloads/NumericPayloadTokenFilter.cl
+ ass
+SHA1-Digest: DHAq3eGgOQZJwsGUWOfO88vhBTY=
+
+Name: org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper$SavedS
+ treams.class
+SHA1-Digest: WF9L6IiYgCnMZw9WvAe6JRYJVHY=
+
+Name: org/apache/lucene/analysis/compound/hyphenation/TernaryTree.clas
+ s
+SHA1-Digest: IlSP+bUtWddkj25ETWx7oCLOvnE=
+
+Name: org/apache/lucene/analysis/ru/RussianLowerCaseFilter.class
+SHA1-Digest: XBQd1wMqVbT+R3pdVvje51sQs0Y=
+
+Name: org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.class
+SHA1-Digest: acqakXcSghDl38hUI+K3DB+yfVE=
+
+Name: org/apache/lucene/analysis/de/GermanAnalyzer$1.class
+SHA1-Digest: DTtscFZ7bhW7/xWbmYPfe9l/Uao=
+
+Name: org/apache/lucene/analysis/position/PositionFilter.class
+SHA1-Digest: gXKOe+vAuNOw/5fEMzSLedsTzY0=
+
+Name: org/apache/lucene/analysis/compound/hyphenation/TernaryTree$Iter
+ ator.class
+SHA1-Digest: h3ns4YBmn5AT8rbL8/VSLO7XCr0=
+
+Name: org/apache/lucene/analysis/shingle/ShingleMatrixFilter$Matrix$Co
+ lumn.class
+SHA1-Digest: bcp6sdeQc8hLrYRaNtSHpH8gukI=
+
diff --git a/dependencyManifests/org.apache.lucene.core_2.9.1.v201101211721.jar/META-INF/MANIFEST.MF b/dependencyManifests/org.apache.lucene.core_2.9.1.v201101211721.jar/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..48305f0
--- /dev/null
+++ b/dependencyManifests/org.apache.lucene.core_2.9.1.v201101211721.jar/META-INF/MANIFEST.MF
@@ -0,0 +1,2348 @@
+Manifest-Version: 1.0
+Bundle-Vendor: %provider.name
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Bundle-Name: %bundle.name
+Bundle-SymbolicName: org.apache.lucene.core
+Bundle-Version: 2.9.1.v201101211721
+Export-Package: org.apache.lucene;core=split;version="2.9.1";mandatory
+ :=core,org.apache.lucene.analysis;core=split;version="2.9.1";mandator
+ y:=core,org.apache.lucene.analysis.standard;core=split;version="2.9.1
+ ";mandatory:=core,org.apache.lucene.analysis.tokenattributes;version=
+ "2.9.1";mandatory:=core,org.apache.lucene.document;core=split;version
+ ="2.9.1";mandatory:=core,org.apache.lucene.index;core=split;version="
+ 2.9.1";mandatory:=core,org.apache.lucene.messages;version="2.9.1";man
+ datory:=core,org.apache.lucene.queryParser;core=split;version="2.9.1"
+ ;mandatory:=core,org.apache.lucene.search;core=split;version="2.9.1";
+ mandatory:=core,org.apache.lucene.search.function;core=split;version=
+ "2.9.1";mandatory:=core,org.apache.lucene.search.payloads;core=split;
+ version="2.9.1";mandatory:=core,org.apache.lucene.search.spans;core=s
+ plit;version="2.9.1";mandatory:=core,org.apache.lucene.store;core=spl
+ it;version="2.9.1";mandatory:=core,org.apache.lucene.util;core=split;
+ version="2.9.1";mandatory:=core,org.apache.lucene.util.cache;core=spl
+ it;version="2.9.1";mandatory:=core
+Bundle-ManifestVersion: 2
+
+Name: org/apache/lucene/index/CorruptIndexException.class
+SHA1-Digest: /iaLQYVv5BXorRKcprwXnJSRl6I=
+
+Name: org/apache/lucene/analysis/CharArraySet$CharArraySetIterator.cla
+ ss
+SHA1-Digest: 1YBwei985C5LHmEfYsZLfQvMZlU=
+
+Name: org/apache/lucene/util/PriorityQueue.class
+SHA1-Digest: euBXS1po24JWJeUass84gfbi7Ks=
+
+Name: org/apache/lucene/document/Document.class
+SHA1-Digest: 9jIcOX/u6f8/ToIvV9kK+ybu8m0=
+
+Name: org/apache/lucene/util/ReaderUtil.class
+SHA1-Digest: Trdlq7BaFe6LdhjVeCLPTMzHSh4=
+
+Name: org/apache/lucene/search/function/OrdFieldSource.class
+SHA1-Digest: 9dqr5eyWydXVd6msybzIGP6u16I=
+
+Name: org/apache/lucene/index/CompoundFileWriter$1.class
+SHA1-Digest: /LT+jHUDDY1dj38fOrFbelj2ZrU=
+
+Name: org/apache/lucene/search/TopFieldCollector$OneComparatorScoringM
+ axScoreCollector.class
+SHA1-Digest: phRu2mGEs2MTq0OzfjPYrsZRQxg=
+
+Name: org/apache/lucene/index/ReadOnlySegmentReader.class
+SHA1-Digest: nLudgKwmJF1/KE2LU5eFFtPbK74=
+
+Name: org/apache/lucene/search/spans/SpanNotQuery$1.class
+SHA1-Digest: 6ntX1PmirCzV5z6sWHV+nVyiwT4=
+
+Name: org/apache/lucene/analysis/LowerCaseTokenizer.class
+SHA1-Digest: KWxOscV1PLdzLvI/FOx2tKYyCQQ=
+
+Name: org/apache/lucene/analysis/standard/StandardTokenizer.class
+SHA1-Digest: gPlMuHG82Ldd22YFTOvq6daQIh4=
+
+Name: org/apache/lucene/index/TermVectorMapper.class
+SHA1-Digest: pZu/lb/TtnJGx315bMOuMBzuWL8=
+
+Name: org/apache/lucene/search/spans/SpanOrQuery$SpanQueue.class
+SHA1-Digest: 6PAf/5DsQFUCXzl+GqTGdDg9vb8=
+
+Name: org/apache/lucene/search/function/OrdFieldSource$1.class
+SHA1-Digest: GdmNWeWbNe/qNQKV2N9IfXFUzT8=
+
+Name: org/apache/lucene/search/TopFieldCollector$MultiComparatorNonSco
+ ringCollector.class
+SHA1-Digest: TqAKl9oXNjR4si6bI3lr/H1Ye8U=
+
+Name: org/apache/lucene/search/BooleanScorer2$2.class
+SHA1-Digest: dEId+wRdcFxBeW0vyUrtl06R/Yc=
+
+Name: org/apache/lucene/analysis/tokenattributes/PayloadAttributeImpl.
+ class
+SHA1-Digest: BuTvh8IRCMrxbCc/3kCnxirv96Y=
+
+Name: org/apache/lucene/util/SortedVIntList.class
+SHA1-Digest: kYwxtRQ+D22frp+BWBFF2wKQYr0=
+
+Name: org/apache/lucene/document/SetBasedFieldSelector.class
+SHA1-Digest: rkTiiAC8rHRXcVXn9T49NHI2wIM=
+
+Name: org/apache/lucene/store/FSDirectory$FSIndexInput.class
+SHA1-Digest: OAZMlVrsEh3l14DBkD/HUWdrW7o=
+
+Name: org/apache/lucene/index/IndexFileNames.class
+SHA1-Digest: 0jfTQBSgbkEceOltK2PWT3etBPk=
+
+Name: org/apache/lucene/search/SpanFilterResult.class
+SHA1-Digest: FbUE1bbTkZPG53jYjSOL1hHVHT4=
+
+Name: org/apache/lucene/index/MultiLevelSkipListWriter.class
+SHA1-Digest: b6p60wPgG40epiJV8b5R/JDwsnk=
+
+Name: org/apache/lucene/index/SegmentReader$1.class
+SHA1-Digest: tgnflaN+f3pHryL5j7seo08cHHE=
+
+Name: org/apache/lucene/index/TermVectorEntry.class
+SHA1-Digest: pOR9q8D4LDopWqxWCnTGwGL17Ik=
+
+Name: org/apache/lucene/index/LogByteSizeMergePolicy.class
+SHA1-Digest: hU9Lx3bBNJxLF3c7SVWQ0F0j0Kc=
+
+Name: org/apache/lucene/util/OpenBitSet.class
+SHA1-Digest: cjQWcuZGvV+Il1IMgZTDXa5ovqk=
+
+Name: org/apache/lucene/util/SimpleStringInterner.class
+SHA1-Digest: i+32adobkUm1pHzRzEj5c4LanM4=
+
+Name: org/apache/lucene/search/FieldCacheImpl.class
+SHA1-Digest: RfjvCY6jT0VPT/sonXGaNrkeda8=
+
+Name: org/apache/lucene/search/FieldSortedHitQueue$8.class
+SHA1-Digest: CJVPCd3uqJTjmjecwmZuy2xL+g4=
+
+Name: org/apache/lucene/store/RAMOutputStream.class
+SHA1-Digest: ijccT1peMrd9LVDBVvg3dA6ra08=
+
+Name: org/apache/lucene/search/function/FloatFieldSource.class
+SHA1-Digest: IJ85u0ltw5BO8NKLbJb3B1nEscc=
+
+Name: org/apache/lucene/index/SortedTermVectorMapper.class
+SHA1-Digest: FE1fTbTc4hTl18wTHZSZK4Z+1CU=
+
+Name: org/apache/lucene/search/FilteredDocIdSet$1.class
+SHA1-Digest: nLVwxC8uxsacNZl30rjrl+Cte1k=
+
+Name: org/apache/lucene/index/TermVectorOffsetInfo.class
+SHA1-Digest: L5S4I7LLefoLr4anRF1TMLDCt8I=
+
+Name: org/apache/lucene/search/RangeFilter.class
+SHA1-Digest: RVUw9CjmQn0DzIl/XP/bkqvy8o4=
+
+Name: org/apache/lucene/index/DocumentsWriter$DocState.class
+SHA1-Digest: s/1heH2yBuMdx2lXLQZTSpDqFIU=
+
+Name: org/apache/lucene/search/FieldCache$CreationPlaceholder.class
+SHA1-Digest: h6GPiWaCnsJ8OF54vanwg5FNOtk=
+
+Name: org/apache/lucene/search/Explanation.class
+SHA1-Digest: YXHmC6jR95jNFRQkTKwh3p6h98E=
+
+Name: org/apache/lucene/search/ReqExclScorer.class
+SHA1-Digest: ge5EJLL67cFLxsUoQprGGrBK4Go=
+
+Name: org/apache/lucene/analysis/CharFilter.class
+SHA1-Digest: HIm3AqD2iuHzZON1381+mwqgEuI=
+
+Name: org/apache/lucene/search/FieldCacheImpl$StringIndexCache.class
+SHA1-Digest: wtEc49gNHW42RodT0TeB7XFGwxg=
+
+Name: org/apache/lucene/index/IndexFileDeleter.class
+SHA1-Digest: pktI1f8pM+hw8zBsztszoFsvc0s=
+
+Name: org/apache/lucene/LucenePackage.class
+SHA1-Digest: 4cn1tkbP9448M7LA8WQpBc4a1JI=
+
+Name: org/apache/lucene/search/ConjunctionScorer$1.class
+SHA1-Digest: wQmehoog4bnan3zubtKlOSZX+NY=
+
+Name: org/apache/lucene/search/BooleanScorer$BucketScorer.class
+SHA1-Digest: CQQPMF9p3Szz3s/BirslYjs/39o=
+
+Name: org/apache/lucene/search/TopFieldCollector.class
+SHA1-Digest: My3eSec/6FjjJlMvQqbY5GwhCMA=
+
+Name: org/apache/lucene/search/FieldCacheRangeFilter$3$1.class
+SHA1-Digest: xatZI02pJOB82woO76wqbg7nKb4=
+
+Name: org/apache/lucene/search/function/IntFieldSource$1.class
+SHA1-Digest: vVIc6O5f/xO/UnI1pEXoFR/Cwew=
+
+Name: org/apache/lucene/search/TermQuery$TermWeight.class
+SHA1-Digest: +/nm06hsAFbWtmFZREay+b7AVyU=
+
+Name: org/apache/lucene/search/TopScoreDocCollector$OutOfOrderTopScore
+ DocCollector.class
+SHA1-Digest: JxGH7cqVySvcGbsybB4u2sFMxY4=
+
+Name: org/apache/lucene/search/FieldCacheRangeFilter$7$1.class
+SHA1-Digest: XzoI1T/aO0hjNMgmjVf8rFcPS4I=
+
+Name: org/apache/lucene/index/CheckIndex.class
+SHA1-Digest: /h/XQBJ8jbLDHg4w90TEzsj8kJk=
+
+Name: org/apache/lucene/search/SortComparatorSource.class
+SHA1-Digest: Nrgn929sX6CPt36nDW/LDOShl4k=
+
+Name: org/apache/lucene/analysis/WhitespaceAnalyzer.class
+SHA1-Digest: niQ+6xEtNtN9g5HJQ6wYNx6ceMs=
+
+Name: org/apache/lucene/index/TermInfosReader$ThreadResources.class
+SHA1-Digest: F/VpunJmD9mzF2pGM/TjI/MCn6M=
+
+Name: org/apache/lucene/index/FilterIndexReader$FilterTermEnum.class
+SHA1-Digest: Y7vUP4+DDgnUQmQ+gv+h5JX+Dkk=
+
+Name: org/apache/lucene/search/FieldComparator$StringValComparator.cla
+ ss
+SHA1-Digest: G6xjvksipqhWwhZyum/p5Pe0rCU=
+
+Name: org/apache/lucene/index/TermVectorsWriter.class
+SHA1-Digest: DhLUwL6rYiBwzV/R8i3mN92OW9Q=
+
+Name: org/apache/lucene/index/FormatPostingsPositionsConsumer.class
+SHA1-Digest: ZR2aqi53nLPfPJf7psBa6RhiQfM=
+
+Name: org/apache/lucene/analysis/standard/StandardTokenizerImpl.class
+SHA1-Digest: 7TtKn2UBLKXFnnCcqEqbyaBRJIc=
+
+Name: org/apache/lucene/search/FieldComparator$StringComparatorLocale.
+ class
+SHA1-Digest: EtqH0Qs+lqBRe8Wq5Ug2GSjxeys=
+
+Name: org/apache/lucene/analysis/TeeSinkTokenFilter.class
+SHA1-Digest: 15yRrMrh6gIng3xlbjjhTPAqDks=
+
+Name: org/apache/lucene/analysis/TeeSinkTokenFilter$SinkTokenStream.cl
+ ass
+SHA1-Digest: KhYvgtD3bPXfHeZ4rbmP7KFImDE=
+
+Name: org/apache/lucene/search/FuzzyQuery$ScoreTermQueue.class
+SHA1-Digest: 6dsoLlJ5NLnwAYE7EPncRfe09Xg=
+
+Name: org/apache/lucene/util/IndexableBinaryStringTools$CodingCase.cla
+ ss
+SHA1-Digest: Ape2BBx0ggPe7ajyCT1KWkS7FDo=
+
+Name: org/apache/lucene/search/FieldComparator$RelevanceComparator.cla
+ ss
+SHA1-Digest: Z8GEygz7pkbNqKGPJ0fXeeDLskg=
+
+Name: org/apache/lucene/index/FilterIndexReader$FilterTermPositions.cl
+ ass
+SHA1-Digest: R8u02M1oo93BEJ4UfOQOOCD/zDI=
+
+Name: org/apache/lucene/index/CompoundFileReader$1.class
+SHA1-Digest: M2By0aR15OV2q1PCiIIkzkF+v9Y=
+
+Name: org/apache/lucene/index/MultipleTermPositions$IntQueue.class
+SHA1-Digest: e855MfMQjDFOj0r51U2FIuANkQI=
+
+Name: org/apache/lucene/search/Sort.class
+SHA1-Digest: NtnpB55jjSsEmdi9OqjsqqYowaw=
+
+Name: org/apache/lucene/analysis/CachingTokenFilter.class
+SHA1-Digest: MISnUgkwHBuZDnxUtB9JViyUHKU=
+
+Name: org/apache/lucene/analysis/tokenattributes/OffsetAttributeImpl.c
+ lass
+SHA1-Digest: +jNWvY7Xw8Hw2LGgbmi3+6jZKhE=
+
+Name: org/apache/lucene/store/RAMInputStream.class
+SHA1-Digest: v+lVx3tvcpcMgdn5hZSfmWPqjg0=
+
+Name: org/apache/lucene/index/IndexWriter$ReaderPool.class
+SHA1-Digest: G8Uob+wiCXIjblXAtqzPuTdM04M=
+
+Name: org/apache/lucene/util/IndexableBinaryStringTools.class
+SHA1-Digest: pZvm5ZMnFD2NAcwcWbEz+JLJExU=
+
+Name: org/apache/lucene/search/BooleanScorer2$SingleMatchScorer.class
+SHA1-Digest: b2///rMUC3KvWXPz4xMVND3EbP4=
+
+Name: org/apache/lucene/index/FieldInvertState.class
+SHA1-Digest: Hwa2saOwBnaCVstw+wqznMOr6qw=
+
+Name: org/apache/lucene/index/TermVectorsTermsWriter$PerDoc.class
+SHA1-Digest: mdJgtFnZeSpc1Avd6GmWk4LbXjo=
+
+Name: org/apache/lucene/search/PhraseQuery$PhraseWeight.class
+SHA1-Digest: HEKeVg1Dl1YolIyQUakLwdqbhMo=
+
+Name: org/apache/lucene/util/SortedVIntList$1.class
+SHA1-Digest: w77Q96vfgdPqLPazoOO9Ji3zGEM=
+
+Name: org/apache/lucene/index/DirectoryReader$MultiTermDocs.class
+SHA1-Digest: O3XnLJhqJ+mtwSsaMgl8X70yxRc=
+
+Name: org/apache/lucene/analysis/standard/StandardAnalyzer.class
+SHA1-Digest: KhNlWD4j2FOEzAiXYEJiCc+awrQ=
+
+Name: org/apache/lucene/index/MultiLevelSkipListReader.class
+SHA1-Digest: DbAlo9fNchEs58wBG+MBjbJSBnc=
+
+Name: org/apache/lucene/store/ChecksumIndexInput.class
+SHA1-Digest: UzmbZAgBbtVxV18SmrHEOjFhz1o=
+
+Name: org/apache/lucene/document/DateTools$Resolution.class
+SHA1-Digest: VXA9L5bLCbT2dATeTyCjJ5ZOCrU=
+
+Name: org/apache/lucene/search/spans/SpanOrQuery.class
+SHA1-Digest: d++kXo+8VVV2XBfH6+sbxA7yJSk=
+
+Name: org/apache/lucene/search/FieldValueHitQueue.class
+SHA1-Digest: 1gfco0exXS2Fb3fAEr+gk1+Mlqc=
+
+Name: org/apache/lucene/search/BooleanQuery$TooManyClauses.class
+SHA1-Digest: CwgNsun1Wf5BjlmyPNRDG2ZHphc=
+
+Name: org/apache/lucene/search/FieldCache$4.class
+SHA1-Digest: Pqs+iPymeU/BnLZKtnKUYsI3BXo=
+
+Name: org/apache/lucene/messages/NLS.class
+SHA1-Digest: E4FRU4agFVHMX/hP6g+tIFrufPg=
+
+Name: org/apache/lucene/search/FieldCacheRangeFilter$3.class
+SHA1-Digest: 7DZTXkniTse0ksQ8fTKMW0x2tGk=
+
+Name: org/apache/lucene/index/TermPositionVector.class
+SHA1-Digest: PtDf5XWR/rEqvEE7wKI1qcTftkg=
+
+Name: org/apache/lucene/search/SpanFilterResult$StartEnd.class
+SHA1-Digest: an0U1CsKKrmZWoIHAqDn2lavgbQ=
+
+Name: org/apache/lucene/search/Hits.class
+SHA1-Digest: T6W0GfrIr258wWk0VuUlFbSoex8=
+
+Name: org/apache/lucene/index/DocumentsWriterThreadState.class
+SHA1-Digest: DQemnfx3sU3Rxb1nkAm7oUloUPo=
+
+Name: org/apache/lucene/index/FieldsReader$FieldForMerge.class
+SHA1-Digest: xZiTYbVs7BdXu3PI5yoRu+bRVjs=
+
+Name: org/apache/lucene/search/BooleanScorer$Bucket.class
+SHA1-Digest: pFjWH4G9GA5Fv5FvG3qywsy9bP4=
+
+Name: org/apache/lucene/search/PositiveScoresOnlyCollector.class
+SHA1-Digest: Yxum75Ud/vdziv2rVkJFJ0mwmPM=
+
+Name: org/apache/lucene/index/TermsHashConsumer.class
+SHA1-Digest: lMuPqsf3+wnFhsFS/MuqaMHsZqo=
+
+Name: org/apache/lucene/search/FieldValueHitQueue$MultiComparatorsFiel
+ dValueHitQueue.class
+SHA1-Digest: xxV6IHbCgVSsqkVMIjf8Imy91os=
+
+Name: org/apache/lucene/search/FieldCacheTermsFilter$FieldCacheTermsFi
+ lterDocIdSet$FieldCacheTermsFilterDocIdSetIterator.class
+SHA1-Digest: U4rT8PmVXyHVHD7iA9dMOgEQZOQ=
+
+Name: org/apache/lucene/index/MergePolicy$MergeSpecification.class
+SHA1-Digest: UJA9deBV6CRpmj/7bJWqjF7dFHQ=
+
+Name: org/apache/lucene/queryParser/QueryParser$JJCalls.class
+SHA1-Digest: 2hiSu2SFivb1uIARyBJTRmqltmI=
+
+Name: org/apache/lucene/index/Payload.class
+SHA1-Digest: T61OU4oXGNgI3V+NiVqbdlgSKCM=
+
+Name: org/apache/lucene/index/TermVectorEntryFreqSortedComparator.clas
+ s
+SHA1-Digest: /tgSvFDxxx0q1krGZE1kg5qD874=
+
+Name: org/apache/lucene/search/BooleanScorer2.class
+SHA1-Digest: ZwdhCqlIP/EFv96oxV6wjYQOp5E=
+
+Name: org/apache/lucene/index/DocumentsWriter$DocWriter.class
+SHA1-Digest: 3sF5kLIkZLf5xOGfRGXf7ns46lI=
+
+Name: org/apache/lucene/index/DocInverterPerThread.class
+SHA1-Digest: 35VEIntxlQk8DAb2uKwtJs++W48=
+
+Name: org/apache/lucene/util/DocIdBitSet$DocIdBitSetIterator.class
+SHA1-Digest: wBdZ0RbGupHc9WflIi5OEL3/mcE=
+
+Name: org/apache/lucene/queryParser/TokenMgrError.class
+SHA1-Digest: q+jeR1ly9yLjiX2W2sp1+UTd/s8=
+
+Name: org/apache/lucene/search/spans/FieldMaskingSpanQuery.class
+SHA1-Digest: 2aioOjab3FY9hoJo2rp6HjQf84c=
+
+Name: org/apache/lucene/util/AttributeSource$1.class
+SHA1-Digest: A5MyeVoPVUUl0S3qI5da10axpPY=
+
+Name: org/apache/lucene/search/FieldDoc.class
+SHA1-Digest: nml5oEl9VQDazQHGuuDFR+fQY28=
+
+Name: org/apache/lucene/index/DocumentsWriter$WaitQueue.class
+SHA1-Digest: a7Z6BKeiskCmxLclwq5DycVe/7Y=
+
+Name: org/apache/lucene/search/spans/NearSpansUnordered$SpansCell.clas
+ s
+SHA1-Digest: mc83nxsfPTC2yKY0tZqyKeNsOx4=
+
+Name: org/apache/lucene/analysis/tokenattributes/PositionIncrementAttr
+ ibuteImpl.class
+SHA1-Digest: KMEOQPnVsQvNrljcW5uEpyLUnQQ=
+
+Name: org/apache/lucene/search/CachingSpanFilter.class
+SHA1-Digest: TKXkSlbs4YJj2M5KIzO3d2S1tTE=
+
+Name: org/apache/lucene/search/FieldSortedHitQueue$2.class
+SHA1-Digest: Wg5jkei9JyqCITGpvgDpqgkkrU4=
+
+Name: org/apache/lucene/index/FieldSortedTermVectorMapper.class
+SHA1-Digest: d1OnLXtCPCBZseN/1/oF12h4nes=
+
+Name: org/apache/lucene/index/TermVectorsReader.class
+SHA1-Digest: E+HecRuUJ4pxBDd+herFYC5hyRY=
+
+Name: org/apache/lucene/search/FieldCache$StringIndex.class
+SHA1-Digest: PY90nqywIgE1bw/oT+G0/LZAPEg=
+
+Name: org/apache/lucene/search/ScoreCachingWrappingScorer.class
+SHA1-Digest: v3EBUk0N9FIrf/hZbl3GGTVd5NU=
+
+Name: org/apache/lucene/store/SimpleFSLockFactory.class
+SHA1-Digest: iXdTSxt6vNWkKGBGHqSm7VUpjAE=
+
+Name: org/apache/lucene/search/CachingWrapperFilter.class
+SHA1-Digest: Fkm6GjDJVVhAtIP3wB88MYVfh7Q=
+
+Name: org/apache/lucene/index/IndexFileNameFilter.class
+SHA1-Digest: /qxM91vqcLgwwmNK03nGRYdqv9Q=
+
+Name: org/apache/lucene/search/FieldCacheImpl$StopFillCacheException.c
+ lass
+SHA1-Digest: ggimzsxy4vX7eUtRgMh44LRKtGA=
+
+Name: org/apache/lucene/search/spans/SpanScorer.class
+SHA1-Digest: qYfEe1xdXGytM4IFmFBqx6SzDO4=
+
+Name: org/apache/lucene/index/FormatPostingsTermsConsumer.class
+SHA1-Digest: oXZ8UPnbffYmf7bAXCj5644NSyk=
+
+Name: org/apache/lucene/search/spans/NearSpansOrdered.class
+SHA1-Digest: Qms023w0Qb/ZOzjTQi9v2fw3UaY=
+
+Name: org/apache/lucene/search/function/CustomScoreQuery$CustomScorer.
+ class
+SHA1-Digest: ags85Bqrb/QL9tLN/JBsA0+bwUA=
+
+Name: org/apache/lucene/search/PhraseQueue.class
+SHA1-Digest: 19uJxCu3jmUjRv2cSEJumMI0AOA=
+
+Name: org/apache/lucene/search/DisjunctionMaxQuery$DisjunctionMaxWeigh
+ t.class
+SHA1-Digest: QuyBZp2fcn5y4+Nk8EufCSiBv5E=
+
+Name: org/apache/lucene/store/VerifyingLockFactory$CheckedLock.class
+SHA1-Digest: nE6sUuEfzhZprHijx0nm6NV9B2E=
+
+Name: org/apache/lucene/search/function/MultiValueSource$MultiDocValue
+ s.class
+SHA1-Digest: 25mPmVz4+I8qtJcnB5OgshCP02A=
+
+Name: org/apache/lucene/search/BooleanQuery$BooleanWeight.class
+SHA1-Digest: /p9G7C6qG7uR9iACoWUtmxZrU1A=
+
+Name: org/apache/lucene/search/function/IntFieldSource.class
+SHA1-Digest: IdMXyK/q38hhEJEk3cXvx7LFKCo=
+
+Name: org/apache/lucene/search/TopDocsCollector.class
+SHA1-Digest: bQ2yOVMNqHL30BLrUJcHm8MLAqk=
+
+Name: org/apache/lucene/index/DirectoryReader$MultiTermPositions.class
+SHA1-Digest: EhEjSGhOBCWr85RUt1+OBX5dOf8=
+
+Name: org/apache/lucene/search/FieldCache$9.class
+SHA1-Digest: M+SGyYo2cpypCHN9g/fgbBNjj9Y=
+
+Name: org/apache/lucene/index/CompoundFileWriter.class
+SHA1-Digest: W6t8KLq/AUU/mQz093UBgTzsVXU=
+
+Name: org/apache/lucene/search/TopFieldCollector$OutOfOrderMultiCompar
+ atorNonScoringCollector.class
+SHA1-Digest: pMveuaRbo0f8bgKIaX374uBQTUU=
+
+Name: org/apache/lucene/index/SegmentMerger$CheckAbort.class
+SHA1-Digest: Mtt7g2PQW45e+0mYi9pn5OFt4A8=
+
+Name: org/apache/lucene/analysis/SimpleAnalyzer.class
+SHA1-Digest: xdIs/v230GXpA0CwuZD9DmuW0j8=
+
+Name: org/apache/lucene/search/function/FieldScoreQuery$Type.class
+SHA1-Digest: n8QItH2w+2eRpjZgy7VJBdgqJS8=
+
+Name: org/apache/lucene/index/SegmentMergeQueue.class
+SHA1-Digest: 7jVpNP8CFKIu+cgS8lCxkZQXMS0=
+
+Name: org/apache/lucene/document/FieldSelectorResult.class
+SHA1-Digest: qb3T5f+wG+NQCdyL866jNIbk+fc=
+
+Name: org/apache/lucene/analysis/LengthFilter.class
+SHA1-Digest: jiZ8xzhPrOwaPVeaufl2o0DPoqo=
+
+Name: org/apache/lucene/search/MultiTermQueryWrapperFilter$TermGenerat
+ or.class
+SHA1-Digest: eq4VAsXteAFRA0fYrYE6U/Qj/BM=
+
+Name: org/apache/lucene/index/FreqProxFieldMergeState.class
+SHA1-Digest: jcbPltx6XjCV7H5bz+N8nAvWbKM=
+
+Name: org/apache/lucene/search/TopFieldCollector$OneComparatorScoringN
+ oMaxScoreCollector.class
+SHA1-Digest: lARAlvrf+qZVRKaE/kjOddhV7Is=
+
+Name: org/apache/lucene/index/InvertedDocEndConsumerPerField.class
+SHA1-Digest: sn1pvyex0CVfpshVOjq//NUkHSc=
+
+Name: org/apache/lucene/search/TopScoreDocCollector.class
+SHA1-Digest: nP1eLTIfTgIqwre77mxzBxJoKlo=
+
+Name: org/apache/lucene/index/IndexFileDeleter$CommitPoint.class
+SHA1-Digest: fxkIYTvPFVFiyou8vcJuVZyLT5o=
+
+Name: org/apache/lucene/index/DocInverterPerField.class
+SHA1-Digest: BpYGGT+F26d1UK4FVheC7O0pxnA=
+
+Name: org/apache/lucene/document/Document$1.class
+SHA1-Digest: tpJNJQ/B2bVFeUKB3t6CAEAzLkE=
+
+Name: org/apache/lucene/search/spans/TermSpans.class
+SHA1-Digest: ZpRUTkEJWybjFwVY4JDab8j+JXA=
+
+Name: org/apache/lucene/analysis/tokenattributes/TypeAttribute.class
+SHA1-Digest: IlQijCNowR/VGjEuFa31SFdRJTA=
+
+Name: org/apache/lucene/search/BooleanScorer2$1.class
+SHA1-Digest: lwpIPisqvxWk/ExcuD8YVwdeGVU=
+
+Name: org/apache/lucene/analysis/NumericTokenStream.class
+SHA1-Digest: ce44+3r/3vRAOhLUfjPohmkEbro=
+
+Name: org/apache/lucene/search/TimeLimitingCollector.class
+SHA1-Digest: IpE2jpMryVl/cMuxiNw44tURBgg=
+
+Name: org/apache/lucene/document/NumericField.class
+SHA1-Digest: I97COQx/qxR/1K7oe5nfOOcjZ8w=
+
+Name: about_files/APACHE-LICENSE-2.0.txt
+SHA1-Digest: D82944NkT7+XDZGL4X9K5EbJ6/g=
+
+Name: org/apache/lucene/index/RawPostingList.class
+SHA1-Digest: 2WlDwepN2Ww1FiO5nbJjxKwuMek=
+
+Name: org/apache/lucene/search/function/ShortFieldSource$1.class
+SHA1-Digest: IUcoCEbq0K4IVxRqpyiPwmN+6fI=
+
+Name: org/apache/lucene/store/NoSuchDirectoryException.class
+SHA1-Digest: TQDXTkCLEsJzL81KJ+E/VBS/FJY=
+
+Name: org/apache/lucene/search/FieldValueHitQueue$Entry.class
+SHA1-Digest: z8nupF18Eil12mRSLjpT2Svsodg=
+
+Name: org/apache/lucene/store/NativeFSLock.class
+SHA1-Digest: Qxgr8z7PCTPWAC/FgGd41iu+6nk=
+
+Name: org/apache/lucene/search/FieldSortedHitQueue$7.class
+SHA1-Digest: d6LidfJ5w33+0wdasE8dmz2jwE0=
+
+Name: org/apache/lucene/search/function/MultiValueSource.class
+SHA1-Digest: biCDQgSHklFR2Irxa6Ke6tpQva0=
+
+Name: org/apache/lucene/search/TimeLimitedCollector$TimerThread.class
+SHA1-Digest: ggI5BvHMmjHgKUR/X8MGvw5j000=
+
+Name: org/apache/lucene/util/FieldCacheSanityChecker$ReaderField.class
+SHA1-Digest: keAngHRRX7Cr0hSCyVsnad8gPOQ=
+
+Name: org/apache/lucene/util/AttributeSource$AttributeFactory$DefaultA
+ ttributeFactory.class
+SHA1-Digest: LJiCJVjvcoTCbM+e/Bg6UTwF3Gs=
+
+Name: org/apache/lucene/analysis/WhitespaceTokenizer.class
+SHA1-Digest: BeaXm4dQME3lgNdYT/6zzbfxShg=
+
+Name: org/apache/lucene/search/DocIdSet.class
+SHA1-Digest: oJSN2UuFNPfeXJWBy3+pCZzNvS8=
+
+Name: org/apache/lucene/search/payloads/BoostingTermQuery.class
+SHA1-Digest: 5cj/EKX94mUb0rn39h+oegzNPn4=
+
+Name: org/apache/lucene/util/SimpleStringInterner$1.class
+SHA1-Digest: uK8FYTMPQ9QswrXCJ/7aKnYvk0g=
+
+Name: org/apache/lucene/search/ReqOptSumScorer.class
+SHA1-Digest: lmtdE4Z7J2JzDHqxmNVyCbTv9Zw=
+
+Name: org/apache/lucene/analysis/standard/StandardAnalyzer$1.class
+SHA1-Digest: epwbno5/y1OlmRhZYeMY4A7eN+w=
+
+Name: org/apache/lucene/search/BooleanScorer2$Coordinator.class
+SHA1-Digest: 1jJMkP7xdK2WQbzxTnvwwDl7srY=
+
+Name: org/apache/lucene/search/NumericRangeQuery$NumericRangeTermEnum$
+ 2.class
+SHA1-Digest: jHfU0AZzhIyYUda+3zprYeYjAWI=
+
+Name: org/apache/lucene/index/DocFieldConsumers.class
+SHA1-Digest: 97u3LMtmU3r+BHk3ZFklOQ6MU/Q=
+
+Name: org/apache/lucene/index/SegmentMergeInfo.class
+SHA1-Digest: a3NlZTTF6oUeSEO/YBV5ISHMS9I=
+
+Name: org/apache/lucene/search/FieldCache$LongParser.class
+SHA1-Digest: cgmqh25tYfcoJ2qJ5lwDM5uXnlk=
+
+Name: org/apache/lucene/search/FuzzyQuery$ScoreTerm.class
+SHA1-Digest: 3EiTOYciWCwhQIPrpQxAoTdKAKY=
+
+Name: org/apache/lucene/util/UnicodeUtil$UTF16Result.class
+SHA1-Digest: Cayq8KCkJHjnKNrAmMwBRZtDCgM=
+
+Name: org/apache/lucene/store/NIOFSDirectory.class
+SHA1-Digest: aHHyJg4zjEC55h4/X/f8nKk8tlA=
+
+Name: org/apache/lucene/search/QueryWrapperFilter.class
+SHA1-Digest: thS2ZR5SonXP9775LgPzaHirp9Q=
+
+Name: org/apache/lucene/search/TimeLimitingCollector$TimeExceededExcep
+ tion.class
+SHA1-Digest: UxcKVzSkbXc/AsDv3pWXZef4kuo=
+
+Name: org/apache/lucene/search/FilteredTermEnum.class
+SHA1-Digest: p5BujsZzWr9Tl4CTSOIBb5VgDBY=
+
+Name: org/apache/lucene/search/BooleanScorer$SubScorer.class
+SHA1-Digest: 4TIU5BfetKZCxUkFm37dyB+6U/s=
+
+Name: org/apache/lucene/index/BufferedDeletes.class
+SHA1-Digest: 1RmMCVMRl2TI7+nVfjiBgtxF9gM=
+
+Name: org/apache/lucene/messages/NLS$1.class
+SHA1-Digest: Pw6RufPRSBCskQnlgKs2nmaUBks=
+
+Name: org/apache/lucene/search/spans/SpanWeight.class
+SHA1-Digest: EKi0kveJnwT6RXzTpiTF2y/jMWw=
+
+Name: org/apache/lucene/search/NumericRangeFilter.class
+SHA1-Digest: awK38skC7mWhKLdCsozPgrazfww=
+
+Name: org/apache/lucene/index/DirectoryOwningReader.class
+SHA1-Digest: wx/iEL5m2gz85cY2bUJNUWCBSkk=
+
+Name: org/apache/lucene/search/DisjunctionSumScorer.class
+SHA1-Digest: 65T7OHfGDwBCOvDL8Tq90nnWSMM=
+
+Name: org/apache/lucene/store/VerifyingLockFactory.class
+SHA1-Digest: VBbt/c8Ekiu1T3lWlIgVs/Dl11U=
+
+Name: org/apache/lucene/store/LockReleaseFailedException.class
+SHA1-Digest: Z3hp+t3u2qb498L0hv6sIRd1OjQ=
+
+Name: org/apache/lucene/store/BufferedIndexInput.class
+SHA1-Digest: uNWJN80SlkFgMaEvNG+RR/Ya6nk=
+
+Name: org/apache/lucene/store/FSDirectory$FSIndexOutput.class
+SHA1-Digest: z2RL3qFDc0RleJVjD5wJofsmeyM=
+
+Name: org/apache/lucene/search/TimeLimitedCollector$1.class
+SHA1-Digest: FrghtodvW5ikWutBYzaELZfVnkM=
+
+Name: org/apache/lucene/index/CompoundFileReader.class
+SHA1-Digest: Qvff8irbnjvWs7gW1z3FWjjfW5w=
+
+Name: org/apache/lucene/search/function/CustomScoreQuery$CustomWeight.
+ class
+SHA1-Digest: Xp2UFJn5DRh1lU6tFy6V0u1dTts=
+
+Name: org/apache/lucene/search/spans/SpanNearQuery.class
+SHA1-Digest: 0pXfU/LpWUwQEn3HmMU8H0e6Y4I=
+
+Name: org/apache/lucene/search/FilteredQuery.class
+SHA1-Digest: oSnr3pDxjlRQMYL+najzWLtYhPM=
+
+Name: org/apache/lucene/index/FreqProxTermsWriter.class
+SHA1-Digest: kYP+GTciHeN/JjBzmLYzQ6cZw5Y=
+
+Name: org/apache/lucene/search/ExtendedFieldCache$DoubleParser.class
+SHA1-Digest: LKewhBhkhWPqk9IYsOZJgvMTAOE=
+
+Name: org/apache/lucene/search/payloads/BoostingTermQuery$BoostingTerm
+ Weight.class
+SHA1-Digest: /wp8KaBL0pRj5XqKtiyzrms7Cn0=
+
+Name: org/apache/lucene/search/TopFieldCollector$1.class
+SHA1-Digest: 7AkCmZm1YMnxy4mL9Uw42d5g+to=
+
+Name: org/apache/lucene/search/SpanQueryFilter.class
+SHA1-Digest: 1m5TglO+qy8PZ9NJ3352/ZBVARU=
+
+Name: org/apache/lucene/index/PositionBasedTermVectorMapper.class
+SHA1-Digest: DnMTk8BrgWaSonY3k2z9GZkF89w=
+
+Name: org/apache/lucene/search/payloads/PayloadTermQuery.class
+SHA1-Digest: 6RrLFhZ0JTBOray8Q8OC5qZauIY=
+
+Name: org/apache/lucene/analysis/SinkTokenizer.class
+SHA1-Digest: +8Fw6ysi9hQRZD0zIzoynwyv9Zs=
+
+Name: org/apache/lucene/analysis/tokenattributes/OffsetAttribute.class
+SHA1-Digest: FVKit2bZgo1phiF19asKdVTB9fk=
+
+Name: org/apache/lucene/search/SortComparator$1.class
+SHA1-Digest: rYwXG0gJVO38O1ZTacUSfHbTjJ0=
+
+Name: org/apache/lucene/search/FieldCacheImpl$ShortCache.class
+SHA1-Digest: CSXWY6/1s+0qw9UDvnfnLWdGz5I=
+
+Name: org/apache/lucene/search/function/ByteFieldSource$1.class
+SHA1-Digest: 6I6u3knG6H7NeAX1zD5Vaj9tEtU=
+
+Name: org/apache/lucene/analysis/tokenattributes/TermAttributeImpl.cla
+ ss
+SHA1-Digest: xtz+8tz7DZZ4ht+O/dYOpWlGaUk=
+
+Name: org/apache/lucene/search/TermRangeFilter.class
+SHA1-Digest: wUk85Rc6Ak8lRrl+rSrHwKZlevc=
+
+Name: org/apache/lucene/search/NumericRangeQuery$NumericRangeTermEnum.
+ class
+SHA1-Digest: gu5OJB+0mMxIf02H/oY/RF8Dn94=
+
+Name: org/apache/lucene/store/SingleInstanceLockFactory.class
+SHA1-Digest: rlVcikfh1PSrjfY8gr4S7vE7s5E=
+
+Name: org/apache/lucene/index/TermsHashPerField.class
+SHA1-Digest: b3AmWfRJXRB3cMTKVphg8AeLJcE=
+
+Name: org/apache/lucene/search/ConstantScoreQuery$ConstantScorer.class
+SHA1-Digest: 4Xhvaa99OKK7aq6wT7QP8DQJ4sM=
+
+Name: org/apache/lucene/analysis/MappingCharFilter.class
+SHA1-Digest: 3Oh5XyDWkuU5sEz+gAaJ5CGG5HA=
+
+Name: org/apache/lucene/search/MatchAllDocsQuery.class
+SHA1-Digest: RfEXapa10Q0fpPPyyi7Imot1NjU=
+
+Name: org/apache/lucene/util/OpenBitSetIterator.class
+SHA1-Digest: Tx2D5OwXf/06Yt+UaFpi635qdr4=
+
+Name: org/apache/lucene/search/FieldCache$3.class
+SHA1-Digest: ViambF8fQyGyViMKOM1FjOLch7A=
+
+Name: org/apache/lucene/store/Directory.class
+SHA1-Digest: VTrgqMhO/42DWYGxkM8bXvr0OYo=
+
+Name: org/apache/lucene/search/TopFieldDocCollector.class
+SHA1-Digest: 7rb/7s7zrpmWTt1xJdKHrsgoNys=
+
+Name: org/apache/lucene/search/FieldComparator$DocComparator.class
+SHA1-Digest: 3Dq/f5HtySUIUpgJ/8zJLynrv8g=
+
+Name: org/apache/lucene/search/FieldCacheRangeFilter$2.class
+SHA1-Digest: eiRy4oQNuMqiCb0ocCifqCEAfUI=
+
+Name: org/apache/lucene/index/DocFieldProcessorPerThread.class
+SHA1-Digest: j5QBNcsZ8H6WoqxJQw+0TDyhfLQ=
+
+Name: org/apache/lucene/index/SegmentInfo.class
+SHA1-Digest: yyNcIRdB7/hgmsJbQLEOKJ/VrFo=
+
+Name: org/apache/lucene/index/SegmentReader$FieldsReaderLocal.class
+SHA1-Digest: 5X4hqLWlfMwVG16oLvaRLsb40Q8=
+
+Name: org/apache/lucene/util/MapOfSets.class
+SHA1-Digest: 7o5iFlkvvpYA6IJQ3HXl9abXF24=
+
+Name: org/apache/lucene/search/TermRangeTermEnum.class
+SHA1-Digest: QWbwypbCrpHVuP6IdyORpYb/t1Y=
+
+Name: org/apache/lucene/search/FieldCacheImpl$ByteCache.class
+SHA1-Digest: NOSaO2//aQ5lLP8ypT5OcTNcwKQ=
+
+Name: org/apache/lucene/analysis/tokenattributes/FlagsAttributeImpl.cl
+ ass
+SHA1-Digest: dhk+Af/6eS/Vttw6CE78f4NEPGE=
+
+Name: org/apache/lucene/search/HitIterator.class
+SHA1-Digest: BkIn+GspL+1Q5eky8hJeYq1uVKA=
+
+Name: org/apache/lucene/search/ExtendedFieldCache.class
+SHA1-Digest: +ytIihTwDDCRfOqyXkRrZEkm98A=
+
+Name: org/apache/lucene/index/SegmentInfos$FindSegmentsFile.class
+SHA1-Digest: DuA7qM7ihC+K4p3hy1wGUYfkyg0=
+
+Name: org/apache/lucene/index/FieldInfo.class
+SHA1-Digest: qOYDDdk96TOP+XaHC1uVL65Tx0g=
+
+Name: org/apache/lucene/analysis/CharReader.class
+SHA1-Digest: FfxYWGf9FoxnqoKRwSRC1d4qMlg=
+
+Name: org/apache/lucene/search/FieldCacheRangeFilter$2$1.class
+SHA1-Digest: NYEbIfxlHUT606+i8gsazzFnoq4=
+
+Name: org/apache/lucene/search/BooleanScorer.class
+SHA1-Digest: RVoSP0Czw3VHCKu3cNzVsL4jDo8=
+
+Name: org/apache/lucene/index/IndexCommitPoint.class
+SHA1-Digest: IyCX56xmu4UhjEsQ+mYLY8cuzj8=
+
+Name: org/apache/lucene/search/MultiTermQuery$RewriteMethod.class
+SHA1-Digest: aK67uWAddBxToEf9hc+x9ePEkJo=
+
+Name: org/apache/lucene/search/FieldCacheRangeFilter$6$1.class
+SHA1-Digest: QmIXGkMqkKTtfensA9oWdzfmC0w=
+
+Name: org/apache/lucene/store/NIOFSDirectory$NIOFSIndexInput.class
+SHA1-Digest: 2Cr7MruRBGZu52kPO1UV4eixxJQ=
+
+Name: org/apache/lucene/index/TermVectorsTermsWriter.class
+SHA1-Digest: /PN0eMDap69lVv2uM3075+aHt5U=
+
+Name: org/apache/lucene/search/FieldComparator$DoubleComparator.class
+SHA1-Digest: UMfA/JzwMwjJWG4OrEq7YF96Mio=
+
+Name: org/apache/lucene/search/FilterManager$FilterCleaner$1.class
+SHA1-Digest: SKImf/c3WpbyeJ5XWyt3vm9ffyk=
+
+Name: org/apache/lucene/index/SegmentTermEnum.class
+SHA1-Digest: MQSEzgv8bYloCpUTVx8lQmbnKhI=
+
+Name: org/apache/lucene/index/SegmentTermVector.class
+SHA1-Digest: eRCJjKIdINnTpRMABNRE0GErZnU=
+
+Name: org/apache/lucene/search/Scorer.class
+SHA1-Digest: dfPBlK2O22EozriTCZDiPDcjjQw=
+
+Name: org/apache/lucene/search/BooleanScorer$BooleanScorerCollector.cl
+ ass
+SHA1-Digest: WCD6VHQOHLGma62YHx+sM27dm+4=
+
+Name: org/apache/lucene/search/FieldSortedHitQueue$1.class
+SHA1-Digest: jC5jUNzkjdddFW/kxPCpi5TZ+Vg=
+
+Name: org/apache/lucene/index/DocFieldProcessorPerThread$PerDoc.class
+SHA1-Digest: kWX7nrEQRZQUC/ExhMQmOLBwfdo=
+
+Name: org/apache/lucene/util/cache/SimpleMapCache$SynchronizedSimpleMa
+ pCache.class
+SHA1-Digest: tTiZMjdUjjTyejmLrquJOFKojTg=
+
+Name: org/apache/lucene/index/IndexCommit.class
+SHA1-Digest: 37Y6YdzFR4aplt8lAysMSHENidU=
+
+Name: org/apache/lucene/analysis/TokenFilter.class
+SHA1-Digest: 4FVy/9pIcbFqKhv0bLFrXtNAKck=
+
+Name: org/apache/lucene/analysis/CharacterCache.class
+SHA1-Digest: 5NxEeAKU98EWJmPaT6CcMrtuetM=
+
+Name: org/apache/lucene/analysis/tokenattributes/TermAttribute.class
+SHA1-Digest: bnsZqTeCMrLinUTUAW2TF1hDRlU=
+
+Name: org/apache/lucene/search/TimeLimitingCollector$1.class
+SHA1-Digest: OTd6592QDtVOB1GZQBf/BTDFkJA=
+
+Name: org/apache/lucene/search/FieldCacheImpl$Cache.class
+SHA1-Digest: UDYen/847iBn/1Eq8Uo7oG7wM5I=
+
+Name: org/apache/lucene/store/NoLockFactory.class
+SHA1-Digest: 02/Zw0DKIgEN5KpnNtQI52oXQr4=
+
+Name: org/apache/lucene/search/function/ReverseOrdFieldSource$1.class
+SHA1-Digest: 6vM+dDg33ZbVyBnpmUVPF40/NDs=
+
+Name: org/apache/lucene/search/WildcardQuery.class
+SHA1-Digest: nD9bL9t+Yr8ZR+KNeuD0B1Xb76k=
+
+Name: org/apache/lucene/util/cache/Cache.class
+SHA1-Digest: TOIRZxt5qhZH9VHxNyd+eX3iEkk=
+
+Name: about.html
+SHA1-Digest: GwK0vDvqOaXjK8MPJXjQ8rkuhTQ=
+
+Name: org/apache/lucene/queryParser/QueryParser.class
+SHA1-Digest: YNJZrJVlQZHwjea8DofEmkGHNtE=
+
+Name: org/apache/lucene/util/UnicodeUtil$UTF8Result.class
+SHA1-Digest: fRRAbTaplprTWNR1FNc2NIQes0k=
+
+Name: org/apache/lucene/util/FieldCacheSanityChecker.class
+SHA1-Digest: /vlkp3cJsAauvVnP+HDv5nAT4sE=
+
+Name: org/apache/lucene/search/spans/NearSpansUnordered.class
+SHA1-Digest: 2S9mTKF5hE3goxwsq3O/ccRCWUw=
+
+Name: org/apache/lucene/index/IndexReader$FieldOption.class
+SHA1-Digest: JoofrjBDaJOOwqxcX9GHsymsX74=
+
+Name: org/apache/lucene/search/FieldCache$11.class
+SHA1-Digest: PFJJs53TClwn7E8ag56inxytlgE=
+
+Name: org/apache/lucene/search/FieldCache$8.class
+SHA1-Digest: bbXJ0HqQ+nGkuMP81h9P96GffLI=
+
+Name: org/apache/lucene/search/FieldComparator$ShortComparator.class
+SHA1-Digest: pM8hNAgdusHRGp7i2feGuaj5oBk=
+
+Name: org/apache/lucene/document/DateField.class
+SHA1-Digest: MRK+8357yEPkd5F47XYUPD31gGM=
+
+Name: org/apache/lucene/search/function/ValueSourceQuery$1.class
+SHA1-Digest: yi+M3NJxXSCVlBv9nxZFXPWnn3U=
+
+Name: org/apache/lucene/search/FieldCacheRangeFilter$7.class
+SHA1-Digest: wJIIQiXrDOyp+2Me8nYFy382I6E=
+
+Name: org/apache/lucene/index/NormsWriterPerThread.class
+SHA1-Digest: fJoI83YtAIiSbiZhlXBnFZ7RuCs=
+
+Name: org/apache/lucene/search/MultiTermQuery.class
+SHA1-Digest: 7Iy5Mf7v/CPkfFaiSSCau6vViLw=
+
+Name: org/apache/lucene/search/FieldCache$ByteParser.class
+SHA1-Digest: NrdMGYjzEdde+Wl+8LhCx5a7Tv8=
+
+Name: org/apache/lucene/search/ConstantScoreQuery$ConstantWeight.class
+SHA1-Digest: IZYwyCZln3mKxkRty70PvSG9zYE=
+
+Name: org/apache/lucene/search/ParallelMultiSearcher.class
+SHA1-Digest: W3IG3bYgeV1y8ptpjP+8z2UB+/w=
+
+Name: org/apache/lucene/util/AverageGuessMemoryModel.class
+SHA1-Digest: UeowZ4qflUCk/Z82UUkGihkRHMQ=
+
+Name: org/apache/lucene/store/FileSwitchDirectory.class
+SHA1-Digest: w7v21s4N7thVA8nXkJXAnTq93EI=
+
+Name: org/apache/lucene/util/NumericUtils.class
+SHA1-Digest: VjE+bb67JhAR9BAX9M86kTfmeTo=
+
+Name: org/apache/lucene/search/TopDocCollector.class
+SHA1-Digest: TfX050BFavXAiotNgImbjJZ0Xhg=
+
+Name: org/apache/lucene/index/ParallelReader$ParallelTermEnum.class
+SHA1-Digest: Bk/uNbIFUa3auUeGSx64lcnoPKs=
+
+Name: org/apache/lucene/search/FieldCache$CacheEntry.class
+SHA1-Digest: TnGdMAcMEFYfAvHirKWXqnwMfkc=
+
+Name: org/apache/lucene/analysis/Token.class
+SHA1-Digest: f/kGXqmR9xlDSSwF6b3HKAXqML8=
+
+Name: org/apache/lucene/search/BooleanQuery$1.class
+SHA1-Digest: KnxB77fdmw8Qro/s+dNpEbBaxmE=
+
+Name: org/apache/lucene/index/SegmentReader$Norm.class
+SHA1-Digest: tmyKCV6a8YtR+TfCeJ+4LOqRRok=
+
+Name: org/apache/lucene/index/Term.class
+SHA1-Digest: lWT5KTNodaEeJmv1BSUQIsMJ/II=
+
+Name: org/apache/lucene/store/SimpleFSDirectory$SimpleFSIndexInput$Des
+ criptor.class
+SHA1-Digest: V1gV5Y/FYx06xBY0rBewAdWbCSY=
+
+Name: org/apache/lucene/search/FieldComparator$ByteComparator.class
+SHA1-Digest: ZR5g+PQwD6lUYR61V/Ew7EBoylY=
+
+Name: org/apache/lucene/index/LogDocMergePolicy.class
+SHA1-Digest: +IX4wdshMTpRKOHuerQqcdpVs04=
+
+Name: org/apache/lucene/search/FieldCache$IntParser.class
+SHA1-Digest: CXIB62dOSRU2819uNLzY1SZXuNk=
+
+Name: org/apache/lucene/index/DocumentsWriter$IndexingChain.class
+SHA1-Digest: 5f9yfshJrul3p50g+gBXxUedjk0=
+
+Name: org/apache/lucene/analysis/ASCIIFoldingFilter.class
+SHA1-Digest: 7BYFpJVtDcK0CLaJtmK3DdTLd1o=
+
+Name: org/apache/lucene/search/FieldCacheImpl$StringCache.class
+SHA1-Digest: vpR11TrRQVbeBpiXro+v/4pv3LM=
+
+Name: org/apache/lucene/index/TermVectorsTermsWriter$PostingList.class
+SHA1-Digest: frItS2cmIyA0vazMYHFwnbVqyV0=
+
+Name: org/apache/lucene/queryParser/QueryParserConstants.class
+SHA1-Digest: IxWIZpRVRM/7x3FfEyER3zA+j2Q=
+
+Name: org/apache/lucene/search/SloppyPhraseScorer.class
+SHA1-Digest: XcmmIf3zP3TggYHFGrTwdWXKI7g=
+
+Name: org/apache/lucene/index/ConcurrentMergeScheduler.class
+SHA1-Digest: BvimNTbfGbj+5ucOgIWwnTjJ0co=
+
+Name: org/apache/lucene/util/ScorerDocQueue.class
+SHA1-Digest: n6nndvJo0SKQBAci690UrGPAn5o=
+
+Name: org/apache/lucene/search/FieldCache$ShortParser.class
+SHA1-Digest: iPbyEsyVVMJzM5FN1uVSlfdsZv8=
+
+Name: org/apache/lucene/document/DateTools.class
+SHA1-Digest: cSu+jAxfTRszaDM1VU1LV1Ba8Zo=
+
+Name: org/apache/lucene/index/TermsHashConsumerPerThread.class
+SHA1-Digest: 1ksopnNvdQeEIGzUDfXpvps4vV8=
+
+Name: org/apache/lucene/search/MatchAllDocsQuery$MatchAllDocsWeight.cl
+ ass
+SHA1-Digest: Dlb7AeJ9dpoNYL0pTp88/R9kQ0c=
+
+Name: org/apache/lucene/analysis/TeeSinkTokenFilter$1.class
+SHA1-Digest: 0Zjou0zm55q+ohnRdVHay1ZGakE=
+
+Name: org/apache/lucene/search/FieldSortedHitQueue$6.class
+SHA1-Digest: 1INI20nhyFELUD0K7Lf/pI+wn+o=
+
+Name: org/apache/lucene/search/TopScoreDocCollector$InOrderTopScoreDoc
+ Collector.class
+SHA1-Digest: 7PZODNIsknhN2bZtT6lcOiMl1fc=
+
+Name: org/apache/lucene/util/BitVector.class
+SHA1-Digest: lCe38XgE5YYTDY9SHeDLr+G4mIY=
+
+Name: org/apache/lucene/search/payloads/PayloadSpanUtil.class
+SHA1-Digest: XOmDJVVcChN+6vCqF0MRESCQNhQ=
+
+Name: org/apache/lucene/index/FieldsWriter.class
+SHA1-Digest: +3QoWPjOxlSUrO2Kju4a6NWPuMA=
+
+Name: org/apache/lucene/search/Similarity$4.class
+SHA1-Digest: wYytHximLepHxMgh1TLMYmt3Nzo=
+
+Name: org/apache/lucene/search/TopFieldCollector$OutOfOrderOneComparat
+ orNonScoringCollector.class
+SHA1-Digest: Eo+NxNixwFHXkQ7+swWtoBcaBrw=
+
+Name: org/apache/lucene/search/PrefixQuery.class
+SHA1-Digest: y52nBKcjVE7Mkk+FwNMJh2/EUBQ=
+
+Name: org/apache/lucene/search/NumericRangeQuery$NumericRangeTermEnum$
+ 1.class
+SHA1-Digest: H61/3CxhOfh90ss1Pkr1R/FexuI=
+
+Name: org/apache/lucene/analysis/PorterStemmer.class
+SHA1-Digest: bAqUO+//9EfVqug/ePlN31jFrnE=
+
+Name: org/apache/lucene/search/Weight.class
+SHA1-Digest: i0XlVk5b4AabUHfONQPYxpGqcTI=
+
+Name: org/apache/lucene/index/IntBlockPool.class
+SHA1-Digest: YyZFhVOqa4uTJQZ4fUhOeRSb24o=
+
+Name: org/apache/lucene/index/SegmentReader$CoreReaders.class
+SHA1-Digest: o9wqtBvWuIf24UGbbSN3X0wy3xQ=
+
+Name: org/apache/lucene/search/TopFieldDocs.class
+SHA1-Digest: gcU/uHhb05ZPT8ufiuZ7AEGW/0k=
+
+Name: org/apache/lucene/util/AttributeSource$AttributeFactory.class
+SHA1-Digest: qw/YCDy5kJave/w0DTQ5BrXvkaE=
+
+Name: org/apache/lucene/search/function/DocValues.class
+SHA1-Digest: aXD1EzRdVcRW7HasgZKxMNW5Wa4=
+
+Name: org/apache/lucene/index/NormsWriterPerField.class
+SHA1-Digest: i9AWz8peT7VnQoJfyrr2Q+UjbX4=
+
+Name: org/apache/lucene/index/TermsHashConsumerPerField.class
+SHA1-Digest: 5+r2sdv736UC3k1u7afR/+wCenA=
+
+Name: org/apache/lucene/search/TopFieldCollector$OutOfOrderOneComparat
+ orScoringNoMaxScoreCollector.class
+SHA1-Digest: zuPfvpFpoWLTf9CUcFOYTYvYszA=
+
+Name: org/apache/lucene/index/BufferedDeletes$Num.class
+SHA1-Digest: XC6JReH+4ESxmP6fdkfFkFMciW8=
+
+Name: org/apache/lucene/util/ScorerDocQueue$HeapedScorerDoc.class
+SHA1-Digest: KiksksWaYCe6iQohgOp/XMwRqlc=
+
+Name: org/apache/lucene/search/ComplexExplanation.class
+SHA1-Digest: VJC2SNmdy0VA4v5x5eeKCqm3aOY=
+
+Name: org/apache/lucene/index/ReadOnlyDirectoryReader.class
+SHA1-Digest: buZRt74PFpxYWYix7A9tt1Ncpeo=
+
+Name: org/apache/lucene/store/LockObtainFailedException.class
+SHA1-Digest: a3ihgQ6J3iGcDWtmg/eMEj3lNig=
+
+Name: org/apache/lucene/index/CharBlockPool.class
+SHA1-Digest: dN3FVp+GB+AOF+kwteNzTvb4d5A=
+
+Name: org/apache/lucene/search/PhrasePositions.class
+SHA1-Digest: MCxYxp8GUu/82CWAyLY5L1iuwvo=
+
+Name: org/apache/lucene/index/SegmentReader.class
+SHA1-Digest: kDptZz151kr5bOGL4PYhspBMX+c=
+
+Name: org/apache/lucene/search/Searcher.class
+SHA1-Digest: VkWSMuHOYaYVRRw01+hUC8PepnA=
+
+Name: org/apache/lucene/index/MergePolicy$MergeException.class
+SHA1-Digest: /eqf7b1txf+dlGd+TLl8urKJmgk=
+
+Name: org/apache/lucene/search/FieldCacheImpl$DoubleCache.class
+SHA1-Digest: vTlD+302mVjf+fPUCSEQF8s1TcE=
+
+Name: org/apache/lucene/util/AttributeImpl.class
+SHA1-Digest: gBd2ND9MUnGeThxUr6zcXB3nACs=
+
+Name: org/apache/lucene/util/RamUsageEstimator.class
+SHA1-Digest: TyuQkIAcaYUF0fiD9uXzApRy4iE=
+
+Name: org/apache/lucene/index/StaleReaderException.class
+SHA1-Digest: GznFFuZyGYGIQjnfhevjrmTyruA=
+
+Name: org/apache/lucene/index/MultiReader.class
+SHA1-Digest: xliUOa4jgHsiRNXpJftvLpHYWQM=
+
+Name: org/apache/lucene/search/ConstantScoreQuery.class
+SHA1-Digest: 7iA3xZVBXq9DZ/Ufd55Zc/6cvp4=
+
+Name: org/apache/lucene/search/SortField.class
+SHA1-Digest: 4bQe/PneNnE4AvGMrMgPBbM/5aY=
+
+Name: org/apache/lucene/search/FieldCacheRangeFilter$FieldCacheDocIdSe
+ t$2.class
+SHA1-Digest: 1ATnQxa1NRJSF6Y7sEbHBWIOXFI=
+
+Name: org/apache/lucene/index/ByteBlockPool.class
+SHA1-Digest: hlyhp0ElMq3CvPttiY2vVadElCc=
+
+Name: org/apache/lucene/search/MultiTermQuery$ScoringBooleanQueryRewri
+ te.class
+SHA1-Digest: ojT/CvtsUEWPtOfgMU5dcfTEve0=
+
+Name: org/apache/lucene/util/ToStringUtils.class
+SHA1-Digest: puL7RlFWPFQ1pCmYnPleRX5f6Iw=
+
+Name: org/apache/lucene/store/BufferedIndexOutput.class
+SHA1-Digest: wX+mVzc4y5POw2cUqzESe96KJuo=
+
+Name: org/apache/lucene/search/FieldValueHitQueue$OneComparatorFieldVa
+ lueHitQueue.class
+SHA1-Digest: t1Ygkb5tsjdxaQAR1zILICTuXk0=
+
+Name: org/apache/lucene/util/Parameter.class
+SHA1-Digest: pU7pRxPS51V6P4nb+ao19uYNhJ0=
+
+Name: org/apache/lucene/search/spans/Spans.class
+SHA1-Digest: JyYbwMB3kWCsw3VPrS5vZqzrts8=
+
+Name: org/apache/lucene/search/Similarity.class
+SHA1-Digest: 1j+trFEXW5X7zj4tlBkANXZ2dTA=
+
+Name: org/apache/lucene/index/IndexWriter$IndexReaderWarmer.class
+SHA1-Digest: VktjXTwm7qIysCtxpojD76/1kTs=
+
+Name: org/apache/lucene/search/DefaultSimilarity.class
+SHA1-Digest: awTuyRK6vnk/5As/mxIF6c3AyXw=
+
+Name: org/apache/lucene/search/FieldCache.class
+SHA1-Digest: 3Za8uEEVzA8kPpYd2j5WPUvrMbs=
+
+Name: org/apache/lucene/store/SimpleFSDirectory$SimpleFSIndexOutput.cl
+ ass
+SHA1-Digest: DTa8Rk9fp//9VtA7FIhSHLaLvok=
+
+Name: org/apache/lucene/index/DefaultSkipListWriter.class
+SHA1-Digest: yNwIKvzsxaJ1h8mtQCkS3FQKovI=
+
+Name: org/apache/lucene/index/TermBuffer.class
+SHA1-Digest: cX/sLcMiNxEUMUHR2TIf5u1tw34=
+
+Name: org/apache/lucene/search/FieldComparator$IntComparator.class
+SHA1-Digest: ixlIvcXRyN9mklWuK/m982tQgJw=
+
+Name: org/apache/lucene/index/TermEnum.class
+SHA1-Digest: PWslx726TRtzfG5tAS/qjmw1m20=
+
+Name: org/apache/lucene/index/TermsHash.class
+SHA1-Digest: l3QElCFJISnWor2vrRA8oJwJIac=
+
+Name: org/apache/lucene/index/MultiLevelSkipListReader$SkipBuffer.clas
+ s
+SHA1-Digest: 6OQ7ETcIRDEa+Al0Bi+xhRLVOvI=
+
+Name: org/apache/lucene/analysis/CharTokenizer.class
+SHA1-Digest: Z72FsDpatfLSliVnqejhPh28sDA=
+
+Name: org/apache/lucene/search/FieldCache$2.class
+SHA1-Digest: k4QWV4tVMwDUtX881WJ1ZyHPRJE=
+
+Name: org/apache/lucene/search/FieldCacheRangeFilter$1.class
+SHA1-Digest: d4b2nLm9QozdPDhX1el3EXql5pI=
+
+Name: org/apache/lucene/util/FieldCacheSanityChecker$Insanity.class
+SHA1-Digest: rDUC1a2o67drJonJExGMByMSsgg=
+
+Name: org/apache/lucene/store/SimpleFSLock.class
+SHA1-Digest: 48CNg9s9on4bp/+TF2pHV+lNKdc=
+
+Name: org/apache/lucene/search/SimilarityDelegator.class
+SHA1-Digest: Q92NISKZp0ZHmiaWSmZkGQTLaL8=
+
+Name: org/apache/lucene/index/FieldsReader.class
+SHA1-Digest: v2WW4lHOZl09M0ib16cq4i5q45g=
+
+Name: org/apache/lucene/search/spans/SpanOrQuery$1.class
+SHA1-Digest: 4HlLRkb+CLBu3Da0ChkVBP/o7oY=
+
+Name: org/apache/lucene/search/FieldValueHitQueue$1.class
+SHA1-Digest: ReAKB3mQgZTqm8VqEOmrtbg2EJc=
+
+Name: org/apache/lucene/search/TimeLimitingCollector$TimerThread.class
+SHA1-Digest: m34Djg1XSgG0t3cX070Rzk1pDwQ=
+
+Name: org/apache/lucene/search/ScoreDoc.class
+SHA1-Digest: xeUn/D7fsMqHuuiJQHh20ttlPbE=
+
+Name: org/apache/lucene/store/MMapDirectory.class
+SHA1-Digest: lBi7pxqpjWO3awMgguu8PXBcNvY=
+
+Name: org/apache/lucene/store/Lock$With.class
+SHA1-Digest: OSWDEQaHMsspQmBhFmgNpOiXBQI=
+
+Name: org/apache/lucene/search/ScoreDocComparator$2.class
+SHA1-Digest: CjVc4xpH6eMeM0jUkT9D/zIW7zg=
+
+Name: org/apache/lucene/index/FilterIndexReader$FilterTermDocs.class
+SHA1-Digest: BljNC0AZrvt/KHomdkmKbarCUUo=
+
+Name: org/apache/lucene/util/SorterTemplate.class
+SHA1-Digest: piJzx64iBcjtKRd7LLwYU353Bmc=
+
+Name: org/apache/lucene/store/FSDirectory.class
+SHA1-Digest: 60yClJ3rRW3bigaC5VggXTQKbWg=
+
+Name: org/apache/lucene/queryParser/QueryParserTokenManager.class
+SHA1-Digest: bBveVoVjSeH5upTVZBQux3R8lGw=
+
+Name: org/apache/lucene/index/IndexDeletionPolicy.class
+SHA1-Digest: 0j8umXQ3mGZnVKHLhI3GLGTdnHc=
+
+Name: org/apache/lucene/search/function/ShortFieldSource.class
+SHA1-Digest: ztb6e6mM0aQiS2v6gv2jr33QV8k=
+
+Name: org/apache/lucene/search/TopDocs.class
+SHA1-Digest: VjnlvZEuAe2mUMEL8Q4B/sCOK6g=
+
+Name: org/apache/lucene/util/AttributeSource.class
+SHA1-Digest: 8HCHJBagsyW/wKGpsv19lA8Dkec=
+
+Name: org/apache/lucene/index/InvertedDocConsumerPerThread.class
+SHA1-Digest: WcVYEnx8XyiQqJc4a5TlTaSaS0k=
+
+Name: org/apache/lucene/analysis/StopAnalyzer.class
+SHA1-Digest: qMBKegvGcx5bZ3iTZedd816TO3Q=
+
+Name: org/apache/lucene/store/FSDirectory$1.class
+SHA1-Digest: T+wYcMFOlx5TlpSXjETLj0Wt03U=
+
+Name: org/apache/lucene/index/SegmentMerger$3.class
+SHA1-Digest: gp1SXi1H+l6DRhx9/a6/bOyczGU=
+
+Name: org/apache/lucene/search/TopFieldCollector$OutOfOrderMultiCompar
+ atorScoringNoMaxScoreCollector.class
+SHA1-Digest: mKMAA20p4sEVDtVCNQ6KQEqGewg=
+
+Name: org/apache/lucene/index/DirectoryReader$2.class
+SHA1-Digest: MgyXvQw5QbgkgBHA4jQFXbCoD40=
+
+Name: org/apache/lucene/search/payloads/PayloadFunction.class
+SHA1-Digest: ZJmlrdFsrvnPuO9mWZoZsMwh+IU=
+
+Name: org/apache/lucene/index/IndexWriter$MaxFieldLength.class
+SHA1-Digest: CXPmeapbXg0JZ9NWUSipIZSKjQk=
+
+Name: about_files/LUCENE-NOTICE.txt
+SHA1-Digest: E3YznOp1ECpwzjYiqu+zPJZoG1E=
+
+Name: org/apache/lucene/search/HitDoc.class
+SHA1-Digest: UVFs+i+Evk5fUuK3UHFUUVW5zoc=
+
+Name: org/apache/lucene/analysis/LetterTokenizer.class
+SHA1-Digest: c+h9inRDE4rfygPaXXCNSs5jmy4=
+
+Name: org/apache/lucene/store/NativeFSLockFactory.class
+SHA1-Digest: ltZ/YQcNYCUUeWEkm+7glgkwsXg=
+
+Name: org/apache/lucene/analysis/TokenWrapper.class
+SHA1-Digest: 0UtkEiCsSBvwLwTLs33WVmet9UI=
+
+Name: org/apache/lucene/search/DisjunctionMaxQuery.class
+SHA1-Digest: AcArSjPgV8aChrpf89NooeKcd7E=
+
+Name: org/apache/lucene/index/SegmentTermPositionVector.class
+SHA1-Digest: gybluoLe4ERo1MxVv5sJkqrZ288=
+
+Name: org/apache/lucene/index/DocFieldConsumers$PerDoc.class
+SHA1-Digest: KlLSDD93oEyCng8nJBYcUKwNOdA=
+
+Name: org/apache/lucene/analysis/Tokenizer.class
+SHA1-Digest: /tlHeYgSZ5owq6UzdOLudOJG7G0=
+
+Name: org/apache/lucene/index/TermVectorsTermsWriterPerThread.class
+SHA1-Digest: IcUZyR9wD+cU8xPxPEEohYL9LOA=
+
+Name: org/apache/lucene/index/FormatPostingsTermsWriter.class
+SHA1-Digest: AM45NdU1pneOrNspTYtNGq60YhE=
+
+Name: org/apache/lucene/index/DirectoryReader$ReaderCommit.class
+SHA1-Digest: 2scM8ITOos7586UR2g53yRkg1do=
+
+Name: org/apache/lucene/search/Hit.class
+SHA1-Digest: 2TSH811DuctiGWIGbioykLSoTwY=
+
+Name: org/apache/lucene/index/MergeDocIDRemapper.class
+SHA1-Digest: BfQvCj6uPK9BNj5Yjj+XUzbuBhU=
+
+Name: org/apache/lucene/index/DocFieldConsumersPerField.class
+SHA1-Digest: aoTDhLPb1MS7FwUBJf92tIYV2eU=
+
+Name: org/apache/lucene/search/FilterManager.class
+SHA1-Digest: Vm49ya9+LwjT4oKberoI8oBURyc=
+
+Name: org/apache/lucene/search/FieldCacheImpl$CustomCache.class
+SHA1-Digest: 8K0A/Jn0y4GR20NvGqOO2OYLyS4=
+
+Name: org/apache/lucene/search/FieldCacheImpl$AutoCache.class
+SHA1-Digest: lwo0OuoSPaVe/7W1iHFuOA15CqQ=
+
+Name: org/apache/lucene/store/SimpleFSDirectory.class
+SHA1-Digest: 7Nr9X/kkScyEWGoxVxQc1agkhxk=
+
+Name: org/apache/lucene/index/ByteSliceWriter.class
+SHA1-Digest: hkobQ/11lWmf0uSTk0Yz20KZkB8=
+
+Name: org/apache/lucene/util/SmallFloat.class
+SHA1-Digest: /7Cccwm+8EfFFYii+0w/EbEV8+M=
+
+Name: org/apache/lucene/search/FieldCache$10.class
+SHA1-Digest: 5o6Pbf0MASfIABtKLP5UtuF6PIs=
+
+Name: org/apache/lucene/search/FieldCache$7.class
+SHA1-Digest: d6PaiqWG9DKZ0Xhn4EsobefarVY=
+
+Name: org/apache/lucene/index/DefaultSkipListReader.class
+SHA1-Digest: mi5rmrP6N6GubgOECxCJmyTJO7o=
+
+Name: org/apache/lucene/search/PrefixTermEnum.class
+SHA1-Digest: 69AsrQ0Kx0tTnEFJQn+cM501C1E=
+
+Name: org/apache/lucene/search/FieldCacheRangeFilter$6.class
+SHA1-Digest: aDsYxILJE/FTgaafMw+gDwmYK8I=
+
+Name: org/apache/lucene/search/BooleanClause$Occur.class
+SHA1-Digest: KSQCGmD4bc/nHiH5lEWQ74Qpzk8=
+
+Name: org/apache/lucene/search/TimeLimitedCollector.class
+SHA1-Digest: 999JGTLNjfueCiXV5GeXePerefM=
+
+Name: org/apache/lucene/index/SegmentWriteState.class
+SHA1-Digest: BS31LKmYuI2N2uauQGrnB3H8MFw=
+
+Name: org/apache/lucene/analysis/CharStream.class
+SHA1-Digest: hB38UAM+HNY3w6+UHi+lJVWcDA8=
+
+Name: org/apache/lucene/queryParser/CharStream.class
+SHA1-Digest: lz7SB3wtE0rAVwTZ9Tcl9YSarlA=
+
+Name: org/apache/lucene/queryParser/QueryParser$1.class
+SHA1-Digest: jEBkXmXluLYTqApsLdanR/jeZ9M=
+
+Name: org/apache/lucene/document/Field$TermVector.class
+SHA1-Digest: 29JeI4ExweLtnhZcx7f0buzz968=
+
+Name: org/apache/lucene/search/FieldCacheRangeFilter$1$1.class
+SHA1-Digest: a8Majz3RQeDiDiIf4QdkV3jvhOE=
+
+Name: org/apache/lucene/index/MergeScheduler.class
+SHA1-Digest: bQyK/AhyQ+WzfsuSPZKNHk9Q0SQ=
+
+Name: org/apache/lucene/index/DocConsumer.class
+SHA1-Digest: O+oVWqrlL0DCh2C8jEfVIJ2HXuk=
+
+Name: org/apache/lucene/index/LogMergePolicy.class
+SHA1-Digest: QSv4IYtUrv6sBHqjxP5si2mCBfo=
+
+Name: org/apache/lucene/search/FieldComparatorSource.class
+SHA1-Digest: ucz3lg57jH7sB8yD1s+Ahc5lyrQ=
+
+Name: org/apache/lucene/search/FieldCacheRangeFilter$5$1.class
+SHA1-Digest: uH4HlM8KnTgsDabFoSyeaJurcZc=
+
+Name: org/apache/lucene/search/spans/SpanTermQuery.class
+SHA1-Digest: 5cRdgca/6iuzlfUCsW4EXlV0zVM=
+
+Name: org/apache/lucene/search/FilterManager$FilterCleaner.class
+SHA1-Digest: 3p3Sw4J69pfuDxyFgJTSDdAjVso=
+
+Name: org/apache/lucene/search/FieldComparator.class
+SHA1-Digest: YZQn2bUd2ZkJnlBVTuxfWG4i14s=
+
+Name: org/apache/lucene/index/FreqProxTermsWriterPerField.class
+SHA1-Digest: tvV9ZD/7HpNrZNn6dyaeA7iHLvQ=
+
+Name: org/apache/lucene/index/CompoundFileWriter$FileEntry.class
+SHA1-Digest: lYkX4i5tcYkpmA/ZS/CsWykixDM=
+
+Name: org/apache/lucene/search/QueryWrapperFilter$2.class
+SHA1-Digest: a8bOl8Y20CiuUecobSvjsLXN0n8=
+
+Name: org/apache/lucene/util/Version.class
+SHA1-Digest: cLPza1z69gWlJru5ku6uAK8zKtE=
+
+Name: org/apache/lucene/util/AverageGuessMemoryModel$1.class
+SHA1-Digest: X1kUzn3IaVQZ88ietYYr8I2YgIk=
+
+Name: org/apache/lucene/util/SimpleStringInterner$Entry.class
+SHA1-Digest: nS8VS/I3GkYKd9YGoAyfBvC3fD0=
+
+Name: org/apache/lucene/search/FieldCacheImpl$Entry.class
+SHA1-Digest: zH5yd0DkxIcdWe4QvbTMyA+9dmI=
+
+Name: org/apache/lucene/search/spans/SpanQuery.class
+SHA1-Digest: pSROJYgAfJoJu8HX25AIYdvyPFo=
+
+Name: org/apache/lucene/search/FieldCacheTermsFilter$FieldCacheTermsFi
+ lterDocIdSet.class
+SHA1-Digest: jreOQbg5jW8cfUGZydwkVo19uHI=
+
+Name: org/apache/lucene/index/FilterIndexReader.class
+SHA1-Digest: XRYdBzPBuhqugJVR5Wli6Zo4/UA=
+
+Name: org/apache/lucene/analysis/tokenattributes/PayloadAttribute.clas
+ s
+SHA1-Digest: xkgLRTcOp8Zfh6FJcLnxlpHXDzI=
+
+Name: org/apache/lucene/search/MultiSearcher$1.class
+SHA1-Digest: EWh2miHc5yJc/T2RNeK84eO9xmU=
+
+Name: org/apache/lucene/document/Field$Index.class
+SHA1-Digest: 5ZhEQnEFLB7KimfK6cgsIjWx7t4=
+
+Name: org/apache/lucene/search/FieldCache$Parser.class
+SHA1-Digest: 86GIz8OIHRvWduMv19k9D76u/UA=
+
+Name: org/apache/lucene/index/CheckIndex$Status$TermIndexStatus.class
+SHA1-Digest: hcal9yUFrL5NdkuhrzaJqSNLYGQ=
+
+Name: org/apache/lucene/index/FormatPostingsDocsConsumer.class
+SHA1-Digest: kdmxscCKx1kC/gSZz6seHWAJLAM=
+
+Name: org/apache/lucene/util/AttributeSource$State.class
+SHA1-Digest: yTSBAg1oTezYBzl6LK1/udpWa7o=
+
+Name: org/apache/lucene/search/function/ReverseOrdFieldSource.class
+SHA1-Digest: yM9oLnmhYlEKiuL4lX/uYIZwuqw=
+
+Name: org/apache/lucene/analysis/TokenStream$TokenWrapperAttributeFact
+ ory.class
+SHA1-Digest: E4Jn2wWrICxxrHcs05IUIktr3a8=
+
+Name: org/apache/lucene/store/RAMDirectory.class
+SHA1-Digest: RjOZjA4yNta6RqN4heQ3bYvOfxs=
+
+Name: org/apache/lucene/document/NumberTools.class
+SHA1-Digest: P7Zsxj9rxEKFYJ51gGRBwczDzak=
+
+Name: org/apache/lucene/search/FieldSortedHitQueue$5.class
+SHA1-Digest: OP89aXKnqio+gmsjFS8Zp7Pt5ko=
+
+Name: org/apache/lucene/search/PrefixFilter.class
+SHA1-Digest: EchwT/OFRgg7hBiojfbio/9FS1U=
+
+Name: org/apache/lucene/index/CheckIndex$Status$FieldNormStatus.class
+SHA1-Digest: +HS8rPyE0HFIZIJzXHWW+po2gyc=
+
+Name: org/apache/lucene/search/FieldCacheRangeFilter.class
+SHA1-Digest: ziLrsSXJSdC+LskXPuU2W13nw+w=
+
+Name: org/apache/lucene/index/SnapshotDeletionPolicy$MyCommitPoint.cla
+ ss
+SHA1-Digest: aUZZ8RqDGwNSZx9RZb8YiUIRl4g=
+
+Name: org/apache/lucene/search/Similarity$3.class
+SHA1-Digest: BLU6cToCH2LsNsuQWElBmsV0ExY=
+
+Name: org/apache/lucene/util/CloseableThreadLocal.class
+SHA1-Digest: 34M4UKg+VnFkHR3pXt/wYgL7rVA=
+
+Name: org/apache/lucene/search/function/ValueSource.class
+SHA1-Digest: dkkcunFrxf8nZL6iudgA45/Dx70=
+
+Name: org/apache/lucene/util/cache/SimpleLRUCache.class
+SHA1-Digest: i/HwlOiegRoECTtkwijiKIwsJIo=
+
+Name: org/apache/lucene/search/FieldComparator$StringOrdValComparator.
+ class
+SHA1-Digest: dGSpZga5EvrLiruHIxxBAjpm6fE=
+
+Name: org/apache/lucene/analysis/standard/StandardFilter.class
+SHA1-Digest: tm3xZruZBhf+6cFTzb5KFEVvdM0=
+
+Name: org/apache/lucene/index/CheckIndex$Status$TermVectorStatus.class
+SHA1-Digest: EcbVM+jsi6DOtoQzBqTjbaPyhX8=
+
+Name: org/apache/lucene/index/IndexReader$1.class
+SHA1-Digest: MPjvR+ne+zhMlgGaabakzEyuTXg=
+
+Name: org/apache/lucene/document/CompressionTools.class
+SHA1-Digest: LKD98xXfBqZmtirDuUFypEFIL90=
+
+Name: org/apache/lucene/store/RAMFile.class
+SHA1-Digest: rFttuBBFw5N78WfIHbLRMER4Jgc=
+
+Name: org/apache/lucene/store/MMapDirectory$MultiMMapIndexInput.class
+SHA1-Digest: QhgEydWhes9PDvhwUo1eyXQl/MQ=
+
+Name: org/apache/lucene/search/spans/SpanNotQuery.class
+SHA1-Digest: pNCfkazmz7S8V4VZCXmrj6HGJPU=
+
+Name: org/apache/lucene/index/DocumentsWriter.class
+SHA1-Digest: BhvGQdhgV0nGivMxhWbSpPScFsQ=
+
+Name: org/apache/lucene/search/spans/SpanFirstQuery.class
+SHA1-Digest: wJc9hFFY33vgEaWhpnyXb+51IV8=
+
+Name: org/apache/lucene/search/BooleanScorer$BucketTable.class
+SHA1-Digest: qOeuZmdUIEr8mWTkW5XNqnyaRW0=
+
+Name: org/apache/lucene/index/ByteSliceReader.class
+SHA1-Digest: wRKvBS/yG3EmUYdgVSHR51FHBHo=
+
+Name: org/apache/lucene/search/RangeQuery.class
+SHA1-Digest: GpygrDB2VBIhENQONVtLbhCXhN4=
+
+Name: org/apache/lucene/messages/Message.class
+SHA1-Digest: FoP1SoeelKS9AayTeDpSmB6qyEk=
+
+Name: org/apache/lucene/index/DocFieldProcessor.class
+SHA1-Digest: JAcgdMMucT9XqHr9K/Ts1eiXs/8=
+
+Name: org/apache/lucene/index/MergePolicy$OneMerge.class
+SHA1-Digest: 8TOYUkyXSikpa5WvoNlEiI+Crq8=
+
+Name: org/apache/lucene/queryParser/QueryParser$Operator.class
+SHA1-Digest: RwUsVy/B2YemeWG2TTiSv/nWvOg=
+
+Name: org/apache/lucene/index/FormatPostingsPositionsWriter.class
+SHA1-Digest: a9E9ZO6HQVPBFzZ4Y3XecpVjHM0=
+
+Name: org/apache/lucene/index/InvertedDocEndConsumer.class
+SHA1-Digest: RvLeRN8KBy6ViZj39IiWe+LQAvg=
+
+Name: org/apache/lucene/search/ParallelMultiSearcher$1.class
+SHA1-Digest: F5VNuT4MMm37QSpMcTZXLcNSpbs=
+
+Name: org/apache/lucene/index/FreqProxTermsWriterPerThread.class
+SHA1-Digest: y/MWit7PE8keBLsLvy4NdMlVcc0=
+
+Name: org/apache/lucene/util/Attribute.class
+SHA1-Digest: UX/nKw9ByWHPrw2fOQslFMcpQEE=
+
+Name: org/apache/lucene/store/MMapDirectory$1.class
+SHA1-Digest: Q3V5o6b1NaxNGpTekgC6gscCQZM=
+
+Name: org/apache/lucene/search/FieldCacheRangeFilter$FieldCacheDocIdSe
+ t$1.class
+SHA1-Digest: 0K/37/4MP8FldHcU55kZkzsKPww=
+
+Name: org/apache/lucene/index/CompoundFileReader$FileEntry.class
+SHA1-Digest: Bfjfz+kXwNfQKEzK82ztRytzPbY=
+
+Name: org/apache/lucene/index/FieldsReader$LazyField.class
+SHA1-Digest: CeXFGbm/pn/CoEBYDgkcD+yBMhI=
+
+Name: org/apache/lucene/search/DisjunctionMaxScorer.class
+SHA1-Digest: 6N5UbZOnpfm6ArxUTU53/B7BJnk=
+
+Name: org/apache/lucene/index/ByteBlockPool$Allocator.class
+SHA1-Digest: C7Z6hMJO2uF3pZ2s7QD598EuGCY=
+
+Name: org/apache/lucene/analysis/TeeTokenFilter.class
+SHA1-Digest: OCUdJ3ccDb5OdOPwKVejK1XswXA=
+
+Name: META-INF/eclipse.inf
+SHA1-Digest: KyT9FF7C7t86NoBoa2kZT3ZJBfw=
+
+Name: org/apache/lucene/util/cache/SimpleMapCache.class
+SHA1-Digest: ODiZkHFeF1nBKzdKenBgPoyRQVM=
+
+Name: org/apache/lucene/queryParser/ParseException.class
+SHA1-Digest: dtxSc6APDq9h769wjN9CID/uOMw=
+
+Name: org/apache/lucene/index/DirectoryReader$MultiTermEnum.class
+SHA1-Digest: fkhDPS90YKhz5nRYmrl8/o1gimk=
+
+Name: org/apache/lucene/search/MultiTermQuery$ConstantScoreAutoRewrite
+ .class
+SHA1-Digest: XOt6rYn/h2k01A2Ck9ZgZ0B/lDE=
+
+Name: org/apache/lucene/util/ArrayUtil.class
+SHA1-Digest: /K5d5RXL+i+m9qNDqSAq1grMX9U=
+
+Name: org/apache/lucene/search/FieldCache$1.class
+SHA1-Digest: /QTrT+h5GS357MldUdSBc6zhtBI=
+
+Name: org/apache/lucene/index/SegmentInfos.class
+SHA1-Digest: PparlxU/GRufM2opWj9Nku4H+ig=
+
+Name: org/apache/lucene/messages/NLSException.class
+SHA1-Digest: ggBRY8iwTV9QfGthWEVIfO38d6s=
+
+Name: org/apache/lucene/search/Filter.class
+SHA1-Digest: x8ZUpEL4BAZtiiV2imKn6Z0ycPA=
+
+Name: org/apache/lucene/search/PhraseScorer.class
+SHA1-Digest: uf7uk7zr5LwaVN9hbBpj1q3o08c=
+
+Name: org/apache/lucene/search/BooleanQuery.class
+SHA1-Digest: MbXmx+y5+PAUnVMw2UHCn7HeRcE=
+
+Name: org/apache/lucene/search/Searchable.class
+SHA1-Digest: bZr5aWUPv5vuLQUFOEJSLk4L1so=
+
+Name: org/apache/lucene/analysis/PerFieldAnalyzerWrapper.class
+SHA1-Digest: WCj3im4zyY0zpMQQSL2HnQE/L98=
+
+Name: org/apache/lucene/util/StringHelper.class
+SHA1-Digest: rlhvwvdLHf3Uh/XTS/FGc4fAtOw=
+
+Name: org/apache/lucene/search/TopFieldCollector$OutOfOrderOneComparat
+ orScoringMaxScoreCollector.class
+SHA1-Digest: Yl67PtFXlQklgFzl3140fEErE8w=
+
+Name: org/apache/lucene/search/MultiTermQuery$ConstantScoreFilterRewri
+ te.class
+SHA1-Digest: gNfoz/Ox/in3K6xK0/H5ixLb0CE=
+
+Name: org/apache/lucene/index/PositionBasedTermVectorMapper$TVPosition
+ Info.class
+SHA1-Digest: ritGIS0TbSxvt8bzdAN5VsOLg2g=
+
+Name: org/apache/lucene/index/CheckIndex$Status.class
+SHA1-Digest: ewAcEiDK9Um4dEV4EPFYAHZivbU=
+
+Name: org/apache/lucene/index/TermInfosWriter.class
+SHA1-Digest: 9I9H+HDdfCmHQxRofYTlI8aLDWQ=
+
+Name: org/apache/lucene/search/ScoreDocComparator$1.class
+SHA1-Digest: I9bkHCkKL/XSGkE0W2TO/K28qtE=
+
+Name: org/apache/lucene/index/DocFieldProcessorPerField.class
+SHA1-Digest: tvZEjaFBKGOIaBjyQToY5xvMRd0=
+
+Name: org/apache/lucene/search/TopFieldCollector$OneComparatorNonScori
+ ngCollector.class
+SHA1-Digest: giBQMAzPRWADb+irnUm7hLtA3Hc=
+
+Name: org/apache/lucene/analysis/CharArraySet.class
+SHA1-Digest: QRtpY/0zLl0rxQTJJDxZIVbgZeg=
+
+Name: org/apache/lucene/search/FieldCacheImpl$IntCache.class
+SHA1-Digest: /ECVjhl1Q5BQixcZ8aUwwVYyaQE=
+
+Name: org/apache/lucene/index/SegmentTermPositions.class
+SHA1-Digest: iP3Ri5HYkaD9VQY4g/w9rwU/yQU=
+
+Name: plugin.properties
+SHA1-Digest: kub9Xshua34cYFPiPXfcJPEfIGQ=
+
+Name: org/apache/lucene/search/MultiSearcher$CachedDfSource.class
+SHA1-Digest: fE7XClmFBV79L2wnRGKiuuGLSOQ=
+
+Name: org/apache/lucene/index/SegmentMerger$2.class
+SHA1-Digest: ISI/KH/x11BuiEvyvXzniIxyMxw=
+
+Name: org/apache/lucene/util/FieldCacheSanityChecker$InsanityType.clas
+ s
+SHA1-Digest: QHHLyo6RpKUdMmpg4bSyF68i7L0=
+
+Name: org/apache/lucene/analysis/CharArraySet$1.class
+SHA1-Digest: iKtMnMGcZZjR/SyewfWrpgPcPqQ=
+
+Name: org/apache/lucene/index/DirectoryReader$1.class
+SHA1-Digest: DjcUp620EJ0eD9kfzIoKDktFkYg=
+
+Name: org/apache/lucene/index/FormatPostingsDocsWriter.class
+SHA1-Digest: g5zhhxHHkWEFdWwzF4PT/Gvp+/o=
+
+Name: org/apache/lucene/index/DocFieldConsumer.class
+SHA1-Digest: SqW0jSpy9jq/2h7c71BjB9VYx+w=
+
+Name: org/apache/lucene/document/LoadFirstFieldSelector.class
+SHA1-Digest: KDJB31slBSsvm2bqqbe114TEPnE=
+
+Name: org/apache/lucene/analysis/tokenattributes/PositionIncrementAttr
+ ibute.class
+SHA1-Digest: MVmglekKu8kXz7uzvlFkL8aAEW8=
+
+Name: org/apache/lucene/util/DocIdBitSet.class
+SHA1-Digest: SaDlF4n6l70X14pkzu1XcmyiGJc=
+
+Name: org/apache/lucene/search/TopFieldCollector$MultiComparatorScorin
+ gNoMaxScoreCollector.class
+SHA1-Digest: GSbbXktiJKGbgnIa5+RfVysibIQ=
+
+Name: org/apache/lucene/search/TopFieldCollector$MultiComparatorScorin
+ gMaxScoreCollector.class
+SHA1-Digest: RN4w/JZu6TiWIFszznwV9KzIvSY=
+
+Name: org/apache/lucene/analysis/NormalizeCharMap.class
+SHA1-Digest: BP5/h2WF7FgSboS1vTVSzdxpmO0=
+
+Name: org/apache/lucene/search/FilteredDocIdSet.class
+SHA1-Digest: OpF8A3MWNvAkK18WEfh9sbSMZRc=
+
+Name: org/apache/lucene/analysis/StopFilter.class
+SHA1-Digest: j37j1cC8ni+MK7nsvFyx6ZXP1rQ=
+
+Name: org/apache/lucene/search/IndexSearcher.class
+SHA1-Digest: b5MP15PXiRRhEvgefNgu2/zdu/g=
+
+Name: org/apache/lucene/analysis/WordlistLoader.class
+SHA1-Digest: jTAF8yCcGdHOehRlkiM9sc14408=
+
+Name: org/apache/lucene/document/Fieldable.class
+SHA1-Digest: sZ5IlhYUX0V0BMwQIApf4h9co5s=
+
+Name: org/apache/lucene/util/BitUtil.class
+SHA1-Digest: WSJNmK4qU6HAsQ4RV169afPev+Y=
+
+Name: org/apache/lucene/search/function/CustomScoreQuery$1.class
+SHA1-Digest: dsIkGeQYDCcbjBERb0x+m4bvBMM=
+
+Name: org/apache/lucene/search/FilteredQuery$1$1.class
+SHA1-Digest: yj6PqAyMiKQFexFIJ5EIWI9jEQI=
+
+Name: org/apache/lucene/index/DocFieldConsumerPerThread.class
+SHA1-Digest: tCwjl0W7XcwU43nIuEPC++niPs8=
+
+Name: org/apache/lucene/search/MatchAllDocsQuery$MatchAllScorer.class
+SHA1-Digest: VsmqNELkitS33ZrT0Wx3yyrIP8o=
+
+Name: org/apache/lucene/search/FilteredDocIdSetIterator.class
+SHA1-Digest: AuQnmk8mPcpL4FXxgWu7aVm3fTE=
+
+Name: org/apache/lucene/search/ConjunctionScorer.class
+SHA1-Digest: CITNnTEk5ecWLGnD2vjAb1AdLcY=
+
+Name: org/apache/lucene/queryParser/MultiFieldQueryParser.class
+SHA1-Digest: S5fIToD7p+jCyyRN8x3ftXD08y8=
+
+Name: org/apache/lucene/search/Explanation$IDFExplanation.class
+SHA1-Digest: yuhxKPt0hiPfdRwN1n07tcUtioA=
+
+Name: org/apache/lucene/analysis/TokenStream$1.class
+SHA1-Digest: fMBMaA3OEJw1pvI5eqJZfEhivz0=
+
+Name: org/apache/lucene/search/FieldCache$6.class
+SHA1-Digest: gTKVqmRVtHwy/m34/fF8Vdk/Or4=
+
+Name: org/apache/lucene/store/ChecksumIndexOutput.class
+SHA1-Digest: idx11vU02e5nxKFxNJ+Dt2FyRFk=
+
+Name: org/apache/lucene/search/ScoreDocComparator.class
+SHA1-Digest: XILwIkBDa/r6PWq4QlwHMmtqZ/U=
+
+Name: org/apache/lucene/search/function/FloatFieldSource$1.class
+SHA1-Digest: EXmZpucD3yZeBpaq6MmMnBcIJ4s=
+
+Name: org/apache/lucene/search/FieldCacheRangeFilter$5.class
+SHA1-Digest: BRUQNNe0bz2RVN3Lsh6qH7lz11s=
+
+Name: org/apache/lucene/search/spans/NearSpansOrdered$1.class
+SHA1-Digest: PsAOZeWHj19MlrWOQfGKwtJG6mg=
+
+Name: org/apache/lucene/util/OpenBitSetDISI.class
+SHA1-Digest: UIVFOU94xgoeJtcJAnBeHp2kFuk=
+
+Name: org/apache/lucene/analysis/tokenattributes/FlagsAttribute.class
+SHA1-Digest: LrbvWDMUAFWSkpMhoVdcR4zRduM=
+
+Name: org/apache/lucene/store/NoLock.class
+SHA1-Digest: FvLbeQZXlkZvo9Sw8ZVtKbNOqsE=
+
+Name: org/apache/lucene/index/KeepOnlyLastCommitDeletionPolicy.class
+SHA1-Digest: XPJ7snM/wbR1zvaXWFSp8t8MkFc=
+
+Name: org/apache/lucene/index/IndexFileDeleter$RefCount.class
+SHA1-Digest: zYF3v7npbM6QOdDVksP5C02RBOk=
+
+Name: org/apache/lucene/search/spans/NearSpansUnordered$CellQueue.clas
+ s
+SHA1-Digest: O/c9RM3FYSTHNrGS+YXplBkXHV4=
+
+Name: org/apache/lucene/index/AllTermDocs.class
+SHA1-Digest: z4Pt7WaQXbkdvnXth8vOGSesP7g=
+
+Name: org/apache/lucene/search/payloads/PayloadTermQuery$PayloadTermWe
+ ight.class
+SHA1-Digest: YOffotQG+slcfoMZGoaDN7S9Yc8=
+
+Name: org/apache/lucene/search/FieldComparator$LongComparator.class
+SHA1-Digest: N70eHSD+C4PFkV3bA6nmTHPsacE=
+
+Name: org/apache/lucene/analysis/standard/StandardAnalyzer$SavedStream
+ s.class
+SHA1-Digest: pXshWXMocVCOozT5jonupwn7MFw=
+
+Name: org/apache/lucene/search/MultiTermQueryWrapperFilter.class
+SHA1-Digest: 8aCiYAQnf3+JWNOEDYFJuj7vLFc=
+
+Name: org/apache/lucene/util/Constants.class
+SHA1-Digest: fbDRPVLu6rsh92wAAy/pyZeObDs=
+
+Name: org/apache/lucene/index/SegmentMerger.class
+SHA1-Digest: DpLQfJv3UC+LkB/Fog9C4HPjQic=
+
+Name: org/apache/lucene/document/AbstractField.class
+SHA1-Digest: q45H3zKu0KbzIYLpO/5fpZmKl8M=
+
+Name: org/apache/lucene/index/DirectoryReader.class
+SHA1-Digest: 6qgc5BMPooG6cFnKSVSPFmPX2Ng=
+
+Name: org/apache/lucene/store/IndexInput.class
+SHA1-Digest: f7bn07ouYB80gHkK8GgQlaLxoy4=
+
+Name: org/apache/lucene/search/Similarity$MethodSupport.class
+SHA1-Digest: KlcvfGiHJ9JETWTDlg3F2/dP2IA=
+
+Name: org/apache/lucene/index/MultipleTermPositions$TermPositionsQueue
+ .class
+SHA1-Digest: qo9hepry4fHeFmLuiYubvc3AX14=
+
+Name: org/apache/lucene/search/MultiSearcher.class
+SHA1-Digest: 3HacSTr9NuhxRwLyv/mddQzH4E0=
+
+Name: org/apache/lucene/search/QueryWrapperFilter$1.class
+SHA1-Digest: dCW/hKoMYJIMtjP4LxXx2MRmG+s=
+
+Name: org/apache/lucene/index/InvertedDocConsumerPerField.class
+SHA1-Digest: 2aLvWx9ak1bNYNO0G4ib2NJDkGk=
+
+Name: org/apache/lucene/search/MultiTermQueryWrapperFilter$2.class
+SHA1-Digest: evS7CJtWJEhar3O02qupZrceP/0=
+
+Name: org/apache/lucene/index/FieldReaderException.class
+SHA1-Digest: jYGOpTNv1IG4fNTiDb4KcV64CQM=
+
+Name: org/apache/lucene/index/SegmentTermDocs.class
+SHA1-Digest: ++hcIOjICuxae0z4wfh2QRmPBqM=
+
+Name: org/apache/lucene/search/TermRangeQuery.class
+SHA1-Digest: O1rPogQXrD3hPkJ7ztmX4856Rd4=
+
+Name: org/apache/lucene/analysis/TokenStream$MethodSupport.class
+SHA1-Digest: SvWwYTkr3qVf7bYLjUnQ8e+uPXc=
+
+Name: org/apache/lucene/index/TermInfosReader.class
+SHA1-Digest: mLyl5EAuMsdZsAJmjvyT017Sqg0=
+
+Name: org/apache/lucene/search/HitCollectorWrapper.class
+SHA1-Digest: anBdH4TeAyLFoY1eLlhPm4ty1cA=
+
+Name: org/apache/lucene/search/FieldDocSortedHitQueue.class
+SHA1-Digest: RIpjAoBpKxvdxgMHkfm+MqmgBek=
+
+Name: org/apache/lucene/index/DocFieldConsumerPerField.class
+SHA1-Digest: Z6+QqpcIwXZFirtO5VW9qBC/YyY=
+
+Name: org/apache/lucene/search/function/ValueSourceQuery$ValueSourceSc
+ orer.class
+SHA1-Digest: 7TF0+dfuulTqz5jDMh/o6eYFxDc=
+
+Name: org/apache/lucene/search/payloads/MinPayloadFunction.class
+SHA1-Digest: 9AgsBwR28i1sL9a1TEny3vkj6f4=
+
+Name: org/apache/lucene/search/TopScoreDocCollector$1.class
+SHA1-Digest: Z7HB8v6QzBz+h9VoXhLXlm9USGc=
+
+Name: org/apache/lucene/util/MemoryModel.class
+SHA1-Digest: OtRwh3dWSxQpu+5m3f+GUKaif54=
+
+Name: org/apache/lucene/store/MMapDirectory$MMapIndexInput.class
+SHA1-Digest: 0rAs3FQbHu6fsOXieKTOI6cSy9Q=
+
+Name: org/apache/lucene/search/SpanFilter.class
+SHA1-Digest: kLX83Dew/3+rkt2uPxN7nyOZxOg=
+
+Name: org/apache/lucene/index/DocumentsWriter$ByteBlockAllocator.class
+SHA1-Digest: upAyw3hl5DYyPRyOqryPdHlCuFU=
+
+Name: org/apache/lucene/search/FieldSortedHitQueue$4.class
+SHA1-Digest: hdz9WqunoW6IMfa31sRPirOAl1I=
+
+Name: org/apache/lucene/document/Field$Store.class
+SHA1-Digest: NX3QlQ0awn+CEqCAp6IoZ3odTuw=
+
+Name: org/apache/lucene/index/MultipleTermPositions.class
+SHA1-Digest: t0PeDgLZD+Z+VvIE2RJSeHnitqg=
+
+Name: org/apache/lucene/search/TimeLimitedCollector$TimeExceededExcept
+ ion.class
+SHA1-Digest: dXWbZJRCaQJE4ffyIKGJsSA/rh0=
+
+Name: org/apache/lucene/analysis/BaseCharFilter.class
+SHA1-Digest: rQqjUhRkOPiYTWZFo82WyqeFCDk=
+
+Name: org/apache/lucene/index/CheckIndex$Status$StoredFieldStatus.clas
+ s
+SHA1-Digest: mGmn+MXT4HJTPriPKrkWii5SgYA=
+
+Name: org/apache/lucene/search/PhraseQuery.class
+SHA1-Digest: KPfLZHnEuORSv4AVfszLDPOC46I=
+
+Name: org/apache/lucene/index/DocFieldConsumersPerThread.class
+SHA1-Digest: la1rV71MTQ+r63bKH7E0HRnmeZ4=
+
+Name: org/apache/lucene/search/Similarity$2.class
+SHA1-Digest: CuQypQGhdb3si5Ea1tIEs/LxsiE=
+
+Name: org/apache/lucene/util/NumericUtils$IntRangeBuilder.class
+SHA1-Digest: oa7Jxl55bIr7z+8rqgnyRPW9R4U=
+
+Name: org/apache/lucene/search/payloads/AveragePayloadFunction.class
+SHA1-Digest: SJoFySEKIpLaW+c6IILLNtQtnv0=
+
+Name: org/apache/lucene/search/MultiSearcherThread.class
+SHA1-Digest: bDzhONzF46ZDWgJdqN1toM7hR2o=
+
+Name: org/apache/lucene/util/cache/Cache$SynchronizedCache.class
+SHA1-Digest: aulm1p7kgu/GvlvBE16l4ML3cHY=
+
+Name: org/apache/lucene/analysis/PorterStemFilter.class
+SHA1-Digest: SKZyZ2OcRcyvP2X7ywioDZ/mMHI=
+
+Name: org/apache/lucene/analysis/StopAnalyzer$SavedStreams.class
+SHA1-Digest: 5AdwA/YOs1Ofaq5Tf4RCesiHQO8=
+
+Name: org/apache/lucene/index/DocConsumerPerThread.class
+SHA1-Digest: Yri1t5wxJjWWW8APMAT45s9jDYw=
+
+Name: org/apache/lucene/analysis/LowerCaseFilter.class
+SHA1-Digest: O5HkON5HPrvJX+JFv0/n7kr3u7Q=
+
+Name: org/apache/lucene/search/QueryFilter.class
+SHA1-Digest: 2AMwinGBdrpLQkYpCPCGIDc9DZs=
+
+Name: org/apache/lucene/queryParser/FastCharStream.class
+SHA1-Digest: ljbm+P3Gbewj1DvzYKX9AxRmjHk=
+
+Name: org/apache/lucene/search/FieldCacheImpl$FloatCache.class
+SHA1-Digest: YmQLpjzM0moaqSA68VkzT2C+/Yo=
+
+Name: org/apache/lucene/index/ParallelReader$ParallelTermDocs.class
+SHA1-Digest: Qc61WI50vbrYuGbgCxtnqKdMCLo=
+
+Name: org/apache/lucene/index/SegmentInfos$2.class
+SHA1-Digest: p/XP2r66jyShLZwmTfS2hXkexxM=
+
+Name: org/apache/lucene/util/cache/SimpleLRUCache$1.class
+SHA1-Digest: n6nmBM2K4vGsjvd9rTKUE1RRsV8=
+
+Name: org/apache/lucene/search/FieldCacheRangeFilter$4$1.class
+SHA1-Digest: TjzlvyIOGZRq0XCc0eu6Va5++Ao=
+
+Name: org/apache/lucene/search/FieldCacheImpl$LongCache.class
+SHA1-Digest: AJpGop8S3rXQoYstcD67DSUwnVs=
+
+Name: org/apache/lucene/index/TermFreqVector.class
+SHA1-Digest: 1zzNq6ebHY3/8Vfu0QChVc5Ohpc=
+
+Name: org/apache/lucene/messages/MessageImpl.class
+SHA1-Digest: PhKtujcvc35GyjEInkSpXlqcx/4=
+
+Name: org/apache/lucene/search/payloads/MaxPayloadFunction.class
+SHA1-Digest: DRayGWwEACcVsOSRIflX//3rTBk=
+
+Name: org/apache/lucene/document/FieldSelector.class
+SHA1-Digest: nN1PDY9vPCojvqqiU0UFre0Zo/I=
+
+Name: org/apache/lucene/queryParser/QueryParser$LookaheadSuccess.class
+SHA1-Digest: vLFdXoigR220WFtoRWQ/6zFhfPM=
+
+Name: org/apache/lucene/search/FieldCacheRangeFilter$FieldCacheDocIdSe
+ t.class
+SHA1-Digest: YKaErRBxeN/jzftrfB9VYo5d7/g=
+
+Name: org/apache/lucene/index/ParallelReader.class
+SHA1-Digest: s0hdOkrDEwXXj23zqRcS46Yi0EU=
+
+Name: org/apache/lucene/search/SortComparator.class
+SHA1-Digest: Mi8FYYqvN0dPNhRyr00ngPW1F1E=
+
+Name: org/apache/lucene/search/spans/SpanFirstQuery$1.class
+SHA1-Digest: slu4cDV14M11qzvsEm2B1YYEnJU=
+
+Name: org/apache/lucene/search/MultiPhraseQuery.class
+SHA1-Digest: 3saSdff5J10u5w339YoSoev+dqY=
+
+Name: org/apache/lucene/search/QueryTermVector.class
+SHA1-Digest: yeElYZ/FWbL1RviMygBfFf3TEVc=
+
+Name: org/apache/lucene/search/FuzzyTermEnum.class
+SHA1-Digest: Fn5Px5I7nJ7WE8JNOj13OK9oiDY=
+
+Name: org/apache/lucene/search/BooleanClause.class
+SHA1-Digest: ib/oHCr4hGKauiExOiq53u2KoV0=
+
+Name: org/apache/lucene/search/NumericRangeQuery.class
+SHA1-Digest: k1HfiCPahsG+IcW8mfL0KLuJI9A=
+
+Name: org/apache/lucene/index/FormatPostingsFieldsWriter.class
+SHA1-Digest: Wm8t2Ac5CIYs+pzLHImMe3ewdeM=
+
+Name: org/apache/lucene/index/CheckIndex$MySegmentTermDocs.class
+SHA1-Digest: Le2qj+wbXjsbKSGXnbH2v6hC5es=
+
+Name: org/apache/lucene/index/TermPositions.class
+SHA1-Digest: 1f0YdpeiSmiBikZyJeQQ2nKIOn4=
+
+Name: org/apache/lucene/index/FormatPostingsFieldsConsumer.class
+SHA1-Digest: qOm9HJ8zTGyDDrJLEu51hKIB5Gw=
+
+Name: org/apache/lucene/index/SerialMergeScheduler.class
+SHA1-Digest: R5Rm4hzltMCCFqIZODOoee80KKg=
+
+Name: org/apache/lucene/index/DocInverterPerThread$SingleTokenTokenStr
+ eam.class
+SHA1-Digest: 7C1oDXJU9UC6wdchSXtP3h/RqpY=
+
+Name: org/apache/lucene/search/FieldComparator$FloatComparator.class
+SHA1-Digest: nKJKd2J4Cjqf/8yr78SNCJIQYBI=
+
+Name: org/apache/lucene/index/ParallelReader$ParallelTermPositions.cla
+ ss
+SHA1-Digest: qu80cL1g3E3W9C4nvWfYg7wmSIY=
+
+Name: org/apache/lucene/index/SegmentReader$Ref.class
+SHA1-Digest: HFNaxppQgeqbAfq0UVo/efnylCE=
+
+Name: org/apache/lucene/search/FieldSortedHitQueue$9.class
+SHA1-Digest: CyolvFm0DQ5P1++PgzVZLM9ojLI=
+
+Name: org/apache/lucene/document/MapFieldSelector.class
+SHA1-Digest: KTp/imUXN+GlmpXhGgdHTsO+8Ss=
+
+Name: org/apache/lucene/analysis/TokenStream.class
+SHA1-Digest: MqWeS1efE0fyCQtFNDvaZWXXBh8=
+
+Name: org/apache/lucene/analysis/Analyzer.class
+SHA1-Digest: CzYcwzOCDxPTS4aEn3SlEL1i2MA=
+
+Name: org/apache/lucene/search/function/ValueSourceQuery.class
+SHA1-Digest: HxtgUakRXVYPGAgW908YjgHxpLk=
+
+Name: org/apache/lucene/search/function/ValueSourceQuery$ValueSourceWe
+ ight.class
+SHA1-Digest: qhkVhlJBdGN5+K/o+e7V/TiGwd0=
+
+Name: org/apache/lucene/index/TermsHashPerThread.class
+SHA1-Digest: /cg4jO2t3DzMIs1O+za6s5e2DB0=
+
+Name: org/apache/lucene/index/MultipleTermPositions$1.class
+SHA1-Digest: y3nf3/nCRu8yi+EgkI5Ho/LGB0A=
+
+Name: org/apache/lucene/search/FilterManager$FilterItem.class
+SHA1-Digest: ihQGV9f321FBp9YZKpCqnk4nE+k=
+
+Name: org/apache/lucene/search/MultiTermQuery$ConstantScoreBooleanQuer
+ yRewrite.class
+SHA1-Digest: cNLwJ9y7PpFaGJQm1kJRu4+nmK0=
+
+Name: org/apache/lucene/search/FieldCache$FloatParser.class
+SHA1-Digest: 0QkJN3lzwFvlNgcYaBbvSIcZbUk=
+
+Name: org/apache/lucene/index/IndexModifier.class
+SHA1-Digest: 4Tf8E6amotBLEH5pXEDCyDk8e9o=
+
+Name: org/apache/lucene/search/payloads/PayloadTermQuery$PayloadTermWe
+ ight$PayloadTermSpanScorer.class
+SHA1-Digest: LsUz8dRTk0gRlKk56UA2G+gOK/0=
+
+Name: org/apache/lucene/index/MergePolicy.class
+SHA1-Digest: icfPewqZGtKkjxphc6IlGqBWIKo=
+
+Name: org/apache/lucene/index/NormsWriter.class
+SHA1-Digest: FB8FpCvF5xIqQguCP61w1SqqPdQ=
+
+Name: org/apache/lucene/search/WildcardTermEnum.class
+SHA1-Digest: FXWtE+sSs5PAx7nlqgnlmCi+xJg=
+
+Name: org/apache/lucene/search/FieldCacheImpl$CacheEntryImpl.class
+SHA1-Digest: AYVPCvAwR0CES1yWKOLndLvxkyQ=
+
+Name: org/apache/lucene/document/Field.class
+SHA1-Digest: nq7g/zzyqLaj+2o9mrmzgULXs+s=
+
+Name: org/apache/lucene/index/FieldInfos.class
+SHA1-Digest: DQZWCRmt0ghLWhCajJuVibmEmEw=
+
+Name: org/apache/lucene/index/DocumentsWriter$SkipDocWriter.class
+SHA1-Digest: dstudjO3oCT+Rp/ESz8xB5oHqNY=
+
+Name: org/apache/lucene/search/MultiTermQuery$1.class
+SHA1-Digest: L6OvK/Ed88a4qz5fdmqG58vxez8=
+
+Name: org/apache/lucene/index/DocumentsWriter$1.class
+SHA1-Digest: 0NgSxzJ0uGO/0wNLkuVR8SNjnik=
+
+Name: org/apache/lucene/index/SegmentMerger$1.class
+SHA1-Digest: I6n/VurgEoj76yaFjEeWibFIwCA=
+
+Name: org/apache/lucene/index/DocInverter.class
+SHA1-Digest: HcrcmG3L6p5ATSOLW9yBHuJ32/o=
+
+Name: org/apache/lucene/index/CheckIndex$Status$SegmentInfoStatus.clas
+ s
+SHA1-Digest: ih2p7WV4w7bGh1g2yYgXPTo0sm4=
+
+Name: org/apache/lucene/analysis/tokenattributes/TypeAttributeImpl.cla
+ ss
+SHA1-Digest: QMAdK/l2FRywI8vgIJviOBPmI6M=
+
+Name: org/apache/lucene/index/TermVectorsTermsWriterPerField.class
+SHA1-Digest: rMPAZbF9mvUsC4raZulu9UkeOjU=
+
+Name: org/apache/lucene/search/payloads/PayloadNearQuery$PayloadNearSp
+ anScorer.class
+SHA1-Digest: wvxBeggp5KWWMJR1rmZgU5xNiWw=
+
+Name: org/apache/lucene/search/ConstantScoreRangeQuery.class
+SHA1-Digest: a0rSEYyzl/QPA4mf98rRveU4h9o=
+
+Name: org/apache/lucene/search/TermQuery.class
+SHA1-Digest: Ll3UafO93rPu6VjOEuOsozB0zVY=
+
+Name: org/apache/lucene/search/function/CustomScoreQuery.class
+SHA1-Digest: 9SrN5AJr3RfDvemwvEgYzkoacZI=
+
+Name: org/apache/lucene/search/FuzzyQuery.class
+SHA1-Digest: h25Z/RRz3ics4plVwyXM0BhHiQU=
+
+Name: org/apache/lucene/search/FilteredQuery$1.class
+SHA1-Digest: BocAAQoT1RN/1CMj/MaBMW6AiVs=
+
+Name: org/apache/lucene/index/CompoundFileReader$CSIndexInput.class
+SHA1-Digest: xVUzdnJ1Ho3Pa/MmiSFea0XRqIQ=
+
+Name: org/apache/lucene/index/ParallelArrayTermVectorMapper.class
+SHA1-Digest: 9FVPSs//q9wpvPQTC6Sq7meoqy0=
+
+Name: org/apache/lucene/store/Lock.class
+SHA1-Digest: 9OHFVRu0ciNqkNyETx1hiW+qT3Q=
+
+Name: org/apache/lucene/index/IndexWriter.class
+SHA1-Digest: tcEicLIT//b9P8Nenc9OWDWJbIc=
+
+Name: org/apache/lucene/index/ReusableStringReader.class
+SHA1-Digest: IyYaDxxQ3BVMijnbefnMIifYbLk=
+
+Name: org/apache/lucene/store/LockStressTest.class
+SHA1-Digest: 6t2tlh170cItsk63vaAsGB3POKY=
+
+Name: org/apache/lucene/search/Query.class
+SHA1-Digest: Yh2NDhB6NW4D5zUuDYa+MUoRQUY=
+
+Name: org/apache/lucene/index/SnapshotDeletionPolicy.class
+SHA1-Digest: rigQHVDBPffjpmmS/uupT2NF6Js=
+
+Name: org/apache/lucene/queryParser/Token.class
+SHA1-Digest: 24/jqNshPjBoUevnXMh2tkM4PoA=
+
+Name: org/apache/lucene/index/TermDocs.class
+SHA1-Digest: I96Q4NkmiSHu9usQUa5XOFODAMc=
+
+Name: org/apache/lucene/search/Collector.class
+SHA1-Digest: 4ylYA7sSevqoWbxkbRRtDmu+HYI=
+
+Name: org/apache/lucene/index/StoredFieldsWriter.class
+SHA1-Digest: BUh5DDMQGD2iqxiYHzDwND5vAZw=
+
+Name: org/apache/lucene/store/FSDirectory$FSIndexInput$Descriptor.clas
+ s
+SHA1-Digest: AzPxlMOYeI3uRwYbf5dx+3pZA54=
+
+Name: org/apache/lucene/analysis/CharArraySet$UnmodifiableCharArraySet
+ .class
+SHA1-Digest: YVHHiQ8yjzYCsrryyd2xj2WBMWM=
+
+Name: org/apache/lucene/search/FieldCacheTermsFilter.class
+SHA1-Digest: DsFBTJNERPQX2IHHWAtDGlXfaYA=
+
+Name: org/apache/lucene/search/ExactPhraseScorer.class
+SHA1-Digest: nL7Mt0M3n0tAZFQCCvBJJMB6KgA=
+
+Name: org/apache/lucene/util/UnicodeUtil.class
+SHA1-Digest: HjjrkJlaX+cv6RGzsCljP4fflfc=
+
+Name: org/apache/lucene/search/FieldCache$5.class
+SHA1-Digest: fKuZ8sezmie5hozfkEak9KXdHmA=
+
+Name: org/apache/lucene/index/ConcurrentMergeScheduler$MergeThread.cla
+ ss
+SHA1-Digest: DQu64IDbI216/ecNwPAiSvfhX+M=
+
+Name: org/apache/lucene/store/SingleInstanceLock.class
+SHA1-Digest: +2Ej80JEe26Vywn25/tvrDg2L8Y=
+
+Name: org/apache/lucene/search/FieldCacheRangeFilter$4.class
+SHA1-Digest: dVmzLBhB/hWiCxNb+OzYE1oTTGs=
+
+Name: org/apache/lucene/store/SimpleFSDirectory$SimpleFSIndexInput.cla
+ ss
+SHA1-Digest: AYbW3PL2jni7iKJBwJzCY2xIjRs=
+
+Name: org/apache/lucene/analysis/KeywordAnalyzer.class
+SHA1-Digest: 6bbBdp1ZTKOvzLbUBPpFavTC4c8=
+
+Name: org/apache/lucene/analysis/BaseCharFilter$OffCorrectMap.class
+SHA1-Digest: 5lh1BbOXEn5G9H8YI+/9AuBFS9M=
+
+Name: org/apache/lucene/search/DocIdSet$1$1.class
+SHA1-Digest: 18PcLAcm3ei7H1zCBN5xNdJuTy8=
+
+Name: org/apache/lucene/search/FieldCache$DoubleParser.class
+SHA1-Digest: 89QGQIzXg3CpzQUmxQ9SILNPgq4=
+
+Name: org/apache/lucene/index/FreqProxTermsWriter$PostingList.class
+SHA1-Digest: PRp7CKHICaPRJmgMfpXroy6MEi4=
+
+Name: org/apache/lucene/util/NumericUtils$LongRangeBuilder.class
+SHA1-Digest: 1DvaNmHyEscanhdHJWLzT6ewS1w=
+
+Name: org/apache/lucene/search/MultiTermQueryWrapperFilter$1.class
+SHA1-Digest: 1ZQVxJK/3vAKjP4OUFicY88zPlI=
+
+Name: org/apache/lucene/search/FieldSortedHitQueue.class
+SHA1-Digest: F99sysCPoyYm3gjGANr0n+yvfXo=
+
+Name: org/apache/lucene/index/InvertedDocConsumer.class
+SHA1-Digest: n7eVuNGbmMe8UgqKiVSv+qC76EU=
+
+Name: org/apache/lucene/util/StringInterner.class
+SHA1-Digest: wOt2q2EKip0vh2Upoao4LeE9S1Q=
+
+Name: org/apache/lucene/search/function/ByteFieldSource.class
+SHA1-Digest: K5IBFkMbOcdTR9X188tmairl7II=
+
+Name: org/apache/lucene/search/function/FieldCacheSource.class
+SHA1-Digest: xmPJzm1yfJX3rIIYQVL/Ch7m3jU=
+
+Name: org/apache/lucene/search/TopFieldCollector$OutOfOrderMultiCompar
+ atorScoringMaxScoreCollector.class
+SHA1-Digest: +MgWdJkLfrYYadVWqO2cfoFoXKs=
+
+Name: org/apache/lucene/index/MergePolicy$MergeAbortedException.class
+SHA1-Digest: 4oYUivySm1fLeXTIF9X3c4AYl08=
+
+Name: org/apache/lucene/store/LockVerifyServer.class
+SHA1-Digest: Q/lwjhWC6e+NJbatu6010JXgQ4w=
+
+Name: org/apache/lucene/search/payloads/PayloadNearQuery.class
+SHA1-Digest: j/0JxXqV8jfACzsg9RLUswalKfk=
+
+Name: org/apache/lucene/search/SpanFilterResult$PositionInfo.class
+SHA1-Digest: Q9v55N8cuABAQxL6rvEM7aSFc78=
+
+Name: org/apache/lucene/util/SortedVIntList$SortedVIntListBuilder.clas
+ s
+SHA1-Digest: HWiY1+bV7nBF0e1N1MTmUVlAD3w=
+
+Name: org/apache/lucene/index/TermInfo.class
+SHA1-Digest: pIvz5GUFlcgcCXVR7pNQBCwMc2w=
+
+Name: org/apache/lucene/analysis/StopAnalyzer$1.class
+SHA1-Digest: tm7ycbXIGfKNP+kR8jlCQ2ZZDJM=
+
+Name: org/apache/lucene/search/FieldSortedHitQueue$3.class
+SHA1-Digest: 7V7gu/UXBuf29s+phXhJ2MQunvY=
+
+Name: org/apache/lucene/index/TermInfosReader$1.class
+SHA1-Digest: TB4lWKB5DLmt877m00/FTHtAUek=
+
+Name: org/apache/lucene/analysis/ISOLatin1AccentFilter.class
+SHA1-Digest: bhpIWaowaPbiwWXJTw2jR/nAwE8=
+
+Name: org/apache/lucene/store/LockFactory.class
+SHA1-Digest: gOCh0eJz92DlR4qYgrugumHRsq8=
+
+Name: org/apache/lucene/search/TermScorer.class
+SHA1-Digest: StS2msY+NewT1jRIKLE5Kq9mdPY=
+
+Name: org/apache/lucene/index/StoredFieldsWriter$PerDoc.class
+SHA1-Digest: AfR/SnEHccGY+geMONhq8eG/Z7w=
+
+Name: org/apache/lucene/search/payloads/PayloadNearQuery$PayloadNearSp
+ anWeight.class
+SHA1-Digest: UUQq0pidrpgnjW6zYtdofY2Cg+k=
+
+Name: org/apache/lucene/search/Similarity$1.class
+SHA1-Digest: 9h5aKKP2IQiogP4S3aLiE38X6ao=
+
+Name: org/apache/lucene/index/IndexReader.class
+SHA1-Digest: yJ+DFdZ/0m+Iit2Di16jvwtAlNY=
+
+Name: org/apache/lucene/index/StoredFieldsWriterPerThread.class
+SHA1-Digest: 0muvRldVE2dUc7IT7aDsoJo+3TM=
+
+Name: org/apache/lucene/index/InvertedDocEndConsumerPerThread.class
+SHA1-Digest: AZSwNuf26ktbpzhs3oIvNekkBPI=
+
+Name: org/apache/lucene/search/function/FieldScoreQuery.class
+SHA1-Digest: qUqmAw/v0P6uaKiOOLwRQ4XzDmc=
+
+Name: org/apache/lucene/analysis/TeeSinkTokenFilter$SinkFilter.class
+SHA1-Digest: 9SF0Z9VZ3eCLWrUGZrxdn3Q44aU=
+
+Name: org/apache/lucene/search/HitCollector.class
+SHA1-Digest: gUHl9KpiDJY8zkVgJkeJMpV7sBg=
+
+Name: org/apache/lucene/analysis/KeywordTokenizer.class
+SHA1-Digest: 9CChOF0pFjNtycivA4UFzub1TfY=
+
+Name: org/apache/lucene/search/MultiPhraseQuery$MultiPhraseWeight.clas
+ s
+SHA1-Digest: 3rJVwX0Wkon88Y/JGruQu/kkoXM=
+
+Name: org/apache/lucene/search/DocIdSet$1.class
+SHA1-Digest: +HhEpb/usnrUbsNCAmehFF1GHNY=
+
+Name: org/apache/lucene/store/FSLockFactory.class
+SHA1-Digest: tiLGepNDYqsYS5s9qZee5kf/Rkk=
+
+Name: org/apache/lucene/search/DocIdSetIterator.class
+SHA1-Digest: 92YvH1HLJHVv/7tHew5IUQt9GbI=
+
+Name: org/apache/lucene/store/IndexOutput.class
+SHA1-Digest: JQMUUHdyb/udUbcimyNfGIGJP0w=
+
+Name: org/apache/lucene/search/HitQueue.class
+SHA1-Digest: pc6gLLx/VWnzqKrFJTVKL0g1dw4=
+
+Name: org/apache/lucene/search/ExtendedFieldCache$LongParser.class
+SHA1-Digest: kHVdyvKwc4Q7dNEsfDqR10PRET4=
+
+Name: org/apache/lucene/store/AlreadyClosedException.class
+SHA1-Digest: 26zeKgyS39BsgsCKZq7vv+5VKv4=
+
+Name: org/apache/lucene/index/SegmentInfos$1.class
+SHA1-Digest: 8pnlgx0Wu0d4eNFaFERlzGWOBM8=
+
diff --git a/dependencyManifests/org.apache.lucene_1.9.1.v20100518-1140.jar/META-INF/MANIFEST.MF b/dependencyManifests/org.apache.lucene_1.9.1.v20100518-1140.jar/META-INF/MANIFEST.MF
deleted file mode 100644
index 72bfd15..0000000
--- a/dependencyManifests/org.apache.lucene_1.9.1.v20100518-1140.jar/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,916 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.apache.lucene
-Export-Package: org.apache.lucene,org.apache.lucene.analysis,org.apach
- e.lucene.analysis.de,org.apache.lucene.analysis.standard,org.apache.l
- ucene.document,org.apache.lucene.index,org.apache.lucene.queryParser,
- org.apache.lucene.search,org.apache.lucene.search.spans,org.apache.lu
- cene.store,org.apache.lucene.util
-Bundle-Version: 1.9.1.v20100518-1140
-Bundle-ManifestVersion: 2
-
-Name: org/apache/lucene/search/ScoreDoc.class
-SHA1-Digest: 7bjm4VNJWLvCbvZrL09UCN6Vwkc=
-
-Name: org/apache/lucene/util/PriorityQueue.class
-SHA1-Digest: 6vsZ0ARE/duPH/LymakfXS0Hndc=
-
-Name: org/apache/lucene/document/Document.class
-SHA1-Digest: tgvlVvkhU3giFGk9aoe3uXO7E48=
-
-Name: org/apache/lucene/store/MMapDirectory.class
-SHA1-Digest: j+ABTcgB/j3xfXw8x3CRMvxY5Eo=
-
-Name: org/apache/lucene/index/MultiTermPositions.class
-SHA1-Digest: gVLesn6633CjgqAUiGQYKvBOCTI=
-
-Name: org/apache/lucene/store/Lock$With.class
-SHA1-Digest: fomd1EnFYlJBXNg8BBUOtcLUauY=
-
-Name: org/apache/lucene/search/ScoreDocComparator$2.class
-SHA1-Digest: +0g0LFX6KKJHzLTKm/MCu0yI7Uc=
-
-Name: org/apache/lucene/search/PhrasePrefixQuery$PhrasePrefixWeight.cl
- ass
-SHA1-Digest: sbmUoBqziG78KDK85MfAfPY2eMA=
-
-Name: org/apache/lucene/search/NonMatchingScorer.class
-SHA1-Digest: +boEsB5arDElY0qA8IpgVdJkh6E=
-
-Name: org/apache/lucene/index/FilterIndexReader$FilterTermDocs.class
-SHA1-Digest: mTbOob59dhq9knpcc5/5ysYvM9M=
-
-Name: org/apache/lucene/store/FSDirectory.class
-SHA1-Digest: JFiUh85BntOHvy3KC775KN8503c=
-
-Name: org/apache/lucene/index/CompoundFileWriter$1.class
-SHA1-Digest: /LT+jHUDDY1dj38fOrFbelj2ZrU=
-
-Name: org/apache/lucene/queryParser/QueryParserTokenManager.class
-SHA1-Digest: vs1zA825hUIJLbM5GgyUXLxVo7k=
-
-Name: org/apache/lucene/search/QueryFilter$1.class
-SHA1-Digest: J44IDJigW5BQX1PypLEj3i/1a84=
-
-Name: org/apache/lucene/search/TopDocs.class
-SHA1-Digest: 8+5aAvFKqcZZxiMDbbHvv3JhWog=
-
-Name: org/apache/lucene/store/FSIndexOutput.class
-SHA1-Digest: UdVO3XUTc/qY2MDtT+84vAJsmmI=
-
-Name: org/apache/lucene/search/spans/SpanNotQuery$1.class
-SHA1-Digest: pVEdQSGMM06s64ffOXMD4Ku3Pwc=
-
-Name: org/apache/lucene/index/DocumentWriter.class
-SHA1-Digest: bQSVc3xILw6ssVMbW4Gp26UE70Y=
-
-Name: org/apache/lucene/analysis/LowerCaseTokenizer.class
-SHA1-Digest: zFZaJEMmSMN4ji7E9NOg+cEz5Vo=
-
-Name: org/apache/lucene/analysis/StopAnalyzer.class
-SHA1-Digest: rTqcULxqdedHcmpx9h+3Yuf04/I=
-
-Name: org/apache/lucene/analysis/standard/StandardTokenizer.class
-SHA1-Digest: b4c/4uzm2X796kFbsg4Q/YEtiwc=
-
-Name: org/apache/lucene/store/FSDirectory$1.class
-SHA1-Digest: XdSPoigqCXSX879hC6POxb2oldA=
-
-Name: org/apache/lucene/search/spans/SpanOrQuery$SpanQueue.class
-SHA1-Digest: S94pciGFqnBZwriMK3qr2DTETLs=
-
-Name: org/apache/lucene/analysis/standard/FastCharStream.class
-SHA1-Digest: Qn/pKkP7YJgN/g4dqFxfqnZlYrU=
-
-Name: org/apache/lucene/search/BooleanScorer2$2.class
-SHA1-Digest: Sh7yOdYUdXhr6CI/zzcwbz+2eV0=
-
-Name: org/apache/lucene/search/spans/SpanTermQuery$1.class
-SHA1-Digest: wSmVtbqucCtxKo/cx9HJx/57tuU=
-
-Name: org/apache/lucene/index/IndexFileNames.class
-SHA1-Digest: 4NRpZaMCqpWrmqoprs/2Zdd4AME=
-
-Name: org/apache/lucene/index/TermVectorsWriter$TVTerm.class
-SHA1-Digest: bIs4kRqrR4gViDU1pdlPolKKZu0=
-
-Name: org/apache/lucene/analysis/LetterTokenizer.class
-SHA1-Digest: f8KO9plk6lagj90PQzV0Ca5yDAk=
-
-Name: org/apache/lucene/search/HitDoc.class
-SHA1-Digest: 4E2DntT+KZVs5lM/dag7SLlLEj8=
-
-Name: org/apache/lucene/search/DisjunctionMaxQuery.class
-SHA1-Digest: bt3YPEc+6SebTWxudmvFZji5/nk=
-
-Name: org/apache/lucene/index/SegmentTermPositionVector.class
-SHA1-Digest: BVMa//BO27JUehpxojUHZ25CsG0=
-
-Name: org/apache/lucene/search/FieldCacheImpl.class
-SHA1-Digest: dJsZRDF03VZoHmO8q45j7YHXTXs=
-
-Name: org/apache/lucene/store/RAMOutputStream.class
-SHA1-Digest: 0QLV7pj+w3AjhCX8CkiRVRGiwiw=
-
-Name: org/apache/lucene/analysis/Tokenizer.class
-SHA1-Digest: AJ1A/ijWWP1PS4RRSKkT+204lTU=
-
-Name: org/apache/lucene/index/IndexWriter$1.class
-SHA1-Digest: LGSFbntDpUpWTU2zU/XKVj94REI=
-
-Name: org/apache/lucene/store/RAMDirectory$1.class
-SHA1-Digest: NIoE1aOvfe0s8i7NOeluZQxfGi8=
-
-Name: org/apache/lucene/search/Hit.class
-SHA1-Digest: qBpyJ9VyA0cvIg8zIwHp3Z4rREQ=
-
-Name: org/apache/lucene/index/TermVectorOffsetInfo.class
-SHA1-Digest: D+Z+rsrjxvJ9JjsRcsQd1CnR7MA=
-
-Name: org/apache/lucene/store/InputStream.class
-SHA1-Digest: iGfX9U4+f9xq1opv2qFzPBNvW90=
-
-Name: org/apache/lucene/search/RangeFilter.class
-SHA1-Digest: zMTAiV5wWEPxvsWSAnVHpk/hbVU=
-
-Name: org/apache/lucene/search/FieldCacheImpl$2.class
-SHA1-Digest: 3CGCPkvgeMAl1os3ZTG9g9A2LZ8=
-
-Name: org/apache/lucene/search/Explanation.class
-SHA1-Digest: VwdwwLPI/BIwqnlMpaeGuundFAg=
-
-Name: org/apache/lucene/search/ReqExclScorer.class
-SHA1-Digest: sPnuooK9oRbtPEg0gPC99b+KJhc=
-
-Name: org/apache/lucene/util/SmallFloat.class
-SHA1-Digest: 2D3SgpzTa7+mpX8fQM5oAP/5h/s=
-
-Name: org/apache/lucene/LucenePackage.class
-SHA1-Digest: Pm6fOCuDLIce6EedPm217ldPpk4=
-
-Name: org/apache/lucene/search/BooleanClause$Occur.class
-SHA1-Digest: kXVwnrBYYUtKFO6oYT8QNOP3ZdI=
-
-Name: org/apache/lucene/search/spans/NearSpans$SpansCell.class
-SHA1-Digest: H5uaQQMGbpUOnvNfncbRA1W57hs=
-
-Name: org/apache/lucene/search/ConjunctionScorer$1.class
-SHA1-Digest: +2al0t+x14aNAweSAI3AAlDpNcY=
-
-Name: org/apache/lucene/queryParser/CharStream.class
-SHA1-Digest: lz7SB3wtE0rAVwTZ9Tcl9YSarlA=
-
-Name: org/apache/lucene/queryParser/QueryParser$1.class
-SHA1-Digest: jEBkXmXluLYTqApsLdanR/jeZ9M=
-
-Name: org/apache/lucene/document/Field$TermVector.class
-SHA1-Digest: bYHWZsTnDi1/rMIzLx2IuPTP0/w=
-
-Name: org/apache/lucene/search/spans/SpanTermQuery.class
-SHA1-Digest: lh9Z9CegLslPfAHlAHcZ9T8Y584=
-
-Name: org/apache/lucene/search/TermQuery$TermWeight.class
-SHA1-Digest: S+jllXFFRxVOSCexUuac1eoCbdI=
-
-Name: org/apache/lucene/search/SortComparatorSource.class
-SHA1-Digest: skCXBc8OhjnzkD5b5bQc5CpvE88=
-
-Name: org/apache/lucene/analysis/WhitespaceAnalyzer.class
-SHA1-Digest: 1rEcnJTNPmB93sjT+V4DnC6KpUw=
-
-Name: org/apache/lucene/index/FilterIndexReader$FilterTermEnum.class
-SHA1-Digest: KE9LJk4J8WrUe3Jr5uxVyz0dNj8=
-
-Name: org/apache/lucene/index/CompoundFileWriter$FileEntry.class
-SHA1-Digest: XO8itXR2+2ENqsHpnxHKhiSOL1M=
-
-Name: org/apache/lucene/index/TermVectorsWriter.class
-SHA1-Digest: idqpzhQYfvIDRjEkSIempnIXS4o=
-
-Name: org/apache/lucene/search/FieldCacheImpl$Entry.class
-SHA1-Digest: kcwGvC8UzQcMLLCe/xnEEZv52SI=
-
-Name: org/apache/lucene/search/spans/SpanQuery.class
-SHA1-Digest: 4HZ3md/wniUYvyajd6Ytiagx1Yo=
-
-Name: org/apache/lucene/index/FilterIndexReader.class
-SHA1-Digest: MyJtTPiKpc2WDbjvTNqIn2oFKbA=
-
-Name: org/apache/lucene/search/FuzzyQuery$ScoreTermQueue.class
-SHA1-Digest: mm274kcfdYBJE11Yw3yIQit5Rhg=
-
-Name: org/apache/lucene/search/MultiSearcher$1.class
-SHA1-Digest: ESsXZ/hkh6BNZE99tbB5wzuORls=
-
-Name: org/apache/lucene/index/FilterIndexReader$FilterTermPositions.cl
- ass
-SHA1-Digest: PAE0/Miiyao6eSnJyKo2pi4/htI=
-
-Name: org/apache/lucene/document/Field$Index.class
-SHA1-Digest: bZChQDVVOF6Yb53oFIR6MbQRUDs=
-
-Name: org/apache/lucene/index/CompoundFileReader$1.class
-SHA1-Digest: M2By0aR15OV2q1PCiIIkzkF+v9Y=
-
-Name: org/apache/lucene/index/MultipleTermPositions$IntQueue.class
-SHA1-Digest: e855MfMQjDFOj0r51U2FIuANkQI=
-
-Name: org/apache/lucene/search/Sort.class
-SHA1-Digest: vjRLnlmU4D9hQPyZqgLYrggV7pM=
-
-Name: org/apache/lucene/index/TermVectorsWriter$1.class
-SHA1-Digest: i1o6lw8i3tRrrIOzt9xOS5Flg7U=
-
-Name: org/apache/lucene/store/RAMInputStream.class
-SHA1-Digest: 53bFE4r8ECQeFWilFa2GOrgQwBI=
-
-Name: org/apache/lucene/search/BooleanScorer2$SingleMatchScorer.class
-SHA1-Digest: vkZ68S4+ljAeWk28fUSZmq7iF5M=
-
-Name: org/apache/lucene/store/RAMDirectory.class
-SHA1-Digest: h6qwDTDUR7w9+b/NpVDdT+RJmiA=
-
-Name: org/apache/lucene/document/NumberTools.class
-SHA1-Digest: gC9SkiuUrduXA+vGYhgLSMV0BX8=
-
-Name: org/apache/lucene/search/PhraseQuery$PhraseWeight.class
-SHA1-Digest: xJagdTugwuVYfMefjy5Glfcxt44=
-
-Name: org/apache/lucene/analysis/standard/StandardAnalyzer.class
-SHA1-Digest: oMN21CsCs3hMEodLIa83EIr5ZYo=
-
-Name: org/apache/lucene/document/DateTools$Resolution.class
-SHA1-Digest: txT1oKhHlLH8DXI04FteBkwum8w=
-
-Name: org/apache/lucene/search/spans/SpanOrQuery.class
-SHA1-Digest: PLfPR/VaBiw2C1fVv/W6A6GmqPI=
-
-Name: org/apache/lucene/search/BooleanQuery$TooManyClauses.class
-SHA1-Digest: Xs5D1syy8OgXG4gBoR8BqyFZ8KI=
-
-Name: org/apache/lucene/analysis/standard/StandardFilter.class
-SHA1-Digest: L0iwHdbDD13AG9ql5KwZ4+4gwdE=
-
-Name: org/apache/lucene/analysis/standard/StandardTokenizerConstants.c
- lass
-SHA1-Digest: ozuDrFUpLHSugS9/BlvgtSHdPr4=
-
-Name: org/apache/lucene/index/TermPositionVector.class
-SHA1-Digest: PtDf5XWR/rEqvEE7wKI1qcTftkg=
-
-Name: org/apache/lucene/index/IndexReader$1.class
-SHA1-Digest: uQiqmGeM7ZgsFT9gNL/H+6Xo8Qs=
-
-Name: org/apache/lucene/search/Hits.class
-SHA1-Digest: A1atDsYCshkJTyJx1hl+Lxg26pM=
-
-Name: org/apache/lucene/store/RAMFile.class
-SHA1-Digest: bret0GXLoSol5zLIl592a2m3vW4=
-
-Name: org/apache/lucene/store/MMapDirectory$MultiMMapIndexInput.class
-SHA1-Digest: YtCjntYTMVQIcv2JIes/w97VAcs=
-
-Name: org/apache/lucene/search/spans/SpanNotQuery.class
-SHA1-Digest: 8aOUI9j106cEChqKe+ra/k5IkeY=
-
-Name: org/apache/lucene/search/BooleanScorer$Bucket.class
-SHA1-Digest: MhFPaxsu4wyeQ7KVnFw+nAqrhyc=
-
-Name: org/apache/lucene/search/spans/SpanFirstQuery.class
-SHA1-Digest: KyvVZEIC6s/6XBW34kZXXDdCI78=
-
-Name: org/apache/lucene/search/BooleanScorer$BucketTable.class
-SHA1-Digest: JsuQ4igWMAqOV6kCYpwcgonMlwE=
-
-Name: org/apache/lucene/queryParser/QueryParser$JJCalls.class
-SHA1-Digest: JL4zdB/YvPnLDPAVMxYntYh/k5Q=
-
-Name: org/apache/lucene/search/BooleanScorer2.class
-SHA1-Digest: Xv3AD/UNtYOLwoJW7rLqWYvRmzQ=
-
-Name: org/apache/lucene/search/RangeQuery.class
-SHA1-Digest: 3PsYUDXgYtWtKqgP3+UZimq2LuM=
-
-Name: org/apache/lucene/queryParser/QueryParser$Operator.class
-SHA1-Digest: +kCmT4LTjdwb9fHIitW5+wBk888=
-
-Name: org/apache/lucene/search/ParallelMultiSearcher$1.class
-SHA1-Digest: eOwFuFxDruAIep/yurXl89swzPk=
-
-Name: org/apache/lucene/store/MMapDirectory$1.class
-SHA1-Digest: OBVJSjdshz6Oc21VYroUlSCZXq0=
-
-Name: org/apache/lucene/store/FSIndexInput.class
-SHA1-Digest: VWrQ/o024wUxu2uTnvr8vpaTKRY=
-
-Name: org/apache/lucene/queryParser/TokenMgrError.class
-SHA1-Digest: yxieSsykzV1IsDCyPo8U4gjn8Fs=
-
-Name: org/apache/lucene/analysis/standard/CharStream.class
-SHA1-Digest: y7ehNZnDj+kCKgq16R8JSXXdSnA=
-
-Name: org/apache/lucene/search/FieldDoc.class
-SHA1-Digest: pqYK6pQZqf8DpOptlLMgCTjZVfc=
-
-Name: about_files/asl-v20.txt
-SHA1-Digest: K4uBUimqimHkg/tLoFiLi2xJGJA=
-
-Name: org/apache/lucene/index/CompoundFileReader$FileEntry.class
-SHA1-Digest: ICger7P3Izjw+cAKbKneg5cwwwY=
-
-Name: org/apache/lucene/search/DisjunctionMaxScorer.class
-SHA1-Digest: PREHEN1EkFOby5RjdlkTsYRUZ64=
-
-Name: org/apache/lucene/index/TermVectorsReader.class
-SHA1-Digest: 4x8xkUM29KBpQTfT91WJtxYWQzE=
-
-Name: org/apache/lucene/search/FieldSortedHitQueue$2.class
-SHA1-Digest: qogFhiWGQzLxb7MuzWTtkX+DNFQ=
-
-Name: org/apache/lucene/search/FieldCache$StringIndex.class
-SHA1-Digest: SVoWi3HpbKmcWP9XQBEpbeLeBQI=
-
-Name: org/apache/lucene/search/spans/NearSpans$CellQueue.class
-SHA1-Digest: tEWVgFZ968LeU6llcVZIfVFbfC0=
-
-Name: org/apache/lucene/analysis/standard/StandardTokenizerTokenManage
- r.class
-SHA1-Digest: H1bggRgSC9xJik0chExrc89DfLo=
-
-Name: META-INF/eclipse.inf
-SHA1-Digest: KyT9FF7C7t86NoBoa2kZT3ZJBfw=
-
-Name: org/apache/lucene/queryParser/ParseException.class
-SHA1-Digest: g87EmK0qh0zShyjUJ+g1nIC9238=
-
-Name: org/apache/lucene/search/CachingWrapperFilter.class
-SHA1-Digest: G+U+21bQx7btxYG6zX2dgKy1dnc=
-
-Name: org/apache/lucene/index/IndexFileNameFilter.class
-SHA1-Digest: 1BqCQlzqw5IjoTAaL8l29PmB+mM=
-
-Name: org/apache/lucene/search/spans/SpanScorer.class
-SHA1-Digest: bEOZVy/lAcTdiz/IOcdoZDa+/E8=
-
-Name: org/apache/lucene/index/IndexWriter$3.class
-SHA1-Digest: ogNFaUsO6ivuM9t4JBEGyRW4xms=
-
-Name: org/apache/lucene/index/SegmentInfos.class
-SHA1-Digest: 70tQadpo7YL9Y+iqy23VcP2xvn0=
-
-Name: org/apache/lucene/search/PhraseQueue.class
-SHA1-Digest: scERKFV3aS8mVt7mi1oMMghToO8=
-
-Name: org/apache/lucene/search/DisjunctionMaxQuery$DisjunctionMaxWeigh
- t.class
-SHA1-Digest: khZrJ0/Fetp49FMbZ/EfGMheRRs=
-
-Name: org/apache/lucene/search/Filter.class
-SHA1-Digest: uNWfIXyl4o1431ng9+wwbdwJaPM=
-
-Name: org/apache/lucene/search/PhraseScorer.class
-SHA1-Digest: mIkctuGCQyJPmzloUWfq3nrP2mc=
-
-Name: org/apache/lucene/search/BooleanQuery$BooleanWeight.class
-SHA1-Digest: qAjQwsVP1UPVFXxHb5HYAkqZtxU=
-
-Name: org/apache/lucene/index/CompoundFileWriter.class
-SHA1-Digest: 2AGpw7osJFG4t3fmFLbCnn4Gwrg=
-
-Name: org/apache/lucene/search/BooleanQuery.class
-SHA1-Digest: ranzU1V20FYqb6/wdgvmZC/ugto=
-
-Name: org/apache/lucene/search/Searchable.class
-SHA1-Digest: JnV6/nA6ZBJDfbzJjllmnHENJ9I=
-
-Name: org/apache/lucene/analysis/SimpleAnalyzer.class
-SHA1-Digest: GdqItnsh5NoLErzppmoaQXiNcwE=
-
-Name: org/apache/lucene/analysis/PerFieldAnalyzerWrapper.class
-SHA1-Digest: SEgp4hoYw/y+QxrEQxXPkHcpmc4=
-
-Name: org/apache/lucene/util/StringHelper.class
-SHA1-Digest: 13ySjur+fIHrGE7iqYhD/JIIYnw=
-
-Name: org/apache/lucene/index/SegmentMergeQueue.class
-SHA1-Digest: WbD0w6gV+VX3Z9cSGLmeCFyBsG8=
-
-Name: org/apache/lucene/index/TermInfosWriter.class
-SHA1-Digest: 0pDHlY08nLgElNNJQI/THFIluHU=
-
-Name: org/apache/lucene/search/ScoreDocComparator$1.class
-SHA1-Digest: rlMWOPxjSLdI0w6eKzzw+JObEJ0=
-
-Name: org/apache/lucene/analysis/LengthFilter.class
-SHA1-Digest: nsKnR8/NQ1Sdq4mntmUVYMGzhJ8=
-
-Name: org/apache/lucene/index/SegmentTermPositions.class
-SHA1-Digest: t8axf0mk+fK5+ZfaFjzfKCbTQL8=
-
-Name: plugin.properties
-SHA1-Digest: VoyAYH13PaywpT3tZ+7AJ5ooMJE=
-
-Name: org/apache/lucene/search/MultiSearcher$CachedDfSource.class
-SHA1-Digest: Y/ym3JF0j/clrbwFgy2tz3PogLY=
-
-Name: org/apache/lucene/store/OutputStream.class
-SHA1-Digest: LnDNd6jVIuMRsSTf2qCDMYKM+Sg=
-
-Name: org/apache/lucene/search/BooleanScorer2$1.class
-SHA1-Digest: cKLngQ4SgTleNCGXXCHzrPkP/PA=
-
-Name: org/apache/lucene/search/FilteredQuery$2.class
-SHA1-Digest: dIOT1PEANvqvwq5Jed6aTti6hYg=
-
-Name: org/apache/lucene/analysis/standard/TokenMgrError.class
-SHA1-Digest: lhAtuEa7itUKeyQ3Ib27HSPWrFg=
-
-Name: org/apache/lucene/analysis/StopFilter.class
-SHA1-Digest: 3YOOoIWnEuFgcBSu+aneBpbBGV4=
-
-Name: org/apache/lucene/search/IndexSearcher.class
-SHA1-Digest: C1dsbrNFl0zOqJ+z4gZ4PFIIgSw=
-
-Name: org/apache/lucene/analysis/WordlistLoader.class
-SHA1-Digest: HNaZI1vqval6rG1wJYsT/Sq00nA=
-
-Name: org/apache/lucene/analysis/WhitespaceTokenizer.class
-SHA1-Digest: jU/mPCZkGwRrJ6iD5m7lrJbDilA=
-
-Name: org/apache/lucene/search/MatchAllDocsQuery$MatchAllScorer.class
-SHA1-Digest: UXu+tSR7JhDJ7TOa/zDwiLQRIT8=
-
-Name: org/apache/lucene/analysis/standard/Token.class
-SHA1-Digest: QdP79CrXXW6I2TdCrRIRKfxJYOw=
-
-Name: org/apache/lucene/search/FieldCacheImpl$1.class
-SHA1-Digest: 2VKcEOnGdKP/xTL7cCP4cF/Xy5E=
-
-Name: org/apache/lucene/search/ReqOptSumScorer.class
-SHA1-Digest: jDzScmevd6Asd2HG7kvyHsmmayU=
-
-Name: org/apache/lucene/search/BooleanScorer2$Coordinator.class
-SHA1-Digest: JA57kPSLU8jYgqqVeY26gayWR+o=
-
-Name: org/apache/lucene/search/ConjunctionScorer.class
-SHA1-Digest: f1Lia/6jOhoQP6ijpiFAVh11oww=
-
-Name: org/apache/lucene/index/SegmentMergeInfo.class
-SHA1-Digest: sbghx5OWT3jnYSjtIbCjoBSIQaw=
-
-Name: org/apache/lucene/queryParser/MultiFieldQueryParser.class
-SHA1-Digest: 5azzTZVzpPnR7Qav86xJPWNXrU4=
-
-Name: org/apache/lucene/search/FuzzyQuery$ScoreTerm.class
-SHA1-Digest: USxS1rn4llcVzkjCmgCfzbsInJg=
-
-Name: org/apache/lucene/search/ScoreDocComparator.class
-SHA1-Digest: SAx98JZat5kjVM7990y7uvASCXU=
-
-Name: org/apache/lucene/search/BooleanScorer$SubScorer.class
-SHA1-Digest: e0Hlkp1oUYNN4PuAZpLUSeZI0+I=
-
-Name: org/apache/lucene/search/FilteredTermEnum.class
-SHA1-Digest: 3Wvgct4AsyyhBQhfU3aqadO+qZI=
-
-Name: org/apache/lucene/search/spans/SpanWeight.class
-SHA1-Digest: rdYmpJkaACMJ90rcvLJWyJkgnFg=
-
-Name: org/apache/lucene/util/Constants.class
-SHA1-Digest: toyjFl2zAETPRuaoYTfNtKgbyAc=
-
-Name: org/apache/lucene/index/SegmentMerger.class
-SHA1-Digest: qcAzO3oXDziqeOjixmvGkyXjbIY=
-
-Name: org/apache/lucene/search/DisjunctionSumScorer.class
-SHA1-Digest: AR2XhIDtamQ/Ge8OVwbn8tlOJ0w=
-
-Name: org/apache/lucene/store/BufferedIndexInput.class
-SHA1-Digest: AfAKxHfbH5P1fzPSwh+q9aKbFPM=
-
-Name: org/apache/lucene/store/IndexInput.class
-SHA1-Digest: YjURuZvuYKTKBt+iNr76nXQzy3o=
-
-Name: org/apache/lucene/index/MultipleTermPositions$TermPositionsQueue
- .class
-SHA1-Digest: y+TEHuOHPpYE64CA5CHqFSquLOI=
-
-Name: org/apache/lucene/search/MultiSearcher.class
-SHA1-Digest: fnXxP7qoTrx6CObO9RjBxJNTiPo=
-
-Name: org/apache/lucene/index/CompoundFileReader.class
-SHA1-Digest: jwdII6XcQY519s0eG21yYTvJp5E=
-
-Name: org/apache/lucene/search/spans/SpanNearQuery.class
-SHA1-Digest: +vEdaaydjlLBe9oLmxC6T0fSXqY=
-
-Name: org/apache/lucene/search/FilteredQuery.class
-SHA1-Digest: chVxELhQBlktjWYk1XJW24ylybs=
-
-Name: org/apache/lucene/index/SegmentTermDocs.class
-SHA1-Digest: ofBe6PXg60uUXwGk4YcKLp9Psjg=
-
-Name: org/apache/lucene/index/TermInfosReader.class
-SHA1-Digest: 6lbor7Wx14baiIaYVacxP+mD5KA=
-
-Name: org/apache/lucene/search/FieldDocSortedHitQueue.class
-SHA1-Digest: lJhzxTVREqox1YQ6Utmz7ydgygU=
-
-Name: org/apache/lucene/search/SortComparator$1.class
-SHA1-Digest: Vex+Tar/46QFcvFAE6hN8/Ja5/8=
-
-Name: org/apache/lucene/store/MMapDirectory$MMapIndexInput.class
-SHA1-Digest: JBDHhkl/gR+dmjFd6ps8c6Ouzww=
-
-Name: org/apache/lucene/search/FieldSortedHitQueue$4.class
-SHA1-Digest: g7ycmhwAmqzOhNKa8DDlPPU22OY=
-
-Name: org/apache/lucene/search/RemoteSearchable.class
-SHA1-Digest: HOEvnB3ba5QGgFFuYUVIuUKDj8s=
-
-Name: org/apache/lucene/index/MultipleTermPositions.class
-SHA1-Digest: i/JY8fyn49afHz1AlHccZOd2cFI=
-
-Name: org/apache/lucene/document/Field$Store.class
-SHA1-Digest: 0x2pDQRArQcmaOwSDCgCM3qm2rk=
-
-Name: org/apache/lucene/search/ConstantScoreQuery$ConstantScorer.class
-SHA1-Digest: sS32g1J4R3nrQssLp6gJhlhy/+M=
-
-Name: org/apache/lucene/search/PhraseQuery.class
-SHA1-Digest: fxvZzMO9D7cffiQJUisL7ETCHbI=
-
-Name: org/apache/lucene/search/MatchAllDocsQuery.class
-SHA1-Digest: 0/c1OD1DPdAk0Xj9s84vufa5i8U=
-
-Name: org/apache/lucene/index/IndexWriter$5.class
-SHA1-Digest: ipKgCbCPFGbn5yFsmkLFwJXp3PY=
-
-Name: org/apache/lucene/store/Directory.class
-SHA1-Digest: HVSs9ie8a8nbYDGyBiiLnazG4K0=
-
-Name: org/apache/lucene/search/MultiSearcherThread.class
-SHA1-Digest: f3DlEPXeACHcXW0kapAGs7iBlI4=
-
-Name: org/apache/lucene/search/TopFieldDocCollector.class
-SHA1-Digest: J7rWN7FRp0M1ljrr6r473IctaHk=
-
-Name: org/apache/lucene/analysis/PorterStemFilter.class
-SHA1-Digest: r2MK9sN8xaQCMUhIY5YnAu3yrQQ=
-
-Name: org/apache/lucene/index/SegmentInfo.class
-SHA1-Digest: tAG2BkY3Ig1EXAMGoxrWh4370Zg=
-
-Name: org/apache/lucene/analysis/LowerCaseFilter.class
-SHA1-Digest: 1iwO3GIiTW/5OrvG92PhnULzMDM=
-
-Name: org/apache/lucene/index/Posting.class
-SHA1-Digest: j46POb21t/1Q2k46OA3ZvzFZAIs=
-
-Name: org/apache/lucene/search/QueryFilter.class
-SHA1-Digest: LCL705rmBVhZ7xv96tBzD/Cb/Qg=
-
-Name: org/apache/lucene/queryParser/FastCharStream.class
-SHA1-Digest: oshmewtnf253/FFnPxtEv/ZHBps=
-
-Name: org/apache/lucene/search/HitIterator.class
-SHA1-Digest: Fxux1HUPYjQAPQSqxOdxCPSCs+A=
-
-Name: org/apache/lucene/index/ParallelReader$ParallelTermDocs.class
-SHA1-Digest: cIgEzpTlwqr7ARmacT0RSaBYKjY=
-
-Name: org/apache/lucene/index/FieldInfo.class
-SHA1-Digest: sc1s/aAuqTzV+1CpGyGnA3e2Gsc=
-
-Name: org/apache/lucene/index/TermVectorsWriter$TVField.class
-SHA1-Digest: uNeiCgblbVKtN8HWGmX4S+r0aFQ=
-
-Name: org/apache/lucene/search/BooleanScorer.class
-SHA1-Digest: TB2NGTsUQXVyi+xFqw6XlezqOHc=
-
-Name: org/apache/lucene/index/TermFreqVector.class
-SHA1-Digest: 1zzNq6ebHY3/8Vfu0QChVc5Ohpc=
-
-Name: org/apache/lucene/queryParser/QueryParser$LookaheadSuccess.class
-SHA1-Digest: mT10lpxNHoMFPkZAuvTQSd2TjmI=
-
-Name: org/apache/lucene/index/ParallelReader.class
-SHA1-Digest: hJHZ05ZbT6m4y67xBvw7N2w3krw=
-
-Name: org/apache/lucene/search/BooleanScorer$Collector.class
-SHA1-Digest: n+4ZcIzEq3Ba6AqwuEdHvheSN0I=
-
-Name: org/apache/lucene/search/SortComparator.class
-SHA1-Digest: Hd6FFtq0Caq+MCLc0JATXW/p/po=
-
-Name: org/apache/lucene/search/spans/SpanFirstQuery$1.class
-SHA1-Digest: /e1MMaY/OwmkpYjyA7nFkst6aBU=
-
-Name: org/apache/lucene/search/MultiPhraseQuery.class
-SHA1-Digest: s1Xvbq53ZauPagC+fKWIbUSqThk=
-
-Name: org/apache/lucene/search/QueryTermVector.class
-SHA1-Digest: b9g8vNoS8Dg/ocVrCSdOrey0guE=
-
-Name: org/apache/lucene/search/BooleanClause.class
-SHA1-Digest: M2rcK4Luy9wP0TXgLHkE4BIp1rE=
-
-Name: org/apache/lucene/search/FuzzyTermEnum.class
-SHA1-Digest: gnpLsDH3B+4F60oia8+Kt79sxoA=
-
-Name: org/apache/lucene/index/TermPositions.class
-SHA1-Digest: iS9aGBlZ1qT4LwAHcl5VfSwm48E=
-
-Name: org/apache/lucene/index/SegmentTermEnum.class
-SHA1-Digest: jcXaOop8d48s1QHn0TCFGu/BvbM=
-
-Name: org/apache/lucene/index/SegmentTermVector.class
-SHA1-Digest: eRCJjKIdINnTpRMABNRE0GErZnU=
-
-Name: org/apache/lucene/search/Scorer.class
-SHA1-Digest: GTAMkGqqDzRhBGqZEZJoux9vAUI=
-
-Name: org/apache/lucene/index/ParallelReader$ParallelTermPositions.cla
- ss
-SHA1-Digest: vdAScaxuqoVRmrVWcA0b/NoBXug=
-
-Name: org/apache/lucene/search/FieldSortedHitQueue$1.class
-SHA1-Digest: UwslrcQlrvZKbVuShEdTZoAfWL8=
-
-Name: org/apache/lucene/analysis/TokenFilter.class
-SHA1-Digest: ESIbMh6L7xPrGj7lLw336heiHnA=
-
-Name: org/apache/lucene/analysis/TokenStream.class
-SHA1-Digest: LMWJrhxbRSGa+IKyX/rZohlqbGw=
-
-Name: org/apache/lucene/search/WildcardQuery.class
-SHA1-Digest: +4d02dtzyy6nKCvxOGe1GxpRAFQ=
-
-Name: org/apache/lucene/index/IndexWriter$2.class
-SHA1-Digest: hBVSj62Zsa4nSRYEx8xfJLkkq8A=
-
-Name: about.html
-SHA1-Digest: 606g8JTFVKK8SEHTGMPs4ku0x6k=
-
-Name: org/apache/lucene/analysis/Analyzer.class
-SHA1-Digest: tIVSoruMcHEtdEwiKw3HeFcbyhc=
-
-Name: org/apache/lucene/index/MultipleTermPositions$1.class
-SHA1-Digest: y3nf3/nCRu8yi+EgkI5Ho/LGB0A=
-
-Name: org/apache/lucene/queryParser/QueryParser.class
-SHA1-Digest: LICirs71lFzDvZXUiaIFZYim14E=
-
-Name: org/apache/lucene/index/IndexReader$FieldOption.class
-SHA1-Digest: yGIf+w/OLNGjB3WNLwqrC3OOhII=
-
-Name: org/apache/lucene/document/DateField.class
-SHA1-Digest: phSAs9B8lwprci5xC+GyZvyGu2w=
-
-Name: org/apache/lucene/search/FieldCache$FloatParser.class
-SHA1-Digest: 2F7UlZScmx/hM9HWF/NoqvbNRNk=
-
-Name: org/apache/lucene/analysis/standard/ParseException.class
-SHA1-Digest: TeRVPbyW9zux/QRYn1VqeRUmVk0=
-
-Name: org/apache/lucene/search/MultiTermQuery.class
-SHA1-Digest: mKqxjRg5FQEhwLtqfm8ajDnMTH8=
-
-Name: org/apache/lucene/index/IndexModifier.class
-SHA1-Digest: 3SArf/KaTO8e20H0fVmPj9cxOVg=
-
-Name: org/apache/lucene/search/ConstantScoreQuery$ConstantWeight.class
-SHA1-Digest: v5YDwklGJLs3LGiTZ9lqe1/Ho9s=
-
-Name: org/apache/lucene/search/DateFilter.class
-SHA1-Digest: l6GtJ6iptkd2+lZjC9SrhCLN0RQ=
-
-Name: org/apache/lucene/search/WildcardTermEnum.class
-SHA1-Digest: WJwXGhkrjTo1UbvvfK2KEUgLzpM=
-
-Name: org/apache/lucene/search/ParallelMultiSearcher.class
-SHA1-Digest: SoSh0ZCO3UEsNi4gS8WGkipm6u4=
-
-Name: org/apache/lucene/search/TopDocCollector.class
-SHA1-Digest: PR06RpviepTTbs2V0zdYdcyrxV4=
-
-Name: org/apache/lucene/index/ParallelReader$ParallelTermEnum.class
-SHA1-Digest: 4xNGgTE8OYxr20Gm2VKHi9GutVE=
-
-Name: org/apache/lucene/analysis/Token.class
-SHA1-Digest: DHuG6qSS5C5KUU27bOigrciRa3Q=
-
-Name: org/apache/lucene/document/Field.class
-SHA1-Digest: KGl8aNZy1wdVFGed8qXkVSGZFKE=
-
-Name: org/apache/lucene/search/BooleanQuery$1.class
-SHA1-Digest: K9ZrK/LrTyFGVPTvoCXF2BTG5Fs=
-
-Name: org/apache/lucene/index/SegmentReader$Norm.class
-SHA1-Digest: Ce/jz/SalZI24Xl4Hl6/EVGekgw=
-
-Name: org/apache/lucene/index/FieldInfos.class
-SHA1-Digest: mrLs8m4oawZYdKYKHGMch5CC0uo=
-
-Name: org/apache/lucene/index/Term.class
-SHA1-Digest: 8IB+s6V0CzwIB17/WtrBTYkWp5c=
-
-Name: org/apache/lucene/search/FieldCache$IntParser.class
-SHA1-Digest: GfjQbl6zZjc+iILIQNWZ+Speg2k=
-
-Name: org/apache/lucene/search/BooleanQuery$BooleanWeight2.class
-SHA1-Digest: RRSVtFpqdJAFBP/KGvpS9UQMuFk=
-
-Name: org/apache/lucene/queryParser/QueryParserConstants.class
-SHA1-Digest: gzGcN/Ibxuq8DA/KuSELgoQnwy8=
-
-Name: org/apache/lucene/search/ConstantScoreRangeQuery.class
-SHA1-Digest: pdwLNi84IobYY+X/87uMIa4gTiA=
-
-Name: org/apache/lucene/search/spans/NearSpans.class
-SHA1-Digest: 5nfVQ+u60qpG7K3iq6zri8gQCxI=
-
-Name: org/apache/lucene/search/TermQuery.class
-SHA1-Digest: nAw3TNqihv8kIP3sKzbecCPy3IY=
-
-Name: org/apache/lucene/search/SloppyPhraseScorer.class
-SHA1-Digest: kpGn3kP+YJbtX2wTfLV9h5f1ZQQ=
-
-Name: org/apache/lucene/index/MultiTermDocs.class
-SHA1-Digest: 3Qcbf6bRm+SkmmBLadOBlcbOIko=
-
-Name: org/apache/lucene/index/CompoundFileReader$CSIndexInput.class
-SHA1-Digest: fOKy1TxyhGOsw6u/tb2RUy+31W0=
-
-Name: org/apache/lucene/search/FilteredQuery$1.class
-SHA1-Digest: Atgl8mgT3pIROumJ/yNMxpNvQZU=
-
-Name: org/apache/lucene/search/FuzzyQuery.class
-SHA1-Digest: jQRvApB9SOEIl6BbFOeRmV07u/k=
-
-Name: org/apache/lucene/store/Lock.class
-SHA1-Digest: oAE7Ns57cFrSfLvn2nIb7Mh91/g=
-
-Name: org/apache/lucene/document/DateTools.class
-SHA1-Digest: vwjjGyyQ7yXIOz8Lhzsha+LeP9A=
-
-Name: org/apache/lucene/index/IndexWriter.class
-SHA1-Digest: 2aTyrINyFDG1ADA5vKB9jDuDKjw=
-
-Name: org/apache/lucene/search/MatchAllDocsQuery$MatchAllDocsWeight.cl
- ass
-SHA1-Digest: HMPBRLg5Pxg4Y4YbC8Q5QCH56ks=
-
-Name: org/apache/lucene/search/Query.class
-SHA1-Digest: BYTC3fRKGi0ok3dgbRE8WOQ1pZw=
-
-Name: org/apache/lucene/util/BitVector.class
-SHA1-Digest: K+ea69DGgqnUE5N0hKlMi1tWdvw=
-
-Name: org/apache/lucene/queryParser/Token.class
-SHA1-Digest: C4DtErVRaqgbN6mG0iPi0wdtd9U=
-
-Name: org/apache/lucene/index/TermDocs.class
-SHA1-Digest: I96Q4NkmiSHu9usQUa5XOFODAMc=
-
-Name: org/apache/lucene/index/FieldsWriter.class
-SHA1-Digest: MBSjN1OLGMcH14zcNMrVi6yZd1g=
-
-Name: org/apache/lucene/search/PrefixQuery.class
-SHA1-Digest: 4rCkMusGaylOwMK5LwseQ7lhRns=
-
-Name: org/apache/lucene/analysis/PorterStemmer.class
-SHA1-Digest: Gm0tuF2GCaV2+3jPL7USzrLJwfw=
-
-Name: org/apache/lucene/search/Weight.class
-SHA1-Digest: ITlpv6Zqbh48FPnQMhChk3gLZ80=
-
-Name: org/apache/lucene/search/ExactPhraseScorer.class
-SHA1-Digest: vIkDqUkj1hWXqlreMnsSgqwJAEs=
-
-Name: org/apache/lucene/store/FSIndexInput$Descriptor.class
-SHA1-Digest: 8Ef8hMdgX0dP2CBYOa5Dl3PtvWQ=
-
-Name: org/apache/lucene/index/IndexReader$2.class
-SHA1-Digest: 79Hy+bova28+FloyX7FoVuHZVsM=
-
-Name: org/apache/lucene/search/TopFieldDocs.class
-SHA1-Digest: QINP25DEswgAibI3aSJw9l+uqSI=
-
-Name: org/apache/lucene/analysis/KeywordAnalyzer.class
-SHA1-Digest: cD86XBElctG4hQ1kiAyBH3wJnMc=
-
-Name: org/apache/lucene/search/PhrasePositions.class
-SHA1-Digest: IcC3zPhnRml39EwGfqbhkbrzeS8=
-
-Name: org/apache/lucene/index/SegmentReader.class
-SHA1-Digest: FTp9gqXZV7RzHjItSrh+bEkBmo4=
-
-Name: org/apache/lucene/search/Searcher.class
-SHA1-Digest: HzbGl9c9rFsDQl4kwFxLINA7dGY=
-
-Name: org/apache/lucene/search/FieldSortedHitQueue.class
-SHA1-Digest: I7dxT7TQ+6Q/V1Kba7KXMDl2CXY=
-
-Name: org/apache/lucene/search/DisjunctionSumScorer$ScorerQueue.class
-SHA1-Digest: TW1wrW1IcuTp1VwJzUwUh+al/9k=
-
-Name: org/apache/lucene/index/MultiReader.class
-SHA1-Digest: qk0zrFgwtPCxxZKxWup2TtnMHGg=
-
-Name: org/apache/lucene/search/ConstantScoreQuery.class
-SHA1-Digest: K+ZOSrHlrqjtioTN0151CM81pNk=
-
-Name: org/apache/lucene/search/SortField.class
-SHA1-Digest: TV1JnRtjD54nvyJN7fS3smRpQyw=
-
-Name: org/apache/lucene/index/TermInfo.class
-SHA1-Digest: NDr62CWz3Qkeiul5NcXKOSHji3s=
-
-Name: org/apache/lucene/util/ToStringUtils.class
-SHA1-Digest: RY0n2Q8+mfBEXc9cr5jls4JL5R8=
-
-Name: org/apache/lucene/store/BufferedIndexOutput.class
-SHA1-Digest: Yp3lKLOh3uDQ50v/XRtb+esGtho=
-
-Name: org/apache/lucene/index/MultiTermEnum.class
-SHA1-Digest: xPB3GDvVlUMt7aedaMi9mCOzmeg=
-
-Name: org/apache/lucene/util/Parameter.class
-SHA1-Digest: u3OayJFhJs0ZnTGxbEiTtohOLK4=
-
-Name: org/apache/lucene/search/spans/Spans.class
-SHA1-Digest: kkUVybRufgN7xCfpwojrQh8Jfcg=
-
-Name: org/apache/lucene/search/Similarity.class
-SHA1-Digest: 7/o86tOa7hK8D0aHx5Tv0Qxp0vQ=
-
-Name: org/apache/lucene/search/DefaultSimilarity.class
-SHA1-Digest: bSPAmStF3Ool73ndxYwAbqPl1KU=
-
-Name: org/apache/lucene/search/FieldSortedHitQueue$3.class
-SHA1-Digest: bRlP5iPxfItHEOILQyD6QA1eCso=
-
-Name: org/apache/lucene/search/RemoteSearchable_Stub.class
-SHA1-Digest: Yl+Sy0YYl+WTOx2NSBTImfyrjzw=
-
-Name: org/apache/lucene/analysis/ISOLatin1AccentFilter.class
-SHA1-Digest: YJEG5hBJeBIwgyOI+07B1AiVkWk=
-
-Name: org/apache/lucene/search/FieldCache.class
-SHA1-Digest: 6iTTSM6XO59WuPUz3W7BuBMwxk8=
-
-Name: org/apache/lucene/search/TermScorer.class
-SHA1-Digest: PZu/+PWxQSmvV3rssETvLmpyM6I=
-
-Name: org/apache/lucene/index/TermBuffer.class
-SHA1-Digest: +BBKwYMnqSy7wMSTjJPMeQWx1Pk=
-
-Name: org/apache/lucene/index/IndexWriter$4.class
-SHA1-Digest: nJtK7WGxH+/Culs3gdu1P8HmnT8=
-
-Name: org/apache/lucene/index/IndexReader.class
-SHA1-Digest: acC7pOi02iSBiSpK+2Z+shC/ips=
-
-Name: org/apache/lucene/index/TermEnum.class
-SHA1-Digest: sIvf0kyRY/G1FUuQdWLo2tqrGqc=
-
-Name: org/apache/lucene/search/IndexSearcher$1.class
-SHA1-Digest: CbPX0Tt4EBdyyVArS1rJc9Vo50M=
-
-Name: org/apache/lucene/analysis/CharTokenizer.class
-SHA1-Digest: 5kbj4/Jwt4yMG4NJMwkme+m90OY=
-
-Name: org/apache/lucene/analysis/KeywordTokenizer.class
-SHA1-Digest: DI9MFEDKK/h2bKsKZ8QnOynbsfM=
-
-Name: org/apache/lucene/search/HitCollector.class
-SHA1-Digest: RwQeC1/koC3njYW0/Q8Tg2oYgwM=
-
-Name: org/apache/lucene/search/MultiPhraseQuery$MultiPhraseWeight.clas
- s
-SHA1-Digest: +nAeivQU/DOjqS9tBDhu28j8UBs=
-
-Name: org/apache/lucene/search/PhrasePrefixQuery.class
-SHA1-Digest: t6B7eGTge6q1nySqzjeshB5Fb00=
-
-Name: org/apache/lucene/analysis/de/WordlistLoader.class
-SHA1-Digest: dMKX2ZhElTV3Re9Wv5WG4TeBK3Q=
-
-Name: org/apache/lucene/store/IndexOutput.class
-SHA1-Digest: SE0gulpmKIFsRZ2nIPPSkCKWm2Q=
-
-Name: org/apache/lucene/search/HitQueue.class
-SHA1-Digest: 1Mldeg5/JXq6nleDgsMIVrb9y+U=
-
-Name: org/apache/lucene/search/SimilarityDelegator.class
-SHA1-Digest: iDfU1uAoa6zU3XdvZ/rAZrSfUj4=
-
-Name: org/apache/lucene/index/FieldsReader.class
-SHA1-Digest: yLZMOlUTwvlQAErCVBeZZKnJXLc=
-
-Name: org/apache/lucene/search/spans/SpanOrQuery$1.class
-SHA1-Digest: fe8g4PeuM6gIzKFFtE5ZhZbgGxU=
-
diff --git a/dependencyManifests/org.objectweb.asm_3.2.0.v200909071300.jar/META-INF/MANIFEST.MF b/dependencyManifests/org.objectweb.asm_3.2.0.v200909071300.jar/META-INF/MANIFEST.MF
deleted file mode 100644
index 5fdcedc..0000000
--- a/dependencyManifests/org.objectweb.asm_3.2.0.v200909071300.jar/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,520 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.3
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.objectweb.asm
-Export-Package: org.objectweb.asm;version="3.2.0",org.objectweb.asm.co
- mmons;version="3.2.0",org.objectweb.asm.signature;version="3.2.0",org
- .objectweb.asm.tree;version="3.2.0",org.objectweb.asm.tree.analysis;v
- ersion="3.2.0",org.objectweb.asm.util;version="3.2.0",org.objectweb.a
- sm.xml;version="3.2.0"
-Bundle-Version: 3.2.0.v200909071300
-Bundle-ManifestVersion: 2
-
-Name: org/objectweb/asm/xml/Processor$SubdocumentHandlerFactory.class
-SHA1-Digest: IRLJnMucw00HQe5leaIn7CmT8GQ=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$OpcodesRule.class
-SHA1-Digest: 6nAEhtBEso+8+Zf49xjgbyFrF34=
-
-Name: org/objectweb/asm/util/AbstractVisitor.class
-SHA1-Digest: tVMZs8Aq7KyTNJOs+OoYy1f72TM=
-
-Name: org/objectweb/asm/util/CheckMethodAdapter.class
-SHA1-Digest: eL7V8t4lH53vZvYVs9h33U/haFc=
-
-Name: org/objectweb/asm/signature/SignatureWriter.class
-SHA1-Digest: HPJAV23RIOlAzGwMoVui33DnuN4=
-
-Name: org/objectweb/asm/tree/AbstractInsnNode.class
-SHA1-Digest: 3ud3mL3b8p9ltWAKZZ7oBptQhrQ=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$RuleSet.class
-SHA1-Digest: P7YJzHvEC2OH8yUDz2wZjgNeFGA=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$OuterClassRule.class
-SHA1-Digest: D8JrQR9Z5b9r5J/SF81LGucKxI0=
-
-Name: org/objectweb/asm/ByteVector.class
-SHA1-Digest: h4ZyM8B9dY7thBKmXUzu0x13Y5s=
-
-Name: org/objectweb/asm/tree/analysis/SourceInterpreter.class
-SHA1-Digest: 2WPgesQkgGp8/RXySfAGnuTSUcs=
-
-Name: org/objectweb/asm/AnnotationVisitor.class
-SHA1-Digest: UQnecRexGB31Cr2kvGgwghcuRoU=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$LabelRule.class
-SHA1-Digest: /QFTnyt5V8mrN+fNORET+Bf5mrA=
-
-Name: org/objectweb/asm/tree/JumpInsnNode.class
-SHA1-Digest: ZT5Fsmfm2TcjySaNJ2yU3EPt18k=
-
-Name: org/objectweb/asm/commons/JSRInlinerAdapter$Subroutine.class
-SHA1-Digest: oAdEhdePVGjucFwgvPf0/QZIn8o=
-
-Name: org/objectweb/asm/xml/SAXFieldAdapter.class
-SHA1-Digest: b6+QKfUnSgXiKGyZlMkhRpjfduk=
-
-Name: org/objectweb/asm/ClassAdapter.class
-SHA1-Digest: sG+h9Nx43aJ24SAFAmhX5JyEoWY=
-
-Name: org/objectweb/asm/ClassWriter.class
-SHA1-Digest: lxlh7golUn1zGQXvuB1yA18BL14=
-
-Name: org/objectweb/asm/tree/analysis/Frame.class
-SHA1-Digest: 6otWk0F5/4TnMpZlXOFXk8k7YtI=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$LookupSwitchRule.class
-SHA1-Digest: xTR9SXki1Tbeq4ERivaeNWfGZPA=
-
-Name: org/objectweb/asm/MethodVisitor.class
-SHA1-Digest: XWyF4JSLXzdQ3blTUyqFeK71K1o=
-
-Name: org/objectweb/asm/tree/MemberNode.class
-SHA1-Digest: r7nOTK/tk+JWO98Yl0xidvQ0ifc=
-
-Name: org/objectweb/asm/tree/TypeInsnNode.class
-SHA1-Digest: lEEY4vKQs/wrYuOMQR+WB5O0kNg=
-
-Name: org/objectweb/asm/tree/analysis/SmallSet.class
-SHA1-Digest: anfshk1bBQr/rWNOLAdHdIYBr0Y=
-
-Name: org/objectweb/asm/tree/analysis/Value.class
-SHA1-Digest: umvNo9wKI0Z5t2GzuxWN8jPdh4k=
-
-Name: org/objectweb/asm/commons/LocalVariablesSorter.class
-SHA1-Digest: vP0IeoabCJaR3zdNmSREfBXShLs=
-
-Name: org/objectweb/asm/tree/LineNumberNode.class
-SHA1-Digest: 4aGbm34h4RkQSsSt40aDb9ud8ug=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$FrameTypeRule.class
-SHA1-Digest: MVTrxjurBweukkcvEOg8A/LUYXs=
-
-Name: org/objectweb/asm/util/TraceAbstractVisitor.class
-SHA1-Digest: U4GTihzkPOqGnwoIefu2FtgLO3U=
-
-Name: org/objectweb/asm/AnnotationWriter.class
-SHA1-Digest: FmuG+CTjzZcypuTUnTnO7FB50BY=
-
-Name: org/objectweb/asm/commons/GeneratorAdapter.class
-SHA1-Digest: fpgaUrvu85Gnfi/sgXm/y9DrJ+Y=
-
-Name: org/objectweb/asm/xml/Processor$OutputSlicingHandler.class
-SHA1-Digest: eiwNlDsKD3EE2D/WVvPBdQmHQSQ=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$ExceptionRule.class
-SHA1-Digest: 7xMDX6KfTVQ8sIKxjAZxMtKxDQg=
-
-Name: org/objectweb/asm/tree/InsnList$1.class
-SHA1-Digest: jxdwoUhxl+cSuk/Vad29up9hkKs=
-
-Name: org/objectweb/asm/tree/FieldInsnNode.class
-SHA1-Digest: DG5wGiblh5xDqpHF45xDBPoXVFM=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$AnnotationDefaultRule.cl
- ass
-SHA1-Digest: sXhgnQD6ytDsV7YC8B/tWXbkD3w=
-
-Name: org/objectweb/asm/signature/SignatureVisitor.class
-SHA1-Digest: DenxenpQSJ8ZkbIrDLDnIORqIeg=
-
-Name: org/objectweb/asm/util/ASMifierFieldVisitor.class
-SHA1-Digest: u57BDY+jeu2N+FLz4pnSm+wHCoU=
-
-Name: org/objectweb/asm/tree/LookupSwitchInsnNode.class
-SHA1-Digest: VtdlA51X8LelF/FXyederEOaL+M=
-
-Name: org/objectweb/asm/xml/SAXCodeAdapter.class
-SHA1-Digest: G7mAHjX8WYnGsDuLk08NTdL1s8I=
-
-Name: org/objectweb/asm/util/ASMifierAnnotationVisitor.class
-SHA1-Digest: Moha0L4npqm6bIh5n4/9IKG1ca4=
-
-Name: org/objectweb/asm/xml/Processor$1.class
-SHA1-Digest: VY02tzcvGflUxFJtl9DTesplcFk=
-
-Name: about_files/README.txt
-SHA1-Digest: g+hfjp6RL2xeop0L2gLHmlqdZkM=
-
-Name: org/objectweb/asm/commons/RemappingSignatureAdapter.class
-SHA1-Digest: xJNzU4FusNhuyFzRIqsl4QWK6Q0=
-
-Name: org/objectweb/asm/Frame.class
-SHA1-Digest: 8/3CB7SL0A11IjVxcwA9YBByXd0=
-
-Name: org/objectweb/asm/MethodAdapter.class
-SHA1-Digest: CBaMBHTAVqdtcyccqACLya21N5U=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$Opcode.class
-SHA1-Digest: phl1rJ4ZcRaC+4w4ssWXULQEmPg=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$MaxRule.class
-SHA1-Digest: I317BA+By0H1RMYsRuXHrRLiWg8=
-
-Name: org/objectweb/asm/tree/InsnNode.class
-SHA1-Digest: vC+88k/JTevh3L73VNg4stN/0bA=
-
-Name: org/objectweb/asm/tree/analysis/SourceValue.class
-SHA1-Digest: nqxOTo/7dSXuRgLxMtXj8N/Ok98=
-
-Name: org/objectweb/asm/tree/InnerClassNode.class
-SHA1-Digest: pEOWq01oj7BmhKWosLBtXOXE6Q8=
-
-Name: org/objectweb/asm/tree/LabelNode.class
-SHA1-Digest: PdzjM3fjKYjvGt56p3jMwHI6zYU=
-
-Name: org/objectweb/asm/tree/analysis/Subroutine.class
-SHA1-Digest: VEH4EsYcgrbYaCZBHREGdKxN5hE=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$FrameRule.class
-SHA1-Digest: ltmo3xrXYpULi7Wj1K+lXue1FOU=
-
-Name: org/objectweb/asm/commons/Method.class
-SHA1-Digest: XWef2eUPLlfEHe0u0jhuFu27Cas=
-
-Name: org/objectweb/asm/commons/InstructionAdapter.class
-SHA1-Digest: N/njcXj5ROpW19md2jKB5GSj8kA=
-
-Name: org/objectweb/asm/util/TraceFieldVisitor.class
-SHA1-Digest: jvDDCoH5PH4mUaaWa0kxPx7myw4=
-
-Name: org/objectweb/asm/util/CheckMethodAdapter$1.class
-SHA1-Digest: QaEcobQ1/7qZfizGWppVIO58OFA=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$OpcodeGroup.class
-SHA1-Digest: obho4UaPGv7y2hnzjtVY6GgwlaE=
-
-Name: org/objectweb/asm/signature/SignatureReader.class
-SHA1-Digest: vk56OWDIbFd5xWa4FyNBl+Rc+Kk=
-
-Name: org/objectweb/asm/MethodWriter.class
-SHA1-Digest: 1VcoZgt+3jK9m694wYBd9p3nKM0=
-
-Name: about_files/LICENSE.txt
-SHA1-Digest: j2BeL98mo7ztDyqaEc5IJfnL2Q4=
-
-Name: org/objectweb/asm/xml/SAXClassAdapter.class
-SHA1-Digest: DXfn9mg3ag9r+FYHr6bCsdsSFIM=
-
-Name: org/objectweb/asm/xml/Processor$SAXWriterFactory.class
-SHA1-Digest: hcIU5AlK6Rg6p4OFBZUQVyCzQjE=
-
-Name: org/objectweb/asm/Type.class
-SHA1-Digest: +Q5udvHkBDr1MeGVdQtq0EXXl0s=
-
-Name: org/objectweb/asm/commons/Remapper.class
-SHA1-Digest: uL1tIWzAaPTviLE0Rus2iybo1YM=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$AnnotationValueRule.clas
- s
-SHA1-Digest: /tmOGK+Uh9n3NIchYUJ5Kw1k/oY=
-
-Name: org/objectweb/asm/tree/LdcInsnNode.class
-SHA1-Digest: xrVsKJm2iQgaUF9Ngszl3bzRhVs=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$LookupSwitchLabelRule.cl
- ass
-SHA1-Digest: YV7f8lqABKILqNF88Tb0Hu8C/uI=
-
-Name: org/objectweb/asm/tree/IntInsnNode.class
-SHA1-Digest: ldzNDWzyE8eFAC3Hb/K64NgHWLU=
-
-Name: org/objectweb/asm/tree/analysis/BasicValue.class
-SHA1-Digest: u+ajv9i+fPQu35JqSIx3VZFB5fU=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$InterfacesRule.class
-SHA1-Digest: Jlaz19FDzjkW8wLgzbAd0mj7RFw=
-
-Name: org/objectweb/asm/commons/JSRInlinerAdapter.class
-SHA1-Digest: Vh1W3a7SabgnnOTgAhQKx1lXTOw=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$SourceRule.class
-SHA1-Digest: 7QzD7amb7F9H6z7u8uJo6FLL1XA=
-
-Name: org/objectweb/asm/commons/CodeSizeEvaluator.class
-SHA1-Digest: JLljG0VtqfiHbHyK0g0ssoXQiTo=
-
-Name: org/objectweb/asm/commons/SerialVersionUIDAdder.class
-SHA1-Digest: hySS/J//j/qRD8eE5b1hIvMVHU0=
-
-Name: org/objectweb/asm/ClassReader.class
-SHA1-Digest: q9zMQ2joqNDyB3v9/lhj9ykJWeg=
-
-Name: about.html
-SHA1-Digest: Pb3bKmCEKrJSO6koFKmxLZ5w78U=
-
-Name: org/objectweb/asm/util/ASMifierClassVisitor.class
-SHA1-Digest: J+jE/eN8ovotfqqkpwHWNNvd4ec=
-
-Name: org/objectweb/asm/util/CheckFieldAdapter.class
-SHA1-Digest: 9TsvqSjZ1ShfcnjhVNRlF8TUz90=
-
-Name: org/objectweb/asm/tree/AnnotationNode.class
-SHA1-Digest: yWBnFAyxolE1o3AZSm5DltsN8xA=
-
-Name: org/objectweb/asm/util/CheckSignatureAdapter.class
-SHA1-Digest: fOlTXO7sisxUUoU2GAoS5xAUv+E=
-
-Name: org/objectweb/asm/util/CheckAnnotationAdapter.class
-SHA1-Digest: msNK6I+i+m40dvLSnzQLJWbULMg=
-
-Name: org/objectweb/asm/commons/JSRInlinerAdapter$1.class
-SHA1-Digest: 8sBeJr95ErmH2gAv0r9i6bEf9Yw=
-
-Name: org/objectweb/asm/Item.class
-SHA1-Digest: u2HwR+Leq4I0TAxbXj+uS7QlWvw=
-
-Name: org/objectweb/asm/util/TraceAnnotationVisitor.class
-SHA1-Digest: zFw28cbyz3V6NpHvYadyqT/8Y1E=
-
-Name: org/objectweb/asm/tree/analysis/AnalyzerException.class
-SHA1-Digest: SH8CzSiMmHxMd/bnWkB+FeZDGGw=
-
-Name: org/objectweb/asm/tree/IincInsnNode.class
-SHA1-Digest: 7bZTrS9yacS4Vg6cd08tKDCsJsE=
-
-Name: org/objectweb/asm/tree/FrameNode.class
-SHA1-Digest: sqSthxQKJfeMqluOEpwYFhi8ejc=
-
-Name: org/objectweb/asm/xml/ASMContentHandler.class
-SHA1-Digest: M6PXpbjoHoWdAqecbBF6J3rQ4wM=
-
-Name: org/objectweb/asm/Label.class
-SHA1-Digest: 5oU9OGYiW2Pn4hjoN26dLqf+Z8k=
-
-Name: org/objectweb/asm/tree/MethodInsnNode.class
-SHA1-Digest: aWfe0NHpqTp5Ft3eMc1f+gTsMVk=
-
-Name: org/objectweb/asm/tree/MultiANewArrayInsnNode.class
-SHA1-Digest: bQR874E6oSxJ5rXxtpHoiY67EU0=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$AnnotationValueArrayRule
- .class
-SHA1-Digest: niN72cpSZGnRhjlouGPAYLWGMq8=
-
-Name: org/objectweb/asm/util/TraceMethodVisitor.class
-SHA1-Digest: K4rcGUcUW24+N+eGk4ZD0Y1NBn8=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$LocalVarRule.class
-SHA1-Digest: Rgua1UYDJGEfzrFsUISyy3zR7m8=
-
-Name: org/objectweb/asm/xml/Processor$InputSlicingHandler.class
-SHA1-Digest: G+Ax5kcWIEh+7GdwSIlzhQSiWKQ=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$TryCatchRule.class
-SHA1-Digest: DKoP68Q/SBrj5WT2f6xez8JifOI=
-
-Name: org/objectweb/asm/commons/RemappingAnnotationAdapter.class
-SHA1-Digest: vZfz8aOYPqTNVM6Fu9V5TbUGOC0=
-
-Name: org/objectweb/asm/util/TraceClassVisitor.class
-SHA1-Digest: QRkAjGy7g+HlbvX4Hea2Kqb6Qhg=
-
-Name: org/objectweb/asm/xml/Processor$ZipEntryElement.class
-SHA1-Digest: V+gN98rxE4ZT31622nKyi/TZXys=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$1.class
-SHA1-Digest: UsgmbbpFXDnf4mekRkUGs7qO6ac=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$ExceptionsRule.class
-SHA1-Digest: +q3LAcxsdgDck3xw44vby0BlZWI=
-
-Name: org/objectweb/asm/tree/analysis/BasicVerifier.class
-SHA1-Digest: W+zQ+de/KfqSflNq+pkYY1A13CM=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$ClassRule.class
-SHA1-Digest: N9OTGu9X5iQ6pU4uGrabNoEaa98=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$InterfaceRule.class
-SHA1-Digest: PlXOJT3jubWutfWOS4L5+yaP6es=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$FieldRule.class
-SHA1-Digest: tw2TrKcqdR5yOct57lZ9e9+Qsss=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$AnnotationParameterRule.
- class
-SHA1-Digest: 1+AtncmccYk+UNlBnbsjRQucDFo=
-
-Name: org/objectweb/asm/Handler.class
-SHA1-Digest: 7slFCwpzMai2GjSAMIoYDyjjkNM=
-
-Name: org/objectweb/asm/tree/LocalVariableNode.class
-SHA1-Digest: cdUfT0n1g0uiJ5KnpGfe/V3faj0=
-
-Name: org/objectweb/asm/tree/VarInsnNode.class
-SHA1-Digest: iONkO5hz0yyMfIESLEXJuuQSCu4=
-
-Name: org/objectweb/asm/commons/RemappingMethodAdapter.class
-SHA1-Digest: FQ6mgaNFT6lBrP8Tpgr9tlZu17Y=
-
-Name: org/objectweb/asm/FieldWriter.class
-SHA1-Digest: AVLwL6LPOTjaRJYzkwOVktJR0Dc=
-
-Name: org/objectweb/asm/xml/SAXAdapter.class
-SHA1-Digest: Rq0XGG1YBhNZ/s/0wS4GnqjKkeU=
-
-Name: org/objectweb/asm/xml/Processor$ContentHandlerFactory.class
-SHA1-Digest: Iql3AcTuk/Zv7KT1J682FAagE6o=
-
-Name: org/objectweb/asm/Edge.class
-SHA1-Digest: zPhU4kuh2C3K2hX7JxP3HRTWciQ=
-
-Name: org/objectweb/asm/commons/StaticInitMerger.class
-SHA1-Digest: CEb0IMAmNTzKt9hH9q7DFJXwr6o=
-
-Name: META-INF/eclipse.inf
-SHA1-Digest: KyT9FF7C7t86NoBoa2kZT3ZJBfw=
-
-Name: org/objectweb/asm/util/ASMifierAbstractVisitor.class
-SHA1-Digest: iwAhqNDyL1BHfSFnZfrd6RIMFq8=
-
-Name: org/objectweb/asm/tree/MethodNode.class
-SHA1-Digest: ARt9uAC8EXHdxhpyIGa/Bvcmf8Q=
-
-Name: org/objectweb/asm/xml/Processor$ProtectedInputStream.class
-SHA1-Digest: vBANXwaSsHj+RhBWagXgXxqkYS8=
-
-Name: org/objectweb/asm/tree/analysis/Interpreter.class
-SHA1-Digest: TGyQTdIapOWWZCMxzp2qP24URLg=
-
-Name: org/objectweb/asm/util/ASMifiable.class
-SHA1-Digest: gc/zNMznah6L9OMNiYH1VJ9u3Fo=
-
-Name: org/objectweb/asm/xml/Processor.class
-SHA1-Digest: hpFDjSzpzfci6PLqgu7+Xf4dXx8=
-
-Name: org/objectweb/asm/tree/analysis/Analyzer.class
-SHA1-Digest: Ii+3w7PXpEfUp5F0qRU/218t9Uc=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$LineNumberRule.class
-SHA1-Digest: 9et/hOWpBROIuG+/k+xkJK+MTRs=
-
-Name: org/objectweb/asm/Attribute.class
-SHA1-Digest: vSTLCi1osXUWM/PbcGSBbi3YEuk=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$AnnotationValueAnnotatio
- nRule.class
-SHA1-Digest: agaZ0tlyW10p+fYfQU8LgdJ2ddQ=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$Rule.class
-SHA1-Digest: n9CeqYim0bgtoyHcECMF8svTcZc=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$MethodRule.class
-SHA1-Digest: rnJXYV8UK9InZWOOQ8srNnBwd3c=
-
-Name: org/objectweb/asm/commons/SimpleRemapper.class
-SHA1-Digest: zv/T3hyl6UOT5r4B6pkE/OIcU2s=
-
-Name: org/objectweb/asm/tree/MethodNode$1.class
-SHA1-Digest: WtSvtR/B+yqOfEIoRnTyc9ghUHo=
-
-Name: org/objectweb/asm/util/CheckClassAdapter.class
-SHA1-Digest: Nms3O04QL5NpaG0H14CaduKSBU4=
-
-Name: org/objectweb/asm/FieldVisitor.class
-SHA1-Digest: RsQ0nH9tT2R9G0QyTkzysSutYuc=
-
-Name: org/objectweb/asm/commons/RemappingFieldAdapter.class
-SHA1-Digest: WgkGC80DuWf5goaTo6apndXfr4U=
-
-Name: org/objectweb/asm/commons/TableSwitchGenerator.class
-SHA1-Digest: XwcnM4llF8WZlI/6bzZS+t4vcWU=
-
-Name: org/objectweb/asm/xml/Processor$TransformerHandlerFactory.class
-SHA1-Digest: T63icHvIwoDqm5rkuigZo/Ihtso=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$AnnotationValueEnumRule.
- class
-SHA1-Digest: 5v7E7TumkN2CrUnGlKRG0JfcJJ8=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$TableSwitchLabelRule.cla
- ss
-SHA1-Digest: hshWVfWz+nGCeCZCPnkdtMSlxxo=
-
-Name: org/objectweb/asm/tree/TryCatchBlockNode.class
-SHA1-Digest: nxjxIm42S5nwsdFxwP0yRaOiMTU=
-
-Name: org/objectweb/asm/tree/InsnList$InsnListIterator.class
-SHA1-Digest: 3eWhjGGpTCIbXnkwE8fcYmZ7WtU=
-
-Name: org/objectweb/asm/util/ASMifierMethodVisitor.class
-SHA1-Digest: bgim3+SBylSeWcHpVejW6peu0qc=
-
-Name: org/objectweb/asm/xml/Processor$ASMContentHandlerFactory.class
-SHA1-Digest: aIIdIIZh6DHrAMLYI3nMY/uhWac=
-
-Name: org/objectweb/asm/commons/EmptyVisitor.class
-SHA1-Digest: ghmu5cSBwOS1Rak+5iLvUhtAPjs=
-
-Name: org/objectweb/asm/tree/ClassNode.class
-SHA1-Digest: zqBnODeb+oeCViRL1aiCYXMZB+4=
-
-Name: plugin.properties
-SHA1-Digest: broAt0N2NCO6dmEOZSReP9HHaVc=
-
-Name: org/objectweb/asm/tree/FieldNode.class
-SHA1-Digest: gIE6CQON87o29iqIhjzRcyzXXc8=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$InnerClassRule.class
-SHA1-Digest: ETHmGw4G8zrRcXRlmRPZdxI1zsU=
-
-Name: org/objectweb/asm/util/TraceSignatureVisitor.class
-SHA1-Digest: tLGOLzBjyFpysmpUNzZ576OmHrg=
-
-Name: org/objectweb/asm/tree/TableSwitchInsnNode.class
-SHA1-Digest: DdbiGEY+a5ySYT32U8IHKSXOziA=
-
-Name: org/objectweb/asm/xml/Processor$SingleDocElement.class
-SHA1-Digest: ygtbYlpFZeaixpnllKygxLwEXMI=
-
-Name: org/objectweb/asm/tree/InsnList.class
-SHA1-Digest: +MYIPQxeKoYUwWZJmCNV9h/g128=
-
-Name: org/objectweb/asm/commons/AdviceAdapter.class
-SHA1-Digest: PwFMoK8/T+Gm7t33cVp7pBsIB2w=
-
-Name: org/objectweb/asm/xml/Processor$SAXWriter.class
-SHA1-Digest: Q0fQrePnZOGod+OaXW6f6+QgUDc=
-
-Name: org/objectweb/asm/tree/analysis/SimpleVerifier.class
-SHA1-Digest: cWtugHusbNXtBlmSnH5iDgM56rs=
-
-Name: org/objectweb/asm/xml/SAXAnnotationAdapter.class
-SHA1-Digest: r3BQAFpY7/Q2nTxEiyHtIlxBDAQ=
-
-Name: org/objectweb/asm/tree/analysis/BasicInterpreter.class
-SHA1-Digest: Qqynj1ZI6tDZcHqo0K67hrQB+9E=
-
-Name: org/objectweb/asm/commons/JSRInlinerAdapter$Instantiation.class
-SHA1-Digest: QFmfvsSjrQ9FcqYsMH442tTZfrY=
-
-Name: org/objectweb/asm/commons/AnalyzerAdapter.class
-SHA1-Digest: 4enpDz2sTNEtcF6/nlLP3rm90ck=
-
-Name: org/objectweb/asm/util/Traceable.class
-SHA1-Digest: HqsPJ6VdYlqA2zfcbaEFZHi5JlY=
-
-Name: org/objectweb/asm/Opcodes.class
-SHA1-Digest: kZovfm82Efc7mxvoDryLJq42IWA=
-
-Name: org/objectweb/asm/xml/Processor$EntryElement.class
-SHA1-Digest: wSv5vSSIZmVGc6X96zR4zgeyOaw=
-
-Name: org/objectweb/asm/ClassVisitor.class
-SHA1-Digest: rHZ01JJcZ/yuuHU2MWVSh+gkdmA=
-
-Name: org/objectweb/asm/commons/RemappingClassAdapter.class
-SHA1-Digest: OSJ2ySTT/e+q1LPqe++Gfptwa40=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$AnnotationRule.class
-SHA1-Digest: 5uAmOEdZEg8jqv/pHMM544PclNY=
-
-Name: org/objectweb/asm/xml/ASMContentHandler$TableSwitchRule.class
-SHA1-Digest: WKbzAXrPew2jURpwEnv8Wz71LxA=
-
-Name: org/objectweb/asm/commons/SerialVersionUIDAdder$Item.class
-SHA1-Digest: gnwpyOJGWyLNa36ns62ubxr8gPI=
-
diff --git a/dependencyManifests/org.objectweb.asm_3.3.1.v201101071600.jar/META-INF/MANIFEST.MF b/dependencyManifests/org.objectweb.asm_3.3.1.v201101071600.jar/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..dcab626
--- /dev/null
+++ b/dependencyManifests/org.objectweb.asm_3.3.1.v201101071600.jar/META-INF/MANIFEST.MF
@@ -0,0 +1,519 @@
+Manifest-Version: 1.0
+Bundle-DocURL: http://asm.objectweb.org
+Implementation-Vendor: France Telecom R&D
+Bundle-RequiredExecutionEnvironment: J2SE-1.3
+Bundle-SymbolicName: org.objectweb.asm
+Export-Package: org.objectweb.asm;version=3.3.1,org.objectweb.asm.sign
+ ature;version=3.3.1,org.objectweb.asm.commons;version=3.3.1,org.objec
+ tweb.asm.tree;version=3.3.1,org.objectweb.asm.tree.analysis;version=3
+ .3.1,org.objectweb.asm.util;version=3.3.1,org.objectweb.asm.xml;versi
+ on=3.3.1
+Bundle-Version: 3.3.1.v201101071600
+Ant-Version: Apache Ant 1.7.1
+Bundle-Vendor: %providerName
+Bundle-Name: %pluginName
+Created-By: 14.3-b01 (Sun Microsystems Inc.)
+Implementation-Version: 3.3.1
+Implementation-Title: ASM all classes
+Bundle-ManifestVersion: 2
+
+Name: org/objectweb/asm/xml/Processor$SubdocumentHandlerFactory.class
+SHA1-Digest: jNBg9c+W6ZKPQTdrp0o3rKZAZzw=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$OpcodesRule.class
+SHA1-Digest: iI0LSCexIQVgoLeYIJC51R65w+I=
+
+Name: org/objectweb/asm/util/AbstractVisitor.class
+SHA1-Digest: tVMZs8Aq7KyTNJOs+OoYy1f72TM=
+
+Name: org/objectweb/asm/util/CheckMethodAdapter.class
+SHA1-Digest: SC7rXqulwjrBnV4XDzhV9BFPOMo=
+
+Name: org/objectweb/asm/signature/SignatureWriter.class
+SHA1-Digest: HPJAV23RIOlAzGwMoVui33DnuN4=
+
+Name: org/objectweb/asm/tree/AbstractInsnNode.class
+SHA1-Digest: 3ud3mL3b8p9ltWAKZZ7oBptQhrQ=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$RuleSet.class
+SHA1-Digest: JIvii9wW5KyQp+F3/VJ/RXKgtgg=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$OuterClassRule.class
+SHA1-Digest: XdQixzjYv6+IojTV6G1FBxPaF0Y=
+
+Name: org/objectweb/asm/ByteVector.class
+SHA1-Digest: h4ZyM8B9dY7thBKmXUzu0x13Y5s=
+
+Name: org/objectweb/asm/tree/analysis/SourceInterpreter.class
+SHA1-Digest: 2WPgesQkgGp8/RXySfAGnuTSUcs=
+
+Name: org/objectweb/asm/AnnotationVisitor.class
+SHA1-Digest: UQnecRexGB31Cr2kvGgwghcuRoU=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$LabelRule.class
+SHA1-Digest: Kgc5zN9QkHafH3c+XY8wZO2mg7c=
+
+Name: org/objectweb/asm/tree/JumpInsnNode.class
+SHA1-Digest: ZT5Fsmfm2TcjySaNJ2yU3EPt18k=
+
+Name: org/objectweb/asm/commons/JSRInlinerAdapter$Subroutine.class
+SHA1-Digest: oAdEhdePVGjucFwgvPf0/QZIn8o=
+
+Name: org/objectweb/asm/xml/SAXFieldAdapter.class
+SHA1-Digest: b6+QKfUnSgXiKGyZlMkhRpjfduk=
+
+Name: org/objectweb/asm/ClassAdapter.class
+SHA1-Digest: sG+h9Nx43aJ24SAFAmhX5JyEoWY=
+
+Name: org/objectweb/asm/ClassWriter.class
+SHA1-Digest: YK6yGl1oVXTVuS3QbBjAVsr1Tvk=
+
+Name: org/objectweb/asm/tree/analysis/Frame.class
+SHA1-Digest: WbZDuwDtToCi49Hk49w7nQLBNXE=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$LookupSwitchRule.class
+SHA1-Digest: xGGDjQm3IWvMNOmuKr5rTs/Eg8I=
+
+Name: org/objectweb/asm/MethodVisitor.class
+SHA1-Digest: XWyF4JSLXzdQ3blTUyqFeK71K1o=
+
+Name: org/objectweb/asm/tree/MemberNode.class
+SHA1-Digest: r7nOTK/tk+JWO98Yl0xidvQ0ifc=
+
+Name: org/objectweb/asm/tree/TypeInsnNode.class
+SHA1-Digest: lEEY4vKQs/wrYuOMQR+WB5O0kNg=
+
+Name: org/objectweb/asm/tree/analysis/SmallSet.class
+SHA1-Digest: anfshk1bBQr/rWNOLAdHdIYBr0Y=
+
+Name: org/objectweb/asm/tree/analysis/Value.class
+SHA1-Digest: umvNo9wKI0Z5t2GzuxWN8jPdh4k=
+
+Name: org/objectweb/asm/commons/LocalVariablesSorter.class
+SHA1-Digest: 0E2NkLgZ6wU55NxJR6oJZRPdBSI=
+
+Name: org/objectweb/asm/tree/LineNumberNode.class
+SHA1-Digest: 4aGbm34h4RkQSsSt40aDb9ud8ug=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$FrameTypeRule.class
+SHA1-Digest: 3Vz5juoFUvZ1hBysIwW/MNhdspw=
+
+Name: org/objectweb/asm/util/TraceAbstractVisitor.class
+SHA1-Digest: U4GTihzkPOqGnwoIefu2FtgLO3U=
+
+Name: org/objectweb/asm/AnnotationWriter.class
+SHA1-Digest: FmuG+CTjzZcypuTUnTnO7FB50BY=
+
+Name: org/objectweb/asm/commons/GeneratorAdapter.class
+SHA1-Digest: fpgaUrvu85Gnfi/sgXm/y9DrJ+Y=
+
+Name: org/objectweb/asm/xml/Processor$OutputSlicingHandler.class
+SHA1-Digest: r+G0vffEj1p2Foi6iN/2YHtXtz8=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$ExceptionRule.class
+SHA1-Digest: 0SnYqt5ryKMP1d9mTr6riFdhqQg=
+
+Name: org/objectweb/asm/tree/FieldInsnNode.class
+SHA1-Digest: DG5wGiblh5xDqpHF45xDBPoXVFM=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$AnnotationDefaultRule.cl
+ ass
+SHA1-Digest: F9P4R7eVghM5s2NqGn8zt+tXoqY=
+
+Name: org/objectweb/asm/signature/SignatureVisitor.class
+SHA1-Digest: DenxenpQSJ8ZkbIrDLDnIORqIeg=
+
+Name: org/objectweb/asm/util/ASMifierFieldVisitor.class
+SHA1-Digest: u57BDY+jeu2N+FLz4pnSm+wHCoU=
+
+Name: org/objectweb/asm/tree/LookupSwitchInsnNode.class
+SHA1-Digest: VtdlA51X8LelF/FXyederEOaL+M=
+
+Name: org/objectweb/asm/xml/SAXCodeAdapter.class
+SHA1-Digest: G7mAHjX8WYnGsDuLk08NTdL1s8I=
+
+Name: org/objectweb/asm/util/ASMifierAnnotationVisitor.class
+SHA1-Digest: Moha0L4npqm6bIh5n4/9IKG1ca4=
+
+Name: about_files/README.txt
+SHA1-Digest: g+hfjp6RL2xeop0L2gLHmlqdZkM=
+
+Name: org/objectweb/asm/commons/RemappingSignatureAdapter.class
+SHA1-Digest: xJNzU4FusNhuyFzRIqsl4QWK6Q0=
+
+Name: org/objectweb/asm/Frame.class
+SHA1-Digest: 8/3CB7SL0A11IjVxcwA9YBByXd0=
+
+Name: org/objectweb/asm/MethodAdapter.class
+SHA1-Digest: CBaMBHTAVqdtcyccqACLya21N5U=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$Opcode.class
+SHA1-Digest: PDx4NZ9mYKiC7H28FGIrS4ygIi0=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$MaxRule.class
+SHA1-Digest: /1YtfA1VhbgQSD1npTZKQ/rdl3c=
+
+Name: org/objectweb/asm/tree/InsnNode.class
+SHA1-Digest: vC+88k/JTevh3L73VNg4stN/0bA=
+
+Name: org/objectweb/asm/tree/analysis/SourceValue.class
+SHA1-Digest: nqxOTo/7dSXuRgLxMtXj8N/Ok98=
+
+Name: org/objectweb/asm/tree/InnerClassNode.class
+SHA1-Digest: pEOWq01oj7BmhKWosLBtXOXE6Q8=
+
+Name: org/objectweb/asm/tree/LabelNode.class
+SHA1-Digest: PdzjM3fjKYjvGt56p3jMwHI6zYU=
+
+Name: org/objectweb/asm/tree/analysis/Subroutine.class
+SHA1-Digest: VEH4EsYcgrbYaCZBHREGdKxN5hE=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$FrameRule.class
+SHA1-Digest: sylJPV/xra1L9MJt8xtEpPcBYyU=
+
+Name: org/objectweb/asm/commons/Method.class
+SHA1-Digest: XWef2eUPLlfEHe0u0jhuFu27Cas=
+
+Name: org/objectweb/asm/commons/InstructionAdapter.class
+SHA1-Digest: N/njcXj5ROpW19md2jKB5GSj8kA=
+
+Name: org/objectweb/asm/util/TraceFieldVisitor.class
+SHA1-Digest: jvDDCoH5PH4mUaaWa0kxPx7myw4=
+
+Name: org/objectweb/asm/util/CheckMethodAdapter$1.class
+SHA1-Digest: GkWLqvZRGD6eoXgvKUATmi4wg6I=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$OpcodeGroup.class
+SHA1-Digest: obho4UaPGv7y2hnzjtVY6GgwlaE=
+
+Name: org/objectweb/asm/signature/SignatureReader.class
+SHA1-Digest: vk56OWDIbFd5xWa4FyNBl+Rc+Kk=
+
+Name: org/objectweb/asm/MethodWriter.class
+SHA1-Digest: sFAy7hmBGkuP3ucLv4qBFrXVeuw=
+
+Name: about_files/LICENSE.txt
+SHA1-Digest: j2BeL98mo7ztDyqaEc5IJfnL2Q4=
+
+Name: org/objectweb/asm/xml/SAXClassAdapter.class
+SHA1-Digest: DXfn9mg3ag9r+FYHr6bCsdsSFIM=
+
+Name: org/objectweb/asm/xml/Processor$SAXWriterFactory.class
+SHA1-Digest: 7Rhw91uB2J5u/9iiCEcCPsnBUHA=
+
+Name: org/objectweb/asm/Type.class
+SHA1-Digest: 3J6+fZZ+ACY1WTslhw9ucbG0748=
+
+Name: org/objectweb/asm/commons/Remapper.class
+SHA1-Digest: uL1tIWzAaPTviLE0Rus2iybo1YM=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$AnnotationValueRule.clas
+ s
+SHA1-Digest: f65xflthl3iXtJDlX+uSNGG8k+Y=
+
+Name: org/objectweb/asm/tree/LdcInsnNode.class
+SHA1-Digest: xrVsKJm2iQgaUF9Ngszl3bzRhVs=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$LookupSwitchLabelRule.cl
+ ass
+SHA1-Digest: WmgYNlK3t/VjLd/VzmxXz/zgizY=
+
+Name: org/objectweb/asm/tree/IntInsnNode.class
+SHA1-Digest: ldzNDWzyE8eFAC3Hb/K64NgHWLU=
+
+Name: org/objectweb/asm/tree/analysis/BasicValue.class
+SHA1-Digest: uyqj9D8C8X/it1yGj6fmAmTIKSo=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$InterfacesRule.class
+SHA1-Digest: JAsviO4LTPy3XWucpOKQ+Vm4szM=
+
+Name: org/objectweb/asm/commons/JSRInlinerAdapter.class
+SHA1-Digest: ULobaqw7mM5kAXPp6dI60zbZy+8=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$SourceRule.class
+SHA1-Digest: IurtRN2/IgxLDTllPR81EgvXvmI=
+
+Name: org/objectweb/asm/commons/CodeSizeEvaluator.class
+SHA1-Digest: JLljG0VtqfiHbHyK0g0ssoXQiTo=
+
+Name: org/objectweb/asm/commons/SerialVersionUIDAdder.class
+SHA1-Digest: Tugv0GEB2ZeU5Y2oWlDpJ3Gaigo=
+
+Name: org/objectweb/asm/ClassReader.class
+SHA1-Digest: X8Qxtq+y0k6v3SIhslQbP1bq65k=
+
+Name: about.html
+SHA1-Digest: ydS7k3ZLlsTeMmEg6RBxk9Ptn7Q=
+
+Name: org/objectweb/asm/util/ASMifierClassVisitor.class
+SHA1-Digest: J+jE/eN8ovotfqqkpwHWNNvd4ec=
+
+Name: org/objectweb/asm/util/CheckFieldAdapter.class
+SHA1-Digest: 9TsvqSjZ1ShfcnjhVNRlF8TUz90=
+
+Name: org/objectweb/asm/tree/AnnotationNode.class
+SHA1-Digest: yWBnFAyxolE1o3AZSm5DltsN8xA=
+
+Name: org/objectweb/asm/util/CheckSignatureAdapter.class
+SHA1-Digest: fOlTXO7sisxUUoU2GAoS5xAUv+E=
+
+Name: org/objectweb/asm/util/CheckAnnotationAdapter.class
+SHA1-Digest: msNK6I+i+m40dvLSnzQLJWbULMg=
+
+Name: org/objectweb/asm/Item.class
+SHA1-Digest: u2HwR+Leq4I0TAxbXj+uS7QlWvw=
+
+Name: org/objectweb/asm/util/TraceAnnotationVisitor.class
+SHA1-Digest: zFw28cbyz3V6NpHvYadyqT/8Y1E=
+
+Name: org/objectweb/asm/tree/analysis/AnalyzerException.class
+SHA1-Digest: AKx9IC+kTEx4gZa2De12RsFAcRw=
+
+Name: org/objectweb/asm/tree/IincInsnNode.class
+SHA1-Digest: 7bZTrS9yacS4Vg6cd08tKDCsJsE=
+
+Name: org/objectweb/asm/tree/FrameNode.class
+SHA1-Digest: 80QMdj4xzHgQGULYAc+bNRP6jnk=
+
+Name: org/objectweb/asm/xml/ASMContentHandler.class
+SHA1-Digest: WQ4Va3iOgTJlmw23RlHfp82Ya5k=
+
+Name: org/objectweb/asm/Label.class
+SHA1-Digest: AKoFTbIyG/JPBitg15Th9uMrQw4=
+
+Name: org/objectweb/asm/tree/MethodInsnNode.class
+SHA1-Digest: aWfe0NHpqTp5Ft3eMc1f+gTsMVk=
+
+Name: org/objectweb/asm/tree/MultiANewArrayInsnNode.class
+SHA1-Digest: bQR874E6oSxJ5rXxtpHoiY67EU0=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$AnnotationValueArrayRule
+ .class
+SHA1-Digest: oHzl3JdCwf9nA/ZFnumoHI8CtKo=
+
+Name: org/objectweb/asm/util/TraceMethodVisitor.class
+SHA1-Digest: K4rcGUcUW24+N+eGk4ZD0Y1NBn8=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$LocalVarRule.class
+SHA1-Digest: x6kxIP3KKdQPV4B1Op0k7UQz5Ak=
+
+Name: org/objectweb/asm/xml/Processor$InputSlicingHandler.class
+SHA1-Digest: CK34F97D2+4hBshmICWuYl7Zu7U=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$TryCatchRule.class
+SHA1-Digest: XFXb3AfNXDwxYNPgoj5BLkhHY5c=
+
+Name: org/objectweb/asm/commons/TryCatchBlockSorter$1.class
+SHA1-Digest: RANtj4I+tIPl76+cAYY/oG0vT9w=
+
+Name: org/objectweb/asm/commons/RemappingAnnotationAdapter.class
+SHA1-Digest: h2R7GCel7tlC3DfBvKIq+0+hgj4=
+
+Name: org/objectweb/asm/util/TraceClassVisitor.class
+SHA1-Digest: dO978Au88FUa63voe8kXrBCD8Rw=
+
+Name: org/objectweb/asm/xml/Processor$ZipEntryElement.class
+SHA1-Digest: jDooCRz4hTcgdUKpcDgtLkciCH0=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$ExceptionsRule.class
+SHA1-Digest: wB+bJXQtYvcwu3rhDN8v0GiQP8k=
+
+Name: org/objectweb/asm/tree/analysis/BasicVerifier.class
+SHA1-Digest: 7ux/BRI3M0YM3lEB7kDRXklnY+I=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$ClassRule.class
+SHA1-Digest: vM8Arq/rUPd+N+nWDBT9z+bjZZM=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$InterfaceRule.class
+SHA1-Digest: rBMOnpBeQ4CpSavaXKQfO1sF1dQ=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$FieldRule.class
+SHA1-Digest: kqqe6c6p9YidztBMfxewUrC6gGM=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$AnnotationParameterRule.
+ class
+SHA1-Digest: OAFHlOiQPl3hx0biGP9kW5T8Kfs=
+
+Name: org/objectweb/asm/Handler.class
+SHA1-Digest: 7slFCwpzMai2GjSAMIoYDyjjkNM=
+
+Name: org/objectweb/asm/tree/LocalVariableNode.class
+SHA1-Digest: cdUfT0n1g0uiJ5KnpGfe/V3faj0=
+
+Name: org/objectweb/asm/tree/VarInsnNode.class
+SHA1-Digest: iONkO5hz0yyMfIESLEXJuuQSCu4=
+
+Name: org/objectweb/asm/commons/RemappingMethodAdapter.class
+SHA1-Digest: x5J2bctKh1nuMfMgBtq4ut94rIY=
+
+Name: org/objectweb/asm/FieldWriter.class
+SHA1-Digest: AouVqDrMvr2z3KTntQaQtfCUqWY=
+
+Name: org/objectweb/asm/xml/SAXAdapter.class
+SHA1-Digest: Rq0XGG1YBhNZ/s/0wS4GnqjKkeU=
+
+Name: org/objectweb/asm/xml/Processor$ContentHandlerFactory.class
+SHA1-Digest: Iql3AcTuk/Zv7KT1J682FAagE6o=
+
+Name: org/objectweb/asm/Edge.class
+SHA1-Digest: zPhU4kuh2C3K2hX7JxP3HRTWciQ=
+
+Name: org/objectweb/asm/commons/StaticInitMerger.class
+SHA1-Digest: CEb0IMAmNTzKt9hH9q7DFJXwr6o=
+
+Name: META-INF/eclipse.inf
+SHA1-Digest: KyT9FF7C7t86NoBoa2kZT3ZJBfw=
+
+Name: org/objectweb/asm/util/ASMifierAbstractVisitor.class
+SHA1-Digest: iwAhqNDyL1BHfSFnZfrd6RIMFq8=
+
+Name: org/objectweb/asm/tree/MethodNode.class
+SHA1-Digest: ARt9uAC8EXHdxhpyIGa/Bvcmf8Q=
+
+Name: org/objectweb/asm/xml/Processor$ProtectedInputStream.class
+SHA1-Digest: EEWGaF5FuPHnCgoybE1HboMxzlU=
+
+Name: org/objectweb/asm/tree/analysis/Interpreter.class
+SHA1-Digest: TGyQTdIapOWWZCMxzp2qP24URLg=
+
+Name: org/objectweb/asm/util/ASMifiable.class
+SHA1-Digest: gc/zNMznah6L9OMNiYH1VJ9u3Fo=
+
+Name: org/objectweb/asm/xml/Processor.class
+SHA1-Digest: k1R+nzqvwzexnn38zwNVUlmTocs=
+
+Name: org/objectweb/asm/tree/analysis/Analyzer.class
+SHA1-Digest: BUd5T/Qc8xbHj4TDRqTUr6W+Puk=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$LineNumberRule.class
+SHA1-Digest: nNQ86iA3yHEpjywv6uBlYWZ8FYQ=
+
+Name: org/objectweb/asm/Attribute.class
+SHA1-Digest: vSTLCi1osXUWM/PbcGSBbi3YEuk=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$AnnotationValueAnnotatio
+ nRule.class
+SHA1-Digest: fh7sRMHq51rGvWnt9X8+eoohu00=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$Rule.class
+SHA1-Digest: y9b+F7g4B1uDWtyXile3vaI1fPA=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$MethodRule.class
+SHA1-Digest: 64u5tZhnhaU0v9DueUH6TobjNpk=
+
+Name: org/objectweb/asm/commons/SimpleRemapper.class
+SHA1-Digest: zv/T3hyl6UOT5r4B6pkE/OIcU2s=
+
+Name: org/objectweb/asm/tree/MethodNode$1.class
+SHA1-Digest: b//LjFLFpUsZbvnSRNZyTElQuQQ=
+
+Name: org/objectweb/asm/util/CheckClassAdapter.class
+SHA1-Digest: cQIkcqhpINLzqf3uxVTBJ4Uq2qs=
+
+Name: org/objectweb/asm/FieldVisitor.class
+SHA1-Digest: RsQ0nH9tT2R9G0QyTkzysSutYuc=
+
+Name: org/objectweb/asm/commons/RemappingFieldAdapter.class
+SHA1-Digest: 3hiyRWXWe0AualXZpgkllMBL2FM=
+
+Name: org/objectweb/asm/commons/TableSwitchGenerator.class
+SHA1-Digest: XwcnM4llF8WZlI/6bzZS+t4vcWU=
+
+Name: org/objectweb/asm/xml/Processor$TransformerHandlerFactory.class
+SHA1-Digest: 1F0o0EkqnW+Czhruz5Z6365xiWM=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$AnnotationValueEnumRule.
+ class
+SHA1-Digest: pGf5BzWJAi9cg6q8bHfn09XK8Mc=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$TableSwitchLabelRule.cla
+ ss
+SHA1-Digest: juzbC0PQCAYqn+vv4DN+Nf1kZck=
+
+Name: org/objectweb/asm/tree/TryCatchBlockNode.class
+SHA1-Digest: nxjxIm42S5nwsdFxwP0yRaOiMTU=
+
+Name: org/objectweb/asm/commons/TryCatchBlockSorter.class
+SHA1-Digest: T7Ceq2PJeSXEXJssQH7Dj5WTr/0=
+
+Name: org/objectweb/asm/tree/InsnList$InsnListIterator.class
+SHA1-Digest: 0L4Y7BGoFXM7KOXHM57oW8EKIWI=
+
+Name: org/objectweb/asm/util/ASMifierMethodVisitor.class
+SHA1-Digest: bgim3+SBylSeWcHpVejW6peu0qc=
+
+Name: org/objectweb/asm/xml/Processor$ASMContentHandlerFactory.class
+SHA1-Digest: 4YK+W5iOsNC9veiDyOqB1nU3MmU=
+
+Name: org/objectweb/asm/commons/EmptyVisitor.class
+SHA1-Digest: ghmu5cSBwOS1Rak+5iLvUhtAPjs=
+
+Name: org/objectweb/asm/tree/ClassNode.class
+SHA1-Digest: zqBnODeb+oeCViRL1aiCYXMZB+4=
+
+Name: plugin.properties
+SHA1-Digest: oOwT8GoUdIL/oAVr9wT3mX3AxlY=
+
+Name: org/objectweb/asm/tree/FieldNode.class
+SHA1-Digest: gIE6CQON87o29iqIhjzRcyzXXc8=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$InnerClassRule.class
+SHA1-Digest: OGk9NWVjt8h1ZBi9PJmSXELLQPs=
+
+Name: org/objectweb/asm/util/TraceSignatureVisitor.class
+SHA1-Digest: tLGOLzBjyFpysmpUNzZ576OmHrg=
+
+Name: org/objectweb/asm/tree/TableSwitchInsnNode.class
+SHA1-Digest: DdbiGEY+a5ySYT32U8IHKSXOziA=
+
+Name: org/objectweb/asm/xml/Processor$SingleDocElement.class
+SHA1-Digest: 37EJZOP5WXgBUAQeRNIHlG81dEE=
+
+Name: org/objectweb/asm/tree/InsnList.class
+SHA1-Digest: CgRV8vXb0APKNpCP8ujNaE8LaCk=
+
+Name: org/objectweb/asm/commons/AdviceAdapter.class
+SHA1-Digest: PwFMoK8/T+Gm7t33cVp7pBsIB2w=
+
+Name: org/objectweb/asm/xml/Processor$SAXWriter.class
+SHA1-Digest: Xet+8o/VALpITFXxpKj4lY0tQZg=
+
+Name: org/objectweb/asm/tree/analysis/SimpleVerifier.class
+SHA1-Digest: kZKT8PvJpHFyKF8YgzQHYGUaE38=
+
+Name: org/objectweb/asm/xml/SAXAnnotationAdapter.class
+SHA1-Digest: r3BQAFpY7/Q2nTxEiyHtIlxBDAQ=
+
+Name: org/objectweb/asm/tree/analysis/BasicInterpreter.class
+SHA1-Digest: SZ7ibvk+IiyCe1CsiIu8opF5IqQ=
+
+Name: org/objectweb/asm/commons/JSRInlinerAdapter$Instantiation.class
+SHA1-Digest: FIgN/uJ5IIxjb/a1FhlZPMlEkgw=
+
+Name: org/objectweb/asm/commons/AnalyzerAdapter.class
+SHA1-Digest: C6kRpRTuOQYZAKfT0w07Rat1QiE=
+
+Name: org/objectweb/asm/util/Traceable.class
+SHA1-Digest: HqsPJ6VdYlqA2zfcbaEFZHi5JlY=
+
+Name: org/objectweb/asm/Opcodes.class
+SHA1-Digest: kZovfm82Efc7mxvoDryLJq42IWA=
+
+Name: org/objectweb/asm/xml/Processor$EntryElement.class
+SHA1-Digest: wSv5vSSIZmVGc6X96zR4zgeyOaw=
+
+Name: org/objectweb/asm/ClassVisitor.class
+SHA1-Digest: rHZ01JJcZ/yuuHU2MWVSh+gkdmA=
+
+Name: org/objectweb/asm/commons/RemappingClassAdapter.class
+SHA1-Digest: Cm0nOvJPjll5h6QDpWZzXjbKnKo=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$AnnotationRule.class
+SHA1-Digest: dE7AZy65zM60gbwHwlwXk4YlYrw=
+
+Name: org/objectweb/asm/xml/ASMContentHandler$TableSwitchRule.class
+SHA1-Digest: Sq4tpH8K65+CC2vyuvEGT5e1mrk=
+
+Name: org/objectweb/asm/commons/SerialVersionUIDAdder$Item.class
+SHA1-Digest: gnwpyOJGWyLNa36ns62ubxr8gPI=
+
diff --git a/dependencyManifests/org.sat4j.core_2.2.0.v20100429.jar/META-INF/MANIFEST.MF b/dependencyManifests/org.sat4j.core_2.2.0.v20100429.jar/META-INF/MANIFEST.MF
deleted file mode 100644
index 3b90cfa..0000000
--- a/dependencyManifests/org.sat4j.core_2.2.0.v20100429.jar/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,544 +0,0 @@
-Manifest-Version: 1.0
-Implementation-Vendor: CRIL CNRS UMR 8188 - Universite d'Artois
-Bundle-Localization: plugin
-Main-Class: org.sat4j.BasicLauncher
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Built-By: Daniel Le Berre
-Bundle-SymbolicName: org.sat4j.core
-Bundle-Version: 2.2.0.v20100429
-Export-Package: org.sat4j;version="2.2.0.v20100429",org.sat4j.core;ver
- sion="2.2.0.v20100429",org.sat4j.minisat;version="2.2.0.v20100429",or
- g.sat4j.minisat.constraints;version="2.2.0.v20100429",org.sat4j.minis
- at.constraints.card;version="2.2.0.v20100429",org.sat4j.minisat.const
- raints.cnf;version="2.2.0.v20100429",org.sat4j.minisat.core;version="
- 2.2.0.v20100429",org.sat4j.minisat.learning;version="2.2.0.v20100429"
- ,org.sat4j.minisat.orders;version="2.2.0.v20100429",org.sat4j.minisat
- .restarts;version="2.2.0.v20100429",org.sat4j.minisat.uip;version="2.
- 2.0.v20100429",org.sat4j.opt;version="2.2.0.v20100429",org.sat4j.read
- er;version="2.2.0.v20100429",org.sat4j.specs;version="2.2.0.v20100429
- ",org.sat4j.tools;version="2.2.0.v20100429",org.sat4j.tools.xplain;ve
- rsion="2.2.0.v20100429"
-Specification-Version: NA
-Specification-Title: SAT4J
-Specification-Vendor: Daniel Le Berre
-Ant-Version: Apache Ant 1.7.1
-Bundle-Vendor: %providerName
-Bundle-Name: %bundleName
-Created-By: 14.0-b16 (Sun Microsystems Inc.)
-Implementation-Version: 2.2.0.v20100429 
-Implementation-Title: SAT4J
-Bundle-ManifestVersion: 2
-
-Name: overview.html
-SHA1-Digest: dn/2qZIKrR/o7110Zst9XnBMJQs=
-
-Name: org/sat4j/tools/GateTranslator.class
-SHA1-Digest: Yh6sCzxURtlx8qrFaI+xhO7taJM=
-
-Name: org/sat4j/minisat/core/IOrder.class
-SHA1-Digest: X18Zt59LqRUfn0D/p7+Yulvx6A4=
-
-Name: org/sat4j/minisat/core/Solver$6.class
-SHA1-Digest: A9NaKDVPCX8avbQtiIcVsSUi0AQ=
-
-Name: org/sat4j/tools/SingleSolutionDetector.class
-SHA1-Digest: xRDSLeA8py9/4oqlAOAZCB5FuBo=
-
-Name: org/sat4j/minisat/constraints/AbstractDataStructureFactory.class
-SHA1-Digest: QC7DJMLxn40aJ6PtPaZzka0do/4=
-
-Name: sat4j.version
-SHA1-Digest: NZ/fetT1tL14CPqc4oXVd0YSLH4=
-
-Name: org/sat4j/minisat/core/VoidTracing.class
-SHA1-Digest: qab4ylcy9igxerjR3oNVShe7oUg=
-
-Name: org/sat4j/tools/xplain/Xplain.class
-SHA1-Digest: 1jX6dpnW8uoWTkXC5s16bjMuF0I=
-
-Name: org/sat4j/minisat/constraints/CardinalityDataStructureYanMin.cla
- ss
-SHA1-Digest: XvPtjZJs9rA05nolsi/QNsXXlvU=
-
-Name: org/sat4j/minisat/orders/VarOrderHeap.class
-SHA1-Digest: IfBRX8A9zzfGV1SbWEpHN2hyqmA=
-
-Name: org/sat4j/minisat/constraints/cnf/OriginalWLClause.class
-SHA1-Digest: e5hXI5VqiNVDnFSAf3+N9cWe+2c=
-
-Name: org/sat4j/minisat/core/ConflictTimerContainer.class
-SHA1-Digest: WZnSTl/i/51xiYxIutjbXSBBrzM=
-
-Name: org/sat4j/minisat/core/Solver$4$1.class
-SHA1-Digest: NkmAx0lapXofeVNwuxwX8QdoNsU=
-
-Name: org/sat4j/minisat/core/Solver$5$1.class
-SHA1-Digest: 8wcs6u5RIDbL8/R64JGfFlClLWk=
-
-Name: org/sat4j/minisat/learning/LimitedLearning.class
-SHA1-Digest: ErjN2ShX727XdTOXJhv363hP9bI=
-
-Name: org/sat4j/minisat/restarts/MiniSATRestarts.class
-SHA1-Digest: k/KhiR/OfC034e0ZPySapkgveAE=
-
-Name: org/sat4j/Messages.class
-SHA1-Digest: N9cs+sh8DpqhA5oV0QFAVAIY91w=
-
-Name: org/sat4j/tools/DecisionLevelTracing.class
-SHA1-Digest: bqc7u8t12qSXuXrIo9Vr5G8s56I=
-
-Name: org/sat4j/minisat/core/ConflictTimerAdapter.class
-SHA1-Digest: EOpIpvS+DhOiAnF4CKrEjlJIDpo=
-
-Name: org/sat4j/minisat/core/RestartStrategy.class
-SHA1-Digest: SV48tRost4rdjsXHcfllFOHsNXE=
-
-Name: org/sat4j/minisat/restarts/LubyRestarts.class
-SHA1-Digest: EEerNSUBAlbld5M7LP7mN2zs9Ts=
-
-Name: org/sat4j/minisat/orders/NegativeLiteralSelectionStrategy.class
-SHA1-Digest: gB+OVkgcdZHx1JonmB7tnCO7Oyc=
-
-Name: org/sat4j/minisat/constraints/ClausalDataStructureCBWL.class
-SHA1-Digest: rP/p+6+pYZiKHSfrrQIRemLWE0w=
-
-Name: org/sat4j/minisat/constraints/AbstractCardinalityDataStructure.c
- lass
-SHA1-Digest: GSCvrYhJoXJ3OrNG6+VkuyfThuY=
-
-Name: org/sat4j/minisat/constraints/cnf/LearntHTClause.class
-SHA1-Digest: MFUNHhZuO01qFAkEy0swU0CfF3w=
-
-Name: org/sat4j/minisat/orders/PhaseCachingAutoEraseStrategy.class
-SHA1-Digest: vaZ7i3+fm0kWgbsdpPmyV9++was=
-
-Name: org/sat4j/tools/ConstrGroup.class
-SHA1-Digest: 8dJf1rUYdJ5D/5q7CzmA3Mzc/jw=
-
-Name: org/sat4j/specs/IOptimizationProblem.class
-SHA1-Digest: BzbKf8Uu0CXX6Z7/80WgezxoyJ0=
-
-Name: org/sat4j/minisat/orders/RandomLiteralSelectionStrategy.class
-SHA1-Digest: tropHGTOmwv8DbIEqkHbW8cVJ28=
-
-Name: org/sat4j/minisat/core/Learner.class
-SHA1-Digest: zZl+IKIJohUSLCPKiPsh54DbG74=
-
-Name: org/sat4j/AbstractLauncher.class
-SHA1-Digest: BTH8yMwC7xiwd2oHaXS2kaEy3CM=
-
-Name: org/sat4j/minisat/orders/UserFixedPhaseSelectionStrategy.class
-SHA1-Digest: IKCHFMe/zjI/CRjw2fDR7EzNwnQ=
-
-Name: org/sat4j/minisat/constraints/card/MaxWatchCard.class
-SHA1-Digest: owfh9LqCYYiwpXaQFVQYe3jM+5k=
-
-Name: org/sat4j/minisat/core/Solver.class
-SHA1-Digest: tWS14McPuDt+bdAm8dWQcbpZzhM=
-
-Name: org/sat4j/specs/ISolver.class
-SHA1-Digest: 7JoFkvIfa9MiC/Uv2a8Conam6DU=
-
-Name: org/sat4j/minisat/constraints/cnf/LearntBinaryClause.class
-SHA1-Digest: BEa+zhrRDpf0D2PK3lHs+m1I0CM=
-
-Name: org/sat4j/minisat/core/Pair.class
-SHA1-Digest: 2CR/EMVg/UZQzmTptUlYTxZTiJw=
-
-Name: org/sat4j/messages.properties
-SHA1-Digest: DkI1sg89OFvS+e7y3E13YjlTmXU=
-
-Name: org/sat4j/AbstractLauncher$2.class
-SHA1-Digest: bcjQuEMkF58of3TUdhfOwxn8i/A=
-
-Name: org/sat4j/core/ReadOnlyVecInt.class
-SHA1-Digest: +v4PIGKi0soP5B90qdmwq8T57hA=
-
-Name: org/sat4j/minisat/core/Solver$3.class
-SHA1-Digest: Kn8DQvvP9QTKo92sfjycbOI2cPM=
-
-Name: org/sat4j/tools/SolverDecorator.class
-SHA1-Digest: VKG/qEQRDQF05dukzLzJJbQpaJI=
-
-Name: org/sat4j/minisat/learning/NoLearningButHeuristics.class
-SHA1-Digest: AQZggH2/k1qVmdC5jvHIAsCJk2I=
-
-Name: org/sat4j/minisat/constraints/MixedDataStructureDanielCBWL.class
-SHA1-Digest: SkYz32iGpeD0D1DoqaHSN8dIE6g=
-
-Name: org/sat4j/minisat/core/Solver$7.class
-SHA1-Digest: Qz0RkGh3arqLFVZjAsEZ7S0FALs=
-
-Name: org/sat4j/minisat/constraints/cnf/Clauses.class
-SHA1-Digest: PGKpp8V5ZSPDszbstf1rYyuIlaw=
-
-Name: org/sat4j/core/VecInt$1.class
-SHA1-Digest: MOlk3IOOGQOh+ItwyuWZfbLV5vE=
-
-Name: org/sat4j/minisat/core/SolverStats.class
-SHA1-Digest: aG5C74srGKadm2/55hkoqZmlfco=
-
-Name: org/sat4j/core/LiteralsUtils.class
-SHA1-Digest: X7TVqVeRHM0IPsg3VV6Llla0xl4=
-
-Name: org/sat4j/minisat/uip/FirstUIP.class
-SHA1-Digest: DT6VUSPEPccVmQsslUxhocuq03g=
-
-Name: org/sat4j/minisat/core/ConstrActivityListener.class
-SHA1-Digest: MZT8g6wjSOyxwYxQPbIFqUOzrDw=
-
-Name: org/sat4j/tools/xplain/Pair.class
-SHA1-Digest: P1Tkq8qH5itdUzZdfBCbm0/KyUE=
-
-Name: org/sat4j/tools/OptToSatAdapter.class
-SHA1-Digest: 9094OVY04hay9fCU8Zkj+xLajWY=
-
-Name: org/sat4j/core/DefaultComparator.class
-SHA1-Digest: Oc+iZAlu+B3SwdOkkvXhrC66xMA=
-
-Name: org/sat4j/tools/ExtendedDimacsArrayReader.class
-SHA1-Digest: iUP8Szu2/7qXIpD5LCC0yclTsnE=
-
-Name: org/sat4j/core/ASolverFactory.class
-SHA1-Digest: r8lJPwCRTvP8SJrsNz3GbM/D1Iw=
-
-Name: org/sat4j/minisat/constraints/cnf/OriginalBinaryClause.class
-SHA1-Digest: HwwUr0wePfbLsvgrQU6bC698E9c=
-
-Name: org/sat4j/tools/xplain/XplainStrategy.class
-SHA1-Digest: KcQau9GPcW2R6Fjyqp5jaeWTdWk=
-
-Name: org/sat4j/minisat/core/Solver$ISimplifier.class
-SHA1-Digest: 4tVyB/nROzHJWlVqmRwOtuVc5ws=
-
-Name: org/sat4j/minisat/constraints/CardinalityDataStructure.class
-SHA1-Digest: wTFZUhwJuPgfIpOUZqzt4BtHZtI=
-
-Name: target/META-INF/MANIFEST.MF
-SHA1-Digest: HUftYWvUbxYRZEc5UfTrflINdHA=
-
-Name: org/sat4j/minisat/orders/PhaseInLastLearnedClauseSelectionStrate
- gy.class
-SHA1-Digest: K97bk3JNYx0tk7Bi157aRr69gn0=
-
-Name: org/sat4j/minisat/constraints/cnf/CBClause.class
-SHA1-Digest: aL8ef8Q6JhWndr8w29VH4i/RTaI=
-
-Name: org/sat4j/minisat/SolverFactory.class
-SHA1-Digest: Z+80DpzGQVxhYxrSHdy/834VjY0=
-
-Name: org/sat4j/minisat/orders/AbstractPhaserecordingSelectionStrategy
- .class
-SHA1-Digest: Ku63mzSsCDrWuploozqcRdmkuko=
-
-Name: org/sat4j/minisat/learning/NoLearningNoHeuristics.class
-SHA1-Digest: ee/1IsqLwl8UIMDFY3B5ByoXC5M=
-
-Name: org/sat4j/minisat/constraints/cnf/UnitClause.class
-SHA1-Digest: QYp29Pf3B+TII1c5QtZ5nUGtxh4=
-
-Name: org/sat4j/minisat/constraints/cnf/LearntWLClause.class
-SHA1-Digest: iXDeBwTa2tEbw4qyfYAuajPahvg=
-
-Name: org/sat4j/core/ReadOnlyVec.class
-SHA1-Digest: 6rMIHJ0cX0CVpomOamEselGaXTQ=
-
-Name: about.html
-SHA1-Digest: ohuwRciYYMwr4+zXRG6vJTiqjlg=
-
-Name: org/sat4j/tools/DotSearchTracing.class
-SHA1-Digest: wzcwTGIxcUVRgOo9wBN2d7TSVQ0=
-
-Name: org/sat4j/minisat/orders/RandomWalkDecorator.class
-SHA1-Digest: bp+eWwcuxZZhZfm6yhziLeyFqTw=
-
-Name: org/sat4j/minisat/orders/RSATPhaseSelectionStrategy.class
-SHA1-Digest: Z9qkW17407uDjMbfkzO9y8QMZiY=
-
-Name: org/sat4j/minisat/learning/FixedLengthLearning.class
-SHA1-Digest: jvMhRyshWO+UGPAB6YkECmjSTdY=
-
-Name: org/sat4j/tools/xplain/QuickXplainStrategy.class
-SHA1-Digest: SjaqwyoYqMxlQmO/nabGhNYSTng=
-
-Name: org/sat4j/minisat/core/Propagatable.class
-SHA1-Digest: O0oTleJry9VDLuyD5aAfUnszVP0=
-
-Name: org/sat4j/minisat/core/UnitPropagationListener.class
-SHA1-Digest: p1znVXCjplcP6DuzMM12Mvlha4Q=
-
-Name: org/sat4j/reader/EfficientScanner.class
-SHA1-Digest: wHkLMQUCF1oW7I4gqgQzcizjpyQ=
-
-Name: org/sat4j/BasicLauncher.class
-SHA1-Digest: p7Jqj9M9ZpUavYfBUPG4VToj5Ks=
-
-Name: org/sat4j/tools/Minimal4InclusionModel.class
-SHA1-Digest: BCd89TeXxrwPQFfIhb759bR8rtU=
-
-Name: org/sat4j/reader/LecteurDimacs.class
-SHA1-Digest: 4Lc66LfuY3q/XiwdUTCGytBQOLk=
-
-Name: org/sat4j/minisat/core/ILits.class
-SHA1-Digest: VjUNRaTLDHQugxPBDHitvhH+wG8=
-
-Name: org/sat4j/minisat/constraints/ClausalDataStructureWL.class
-SHA1-Digest: ffoF+WFZBin6+8QH/GgAykHIS0w=
-
-Name: org/sat4j/minisat/constraints/card/MinWatchCard.class
-SHA1-Digest: q7dA0RILYtAqoS5G8VDWwJ8B+zc=
-
-Name: org/sat4j/minisat/core/ActivityListener.class
-SHA1-Digest: ZroatMN6iWIhRyiEJ/ZmdFq9JAc=
-
-Name: org/sat4j/minisat/core/Solver$4.class
-SHA1-Digest: 17HruTEcxPRso7T0xjA3SdDZcrM=
-
-Name: org/sat4j/minisat/learning/PercentLengthLearning.class
-SHA1-Digest: stM1IxYEvXcwY67YJKkLdu5FdXU=
-
-Name: org/sat4j/minisat/learning/ActiveLearning.class
-SHA1-Digest: /UKTVjAZgSr0gd3NW5liJQhzVXY=
-
-Name: org/sat4j/minisat/core/AssertingClauseGenerator.class
-SHA1-Digest: n1TtEGxXGTmCNtlOmrDJywmVZX4=
-
-Name: org/sat4j/core/VecInt$2.class
-SHA1-Digest: nqKZ6/mfZoAu5eUzuCoFfcN8X0Y=
-
-Name: org/sat4j/minisat/constraints/ClausalDataStructureCB.class
-SHA1-Digest: DQ+WOVB9VKsC6plLm6AHIjvLTuc=
-
-Name: org/sat4j/tools/Minimal4CardinalityModel.class
-SHA1-Digest: vA1Z9OaXi5zi6CXITzmuee9OSn4=
-
-Name: org/sat4j/minisat/core/Constr.class
-SHA1-Digest: gI2BzvdyzWDWZbIJXhhybvGyzmk=
-
-Name: org/sat4j/tools/ConflictLevelTracing.class
-SHA1-Digest: AsJ3xdPG/+T5p+PPRDrmIDnYtNs=
-
-Name: org/sat4j/specs/TimeoutException.class
-SHA1-Digest: l3TRwZEfDOxtce6QQ6UxlC23zXQ=
-
-Name: org/sat4j/specs/IConstr.class
-SHA1-Digest: fcsTeyTUhjLxclDuPNheWb60Nik=
-
-Name: org/sat4j/minisat/constraints/cnf/HTClause.class
-SHA1-Digest: BITYwr9toXIK4fOH5GkdD+LoN8Y=
-
-Name: org/sat4j/minisat/constraints/cnf/Lits.class
-SHA1-Digest: rlweU4B5vm9zh2s859Qo2Npuxjw=
-
-Name: org/sat4j/core/VecInt$1$1.class
-SHA1-Digest: 52axwE4a/5xaCBBiBW7sPOAHd3o=
-
-Name: org/sat4j/specs/IProblem.class
-SHA1-Digest: jEM7LkKzd591iLMZyg4EggQngu4=
-
-Name: org/sat4j/minisat/constraints/card/AtLeast.class
-SHA1-Digest: 5t2/PBFWiSW2fePcSdxhjAA7Kk4=
-
-Name: org/sat4j/minisat/uip/DecisionUIP.class
-SHA1-Digest: 08gofaQpbrVsVfAJ54ZRJn5VXig=
-
-Name: org/sat4j/minisat/constraints/CardinalityDataStructureYanMax.cla
- ss
-SHA1-Digest: y4OYLw+8K76jFI9FBrscL4nfFr8=
-
-Name: org/sat4j/minisat/core/Undoable.class
-SHA1-Digest: JlBAZdp2+IV3L38pKFCjKE0XbVA=
-
-Name: org/sat4j/reader/Reader.class
-SHA1-Digest: G1FxrKF1uWVL2FRlKyCB+OtfjbU=
-
-Name: org/sat4j/specs/ContradictionException.class
-SHA1-Digest: r1UYadzl/slay7uG5fgp2wNba3c=
-
-Name: org/sat4j/tools/DecisionTracing.class
-SHA1-Digest: Bot9owQNrQt/OYGdWJM0wXEmFBE=
-
-Name: org/sat4j/reader/AIGReader.class
-SHA1-Digest: UE5/U2zDJmqF+WoaYvaLlEogfyg=
-
-Name: org/sat4j/minisat/constraints/cnf/UnitClauses.class
-SHA1-Digest: P+j5C5cmNPQXQodvVnPXOhFC30U=
-
-Name: org/sat4j/tools/xplain/ReplayXplainStrategy.class
-SHA1-Digest: sL+4Coo1SK3Mglx2xB1V7jrktu4=
-
-Name: org/sat4j/minisat/core/VarActivityListener.class
-SHA1-Digest: n4xDxXyrKcY2NTF3EG5Td2eGKuk=
-
-Name: META-INF/eclipse.inf
-SHA1-Digest: 6mDW8kS/T9pK7w1by/wcxy21Z20=
-
-Name: org/sat4j/minisat/constraints/cnf/BinaryClause.class
-SHA1-Digest: XsywFiKmf/+/N5R1FaKtqRgUf/w=
-
-Name: org/sat4j/reader/AAGReader.class
-SHA1-Digest: trW8fG34QnCclxbTvL7j9N5b1+8=
-
-Name: org/sat4j/minisat/core/SearchParams.class
-SHA1-Digest: Obh/FcMTRJ1sNs9nmKxnMIA/CKI=
-
-Name: org/sat4j/tools/LearnedClauseSizeTracing.class
-SHA1-Digest: 7eIqj9Lxk9dkEt4wEy+7T22kg2I=
-
-Name: org/sat4j/tools/TextOutputTracing.class
-SHA1-Digest: UCrX0HDxtr/vopL3ZgEFXveuKds=
-
-Name: org/sat4j/core/Vec.class
-SHA1-Digest: lE23BQ58AXB3uzpLEGx1XjF6o3o=
-
-Name: org/sat4j/ExitCode.class
-SHA1-Digest: V5DfojXDofFKw5jKg2UlW44ID1k=
-
-Name: org/sat4j/specs/IteratorInt.class
-SHA1-Digest: 1Qw+nLBznA9xfE1k0NrCk1ZL12U=
-
-Name: org/sat4j/core/VecInt.class
-SHA1-Digest: 20p4G5/a9+z16EKfMnEpBfdBU04=
-
-Name: org/sat4j/tools/RemiUtils.class
-SHA1-Digest: FOYt8rXW11SzMi1XWT+zrLooXmo=
-
-Name: org/sat4j/minisat/restarts/NoRestarts.class
-SHA1-Digest: ZJt2YbQAK0pH0rahOGmBGxcD0iY=
-
-Name: org/sat4j/minisat/core/Solver$1.class
-SHA1-Digest: Har1eRgn67d9nkWdXEB76785ABY=
-
-Name: org/sat4j/reader/ParseFormatException.class
-SHA1-Digest: r+ff4ZThrCgnOr3nHx/9TwYYQPo=
-
-Name: org/sat4j/minisat/core/IntQueue.class
-SHA1-Digest: rA0Ji2sWaNzFPNWmQIoiWB8vaDw=
-
-Name: org/sat4j/minisat/core/Solver$5.class
-SHA1-Digest: 4S9CfrpO0dreVFpmCVv5Ge7YRZg=
-
-Name: org/sat4j/minisat/constraints/cnf/OriginalHTClause.class
-SHA1-Digest: yyLzkGGZmajG9BlwV+uplq4AxP0=
-
-Name: org/sat4j/minisat/restarts/ArminRestarts.class
-SHA1-Digest: P0Cnayj1WSNFLwVQfahcFcQ3/G8=
-
-Name: org/sat4j/minisat/orders/ValuedLit.class
-SHA1-Digest: nJs3StPJtLykgfQ1RAM9auCOTWY=
-
-Name: org/sat4j/minisat/constraints/cnf/MixableCBClause.class
-SHA1-Digest: Y3rGogVleu8GyMCiVL/Kpg/0owY=
-
-Name: org/sat4j/reader/DimacsReader.class
-SHA1-Digest: QTAdRnvX9GYGQGpgXTS4JLgSdvA=
-
-Name: org/sat4j/minisat/learning/MiniSATLearning.class
-SHA1-Digest: zKTO0CcnZQGRkMveUBuAXZJauW8=
-
-Name: org/sat4j/minisat/core/Heap.class
-SHA1-Digest: NfjIWQkaul6hYWtfsCftt1B+zuc=
-
-Name: org/sat4j/specs/IVec.class
-SHA1-Digest: ViymudVBXcOLO3BSJL2o1ejW3xg=
-
-Name: org/sat4j/tools/DimacsArrayReader.class
-SHA1-Digest: MQJ5QjAj+eb9gkW+Dq1ltLpYlc8=
-
-Name: org/sat4j/minisat/core/ConflictTimer.class
-SHA1-Digest: wBGYIZwmGm5yU49qu7QyJ2qXuG8=
-
-Name: org/sat4j/minisat/core/LearningStrategy.class
-SHA1-Digest: KOVMl4sz6I11jK2OXRUF46XxKoo=
-
-Name: plugin.properties
-SHA1-Digest: t0bd67OgJQf7Vs75aUOH2ysVGf4=
-
-Name: org/sat4j/tools/ModelIterator.class
-SHA1-Digest: gbZ+AxzpF5uOc4dUthOALy9rPmY=
-
-Name: org/sat4j/reader/InstanceReader.class
-SHA1-Digest: 8sjRko3rsU7XeZsQxycrAOcYjf0=
-
-Name: org/sat4j/opt/MinOneDecorator.class
-SHA1-Digest: FZpFT9loWBkBR+eVjVbc5MUYXYM=
-
-Name: org/sat4j/tools/DimacsOutputSolver.class
-SHA1-Digest: 1bM6Jq6L+XRXGuaYgTd9PBt5pNg=
-
-Name: org/sat4j/specs/IVecInt.class
-SHA1-Digest: s8rPWLP40S8PSFlm1S+fXu2i908=
-
-Name: org/sat4j/minisat/constraints/cnf/WLClause.class
-SHA1-Digest: /azcSLRSN7iKmvwoOk1a21MyEkE=
-
-Name: org/sat4j/minisat/constraints/MixedDataStructureDanielHT.class
-SHA1-Digest: X3AOESzN+Ai0088Po83JgsYf3IA=
-
-Name: org/sat4j/tools/SolutionCounter.class
-SHA1-Digest: c6y7VipHT+iHQkJnjRZOzJOxVCM=
-
-Name: org/sat4j/specs/SearchListener.class
-SHA1-Digest: dE+pqRw9CHWEYw9HPGm/PL1MS3w=
-
-Name: org/sat4j/LightFactory.class
-SHA1-Digest: y3vlDHbXmiThTEdaCClNtKhbBUk=
-
-Name: org/sat4j/minisat/core/Solver$LearnedConstraintsDeletionStrategy
- .class
-SHA1-Digest: RmLTVjBWD8y95SwnJ6/erR6iNDg=
-
-Name: org/sat4j/minisat/learning/AbstractLearning.class
-SHA1-Digest: S13vJv++vfR80BGDLi8imFCndiQ=
-
-Name: org/sat4j/minisat/orders/PositiveLiteralSelectionStrategy.class
-SHA1-Digest: 20jMN1A+acBGM1F51N+IlCRCuCY=
-
-Name: org/sat4j/minisat/core/ActivityComparator.class
-SHA1-Digest: YOQ17ebH2Qn6Fm2wT8e0RC/QOOQ=
-
-Name: org/sat4j/minisat/constraints/MixedDataStructureDanielWL.class
-SHA1-Digest: FaMTZx802nGMGk5F4CPwkpQizk4=
-
-Name: org/sat4j/minisat/core/IPhaseSelectionStrategy.class
-SHA1-Digest: rDjzB1H+97Ak1X7IvTAhhrJzu9Y=
-
-Name: org/sat4j/tools/DimacsStringSolver.class
-SHA1-Digest: 4aybBXJd0kpsio0qkMaDzv+4mtU=
-
-Name: org/sat4j/opt/MaxSatDecorator.class
-SHA1-Digest: sL9aW1K32uO0EzwpF4n0MNsDPgU=
-
-Name: org/sat4j/opt/AbstractSelectorVariablesDecorator.class
-SHA1-Digest: sXVhRd7oT84ewBW0tV3P8sz1OSE=
-
-Name: org/sat4j/specs/Lbool.class
-SHA1-Digest: NvK9fv0aVpTWlIHuMRBxgMDHGPM=
-
-Name: org/sat4j/minisat/orders/PureOrder.class
-SHA1-Digest: XXadIuZAlvYKyov44IWn12jTyEE=
-
-Name: org/sat4j/minisat/core/Counter.class
-SHA1-Digest: w5M/JC6k2IzZvkXiDMJmy9yHT3Q=
-
-Name: org/sat4j/minisat/learning/ClauseOnlyLearning.class
-SHA1-Digest: OhALcZTHlmXDBrgx5FPPIIiCY9k=
-
-Name: org/sat4j/AbstractOptimizationLauncher.class
-SHA1-Digest: yJSczPYnz6oI60x2qyvUeOLGnao=
-
-Name: org/sat4j/AbstractLauncher$1.class
-SHA1-Digest: Fex2k4SAbvtlf17yuFWNOHW6DiM=
-
-Name: org/sat4j/core/Vec$1.class
-SHA1-Digest: ws7WosmOOr7ItmXAq4dmuFDStbs=
-
-Name: org/sat4j/MoreThanSAT.class
-SHA1-Digest: zcZWXGo/kZbMlsfsgm/hqMvKaKI=
-
-Name: org/sat4j/minisat/core/DataStructureFactory.class
-SHA1-Digest: 5dnenVHIhwUvoRdLPk2jm+ZDZIc=
-
-Name: org/sat4j/minisat/core/Solver$2.class
-SHA1-Digest: tSYoi7MLi0qIXv6NdEQNPTALFVE=
-
diff --git a/dependencyManifests/org.sat4j.core_2.3.0.v20110329.jar/META-INF/MANIFEST.MF b/dependencyManifests/org.sat4j.core_2.3.0.v20110329.jar/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..70e2163
--- /dev/null
+++ b/dependencyManifests/org.sat4j.core_2.3.0.v20110329.jar/META-INF/MANIFEST.MF
@@ -0,0 +1,30 @@
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.8.2
+Created-By: 1.6.0_22-b22 (Sun Microsystems Inc.)
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.sat4j.core
+Bundle-Version: 2.3.0.v20100429
+Export-Package: org.sat4j;version="2.3.0.v20100429",org.sat4j.core;ver
+ sion="2.3.0.v20100429",org.sat4j.minisat;version="2.3.0.v20100429",or
+ g.sat4j.minisat.constraints;version="2.3.0.v20100429",org.sat4j.minis
+ at.constraints.card;version="2.3.0.v20100429",org.sat4j.minisat.const
+ raints.cnf;version="2.3.0.v20100429",org.sat4j.minisat.core;version="
+ 2.3.0.v20100429",org.sat4j.minisat.learning;version="2.3.0.v20100429"
+ ,org.sat4j.minisat.orders;version="2.3.0.v20100429",org.sat4j.minisat
+ .restarts;version="2.3.0.v20100429",org.sat4j.opt;version="2.3.0.v201
+ 00429",org.sat4j.reader;version="2.3.0.v20100429",org.sat4j.specs;ver
+ sion="2.3.0.v20100429",org.sat4j.tools;version="2.3.0.v20100429",org.
+ sat4j.tools.xplain;version="2.3.0.v20100429"
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Built-By: Daniel Le Berre
+Main-Class: org.sat4j.BasicLauncher
+Specification-Title: SAT4J
+Specification-Version: NA
+Specification-Vendor: Daniel Le Berre
+Implementation-Title: SAT4J
+Implementation-Version: 2.3.0.v20100429
+Implementation-Vendor: CRIL CNRS UMR 8188 - Universite d'Artois
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
+
diff --git a/dependencyManifests/org.sat4j.pb_2.2.0.v20100429.jar/META-INF/MANIFEST.MF b/dependencyManifests/org.sat4j.pb_2.2.0.v20100429.jar/META-INF/MANIFEST.MF
deleted file mode 100644
index 31d1d86..0000000
--- a/dependencyManifests/org.sat4j.pb_2.2.0.v20100429.jar/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,304 +0,0 @@
-Manifest-Version: 1.0
-Implementation-Vendor: CRIL CNRS UMR 8188 - Universite d'Artois
-Main-Class: org.sat4j.pb.LanceurPseudo2007
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Built-By: Daniel Le Berre
-Bundle-SymbolicName: org.sat4j.pb
-Require-Bundle: org.sat4j.core
-Bundle-Version: 2.2.0.v20100429
-Export-Package: org.sat4j.pb;version="2.2.0.v20100429",org.sat4j.pb.co
- nstraints;version="2.2.0.v20100429",org.sat4j.pb.constraints.pb;versi
- on="2.2.0.v20100429",org.sat4j.pb.core;version="2.2.0.v20100429",org.
- sat4j.pb.orders;version="2.2.0.v20100429",org.sat4j.pb.reader;version
- ="2.2.0.v20100429",org.sat4j.pb.tools;version="2.2.0.v20100429"
-Specification-Version: NA
-Specification-Title: SAT4J
-Specification-Vendor: Daniel Le Berre
-Ant-Version: Apache Ant 1.7.1
-Bundle-Vendor: %providerName
-Bundle-Name: %bundleName
-Class-Path: org.sat4j.core.jar
-Created-By: 14.0-b16 (Sun Microsystems Inc.)
-Implementation-Version: 2.2.0.v20100429 
-Implementation-Title: SAT4J
-Bundle-ManifestVersion: 2
-
-Name: overview.html
-SHA1-Digest: dn/2qZIKrR/o7110Zst9XnBMJQs=
-
-Name: org/sat4j/pb/core/PBSolverCautious.class
-SHA1-Digest: G6PE+jY5a6fBYlvCCJ80DIRQttg=
-
-Name: org/sat4j/pb/constraints/pb/IDataStructurePB.class
-SHA1-Digest: K8hIGafz38gYco1roO+km+62nUI=
-
-Name: org/sat4j/pb/constraints/pb/OriginalBinaryClausePB.class
-SHA1-Digest: 2u9IrZTRMP8k/+Pgirz48qiZ7/0=
-
-Name: org/sat4j/pb/UserFriendlyPBStringSolver$1.class
-SHA1-Digest: gKdki2AgPWZsKfQrO3rcO8Xdsp8=
-
-Name: org/sat4j/pb/reader/OPBReader2006.class
-SHA1-Digest: Za8OEzrefdDt2z98j51EBX3xj3A=
-
-Name: org/sat4j/pb/tools/ImplicationNamer.class
-SHA1-Digest: uaNnc29kUvqltyMLCZ6SEoetrnc=
-
-Name: org/sat4j/pb/core/PBSolverMerging.class
-SHA1-Digest: djmzlzPZAInJVw6wMQ7MCGQT6F4=
-
-Name: org/sat4j/pb/constraints/CompetResolutionPBMixedWLClauseCardCons
- trDataStructure.class
-SHA1-Digest: nloc0/mY93BZDB4uTWIOeP1WHY4=
-
-Name: org/sat4j/pb/constraints/CompetMinHTmixedClauseCardConstrDataStr
- uctureFactory.class
-SHA1-Digest: GO7p5Za7oIPox69KRZ053C99kLg=
-
-Name: org/sat4j/pb/constraints/PBMaxCBClauseCardConstrDataStructure.cl
- ass
-SHA1-Digest: 8B4zKn975+9WwnkxYqODzGgNMtA=
-
-Name: org/sat4j/pb/core/PBSolverCP.class
-SHA1-Digest: +Qc17V3GJ6vqbTiGdEC/NiVaSRE=
-
-Name: org/sat4j/pb/constraints/pb/AtLeastPB.class
-SHA1-Digest: NasfzFaI5jhvxcIXI67cTVOg124=
-
-Name: org/sat4j/pb/constraints/pb/ConflictMapSwitchToClause.class
-SHA1-Digest: mx8XOflLPBSXnWWc3bXlHIYyj6A=
-
-Name: org/sat4j/pb/constraints/pb/MinWatchCardPB.class
-SHA1-Digest: crONz2vRhajI5wwzRVtND9P37RI=
-
-Name: org/sat4j/pb/constraints/pb/ConflictMap.class
-SHA1-Digest: y16ySy2IGCLtsK0U50yhENNC6W0=
-
-Name: org/sat4j/pb/constraints/pb/MapPb.class
-SHA1-Digest: NXbo9EEw7HqKORoEXNbOk2hCeq8=
-
-Name: org/sat4j/pb/constraints/pb/UnitClausePB.class
-SHA1-Digest: 4n3MLmHlk2tAJbg1EgAp8mQf64o=
-
-Name: org/sat4j/pb/LanceurPseudo2007Eclipse.class
-SHA1-Digest: +QTEdsoG7bzmL/YI28W57v47CAk=
-
-Name: org/sat4j/pb/tools/DependencyHelper.class
-SHA1-Digest: OMY1u4aMLJ3UoL+za68NnMiocyY=
-
-Name: org/sat4j/pb/tools/ImplicationAnd.class
-SHA1-Digest: +k7ETPN3t0C+UZAnZcW8u7eFomw=
-
-Name: org/sat4j/pb/constraints/PBMaxDataStructure.class
-SHA1-Digest: w0Xjba3ddTPxB2dVW1HvWpfGIq4=
-
-Name: org/sat4j/pb/constraints/pb/Pseudos.class
-SHA1-Digest: ose+x3/CGsc7AjXEunLkqmNm63I=
-
-Name: org/sat4j/pb/constraints/PBMinClauseCardConstrDataStructure.clas
- s
-SHA1-Digest: 3x3BBKrLLuA5SCj3X+IH41yAsr8=
-
-Name: org/sat4j/pb/constraints/pb/ConflictMapClause.class
-SHA1-Digest: dSLvmwcCiD9ZFlvFrTw8bneJCI4=
-
-Name: org/sat4j/pb/constraints/PuebloPBMinClauseAtLeastConstrDataStruc
- ture.class
-SHA1-Digest: w309O/LZInrUh++d8phGpdJEZtA=
-
-Name: org/sat4j/pb/core/PBSolverResCP.class
-SHA1-Digest: zCdBCthIUAVA6/i4k1D5o9Te7e8=
-
-Name: org/sat4j/pb/constraints/PBContainer.class
-SHA1-Digest: kcNv1+UXugI/PV/+sSoMgLAIftU=
-
-Name: org/sat4j/pb/PBSolverDecorator.class
-SHA1-Digest: GD0qkZZprzxUHS2LGjSka/FTl+0=
-
-Name: org/sat4j/pb/constraints/pb/LearntBinaryClausePB.class
-SHA1-Digest: QL6nsPydh+z3nKNQYe7jwE1CgHo=
-
-Name: org/sat4j/pb/SolverFactory.class
-SHA1-Digest: NBohv7locQ+NEAky27a7fek+8SY=
-
-Name: org/sat4j/pb/constraints/PuebloPBMinClauseCardConstrDataStructur
- e.class
-SHA1-Digest: ZT86iNkY8IXjLjUr72UiFPplKLw=
-
-Name: META-INF/eclipse.inf
-SHA1-Digest: 6mDW8kS/T9pK7w1by/wcxy21Z20=
-
-Name: org/sat4j/pb/tools/DependencyHelper$2.class
-SHA1-Digest: aLYin0QkwOIijO/rXnY0UmXqTpc=
-
-Name: org/sat4j/pb/orders/VarOrderHeapObjective.class
-SHA1-Digest: 2FsAP/pICHcMCNdPadbMBG7y/do=
-
-Name: org/sat4j/pb/core/PBSolverWithImpliedClause.class
-SHA1-Digest: xue1+JX1bmghjnwSZpBO+vz1WMI=
-
-Name: org/sat4j/pb/constraints/AbstractPBDataStructureFactory$2.class
-SHA1-Digest: rKuP05A+NpTct21Ak6zGVQ7vAHc=
-
-Name: org/sat4j/pb/core/PBSolverResolution.class
-SHA1-Digest: SRfvQmnFA/QRlfyWvt9nqRR/lns=
-
-Name: org/sat4j/pb/constraints/pb/MaxWatchPb.class
-SHA1-Digest: jwNLXKfu0MZJqHvWUU87nuz9r1Q=
-
-Name: org/sat4j/pb/constraints/pb/OriginalHTClausePB.class
-SHA1-Digest: +TRdmilQ15C9Xic9IlZeDbLBMM0=
-
-Name: org/sat4j/pb/core/PBSolverClause.class
-SHA1-Digest: trpkB4UWxuGDFj3J+dGk8DIKFtI=
-
-Name: org/sat4j/pb/constraints/pb/PBConstr.class
-SHA1-Digest: qaZnIWUyx9dxXNAti4MebxloBjE=
-
-Name: org/sat4j/pb/OPBStringSolver.class
-SHA1-Digest: gdLAcb+mUTxzOM6kk/5p88mp0qY=
-
-Name: org/sat4j/pb/constraints/pb/InternalMapPBStructure.class
-SHA1-Digest: W+CVWLpOBzqKrTm71l0sCPWuZyc=
-
-Name: org/sat4j/pb/core/PBSolverStats.class
-SHA1-Digest: i1V3lr1ohpwMObvUCO6yu3+jNlY=
-
-Name: org/sat4j/pb/tools/DisjunctionRHS.class
-SHA1-Digest: MqBHzo9QkDUG85zHorqZaUHoDoU=
-
-Name: org/sat4j/pb/constraints/AbstractPBClauseCardConstrDataStructure
- .class
-SHA1-Digest: QXWQslhjncOBuirq/A6ldLhfOdE=
-
-Name: org/sat4j/pb/PseudoIteratorDecorator.class
-SHA1-Digest: K3JFS3H4wD0Net76iHilpaP/ijA=
-
-Name: org/sat4j/pb/tools/ImplicationRHS.class
-SHA1-Digest: 6N5qhFgu8eCcUJgR/nyZnm9QAO0=
-
-Name: org/sat4j/pb/constraints/pb/IConflict.class
-SHA1-Digest: PHI0OOz1wRQfxXGh8PLGIidS1zg=
-
-Name: org/sat4j/pb/tools/XplainPB.class
-SHA1-Digest: DRGrsuFqXjYIrNN5TreQyylIxKo=
-
-Name: org/sat4j/pb/constraints/pb/PuebloMinWatchPb.class
-SHA1-Digest: 1ALpLOsAU3mfsrmmAVrk5duTFbM=
-
-Name: org/sat4j/pb/reader/OPBReader2005.class
-SHA1-Digest: pKJb39oplIXV3JlrwxWrZBcMk6g=
-
-Name: org/sat4j/pb/reader/OPBEclipseReader2007.class
-SHA1-Digest: cNvV2IRw/CmiGv9Xcp7GkZmMhyg=
-
-Name: org/sat4j/pb/reader/OPBReader2007.class
-SHA1-Digest: bHOST+J41ibjBKz0b7FSbOsyKlY=
-
-Name: org/sat4j/pb/constraints/pb/WatchPb.class
-SHA1-Digest: Wl9nlz4WzhuGaXqZBA8eyw8yzg8=
-
-Name: org/sat4j/pb/tools/ConflictTracing.class
-SHA1-Digest: bNwGBc0F0AQRb65r+fYJ83nYdfs=
-
-Name: org/sat4j/pb/constraints/PBMaxClauseCardConstrDataStructure.clas
- s
-SHA1-Digest: vXE4DWIWLt9Xmnhfq5IB4dIhav0=
-
-Name: org/sat4j/pb/tools/StringNegator.class
-SHA1-Digest: k0hKqdrMlxYBJhCJ8S1QmhrOLJE=
-
-Name: org/sat4j/pb/constraints/pb/LearntHTClausePB.class
-SHA1-Digest: aJhiQFddE3ZDaXaeX/23LeHN1g8=
-
-Name: plugin.properties
-SHA1-Digest: jH6bKyeXDNDTAFPXOMVz3/1taug=
-
-Name: org/sat4j/pb/constraints/pb/ConflictMapCardinality.class
-SHA1-Digest: kYQEQKAQns7W6rY6Y+ZYX9bBpWk=
-
-Name: org/sat4j/pb/OptToPBSATAdapter.class
-SHA1-Digest: MXj/pFl1iZd0sYLMBIrF/1agANM=
-
-Name: org/sat4j/pb/constraints/AbstractPBDataStructureFactory.class
-SHA1-Digest: tPyl3mGH0TFhhdNVWHTDSKj9o3s=
-
-Name: org/sat4j/pb/constraints/PBMaxClauseAtLeastConstrDataStructure.c
- lass
-SHA1-Digest: uKBmKVPD6QYIT3RVFqCUC6kD9qA=
-
-Name: org/sat4j/pb/ObjectiveFunction.class
-SHA1-Digest: F3NAF2DIaLsJAGzMLGIvo97AWeY=
-
-Name: target/META-INF/MANIFEST.MF
-SHA1-Digest: hQv/s0DLOeak/5OqsUcxm3guLeU=
-
-Name: org/sat4j/pb/core/PBSolver.class
-SHA1-Digest: gxJCEd2FqXuZuDpUXEc9kGdprNY=
-
-Name: org/sat4j/pb/reader/PBInstanceReader.class
-SHA1-Digest: J9s9zvTyMXHShX1KupSLAqns3Hw=
-
-Name: org/sat4j/pb/constraints/AbstractPBDataStructureFactory$INormali
- zer.class
-SHA1-Digest: 2iRa3YBib1gXCgoE57DR3NF6x+I=
-
-Name: org/sat4j/pb/tools/DependencyHelper$1.class
-SHA1-Digest: 7fORyR0FINvIRM6pfII4nQmLLhk=
-
-Name: org/sat4j/pb/constraints/AbstractPBDataStructureFactory$1.class
-SHA1-Digest: Ko42eIS8RwhywU09NkfV1pawdlI=
-
-Name: org/sat4j/pb/LanceurPseudo2005.class
-SHA1-Digest: Ka03bnbg7X84LZly4Ncsg/HuWys=
-
-Name: org/sat4j/pb/LanceurPseudo2007.class
-SHA1-Digest: ed4pLqCMTL1Yc4W9hkerdqO6YiQ=
-
-Name: org/sat4j/pb/tools/DependencyHelper$Negation.class
-SHA1-Digest: Rw1JeScc9GREEsMFgDyL7Ebok68=
-
-Name: org/sat4j/pb/constraints/PBMinDataStructure.class
-SHA1-Digest: sKRfSps0qSzK9KigQwTOxj2WagU=
-
-Name: about.html
-SHA1-Digest: GrW2Mel5Q31SWUprDqfCckmZlc8=
-
-Name: org/sat4j/pb/core/PBDataStructureFactory.class
-SHA1-Digest: H8EuqbIE5W7Tphq3qKi7sH6qn/M=
-
-Name: org/sat4j/pb/PseudoOptDecorator.class
-SHA1-Digest: z65sDBvX3JjybTNhUe4IHGtJTcg=
-
-Name: org/sat4j/pb/constraints/PuebloPBMinDataStructure.class
-SHA1-Digest: SM8ErxquNZp0yqPAkjtxKEce+lo=
-
-Name: org/sat4j/pb/constraints/CompetResolutionPBMixedHTClauseCardCons
- trDataStructure.class
-SHA1-Digest: m0yfuYuZXnykAZA/7AUKQXAH21E=
-
-Name: org/sat4j/pb/tools/WeightedObject.class
-SHA1-Digest: 0Ftz4Xdwv6BlICjIiLtQmqig+Fc=
-
-Name: org/sat4j/pb/UserFriendlyPBStringSolver.class
-SHA1-Digest: alT+ejzhY34Amp3w9ibn2W9Pxzw=
-
-Name: org/sat4j/pb/IPBSolver.class
-SHA1-Digest: fYQnDxuLMJKMVYHfvWwgAQFPamk=
-
-Name: org/sat4j/pb/tools/INegator.class
-SHA1-Digest: wcPOwhE1FJYCkyldqzJ4L5++ksM=
-
-Name: org/sat4j/pb/constraints/pb/ConflictMapMerging.class
-SHA1-Digest: F0BQSKqM/+RWB3eVBD/l6Zg6TEw=
-
-Name: org/sat4j/pb/constraints/pb/MixableCBClausePB.class
-SHA1-Digest: kQR6fpZJWXeRbyTtDqVfNuUyMKY=
-
-Name: org/sat4j/pb/OPBStringSolver$1.class
-SHA1-Digest: 5AYRMJJhrIzA0BjEjRSf4DQbeYo=
-
-Name: org/sat4j/pb/constraints/pb/MinWatchPb.class
-SHA1-Digest: USLVxnCfcv8nQNOf627OseH5DIM=
-
diff --git a/dependencyManifests/org.sat4j.pb_2.3.0.v20110329.jar/META-INF/MANIFEST.MF b/dependencyManifests/org.sat4j.pb_2.3.0.v20110329.jar/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..dc33e87
--- /dev/null
+++ b/dependencyManifests/org.sat4j.pb_2.3.0.v20110329.jar/META-INF/MANIFEST.MF
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.8.2
+Created-By: 1.6.0_22-b22 (Sun Microsystems Inc.)
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.sat4j.pb
+Bundle-Version: 2.3.0.v20100429
+Export-Package: org.sat4j.pb;version="2.3.0.v20100429",org.sat4j.pb.co
+ nstraints;version="2.3.0.v20100429",org.sat4j.pb.constraints.pb;versi
+ on="2.3.0.v20100429",org.sat4j.pb.core;version="2.3.0.v20100429",org.
+ sat4j.pb.orders;version="2.3.0.v20100429",org.sat4j.pb.reader;version
+ ="2.3.0.v20100429",org.sat4j.pb.tools;version="2.3.0.v20100429"
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Require-Bundle: org.sat4j.core
+Built-By: Daniel Le Berre
+Main-Class: org.sat4j.pb.LanceurPseudo2007
+Specification-Title: SAT4J
+Specification-Version: NA
+Specification-Vendor: Daniel Le Berre
+Implementation-Title: SAT4J
+Implementation-Version: 2.3.0.v20100429
+Implementation-Vendor: CRIL CNRS UMR 8188 - Universite d'Artois
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
+
diff --git a/eclipse-build-additionalArchs.tar.bz2 b/eclipse-build-additionalArchs.tar.bz2
index 9401717..67e50a4 100644
Binary files a/eclipse-build-additionalArchs.tar.bz2 and b/eclipse-build-additionalArchs.tar.bz2 differ
diff --git a/eclipse-build-config/.project b/eclipse-build-config/.project
new file mode 100644
index 0000000..caa03f5
--- /dev/null
+++ b/eclipse-build-config/.project
@@ -0,0 +1,11 @@
+<?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-config/ChangeLog b/eclipse-build-config/ChangeLog
index 8c49040..4acb9ca 100644
--- a/eclipse-build-config/ChangeLog
+++ b/eclipse-build-config/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-06  Alexander Kurtakov  <akurtako at redhat.com>
+
+	* build.properties.in: Don't ask javac to be verbose, it just clutters the output.
+
 2010-07-14  Andrew Overholt  <overholt at redhat.com>
 
 	* build.properties.in: Remove svn:executable property.
diff --git a/eclipse-build-config/build.properties.in b/eclipse-build-config/build.properties.in
index a654bfb..c0843b6 100644
--- a/eclipse-build-config/build.properties.in
+++ b/eclipse-build-config/build.properties.in
@@ -39,7 +39,6 @@ configs=\
 archivesFormat =group,group,group-zip
 javacFailOnError=false
 javacDebugInfo=on
-javacVerbose=true
 compilerArg=-inlineJSR -enableJavadoc -encoding ISO-8859-1
 
 zipargs=
diff --git a/eclipse-build-config/productFiles/platform.sdk/platform.product b/eclipse-build-config/productFiles/platform.sdk/platform.product
index be10b2e..56c9635 100644
--- a/eclipse-build-config/productFiles/platform.sdk/platform.product
+++ b/eclipse-build-config/productFiles/platform.sdk/platform.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse Platform SDK" uid="org.eclipse.platform.sdk" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="3.6.0. at qualifier@" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse Platform SDK" uid="org.eclipse.platform.sdk" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="3.7.0. at qualifier@" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -28,7 +28,7 @@
         <url>http://eclipse.org/legal/epl/notice.php</url>
         <text>
    Eclipse Foundation Software User Agreement
-April 14, 2010
+February 1, 2011
 
 Usage Of Content
 
@@ -57,7 +57,7 @@ documentation and other files maintained in the Eclipse Foundation source code
 repository ("Repository") in software modules ("Modules") and made available
 as downloadable archives ("Downloads").
 
-       - Content may be structured and packaged into modules to facilitate delivering,
+      - Content may be structured and packaged into modules to facilitate delivering,
          extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),
          plug-in fragments ("Fragments"), and features ("Features").
        - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)
@@ -97,6 +97,7 @@ THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER
 TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.
 SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
 
+       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
        - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
        - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
        - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
@@ -173,3 +174,4 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
    </configurations>
 
 </product>
+
diff --git a/eclipse-build-config/productFiles/platform/platform.product b/eclipse-build-config/productFiles/platform/platform.product
index 5dac54e..3d0c4e6 100644
--- a/eclipse-build-config/productFiles/platform/platform.product
+++ b/eclipse-build-config/productFiles/platform/platform.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse Platform" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="3.6.0. at qualifier@" useFeatures="true">
+<product name="Eclipse Platform" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="3.7.0. at qualifier@" useFeatures="true">
 
    <configIni use="default">
    </configIni>
diff --git a/eclipse-build-config/productFiles/rcp.sdk/rcp.product b/eclipse-build-config/productFiles/rcp.sdk/rcp.product
index 33be0ba..3aa82d3 100644
--- a/eclipse-build-config/productFiles/rcp.sdk/rcp.product
+++ b/eclipse-build-config/productFiles/rcp.sdk/rcp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse RCP SDK" uid="org.eclipse.rcp.sdk.id" version="3.6.0. at qualifier@" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse RCP SDK" uid="org.eclipse.rcp.sdk.id" version="3.7.0. at qualifier@" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -26,7 +26,7 @@
         <url>http://eclipse.org/legal/epl/notice.php</url>
         <text>
    Eclipse Foundation Software User Agreement
-April 14, 2010
+February 1, 2011
 
 Usage Of Content
 
@@ -55,7 +55,7 @@ documentation and other files maintained in the Eclipse Foundation source code
 repository ("Repository") in software modules ("Modules") and made available
 as downloadable archives ("Downloads").
 
-       - Content may be structured and packaged into modules to facilitate delivering,
+      - Content may be structured and packaged into modules to facilitate delivering,
          extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),
          plug-in fragments ("Fragments"), and features ("Features").
        - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)
@@ -95,6 +95,7 @@ THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER
 TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.
 SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
 
+       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
        - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
        - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
        - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
@@ -168,3 +169,4 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
    </configurations>
 
 </product>
+
diff --git a/eclipse-build-config/productFiles/rcp/rcp.product b/eclipse-build-config/productFiles/rcp/rcp.product
index 9fadde5..dbec686 100644
--- a/eclipse-build-config/productFiles/rcp/rcp.product
+++ b/eclipse-build-config/productFiles/rcp/rcp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse RCP" uid="org.eclipse.rcp.id" version="3.6.0. at qualifier@" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse RCP" uid="org.eclipse.rcp.id" version="3.7.0. at qualifier@" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -25,8 +25,7 @@
    <license>
         <url>http://eclipse.org/legal/epl/notice.php</url>
         <text>
-   Eclipse Foundation Software User Agreement
-April 14, 2010
+   February 1, 2011
 
 Usage Of Content
 
@@ -55,7 +54,7 @@ documentation and other files maintained in the Eclipse Foundation source code
 repository ("Repository") in software modules ("Modules") and made available
 as downloadable archives ("Downloads").
 
-       - Content may be structured and packaged into modules to facilitate delivering,
+      - Content may be structured and packaged into modules to facilitate delivering,
          extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),
          plug-in fragments ("Fragments"), and features ("Features").
        - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)
@@ -95,6 +94,7 @@ THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER
 TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.
 SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
 
+       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
        - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
        - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
        - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
@@ -145,7 +145,7 @@ and/or re-export to another country, of encryption software. BEFORE
 using any encryption software, please check the country's laws,
 regulations and policies concerning the import, possession, or use, and
 re-export of encryption software, to see if this is permitted.
-s
+
 Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
          </text>
    </license>
diff --git a/eclipse-build-config/productFiles/rcpConfig/buildConfiguration.xml b/eclipse-build-config/productFiles/rcpConfig/buildConfiguration.xml
index 8afcf2a..37f02d7 100644
--- a/eclipse-build-config/productFiles/rcpConfig/buildConfiguration.xml
+++ b/eclipse-build-config/productFiles/rcpConfig/buildConfiguration.xml
@@ -24,6 +24,7 @@
 
 		<!-- generate a feature based on our .product file -->
 		<ant antfile="${eclipse.pdebuild.scripts}/productBuild/productBuild.xml" target="generateFeature" >
+			<property name="nestedInclusions" value="false" />
 			<property name="buildDirectory" value="${basedir}/temp"/>
 		</ant>
 		<!-- generate product build scripts for the generated feature -->
@@ -50,4 +51,4 @@
 			baseDirectory="${basedir}"
 		/>
 	</target>
-</project>
\ No newline at end of file
+</project>
diff --git a/eclipse-build-config/productFiles/rcpConfig/feature.xml b/eclipse-build-config/productFiles/rcpConfig/feature.xml
index 0676e37..89c8eb5 100644
--- a/eclipse-build-config/productFiles/rcpConfig/feature.xml
+++ b/eclipse-build-config/productFiles/rcpConfig/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.rcp.configuration"
       label="%featureName"
-      version="1.0.0.I20090611-1540"
+      version="1.0.0. at qualifier@"
       provider-name="%providerName">
 
    <description>
diff --git a/eclipse-build-config/productFiles/sdk/p2.inf b/eclipse-build-config/productFiles/sdk/p2.inf
index e3cd47c..43d7000 100644
--- a/eclipse-build-config/productFiles/sdk/p2.inf
+++ b/eclipse-build-config/productFiles/sdk/p2.inf
@@ -1,8 +1,8 @@
 instructions.configure=\
-addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/3.6,name:The Eclipse Project Updates);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/3.6,name:The Eclipse Project Updates);\
-addRepository(type:0,location:http${#58}//download.eclipse.org/releases/helios,name:Helios);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/releases/helios,name:Helios);\
+addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/3.7,name:The Eclipse Project Updates);\
+addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/3.7,name:The Eclipse Project Updates);\
+addRepository(type:0,location:http${#58}//download.eclipse.org/releases/indigo,name:Indigo);\
+addRepository(type:1,location:http${#58}//download.eclipse.org/releases/indigo,name:Indigo);\
   mkdir(path:${installFolder}/dropins);
 requires.1.namespace=org.eclipse.equinox.p2.iu
 requires.1.name=toolingorg.eclipse.configuration.macosx
diff --git a/eclipse-build-config/productFiles/sdk/sdk.product b/eclipse-build-config/productFiles/sdk/sdk.product
index b841c96..c33946d 100644
--- a/eclipse-build-config/productFiles/sdk/sdk.product
+++ b/eclipse-build-config/productFiles/sdk/sdk.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse SDK" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="3.6.0. at qualifier@" useFeatures="true">
+<product name="Eclipse SDK" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="3.7.0. at qualifier@" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -30,7 +30,7 @@
         <url>http://eclipse.org/legal/epl/notice.php</url>
         <text>
    Eclipse Foundation Software User Agreement
-April 14, 2010
+February 1, 2011
 
 Usage Of Content
 
@@ -59,7 +59,7 @@ documentation and other files maintained in the Eclipse Foundation source code
 repository ("Repository") in software modules ("Modules") and made available
 as downloadable archives ("Downloads").
 
-       - Content may be structured and packaged into modules to facilitate delivering,
+      - Content may be structured and packaged into modules to facilitate delivering,
          extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),
          plug-in fragments ("Fragments"), and features ("Features").
        - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)
@@ -99,6 +99,7 @@ THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER
 TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.
 SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
 
+       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
        - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
        - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
        - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
@@ -177,3 +178,4 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
    </configurations>
 
 </product>
+
diff --git a/eclipse-build-feature/.project b/eclipse-build-feature/.project
new file mode 100644
index 0000000..d9e97c4
--- /dev/null
+++ b/eclipse-build-feature/.project
@@ -0,0 +1,11 @@
+<?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 c2835f3..22c14c7 100644
Binary files a/eclipse-build-generatedScripts.tar.bz2 and b/eclipse-build-generatedScripts.tar.bz2 differ
diff --git a/eclipse/directory.txt b/eclipse/directory.txt
index bc08b3c..544d62e 100644
--- a/eclipse/directory.txt
+++ b/eclipse/directory.txt
@@ -1,170 +1,191 @@
 !***************  ANT CONTRIBUTION  ******************************************************** 
 
 #plugin at org.apache.ant=v20070416,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ant.core=v20110203_r362,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ant.launching=v20101020_r362,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ant.core=v20110511,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ant.launching=v20110506,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.ant.ui=v20100427,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ant.ui=v20110510,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.ui.externaltools=v20100427,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.externaltools=v20100831_r361,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.externaltools=v20110506,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.externaltools=v20110506,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.ant.tests.core=v20091214,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ant.tests.ui=v20100602-1000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ant.tests.core=v20110506,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ant.tests.ui=v20110506,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 !***************  COMPARE CONTRIBUTION  ******************************************************** 
 
-plugin at org.eclipse.compare=R36x_v20100929-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare
-plugin at org.eclipse.compare.core=R36x_v20100929-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare.core
-plugin at org.eclipse.compare.win32=R36x_v20101103-0618,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare.win32
+plugin at org.eclipse.compare=I20110525-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare
+plugin at org.eclipse.compare.core=I20110208-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare.core
+plugin at org.eclipse.compare.win32=I20110510-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare.win32
 
-plugin at org.eclipse.compare.examples=I20100505-1245,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.compare.examples.xml=I20100505-1245,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.compare.examples=I20110510-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.compare.examples.xml=I20110510-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.compare.tests=I20100505-1245,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.compare.tests=I20110510-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 !***************  CORE (HP-UX) CONTRIBUTION  ************************************************ 
 
-fragment at org.eclipse.core.filesystem.hpux.ia64_32=v20100505,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.hpux.ia64_32=v20110423-0524,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 !***************  CORE (MacOSX) CONTRIBUTION  ************************************************ 
 
-fragment at org.eclipse.core.filesystem.macosx=v20100505,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.macosx=v20110423-0524,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 !***************  CORE VARIABLES CONTRIBUTION  ******************************************************** 
 
-plugin at org.eclipse.core.variables=v20100505,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-!***************  CORE CONTRIBUTION  ******************************************************** 
+plugin at org.eclipse.core.variables=v20110511,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+!***************  CORE CONTRIBUTION  ********************************************************* 
 
 !**** OSGi
-plugin at org.eclipse.osgi=R36x_v20110210,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi
-plugin at org.eclipse.osgi.services=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.osgi.services
-plugin at org.eclipse.osgi.util=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.osgi.util
+plugin at org.eclipse.osgi=v20110613,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi
+plugin at org.eclipse.osgi.services=v20110513,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.osgi.services
+plugin at org.eclipse.osgi.util=v20110110,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.osgi.util
 
 !**** Equinox
-plugin at org.eclipse.equinox.common=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.common
-plugin at org.eclipse.equinox.preferences=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.preferences
-plugin at org.eclipse.equinox.registry=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.registry
-plugin at org.eclipse.equinox.supplement=R36x_v20101021,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi/supplement
-plugin at org.eclipse.equinox.app=R36x_v20100803,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.app
-plugin at org.eclipse.equinox.device=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.device
-plugin at org.eclipse.equinox.event=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.event
-plugin at org.eclipse.equinox.http=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http
-plugin at org.eclipse.equinox.log=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.log
-plugin at org.eclipse.equinox.metatype=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.metatype
-plugin at org.eclipse.equinox.useradmin=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.useradmin
-plugin at org.eclipse.equinox.http.jetty,2.0.0=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.jetty6
-plugin at org.eclipse.equinox.http.jetty,1.1.100=v20100519,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.jetty5
-plugin at org.eclipse.equinox.http.servlet=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.servlet
+plugin at org.eclipse.equinox.common=v20110523,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.common
+plugin at org.eclipse.equinox.preferences=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.preferences
+plugin at org.eclipse.equinox.registry=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.registry
+plugin at org.eclipse.equinox.supplement=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi/supplement
+plugin at org.eclipse.equinox.app=v20110321,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.app
+plugin at org.eclipse.equinox.device=v20101217,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.device
+plugin at org.eclipse.equinox.event=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.event
+plugin at org.eclipse.equinox.http=v20110413,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http
+plugin at org.eclipse.equinox.log=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.log
+plugin at org.eclipse.equinox.metatype=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.metatype
+plugin at org.eclipse.equinox.useradmin=v20110413,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.useradmin
+plugin at org.eclipse.equinox.http.jetty,2.0.0=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.jetty6
+plugin at org.eclipse.equinox.http.jetty,1.1.100=v20110418,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.jetty5
+plugin at org.eclipse.equinox.http.servlet=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.servlet
 plugin at org.eclipse.equinox.http.servletbridge=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.http.servletbridge
-plugin at org.eclipse.equinox.http.registry=R36x_v20101103,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.http.registry
-plugin at org.eclipse.equinox.servletbridge=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.servletbridge
+plugin at org.eclipse.equinox.http.registry=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.http.registry
+plugin at org.eclipse.equinox.servletbridge=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.servletbridge
 fragment at org.eclipse.equinox.servletbridge.extensionbundle=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.servletbridge.extensionbundle
-bundle at org.eclipse.equinox.jsp.jasper=R36x_v20101103,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.jsp.jasper
+bundle at org.eclipse.equinox.jsp.jasper=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.jsp.jasper
 bundle at org.eclipse.equinox.jsp.jasper.registry=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.jsp.jasper.registry
-plugin at org.eclipse.equinox.cm=v20100520,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.cm
-plugin at org.eclipse.equinox.concurrent=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.concurrent
+plugin at org.eclipse.equinox.cm=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.cm
+plugin at org.eclipse.equinox.concurrent=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.concurrent
+plugin at org.eclipse.equinox.coordinator=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.coordinator
 
 !**** Prosyst Contributions
-plugin at org.eclipse.equinox.ds=R36x_v20100803,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.ds
-plugin at org.eclipse.equinox.io=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.io
-plugin at org.eclipse.equinox.ip=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.ip
-plugin at org.eclipse.equinox.util=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.util
-plugin at org.eclipse.equinox.wireadmin=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.wireadmin
+plugin at org.eclipse.equinox.ds=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.ds
+plugin at org.eclipse.equinox.io=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.io
+plugin at org.eclipse.equinox.ip=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.ip
+plugin at org.eclipse.equinox.util=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.util
+plugin at org.eclipse.equinox.wireadmin=v20110601,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.wireadmin
 
 !**** Security Contributions
-plugin at org.eclipse.equinox.security=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security
-plugin at org.eclipse.equinox.security.tests=v20080722-0430,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.tests
-plugin at org.eclipse.equinox.security.ui=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.ui
+plugin at org.eclipse.equinox.security=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security
+plugin at org.eclipse.equinox.security.tests=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.tests
+plugin at org.eclipse.equinox.security.ui=v20101004,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.ui
 fragment at org.eclipse.equinox.security.win32.x86=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.win32.x86
+fragment at org.eclipse.equinox.security.win32.x86_64=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.win32.x86_64
 fragment at org.eclipse.equinox.security.macosx=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.macosx
 
 !**** Transforms
 plugin at org.eclipse.equinox.transforms.xslt=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.transforms.xslt
-fragment at org.eclipse.equinox.transforms.hook=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.transforms.hook
+fragment at org.eclipse.equinox.transforms.hook=v20100719,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.transforms.hook
 
 !**** Weaving
-plugin at org.eclipse.equinox.weaving.aspectj=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/weaving/bundles/org.eclipse.equinox.weaving.aspectj
-plugin at org.eclipse.equinox.weaving.caching=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/weaving/bundles/org.eclipse.equinox.weaving.caching
-plugin at org.eclipse.equinox.weaving.caching.j9=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/weaving/bundles/org.eclipse.equinox.weaving.caching.j9
-fragment at org.eclipse.equinox.weaving.hook=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/weaving/bundles/org.eclipse.equinox.weaving.hook
+plugin at org.eclipse.equinox.weaving.aspectj=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/weaving/bundles/org.eclipse.equinox.weaving.aspectj
+plugin at org.eclipse.equinox.weaving.caching=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/weaving/bundles/org.eclipse.equinox.weaving.caching
+plugin at org.eclipse.equinox.weaving.caching.j9=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/weaving/bundles/org.eclipse.equinox.weaving.caching.j9
+fragment at org.eclipse.equinox.weaving.hook=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/weaving/bundles/org.eclipse.equinox.weaving.hook
 
 !****launcher, startup.jar
-plugin at org.eclipse.equinox.launcher=R36x_v20101122_1400,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher
-fragment at org.eclipse.equinox.launcher.win32.win32.x86=R36x_v20101222,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86
-fragment at org.eclipse.equinox.launcher.win32.win32.x86_64=R36x_v20101222,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86_64
-fragment at org.eclipse.equinox.launcher.win32.win32.ia64=R36x_v20101222,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.ia64
-fragment at org.eclipse.equinox.launcher.wpf.win32.x86=R36x_v20101222,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.wpf.win32.x86
-fragment at org.eclipse.equinox.launcher.carbon.macosx=R36x_v20101019_1345,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.carbon.macosx
-fragment at org.eclipse.equinox.launcher.cocoa.macosx=R36x_v20101019_1345,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx
-fragment at org.eclipse.equinox.launcher.cocoa.macosx.x86_64=R36x_v20101019_1345,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx.x86_64
-fragment at org.eclipse.equinox.launcher.gtk.linux.x86=R36x_v20101019_1345,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86
-fragment at org.eclipse.equinox.launcher.gtk.linux.x86_64=R36x_v20101019_1345,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86_64
-fragment at org.eclipse.equinox.launcher.gtk.linux.ppc=R36x_v20101019_1345,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc
-fragment at org.eclipse.equinox.launcher.gtk.linux.ppc64=R36x_v20101019_1345,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc64
-fragment at org.eclipse.equinox.launcher.gtk.aix.ppc64=R36x_v20101102,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc64
-fragment at org.eclipse.equinox.launcher.motif.hpux.ia64_32=R36x_v20101019_1345,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.hpux.ia64_32
-fragment at org.eclipse.equinox.launcher.motif.aix.ppc=R36x_v20101019_1345,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.aix.ppc
-fragment at org.eclipse.equinox.launcher.motif.linux.x86=R36x_v20101019_1345,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86
-fragment at org.eclipse.equinox.launcher.gtk.solaris.sparc=R36x_v20101019_1345,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.solaris.sparc
-plugin at org.eclipse.equinox.launcher.releng=R36x_v20101019,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/releng/org.eclipse.equinox.launcher.releng
+plugin at org.eclipse.equinox.launcher=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher
+fragment at org.eclipse.equinox.launcher.win32.win32.x86=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86
+fragment at org.eclipse.equinox.launcher.win32.win32.x86_64=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86_64
+fragment at org.eclipse.equinox.launcher.win32.win32.ia64=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.ia64
+fragment at org.eclipse.equinox.launcher.wpf.win32.x86=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.wpf.win32.x86
+fragment at org.eclipse.equinox.launcher.carbon.macosx=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.carbon.macosx
+fragment at org.eclipse.equinox.launcher.cocoa.macosx=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx
+fragment at org.eclipse.equinox.launcher.cocoa.macosx.x86_64=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx.x86_64
+fragment at org.eclipse.equinox.launcher.gtk.linux.x86=v20110505,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86
+fragment at org.eclipse.equinox.launcher.gtk.linux.x86_64=v20110505,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86_64
+fragment at org.eclipse.equinox.launcher.gtk.linux.ppc=v20110505,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc
+fragment at org.eclipse.equinox.launcher.gtk.linux.ppc64=v20110505,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc64
+fragment at org.eclipse.equinox.launcher.gtk.aix.ppc64=v20110530,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc64
+fragment at org.eclipse.equinox.launcher.gtk.aix.ppc=v20110530,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc
+fragment at org.eclipse.equinox.launcher.gtk.hpux.ia64_32=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.hpux.ia64_32
+fragment at org.eclipse.equinox.launcher.motif.hpux.ia64_32=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.hpux.ia64_32
+fragment at org.eclipse.equinox.launcher.motif.aix.ppc=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.aix.ppc
+fragment at org.eclipse.equinox.launcher.motif.linux.x86=v20110505,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86
+fragment at org.eclipse.equinox.launcher.gtk.solaris.sparc=v20110505,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.solaris.sparc
+plugin at org.eclipse.equinox.launcher.releng=v20101129,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/releng/org.eclipse.equinox.launcher.releng
 
 !****contributed fragments
-fragment at org.eclipse.equinox.launcher.gtk.linux.s390=R36x_v20110125,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390
-fragment at org.eclipse.equinox.launcher.gtk.linux.s390x=R36x_v20110125,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390x
-fragment at org.eclipse.equinox.launcher.gtk.solaris.x86=R36x_v20101019_1345,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.solaris.x86
-fragment at org.eclipse.equinox.launcher.motif.solaris.sparc=R36x_v20101019_1345,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.solaris.sparc
+fragment at org.eclipse.equinox.launcher.gtk.linux.s390=v20110505,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390
+fragment at org.eclipse.equinox.launcher.gtk.linux.s390x=v20110505,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390x
+fragment at org.eclipse.equinox.launcher.gtk.solaris.x86=v20110505,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.solaris.x86
+fragment at org.eclipse.equinox.launcher.motif.solaris.sparc=v20110505,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.solaris.sparc
 
-feature at org.eclipse.equinox.executable=R36x_v20110125,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.executable
+feature at org.eclipse.equinox.executable=v20110530,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.executable
 
 !**** Runtime
-plugin at org.eclipse.core.runtime=v20100505,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.contenttype=v20100505-1235,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.jobs=R36x_v20100824,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.runtime=v20110110,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.contenttype=v20110423-0524,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.jobs=v20110404,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
 !**** Expressions
-plugin at org.eclipse.core.expressions=v20100505,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.expressions=v20110228,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 plugin at org.eclipse.core.expressions.tests=v20091203,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
 !**** Resources
-plugin at org.eclipse.core.resources=R36x_v20110131-1630,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.resources=v20110510-0712,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 fragment at org.eclipse.core.resources.win32=v20100505-1235,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.resources.win32.x86=v20100505-1345,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.resources.win32.ia64=v20081020,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.resources.compatibility=v20100505-1235,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.resources.win32.x86=v20110423-0524,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.resources.win32.ia64=v20110423-0524,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.resources.compatibility=v20101108,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
 !**** File System
-plugin at org.eclipse.core.filesystem=R36x_v20100727-0745,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.filesystem.win32.x86=R36x_v20100727-0745,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.filesystem.win32.x86_64=R36x_v20100727-0745,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.filesystem.win32.ia64=R36x_v20100727-0745,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.filesystem.linux.x86=v20100505-1235,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.filesystem.linux.x86_64=v20100505-1235,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.filesystem.linux.ppc=v20100505-1235,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.filesystem.solaris.sparc=v20100505-1235,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.filesystem.aix.ppc=v20100505-1235,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc
+plugin at org.eclipse.core.filesystem=v20110423-0524,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.win32.x86=v20110423-0524,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.win32.x86_64=v20110423-0524,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.win32.ia64=v20110423-0524,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.linux.x86=v20110423-0524,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.linux.x86_64=v20110423-0524,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.solaris.sparc=v20110423-0524,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.aix.ppc=v20110423-0524,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc
 
 !**** Legacy Runtime
 plugin at org.eclipse.core.boot=v20100505,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 plugin at org.eclipse.core.runtime.compatibility=v20100505,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.runtime.compatibility.auth=v20100517,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.runtime.compatibility.registry=v20100520,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.runtime.compatibility.auth=v20110110,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.runtime.compatibility.registry=v20110505,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
 !**** Other Core Code
-plugin at org.eclipse.pde.build=R36x_20110203,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build
-plugin at org.eclipse.pde.build.tests=R36x_v20110111,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build.tests
+plugin at org.eclipse.pde.build=v20110512-1320,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build
+plugin at org.eclipse.pde.build.tests=v20110512-1320,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build.tests
 feature at org.eclipse.pde.builder=v20040624a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build/feature
+feature at org.eclipse.pde.build.feature=v20110123,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build.feature
+feature at org.eclipse.pde.build.product.feature=v20110123,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build.product.feature
+
+!**** Features and Products
+feature at org.eclipse.core.runtime.feature=v20110124,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+feature at org.eclipse.equinox.compendium.sdk=CVS,tag=v20110502,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/compendium/features/org.eclipse.equinox.compendium.sdk
+feature at org.eclipse.equinox.core.feature=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/features/org.eclipse.equinox.core.feature
+feature at org.eclipse.equinox.core.sdk=CVS,tag=v20110506-0800,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/framework/features/org.eclipse.equinox.core.sdk
+feature at org.eclipse.equinox.sdk=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/features/org.eclipse.equinox.sdk
+feature at org.eclipse.equinox.starterkit.product.feature=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/features/org.eclipse.equinox.starterkit.product.feature
+feature at org.eclipse.equinox.server.core=CVS,tag=v20110502,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.core
+feature at org.eclipse.equinox.server.jetty=CVS,tag=v20110502,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.jetty
+feature at org.eclipse.equinox.server.p2=CVS,tag=v20110502,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.p2
+feature at org.eclipse.equinox.server.servletbridge=CVS,tag=v20110502,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.servletbridge
+feature at org.eclipse.equinox.server.simple=CVS,tag=v20110502,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.simple
+feature at org.eclipse.equinox.serverside.sdk=CVS,tag=v20110502,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.serverside.sdk
+feature at org.eclipse.equinox.weaving.sdk=CVS,tag=v20110502,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/weaving/features/org.eclipse.equinox.weaving.sdk
 
 !**** Test Suites
-plugin at org.eclipse.core.tests.harness=v20100505-1235,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.tests.resources=R36x_v20110131-1630,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.tests.runtime=R36x_v20101213,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.osgi.tests=R36x_v20101103,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi.tests
+plugin at org.eclipse.core.tests.harness=v20110505,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.tests.resources=v20110511-0607,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.tests.runtime=v20110506,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.osgi.tests=v20110513,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi.tests
+plugin at org.eclipse.equinox.ds.tests=v20110502,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.ds.tests
 !***************  DOC CONTRIBUTION  ******************************************************** 
 
-plugin at org.eclipse.platform.doc.user=r362_v20101117-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.platform.doc.isv=r362_v20110111,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.platform.doc.user=v20110601-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.platform.doc.isv=v20110602-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.jdt.doc.user=r361_v20100721-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.doc.isv=r362_v20101117-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.doc.user=v20110601-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.doc.isv=v20110531-1242,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.pde.doc.user=v20101118_r362,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/doc/org.eclipse.pde.doc.user
+plugin at org.eclipse.pde.doc.user=v20110601-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/doc/org.eclipse.pde.doc.user
 !***************  Equinox Incubator Contribution ***************************
 
 !**** Initializer bundle
@@ -176,30 +197,40 @@ bundle at org.eclipse.equinox.initializer=v20100503,:pserver:anonymous at dev.eclipse.
 plugin at org.eclipse.equinox.jmx.client=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.client
 plugin at org.eclipse.equinox.jmx.client.rmi=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi
 plugin at org.eclipse.equinox.jmx.client.xmlrpc=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc
-feature at org.eclipse.equinox.jmx.client.feature=v20081124,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.client.feature
+feature at org.eclipse.equinox.jmx.client.feature=v20110511,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.client.feature
 
 !** Common **
 plugin at org.eclipse.equinox.jmx.common=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.common
-feature at org.eclipse.equinox.jmx.common.feature=v20070507,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.common.feature
+feature at org.eclipse.equinox.jmx.common.feature=v20110511,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.common.feature
 
 !** Server **
 plugin at org.eclipse.equinox.jmx.server=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.server
 plugin at org.eclipse.equinox.jmx.server.rmi=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi
-plugin at org.eclipse.equinox.jmx.server.xmlrpc=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc
+plugin at org.eclipse.equinox.jmx.server.xmlrpc=v20110413,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc
 plugin at org.eclipse.equinox.jmx.vm=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.vm
 plugin at org.eclipse.equinox.preferences.jmx=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.preferences.jmx
 plugin at org.eclipse.equinox.registry.jmx=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.registry.jmx
-plugin at org.eclipse.osgi.jmx=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.osgi.jmx
+plugin at org.eclipse.osgi.jmx=v20110414,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.osgi.jmx
 plugin at org.eclipse.swt.jmx=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.swt.jmx
 plugin at org.eclipse.core.resources.jmx=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.core.resources.jmx
-feature at org.eclipse.equinox.jmx.server.feature=v20081124,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.server.feature
+feature at org.eclipse.equinox.jmx.server.feature=v20110511,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.server.feature
+
+!** Console **
+plugin at org.eclipse.equinox.console.supportability=v20110207,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/console/org.eclipse.equinox.console.supportability
+
+!** Region **
+plugin at org.eclipse.equinox.region=v20110524,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.region
+plugin at org.eclipse.equinox.region.tests=v20110523,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.region.tests
+
+!** Feature for all equinox incubatorbundles **
+feature at org.eclipse.equinox.incubator.feature=v20110511,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.incubator.feature
 !***************  FEATURE CONTRIBUTION  ******************************************************
-feature at org.eclipse.sdk=r362_v20100929,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.sdk
-plugin at org.eclipse.sdk=r362_v20110202,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+feature at org.eclipse.sdk=v20110426,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.sdk
+plugin at org.eclipse.sdk=v20110504-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
-feature at org.eclipse.jdt=r362_v20101117-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.jdt-feature
+feature at org.eclipse.jdt=v20110520-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.jdt-feature
 
-feature at org.eclipse.pde=r362_v20110203,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.pde-feature
+feature at org.eclipse.pde=v20110504-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.pde-feature
 feature at org.eclipse.pde.api.tools.ee.cdcfoundation10_feature=v20091027-1300,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature
 feature at org.eclipse.pde.api.tools.ee.cdcfoundation11_feature=v20091027-1300,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature
 feature at org.eclipse.pde.api.tools.ee.j2se12_feature=v20091027-1300,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se12-feature
@@ -212,204 +243,206 @@ feature at org.eclipse.pde.api.tools.ee.osgiminimum10_feature=v20091027-1300,:pserv
 feature at org.eclipse.pde.api.tools.ee.osgiminimum11_feature=v20091027-1300,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature
 feature at org.eclipse.pde.api.tools.ee.osgiminimum12_feature=v20091027-1300,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature
 
-feature at org.eclipse.platform=r362_v20110210,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.platform-feature
-plugin at org.eclipse.platform=r362_v20110120,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-
-feature at org.eclipse.sdk.examples=r362_v20101014,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk.examples-feature
-plugin at org.eclipse.sdk.examples=v20100527,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-
-feature at org.eclipse.sdk.tests=r361_v20100714-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk.tests-feature/features/org.eclipse.sdk.tests
-plugin at org.eclipse.sdk.tests=v20060605,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+feature at org.eclipse.platform=v20110530,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.platform-feature
+plugin at org.eclipse.platform=v20110520,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
-feature at org.eclipse.equinox.sdk=r362_v20110210b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.equinox.sdk
+feature at org.eclipse.sdk.examples=v20110503,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk.examples-feature
+plugin at org.eclipse.sdk.examples=v20110503,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
-feature at org.eclipse.cvs=r362_v20101111,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.cvs-feature
-plugin at org.eclipse.cvs=v20100414,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/org.eclipse.cvs
+feature at org.eclipse.sdk.tests=v20110503,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk.tests-feature/features/org.eclipse.sdk.tests
+plugin at org.eclipse.sdk.tests=v20100907,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
-feature at org.eclipse.help=r362_v20101111,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.help-feature
+feature at org.eclipse.cvs=v20110520-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.cvs-feature
+plugin at org.eclipse.cvs=v20110505-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/org.eclipse.cvs
 
-feature at org.eclipse.equinox.p2.user.ui=r361_v20100903,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/p2/org.eclipse.equinox.p2.releng/buildtime-features/org.eclipse.equinox.p2.user.ui
+feature at org.eclipse.help=v20110327,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.help-feature
 
-feature at org.eclipse.equinox.p2.sdk=CVS,tag=R36x_v20110120,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.sdk
-feature at org.eclipse.equinox.p2.discovery.feature=CVS,tag=R36x_v20110210,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.discovery.feature
-feature at org.eclipse.equinox.core.sdk=CVS,tag=r36x_v20110210,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/framework/features/org.eclipse.equinox.core.sdk
-feature at org.eclipse.equinox.compendium.sdk=CVS,tag=R36x_v20101014,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/compendium/features/org.eclipse.equinox.compendium.sdk
+feature at org.eclipse.pde.api.tools.ee.fragments=v20110123,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.pde.api.tools.ee.fragments
 
-feature at org.eclipse.equinox.serverside.sdk=CVS,tag=R36x_v20101014,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.serverside.sdk
-feature at org.eclipse.equinox.server.core=CVS,tag=R36x_v20101007,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.core
-feature at org.eclipse.equinox.server.jetty=CVS,tag=v20100510,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.jetty
-feature at org.eclipse.equinox.server.p2=CVS,tag=R36x_v20101007,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.p2
-feature at org.eclipse.equinox.server.servletbridge=CVS,tag=v20100510,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.servletbridge
-feature at org.eclipse.equinox.server.simple=CVS,tag=v20100510,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.simple
-
-feature at org.eclipse.equinox.weaving.sdk=CVS,tag=v20100421,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/weaving/features/org.eclipse.equinox.weaving.sdk
-
-feature at org.eclipse.pde.api.tools.ee.fragments=v20100427,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.pde.api.tools.ee.fragments
+feature at org.eclipse.pde.junit.runtime.addon=v20110331,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.pde.junit.runtime.addon
+feature at org.eclipse.pde.junit.runtime.standalone=v20110331,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.pde.junit.runtime.standalone
+feature at org.eclipse.license=v20110208,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.license
 
 !***************  JDT APT CONTRIBUTION *******************************************
 
-plugin at org.eclipse.jdt.apt.core=R36_v20110120-1000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.apt.ui=v20100513-0845,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.apt.tests=R36x_v20100707-0100,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.jdt.compiler.apt=v20100513-0845,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.compiler.apt.tests=v20100513-0845,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.apt.pluggable.core=R36_v20100727-0110,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.apt.pluggable.tests=v20100513-0845,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.apt.core=v20110420-1015,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.apt.ui=v20110305-1450,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.apt.tests=v20110305-1450,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.jdt.compiler.apt=v0110509-1300,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.compiler.apt.tests=v0110509-1300,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.apt.pluggable.core=v20110305-1450,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.apt.pluggable.tests=v20110305-1450,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
-!*********************************** JDT CORE CONTRIBUTION ******************************************* 
+!*******************************  JDT CORE CONTRIBUTION ******************************************* 
 
-plugin at org.eclipse.jdt.core=v_A76_R36x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.jdt.compiler.tool=v_A76_R36x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core=v_B61,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.jdt.compiler.tool=v_B61,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.jdt.core.tests.builder=v_A76_R36x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.core.tests.compiler=v_A76_R36x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.core.tests.model=v_A76_R36x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.core.tests.performance=v_A76_R36x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.compiler.tool.tests=v_A76_R36x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core.tests.builder=v_B61,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core.tests.compiler=v_B61,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core.tests.model=v_B61,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core.tests.performance=v_B61,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.compiler.tool.tests=v_B61,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 !***************  DEBUG CONTRIBUTION  ******************************************************** 
 
-plugin at org.eclipse.debug.core=v20100519,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.debug.ui=v20101201_r362,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.debug=v20100715_r361,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.debug.ui=v20100928a_r362,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.launching=v20110105_r362,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.launching.macosx=v20100505,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.launching.ui.macosx=v20100505,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.debug.core=v20110518,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.debug.ui=v20110518,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.debug=v20110509,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.debug.ui=v20110512,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.launching=v20110509,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.launching.macosx=v20110509,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.launching.ui.macosx=v20110509,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.ui.console=v20100526,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.console=v20110511,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.jdt.debug.tests=v20100526,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.debug.tests=v20100624_r361,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.debug.tests=v20110509,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.debug.tests=v20110511,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.debug.examples.core=v20100505,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.debug.examples.ui=v20100526,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.debug.examples.core=v20110511,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.debug.examples.ui=v20110511,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 !***************  JDT UI CONTRIBUTION  ******************************************************** 
-plugin at org.eclipse.search=v20100520-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.search.tests=v20100520-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.search=v20110505-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.search.tests=v20110505-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.ltk.core.refactoring=r362_v20101117-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ltk.core.refactoring.tests=v20100520-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ltk.ui.refactoring=v20100526-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ltk.ui.refactoring.tests=v20100520-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ltk.core.refactoring=v20110505-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ltk.core.refactoring.tests=v20110505-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ltk.ui.refactoring=v20110505-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ltk.ui.refactoring.tests=v20110505-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.jdt=r361_v20100714-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt=v20110505-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.jdt.core.manipulation=v20100520-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core.manipulation=v20110505-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.jdt.ui=r362_v20110203,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.ui.tests=r361_v20100818-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.ui.tests.refactoring=v20100526-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.ui=v20110531-1200,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.ui.tests=v20110518-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.ui.tests.refactoring=v20110511-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.jdt.junit=r361_v20100825-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.junit.core=r361_v20100825-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.junit.runtime=v20100526-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.junit4.runtime=v20100526-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.junit=v20110505-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.junit.core=v20110518-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.junit.runtime=v20110505-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.junit4.runtime=v20110505-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
 plugin at org.junit4=v20100525,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 !***************  ORBIT CONTRIBUTION  ********************************************************
-plugin at com.ibm.icu,4.2.1=p2IU,id=com.ibm.icu,version=4.2.1.v20100412,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at com.ibm.icu.base,4.2.1=p2IU,id=com.ibm.icu.base,version=4.2.1.v20100412,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at com.ibm.icu.base.source,4.2.1=p2IU,id=com.ibm.icu.base.source,version=4.2.1.v20100412,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at com.ibm.icu.source,4.2.1=p2IU,id=com.ibm.icu.source,version=4.2.1.v20100412,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at com.jcraft.jsch,0.1.41=p2IU,id=com.jcraft.jsch,version=0.1.41.v200903070017,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at com.jcraft.jsch.source,0.1.41=p2IU,id=com.jcraft.jsch.source,version=0.1.41.v200903070017,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at javax.management,1.2.0=p2IU,id=javax.management,version=1.2.0.v20100427-1100,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at javax.management.remote,1.0.0=p2IU,id=javax.management.remote,version=1.0.0.v20100427-1100,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at javax.servlet,2.4.0=p2IU,id=javax.servlet,version=2.4.0.v200806031604,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at javax.servlet,2.5.0=p2IU,id=javax.servlet,version=2.5.0.v200910301333,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at javax.servlet.source,2.4.0=p2IU,id=javax.servlet.source,version=2.4.0.v200806031604,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at javax.servlet.source,2.5.0=p2IU,id=javax.servlet.source,version=2.5.0.v200910301333,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at javax.servlet.jsp,2.0.0=p2IU,id=javax.servlet.jsp,version=2.0.0.v200806031607,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at javax.servlet.jsp.source,2.0.0=p2IU,id=javax.servlet.jsp.source,version=2.0.0.v200806031607,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at net.sourceforge.mx4j,3.0.1=p2IU,id=net.sourceforge.mx4j,version=3.0.1.v20100427-1100,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at net.sourceforge.mx4j.remote,3.0.1=p2IU,id=net.sourceforge.mx4j.remote,version=3.0.1.v20100427-1100,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.ant,1.7.1=p2IU,id=org.apache.ant,version=1.7.1.v20100518-1145,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.ant.source,1.7.1=p2IU,id=org.apache.ant.source,version=1.7.1.v20100518-1145,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.commons.codec,1.3.0=p2IU,id=org.apache.commons.codec,version=1.3.0.v20100518-1140,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.commons.codec.source,1.3.0=p2IU,id=org.apache.commons.codec.source,version=1.3.0.v20100518-1140,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.commons.el,1.0.0=p2IU,id=org.apache.commons.el,version=1.0.0.v201004212143,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.commons.el.source,1.0.0=p2IU,id=org.apache.commons.el.source,version=1.0.0.v201004212143,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.commons.httpclient,3.1.0=p2IU,id=org.apache.commons.httpclient,version=3.1.0.v201005080502,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.commons.httpclient.source,3.1.0=p2IU,id=org.apache.commons.httpclient.source,version=3.1.0.v201005080502,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.commons.logging,1.0.4=p2IU,id=org.apache.commons.logging,version=1.0.4.v201005080501,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.commons.logging.source,1.0.4=p2IU,id=org.apache.commons.logging.source,version=1.0.4.v201005080501,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.jasper,5.5.17=p2IU,id=org.apache.jasper,version=5.5.17.v201004212143,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.jasper.source,5.5.17=p2IU,id=org.apache.jasper.source,version=5.5.17.v201004212143,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.lucene,1.9.1=p2IU,id=org.apache.lucene,version=1.9.1.v20100518-1140,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.lucene.analysis,1.9.1=p2IU,id=org.apache.lucene.analysis,version=1.9.1.v20100518-1140,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.lucene.analysis.source,1.9.1=p2IU,id=org.apache.lucene.analysis.source,version=1.9.1.v20100518-1140,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.ws.commons.util,1.0.0=p2IU,id=org.apache.ws.commons.util,version=1.0.0.v20100518-1135,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.ws.jaxme,0.5.1=p2IU,id=org.apache.ws.jaxme,version=0.5.1.v20100427-1100,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.xmlrpc,3.0.0=p2IU,id=org.apache.xmlrpc,version=3.0.0.v20100427-1100,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.easymock,2.4.0=p2IU,id=org.easymock,version=2.4.0.v20090202-0900,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.easymock.source,2.4.0=p2IU,id=org.easymock.source,version=2.4.0.v20090202-0900,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.hamcrest.core,1.1.0=p2IU,id=org.hamcrest.core,version=1.1.0.v20090501071000,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.hamcrest.core.source,1.1.0=p2IU,id=org.hamcrest.core.source,version=1.1.0.v20090501071000,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.junit,3.8.2=p2IU,id=org.junit,version=3.8.2.v3_8_2_v20100427-1100,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.junit.source,3.8.2=p2IU,id=org.junit.source,version=3.8.2.v3_8_2_v20100427-1100,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.junit,4.8.1=p2IU,id=org.junit,version=4.8.1.v4_8_1_v20100427-1100,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.junit.source,4.8.1=p2IU,id=org.junit.source,version=4.8.1.v4_8_1_v20100427-1100,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.mortbay.jetty,5.1.14=p2IU,id=org.mortbay.jetty,version=5.1.14.v200806031611,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.mortbay.jetty.source,5.1.14=p2IU,id=org.mortbay.jetty.source,version=5.1.14.v200806031611,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.mortbay.jetty.server,6.1.23=p2IU,id=org.mortbay.jetty.server,version=6.1.23.v201004211559,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.mortbay.jetty.server.source,6.1.23=p2IU,id=org.mortbay.jetty.server.source,version=6.1.23.v201004211559,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.mortbay.jetty.util,6.1.23=p2IU,id=org.mortbay.jetty.util,version=6.1.23.v201004211559,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.mortbay.jetty.util.source,6.1.23=p2IU,id=org.mortbay.jetty.util.source,version=6.1.23.v201004211559,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
+plugin at com.ibm.icu,4.4.2=p2IU,id=com.ibm.icu,version=4.4.2.v20110208,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at com.ibm.icu.base,4.4.2=p2IU,id=com.ibm.icu.base,version=4.4.2.v20110208,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at com.ibm.icu.base.source,4.4.2=p2IU,id=com.ibm.icu.base.source,version=4.4.2.v20110208,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at com.ibm.icu.source,4.4.2=p2IU,id=com.ibm.icu.source,version=4.4.2.v20110208,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at com.jcraft.jsch,0.1.41=p2IU,id=com.jcraft.jsch,version=0.1.41.v201101211617,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at com.jcraft.jsch.source,0.1.41=p2IU,id=com.jcraft.jsch.source,version=0.1.41.v201101211617,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at javax.management,1.2.0=p2IU,id=javax.management,version=1.2.0.v20100427-1100,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at javax.management.remote,1.0.0=p2IU,id=javax.management.remote,version=1.0.0.v20100427-1100,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at javax.servlet,2.4.0=p2IU,id=javax.servlet,version=2.4.0.v200806031604,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at javax.servlet,2.5.0=p2IU,id=javax.servlet,version=2.5.0.v201103041518,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at javax.servlet.source,2.4.0=p2IU,id=javax.servlet.source,version=2.4.0.v200806031604,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at javax.servlet.source,2.5.0=p2IU,id=javax.servlet.source,version=2.5.0.v201103041518,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at javax.servlet.jsp,2.0.0=p2IU,id=javax.servlet.jsp,version=2.0.0.v201101211617,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at javax.servlet.jsp.source,2.0.0=p2IU,id=javax.servlet.jsp.source,version=2.0.0.v201101211617,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at net.sourceforge.mx4j,3.0.1=p2IU,id=net.sourceforge.mx4j,version=3.0.1.v20100427-1100,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at net.sourceforge.mx4j.remote,3.0.1=p2IU,id=net.sourceforge.mx4j.remote,version=3.0.1.v20100427-1100,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.ant,1.8.2=p2IU,id=org.apache.ant,version=1.8.2.v20110505-1300,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.ant.source,1.8.2=p2IU,id=org.apache.ant.source,version=1.8.2.v20110505-1300,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.commons.codec,1.3.0=p2IU,id=org.apache.commons.codec,version=1.3.0.v201101211617,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.commons.codec.source,1.3.0=p2IU,id=org.apache.commons.codec.source,version=1.3.0.v201101211617,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.commons.el,1.0.0=p2IU,id=org.apache.commons.el,version=1.0.0.v201101211617,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.commons.el.source,1.0.0=p2IU,id=org.apache.commons.el.source,version=1.0.0.v201101211617,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.commons.httpclient,3.1.0=p2IU,id=org.apache.commons.httpclient,version=3.1.0.v201012070820,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.commons.httpclient.source,3.1.0=p2IU,id=org.apache.commons.httpclient.source,version=3.1.0.v201012070820,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.commons.logging,1.0.4=p2IU,id=org.apache.commons.logging,version=1.0.4.v201101211617,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.commons.logging.source,1.0.4=p2IU,id=org.apache.commons.logging.source,version=1.0.4.v201101211617,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.jasper,5.5.17=p2IU,id=org.apache.jasper,version=5.5.17.v201101211617,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.jasper.source,5.5.17=p2IU,id=org.apache.jasper.source,version=5.5.17.v201101211617,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.lucene,2.9.1=p2IU,id=org.apache.lucene,version=2.9.1.v201101211721,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.lucene.source,2.9.1=p2IU,id=org.apache.lucene.source,version=2.9.1.v201101211721,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.lucene.analysis,2.9.1=p2IU,id=org.apache.lucene.analysis,version=2.9.1.v201101211721,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.lucene.analysis.source,2.9.1=p2IU,id=org.apache.lucene.analysis.source,version=2.9.1.v201101211721,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.lucene.core,2.9.1=p2IU,id=org.apache.lucene.core,version=2.9.1.v201101211721,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.lucene.core.source,2.9.1=p2IU,id=org.apache.lucene.core.source,version=2.9.1.v201101211721,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.ws.commons.util,1.0.0=p2IU,id=org.apache.ws.commons.util,version=1.0.0.v20100518-1135,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.ws.jaxme,0.5.1=p2IU,id=org.apache.ws.jaxme,version=0.5.1.v20100427-1100,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.xmlrpc,3.0.0=p2IU,id=org.apache.xmlrpc,version=3.0.0.v20100427-1100,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.easymock,2.4.0=p2IU,id=org.easymock,version=2.4.0.v20090202-0900,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.easymock.source,2.4.0=p2IU,id=org.easymock.source,version=2.4.0.v20090202-0900,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.hamcrest.core,1.1.0=p2IU,id=org.hamcrest.core,version=1.1.0.v20090501071000,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.hamcrest.core.source,1.1.0=p2IU,id=org.hamcrest.core.source,version=1.1.0.v20090501071000,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.junit,3.8.2=p2IU,id=org.junit,version=3.8.2.v3_8_2_v20100427-1100,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.junit.source,3.8.2=p2IU,id=org.junit.source,version=3.8.2.v3_8_2_v20100427-1100,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.junit,4.8.2=p2IU,id=org.junit,version=4.8.2.v4_8_2_v20110321-1705,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.junit.source,4.8.2=p2IU,id=org.junit.source,version=4.8.2.v4_8_2_v20110321-1705,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.mortbay.jetty,5.1.14=p2IU,id=org.mortbay.jetty,version=5.1.14.v200806031611,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.mortbay.jetty.source,5.1.14=p2IU,id=org.mortbay.jetty.source,version=5.1.14.v200806031611,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.mortbay.jetty.server,6.1.23=p2IU,id=org.mortbay.jetty.server,version=6.1.23.v201012071420,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.mortbay.jetty.server.source,6.1.23=p2IU,id=org.mortbay.jetty.server.source,version=6.1.23.v201012071420,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.mortbay.jetty.util,6.1.23=p2IU,id=org.mortbay.jetty.util,version=6.1.23.v201012071420,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.mortbay.jetty.util.source,6.1.23=p2IU,id=org.mortbay.jetty.util.source,version=6.1.23.v201012071420,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
 
 # Bundles from Orbit for p2
-plugin at org.apache.xml.resolver,1.2.0=p2IU,id=org.apache.xml.resolver,version=1.2.0.v201005080400,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.xerces,2.8.0=p2IU,id=org.apache.xerces,version=2.8.0.v200803070308,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.sat4j.core,2.2.0=p2IU,id=org.sat4j.core,version=2.2.0.v20100429,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.sat4j.pb,2.2.0=p2IU,id=org.sat4j.pb,version=2.2.0.v20100429,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
+plugin at org.apache.xml.resolver,1.2.0=p2IU,id=org.apache.xml.resolver,version=1.2.0.v201005080400,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.xerces,2.8.0=p2IU,id=org.apache.xerces,version=2.8.0.v200803070308,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.sat4j.core,2.3.0=p2IU,id=org.sat4j.core,version=2.3.0.v20110329,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.sat4j.pb,2.3.0=p2IU,id=org.sat4j.pb,version=2.3.0.v20110329,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
 
 # Orbit bundles for API tooling
-plugin at org.objectweb.asm,3.2.0=p2IU,id=org.objectweb.asm,version=3.2.0.v200909071300,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.objectweb.asm.source,3.2.0=p2IU,id=org.objectweb.asm.source,version=3.2.0.v200909071300,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
+plugin at org.objectweb.asm,3.3.1=p2IU,id=org.objectweb.asm,version=3.3.1.v201105211655,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.objectweb.asm.source,3.3.1=p2IU,id=org.objectweb.asm.source,version=3.3.1.v201105211655,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
 
 #aspectj plugins for equinox weaving plugins
 plugin at org.aspectj.weaver,1.6.7=p2IU,id=org.aspectj.weaver,version=1.6.7.20091231194938,repository=http://download.eclipse.org/tools/ajdt/aspectj/update																   
 plugin at org.aspectj.runtime,1.6.7=p2IU,id=org.aspectj.runtime,version=1.6.7.20091231194938,repository=http://download.eclipse.org/tools/ajdt/aspectj/update
-plugin at org.eclipse.equinox.frameworkadmin=CVS,tag=v20100503,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin
-plugin at org.eclipse.equinox.frameworkadmin.equinox=CVS,tag=v20100505,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin.equinox
-plugin at org.eclipse.equinox.frameworkadmin.test=CVS,tag=v20100503,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin.test
-plugin at org.eclipse.equinox.p2.artifact.repository=CVS,tag=R36x_v20100901,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.repository
-plugin at org.eclipse.equinox.p2.console=CVS,tag=v20100601,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.console
-plugin at org.eclipse.equinox.p2.core=CVS,tag=R36x_v20110111,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.core
-plugin at org.eclipse.equinox.p2.director=CVS,tag=R36x_v20101117-1018,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director
-plugin at org.eclipse.equinox.p2.director.app=CVS,tag=R36x_v20100823,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director.app
-plugin at org.eclipse.equinox.p2.directorywatcher=CVS,tag=R36x_v20101220,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.directorywatcher
-plugin at org.eclipse.equinox.p2.discovery=CVS,tag=v20100503,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.discovery
-plugin at org.eclipse.equinox.p2.discovery.compatibility=CVS,tag=v20110204-1323,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.discovery.compatibility
-plugin at org.eclipse.equinox.p2.engine=CVS,tag=R36x_v20110201,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine
-plugin at org.eclipse.equinox.p2.extensionlocation=CVS,tag=v20100518,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.extensionlocation
-plugin at org.eclipse.equinox.p2.garbagecollector=CVS,tag=v20100503,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.garbagecollector
-plugin at org.eclipse.equinox.p2.installer=CVS,tag=v20100503a,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.installer
-plugin at org.eclipse.equinox.p2.jarprocessor=CVS,tag=v20100503a,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.jarprocessor
-plugin at org.eclipse.equinox.p2.metadata=CVS,tag=R36x_v20101202,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata
-plugin at org.eclipse.equinox.p2.metadata.generator=CVS,tag=R36x_v20101208-1400,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.generator
-plugin at org.eclipse.equinox.p2.metadata.repository=CVS,tag=v20100513,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.repository
-plugin at org.eclipse.equinox.p2.operations=CVS,tag=v20100510,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.operations
-plugin at org.eclipse.equinox.p2.publisher=CVS,tag=v20100824-2220,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.publisher
-plugin at org.eclipse.equinox.p2.reconciler.dropins=CVS,tag=R36x_v20110114,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.reconciler.dropins
-plugin at org.eclipse.equinox.p2.repository=CVS,tag=R36x_v20110111-1500,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository
-plugin at org.eclipse.equinox.p2.repository.tools=CVS,tag=R36x_v20100823,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository.tools
-plugin at org.eclipse.equinox.p2.touchpoint.eclipse=CVS,tag=R36x_v20101202,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.eclipse
-plugin at org.eclipse.equinox.p2.touchpoint.natives=CVS,tag=R36x_v20110111,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.natives
-plugin at org.eclipse.equinox.p2.ui=CVS,tag=v20100518,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui
-plugin at org.eclipse.equinox.p2.ui.admin=CVS,tag=v20100503,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.admin
-plugin at org.eclipse.equinox.p2.ui.discovery=CVS,tag=v20100519,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.discovery
-plugin at org.eclipse.equinox.p2.ui.sdk=CVS,tag=v20100513,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.sdk
-plugin at org.eclipse.equinox.p2.ui.sdk.scheduler=CVS,tag=v20100507-1815,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler
-plugin at org.eclipse.equinox.p2.ui.admin.rcp=CVS,tag=R36x_v20100823,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.admin.rcp
-plugin at org.eclipse.equinox.p2.updatechecker=CVS,tag=R36x_v20100823,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatechecker
-plugin at org.eclipse.equinox.p2.updatesite=CVS,tag=R36x_v20100823,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatesite
-plugin at org.eclipse.equinox.simpleconfigurator=CVS,tag=v20100503,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.simpleconfigurator
-plugin at org.eclipse.equinox.simpleconfigurator.manipulator=CVS,tag=v20100503,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.simpleconfigurator.manipulator
-plugin at org.eclipse.equinox.p2.tests=CVS,tag=R36x_v20101202,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests
-plugin at org.eclipse.equinox.p2.tests.discovery=CVS,tag=v20100503,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.discovery
-plugin at org.eclipse.equinox.p2.tests.ui=CVS,tag=v20100513,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.ui
-plugin at org.eclipse.equinox.p2.tests.verifier=CVS,tag=v20100503,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.verifier
-plugin at org.eclipse.equinox.p2.ql=CVS,tag=v20100503a,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ql
+
+# gogo needed for equinox incubator console
+plugin at org.apache.felix.gogo.runtime,0.6.1=p2IU,id=org.apache.felix.gogo.runtime,version=0.6.1.v20110414-1850,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.eclipse.equinox.frameworkadmin=CVS,tag=v20110502-1955,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin
+plugin at org.eclipse.equinox.frameworkadmin.equinox=CVS,tag=v20110506,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin.equinox
+plugin at org.eclipse.equinox.frameworkadmin.test=CVS,tag=v20110502-1955,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin.test
+plugin at org.eclipse.equinox.p2.artifact.repository=CVS,tag=v20110519,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.repository
+plugin at org.eclipse.equinox.p2.console=CVS,tag=v20110502-1955,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.console
+plugin at org.eclipse.equinox.p2.core=CVS,tag=v20110502-1955,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.core
+plugin at org.eclipse.equinox.p2.director=CVS,tag=v20110504-1715,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director
+plugin at org.eclipse.equinox.p2.director.app=CVS,tag=v20110505,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director.app
+plugin at org.eclipse.equinox.p2.directorywatcher=CVS,tag=v20110502-1955,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.directorywatcher
+plugin at org.eclipse.equinox.p2.discovery=CVS,tag=v20110502-1955,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.discovery
+plugin at org.eclipse.equinox.p2.discovery.compatibility=CVS,tag=v20110502-1955,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.discovery.compatibility
+plugin at org.eclipse.equinox.p2.engine=CVS,tag=v20110511,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine
+plugin at org.eclipse.equinox.p2.extensionlocation=CVS,tag=v20110510,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.extensionlocation
+plugin at org.eclipse.equinox.p2.garbagecollector=CVS,tag=v20110510,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.garbagecollector
+plugin at org.eclipse.equinox.p2.installer=CVS,tag=v20110502-1955,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.installer
+plugin at org.eclipse.equinox.p2.jarprocessor=CVS,tag=v20110502-1955,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.jarprocessor
+plugin at org.eclipse.equinox.p2.metadata=CVS,tag=v20110510,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata
+plugin at org.eclipse.equinox.p2.metadata.repository=CVS,tag=v20110511-1359,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.repository
+plugin at org.eclipse.equinox.p2.operations=CVS,tag=v20110511-1821,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.operations
+plugin at org.eclipse.equinox.p2.publisher=CVS,tag=v20110511,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.publisher
+plugin at org.eclipse.equinox.p2.publisher.eclipse=CVS,tag=v20110511,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.publisher.eclipse
+plugin at org.eclipse.equinox.p2.reconciler.dropins=CVS,tag=v20110510,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.reconciler.dropins
+plugin at org.eclipse.equinox.p2.repository=CVS,tag=v20110601,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository
+plugin at org.eclipse.equinox.p2.repository.tools=CVS,tag=v20110512-1320,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository.tools
+plugin at org.eclipse.equinox.p2.touchpoint.eclipse=CVS,tag=v20110511,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.eclipse
+plugin at org.eclipse.equinox.p2.transport.ecf=CVS,tag=v20110510,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.transport.ecf
+plugin at org.eclipse.equinox.p2.touchpoint.natives=CVS,tag=v20110502-1955,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.natives
+plugin at org.eclipse.equinox.p2.ui=CVS,tag=v20110601,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui
+plugin at org.eclipse.equinox.p2.ui.admin=CVS,tag=v20110502-1955,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.admin
+plugin at org.eclipse.equinox.p2.ui.discovery=CVS,tag=v20110502-1955,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.discovery
+plugin at org.eclipse.equinox.p2.ui.importexport=CVS,tag=v20110511,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.importexport
+plugin at org.eclipse.equinox.p2.ui.sdk=CVS,tag=v20110502-1955,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.sdk
+plugin at org.eclipse.equinox.p2.ui.sdk.scheduler=CVS,tag=v20110502-1955,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler
+plugin at org.eclipse.equinox.p2.ui.admin.rcp=CVS,tag=v20110502-1955,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.admin.rcp
+plugin at org.eclipse.equinox.p2.updatechecker=CVS,tag=v20110502-1955,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatechecker
+plugin at org.eclipse.equinox.p2.updatesite=CVS,tag=v20110510,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatesite
+plugin at org.eclipse.equinox.simpleconfigurator=CVS,tag=v20110502-1955,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.simpleconfigurator
+plugin at org.eclipse.equinox.simpleconfigurator.manipulator=CVS,tag=v20110502-1955,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.simpleconfigurator.manipulator
+plugin at org.eclipse.equinox.p2.tests=CVS,tag=v20110519,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests
+plugin at org.eclipse.equinox.p2.tests.discovery=CVS,tag=v20110502-1955,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.discovery
+plugin at org.eclipse.equinox.p2.tests.ui=CVS,tag=v20110511,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.ui
+plugin at org.eclipse.equinox.p2.tests.verifier=CVS,tag=v20110222-0044,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.verifier
+plugin at org.eclipse.equinox.p2.ql=CVS,tag=v20110510,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ql
+
+!# p2 features
+feature at org.eclipse.equinox.p2.core.feature=v20110519,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.core.feature
+feature at org.eclipse.equinox.p2.discovery.feature=CVS,tag=v20110519,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.discovery.feature
+feature at org.eclipse.equinox.p2.extras.feature=v20110519,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.extras.feature
+feature at org.eclipse.equinox.p2.rcp.feature=v20110519,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.rcp.feature
+feature at org.eclipse.equinox.p2.sdk=CVS,tag=v20110519,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.sdk
+feature at org.eclipse.equinox.p2.user.ui=CVS,tag=v20110526,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.user.ui
 
 !# p2 examples
 plugin at org.eclipse.equinox.p2.examples.rcp.cloud=CVS,tag=v20100604,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/examples/org.eclipse.equinox.p2.examples.rcp.cloud
@@ -420,76 +453,84 @@ plugin at org.eclipse.equinox.p2.examples.rcp.prestartupdate=CVS,tag=v20100604,cvsR
 plugin at org.eclipse.equinox.p2.examples.rcp.prestartupdate.releng=CVS,tag=v20100604,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/examples/org.eclipse.equinox.p2.examples.rcp.prestartupdate.releng
 plugin at org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility=CVS,tag=v20100604,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility
 plugin at org.eclipse.equinox.p2.examples.rcp.sdknoautoupdates=CVS,tag=v20100604,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/examples/org.eclipse.equinox.p2.examples.rcp.sdknoautoupdates
-plugin at org.eclipse.equinox.p2.examples.rcp.sdkui=CVS,tag=v20100604,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/examples/org.eclipse.equinox.p2.examples.rcp.sdkui
+plugin at org.eclipse.equinox.p2.examples.rcp.sdkui=CVS,tag=v20100927-1600,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/examples/org.eclipse.equinox.p2.examples.rcp.sdkui
 
 !# Bundles from ECF
-plugin at org.eclipse.ecf,3.1.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf_3.1.0.v20100906-1425.jar,usetimestamp=true
-plugin at org.eclipse.ecf.source,3.1.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.source_3.1.0.v20100906-1425.jar,usetimestamp=true
-fragment at org.eclipse.ecf.ssl,1.0.100=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.ssl_1.0.100.v20100906-1425.jar,usetimestamp=true
-fragment at org.eclipse.ecf.ssl.source,1.0.100=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.ssl.source_1.0.100.v20100906-1425.jar,usetimestamp=true
-plugin at org.eclipse.ecf.identity,3.1.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.identity_3.1.0.v20100906-1425.jar,usetimestamp=true
-plugin at org.eclipse.ecf.identity.source,3.1.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.identity.source_3.1.0.v20100906-1425.jar,usetimestamp=true
-plugin at org.eclipse.ecf.filetransfer,4.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.filetransfer_4.0.0.v20100906-1425.jar,usetimestamp=true
-plugin at org.eclipse.ecf.filetransfer.source,4.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.filetransfer.source_4.0.0.v20100906-1425.jar,usetimestamp=true
-plugin at org.eclipse.ecf.provider.filetransfer,3.1.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer_3.1.0.v20100906-1425.jar,usetimestamp=true
-plugin at org.eclipse.ecf.provider.filetransfer.source,3.1.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer.source_3.1.0.v20100906-1425.jar,usetimestamp=true
-fragment at org.eclipse.ecf.provider.filetransfer.ssl,1.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20100906-1425.jar,usetimestamp=true
-fragment at org.eclipse.ecf.provider.filetransfer.ssl.source,1.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer.ssl.source_1.0.0.v20100906-1425.jar,usetimestamp=true
-plugin at org.eclipse.ecf.provider.filetransfer.httpclient,4.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.v20100906-1425.jar,usetimestamp=true
-plugin at org.eclipse.ecf.provider.filetransfer.httpclient.source,4.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.source_4.0.0.v20100906-1425.jar,usetimestamp=true
-fragment at org.eclipse.ecf.provider.filetransfer.httpclient.ssl,1.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20100906-1425.jar,usetimestamp=true
-fragment at org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source,1.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source_1.0.0.v20100906-1425.jar,usetimestamp=true
+plugin at org.eclipse.ecf,3.1.300=p2IU,id=org.eclipse.ecf,version=3.1.300.v20110531-2218,repository=http://download.eclipse.org/rt/ecf/3.5.1/site.p2
+plugin at org.eclipse.ecf.source,3.1.300=p2IU,id=org.eclipse.ecf.source,version=3.1.300.v20110531-2218,repository=http://download.eclipse.org/rt/ecf/3.5.1/site.p2
+fragment at org.eclipse.ecf.ssl,1.0.100=p2IU,id=org.eclipse.ecf.ssl,version=1.0.100.v20110531-2218,repository=http://download.eclipse.org/rt/ecf/3.5.1/site.p2
+fragment at org.eclipse.ecf.ssl.source,1.0.100=p2IU,id=org.eclipse.ecf.ssl.source,version=1.0.100.v20110531-2218,repository=http://download.eclipse.org/rt/ecf/3.5.1/site.p2
+plugin at org.eclipse.ecf.identity,3.1.100=p2IU,id=org.eclipse.ecf.identity,version=3.1.100.v20110531-2218,repository=http://download.eclipse.org/rt/ecf/3.5.1/site.p2
+plugin at org.eclipse.ecf.identity.source,3.1.100=p2IU,id=org.eclipse.ecf.identity.source,version=3.1.100.v20110531-2218,repository=http://download.eclipse.org/rt/ecf/3.5.1/site.p2
+plugin at org.eclipse.ecf.filetransfer,5.0.0=p2IU,id=org.eclipse.ecf.filetransfer,version=5.0.0.v20110531-2218,repository=http://download.eclipse.org/rt/ecf/3.5.1/site.p2
+plugin at org.eclipse.ecf.filetransfer.source,5.0.0=p2IU,id=org.eclipse.ecf.filetransfer.source,version=5.0.0.v20110531-2218,repository=http://download.eclipse.org/rt/ecf/3.5.1/site.p2
+plugin at org.eclipse.ecf.provider.filetransfer,3.2.0=p2IU,id=org.eclipse.ecf.provider.filetransfer,version=3.2.0.v20110531-2218,repository=http://download.eclipse.org/rt/ecf/3.5.1/site.p2
+plugin at org.eclipse.ecf.provider.filetransfer.source,3.2.0=p2IU,id=org.eclipse.ecf.provider.filetransfer.source,version=3.2.0.v20110531-2218,repository=http://download.eclipse.org/rt/ecf/3.5.1/site.p2
+fragment at org.eclipse.ecf.provider.filetransfer.ssl,1.0.0=p2IU,id=org.eclipse.ecf.provider.filetransfer.ssl,version=1.0.0.v20110531-2218,repository=http://download.eclipse.org/rt/ecf/3.5.1/site.p2
+fragment at org.eclipse.ecf.provider.filetransfer.ssl.source,1.0.0=p2IU,id=org.eclipse.ecf.provider.filetransfer.ssl.source,version=1.0.0.v20110531-2218,repository=http://download.eclipse.org/rt/ecf/3.5.1/site.p2
+plugin at org.eclipse.ecf.provider.filetransfer.httpclient,4.0.0=p2IU,id=org.eclipse.ecf.provider.filetransfer.httpclient,version=4.0.0.v20110531-2218,repository=http://download.eclipse.org/rt/ecf/3.5.1/site.p2
+plugin at org.eclipse.ecf.provider.filetransfer.httpclient.source,4.0.0=p2IU,id=org.eclipse.ecf.provider.filetransfer.httpclient.source,version=4.0.0.v20110531-2218,repository=http://download.eclipse.org/rt/ecf/3.5.1/site.p2
+fragment at org.eclipse.ecf.provider.filetransfer.httpclient.ssl,1.0.0=p2IU,id=org.eclipse.ecf.provider.filetransfer.httpclient.ssl,version=1.0.0.v20110531-2218,repository=http://download.eclipse.org/rt/ecf/3.5.1/site.p2
+fragment at org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source,1.0.0=p2IU,id=org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source,version=1.0.0.v20110531-2218,repository=http://download.eclipse.org/rt/ecf/3.5.1/site.p2
+
+!# The following apache bundes are obtained from the orbit.map
+!#plugin at org.apache.commons.codec,1.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S20090426201227/bundles/org.apache.commons.codec_1.3.0.v20080530-1600.jar
+!#plugin at org.apache.commons.codec.source,1.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S20090426201227/bundles/org.apache.commons.codec.source_1.3.0.v20080530-1600.jar
+!#plugin at org.apache.commons.httpclient,3.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S20090426201227/bundles/org.apache.commons.httpclient_3.1.0.v20080605-1935.jar
+!#plugin at org.apache.commons.httpclient.source,3.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S20090426201227/bundles/org.apache.commons.httpclient.source_3.1.0.v20080605-1935.jar
+!#plugin at org.apache.commons.logging,1.0.4=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S20090426201227/bundles/org.apache.commons.logging_1.0.4.v200904062259.jar
+!#plugin at org.apache.commons.logging.source,1.0.4=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S20090426201227/bundles/org.apache.commons.logging.source_1.0.4.v200904062259.jar
 !***************  PDE CONTRIBUTION  ******************************************************** 
 
 
-plugin at org.eclipse.pde=v20100625_r361,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde
-plugin at org.eclipse.pde.core=v20110210_r362,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.core
-plugin at org.eclipse.pde.junit.runtime=v20100601,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.junit.runtime
-plugin at org.eclipse.pde.runtime=v20100601,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.runtime
-plugin at org.eclipse.pde.launching=v20100601,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.launching
-plugin at org.eclipse.pde.ui=v20110210_r362,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui
-plugin at org.eclipse.pde.ui.templates=v20100601,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui.templates
-plugin at org.eclipse.pde.ui.tests=v20101210_r362,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui.tests
-
-plugin at org.eclipse.ui.views.log=v20110210_r362,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.ui.views.log
-plugin at org.eclipse.pde.api.tools=v20100820_r361,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools
-plugin at org.eclipse.pde.api.tools.ui=v20100820_r361,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ui
-plugin at org.eclipse.pde.api.tools.tests=v20100820_r361,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.tests
-fragment at org.eclipse.pde.api.tools.ee.cdcfoundation10=v20100506-0900,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10
-fragment at org.eclipse.pde.api.tools.ee.cdcfoundation11=v20100506-0900,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11
-fragment at org.eclipse.pde.api.tools.ee.j2se12=v20100506-0900,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se12
-fragment at org.eclipse.pde.api.tools.ee.j2se13=v20100506-0900,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se13
-fragment at org.eclipse.pde.api.tools.ee.j2se14=v20100506-0900,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se14
-fragment at org.eclipse.pde.api.tools.ee.j2se15=v20100506-0900,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se15
-fragment at org.eclipse.pde.api.tools.ee.javase16=v20100506-0900,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.javase16
-fragment at org.eclipse.pde.api.tools.ee.jre11=v20100506-0900,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.jre11
-fragment at org.eclipse.pde.api.tools.ee.osgiminimum10=v20100506-0900,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10
-fragment at org.eclipse.pde.api.tools.ee.osgiminimum11=v20100506-0900,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11
-fragment at org.eclipse.pde.api.tools.ee.osgiminimum12=v20100506-0900,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12
+plugin at org.eclipse.pde=v20110504-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde
+plugin at org.eclipse.pde.core=v20110603,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.core
+plugin at org.eclipse.pde.junit.runtime=v20110406,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.junit.runtime
+plugin at org.eclipse.pde.runtime=v20110508,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.runtime
+plugin at org.eclipse.pde.launching=v20110506,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.launching
+plugin at org.eclipse.pde.ui=v20110603,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui
+plugin at org.eclipse.pde.ui.templates=v20110516,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui.templates
+plugin at org.eclipse.pde.ui.tests=v20110509,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui.tests
+
+plugin at org.eclipse.ui.views.log=v20110404,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.ui.views.log
+plugin at org.eclipse.pde.api.tools=v20110523-1600,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools
+plugin at org.eclipse.pde.api.tools.ui=v20110523-1600,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ui
+plugin at org.eclipse.pde.api.tools.tests=v20110523-1600,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.tests
+fragment at org.eclipse.pde.api.tools.ee.cdcfoundation10=v20110401-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10
+fragment at org.eclipse.pde.api.tools.ee.cdcfoundation11=v20110401-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11
+fragment at org.eclipse.pde.api.tools.ee.j2se12=v20110401-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se12
+fragment at org.eclipse.pde.api.tools.ee.j2se13=v20110401-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se13
+fragment at org.eclipse.pde.api.tools.ee.j2se14=v20110401-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se14
+fragment at org.eclipse.pde.api.tools.ee.j2se15=v20110401-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se15
+fragment at org.eclipse.pde.api.tools.ee.javase16=v20110401-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.javase16
+fragment at org.eclipse.pde.api.tools.ee.jre11=v20110401-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.jre11
+fragment at org.eclipse.pde.api.tools.ee.osgiminimum10=v20110401-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10
+fragment at org.eclipse.pde.api.tools.ee.osgiminimum11=v20110401-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11
+fragment at org.eclipse.pde.api.tools.ee.osgiminimum12=v20110401-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12
 
 plugin at org.eclipse.pde.ds.core=v20100601,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ds/org.eclipse.pde.ds.core
-plugin at org.eclipse.pde.ds.ui=v20100601,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ds/org.eclipse.pde.ds.ui
+plugin at org.eclipse.pde.ds.ui=v20110516,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ds/org.eclipse.pde.ds.ui
 plugin at org.eclipse.pde.ds.tests=v20100601,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ds/org.eclipse.pde.ds.tests
 
-plugin at org.eclipse.pde.ua.core=v20100504,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ua/org.eclipse.pde.ua.core
-plugin at org.eclipse.pde.ua.ui=v20100504,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ua/org.eclipse.pde.ua.ui
-feature at org.eclipse.rcp=r362_v20101104,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.rcp
+plugin at org.eclipse.pde.ua.core=v20110516,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ua/org.eclipse.pde.ua.core
+plugin at org.eclipse.pde.ua.ui=v20110516,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ua/org.eclipse.pde.ua.ui
+feature at org.eclipse.rcp=v20110216,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.rcp
 feature at org.eclipse.rcp.sdk=v20080507,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.rcp.sdk
-plugin at org.eclipse.rcp=v20100527-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/org.eclipse.rcp
+plugin at org.eclipse.rcp=v20110504-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/org.eclipse.rcp
 !****************  RELENG CONTRIBUTION  ******************************************************** 
-feature at master=v20091019,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master
-feature at master-equinox=r362_v20101118,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-equinox
-feature at master-equinox-p2=v20091106,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-equinox-p2
-feature at master-equinox-weaving=v20090817,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-equinox-weaving
-feature at master-jetty=r362_v20101014,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-jetty
-feature at master-ecf=v20090316,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-ecf
+feature at master=v20110426,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master
+feature at master-equinox=v20110511,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-equinox
+feature at master-equinox-p2=v20110503,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-equinox-p2
+feature at master-equinox-weaving=v20110505,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-equinox-weaving
+feature at master-jetty=v20110326,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-jetty
+feature at master-ecf=v20110503,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-ecf
 
-feature at com.ibm.icu.base=v20090119,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/com.ibm.icu.base
+feature at com.ibm.icu.base=v20110302,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/com.ibm.icu.base
 
-feature at org.eclipse.releng.tools=v20100427,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.releng.tools
+feature at org.eclipse.releng.tools=v20110503,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.releng.tools
 
-plugin at org.eclipse.releng.tools=v20100531,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.releng.tests=r362_v20110203,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.releng.tools=v20110523,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.releng.tests=v20110520,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
 plugin at org.eclipse.pde.tools.versioning=r20080922,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk.tests-feature/plugins/org.eclipse.pde.tools.versioning
 
@@ -498,76 +539,72 @@ feature at org.eclipse.jdt.test.feature.sample=HEAD,:pserver:anonymous at dev.eclipse.
 !***************  SWT CONTRIBUTION  ******************************************************** 
 
 !*** SWT Plugin
-plugin at org.eclipse.swt=v3659c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt=v3735b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
 !*** SWT Platform Fragments
-fragment at org.eclipse.swt.carbon.macosx=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.cocoa.macosx=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.cocoa.macosx.x86_64=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.ppc=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.ppc64=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.x86=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.x86_64=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.solaris.sparc=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.solaris.x86=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.aix.ppc64=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.motif.aix.ppc=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.motif.hpux.ia64_32=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.motif.linux.x86=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.motif.solaris.sparc=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.photon.qnx.x86=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.win32.wce_ppc.arm=v3659c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.win32.win32.x86=v3659c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.win32.win32.x86_64=v3659c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.win32.win32.ia64=v3659c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-
-fragment at org.eclipse.swt.gtk.linux.s390=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.s390x=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.carbon.macosx=v3735b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.cocoa.macosx=v3735b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.cocoa.macosx.x86_64=v3735b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.ppc64=v3735b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.x86=v3735b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.x86_64=v3735b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.solaris.sparc=v3735b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.solaris.x86=v3735b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.aix.ppc=v3735b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.aix.ppc64=v3735b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.hpux.ia64_32=v3735b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.win32.wce_ppc.arm=v3735b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.win32.win32.x86=v3735b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.win32.win32.x86_64=v3735b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.win32.win32.ia64=v3735b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+
+fragment at org.eclipse.swt.gtk.linux.s390=v3735b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.s390x=v3735b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
 !*** SWT Examples
-plugin at org.eclipse.swt.examples=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.browser=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.browser.demos=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.controls=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.launcher=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.layouts=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.ole.win32=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.paint=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples=v3735b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.browser=v3735b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.browser.demos=v3735b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.controls=v3735b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.launcher=v3735b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.layouts=v3735b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.ole.win32=v3735b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.paint=v3735b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
 !*** SWT Tests and Tools
-plugin at org.eclipse.swt.tests=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.tools=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.tests=v3735b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.tools=v3735b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 !***************  TEAM CONTRIBUTION  ******************************************************** 
 
-plugin at org.eclipse.team.core=R36x_v20110203-1036,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.cvs.core=R36x_v20110119-0815,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.cvs.ssh=I20100526-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.cvs.ssh2=I20100526-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.ui=R36x_v20110203-1036,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.cvs.ui=R36x_v20110203-1036,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-
-plugin at org.eclipse.core.net=I20100511-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.net=I20100505-1245,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.tests.net=I20100505-1245,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jsch.core=I20100505-1245,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jsch.ui=I20100505-1245,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jsch.tests=I20100505-1245,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-
-plugin at org.eclipse.team.examples.filesystem=I20100526-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-
-plugin at org.eclipse.team.tests.core=I20100511-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.tests.cvs.core=R36x_v20110119-0815,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.net.win32.x86=I20100511-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86
-fragment at org.eclipse.core.net.linux.x86=R36x_v20100825-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86
-fragment at org.eclipse.core.net.linux.x86_64=I20100505-1245,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64
-fragment at org.eclipse.core.net.win32.x86_64=I20100505-1245,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64
+plugin at org.eclipse.team.core=I20110525-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.cvs.core=I20110510-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.cvs.ssh=I20110208-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.cvs.ssh2=I20110511-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.ui=I20110525-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.cvs.ui=I20110510-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+
+plugin at org.eclipse.core.net=I20110511-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.net=I20110511-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.tests.net=I20110208-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jsch.core=I20110514-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jsch.ui=I20110511-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jsch.tests=I20100912-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+
+plugin at org.eclipse.team.examples.filesystem=I20110510-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+
+plugin at org.eclipse.team.tests.core=I20110510-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.tests.cvs.core=I20110525-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.net.win32.x86=I20110331-0827,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86
+fragment at org.eclipse.core.net.linux.x86=I20110419-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86
+fragment at org.eclipse.core.net.linux.x86_64=I20110331-0827,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64
+fragment at org.eclipse.core.net.win32.x86_64=I20110331-0827,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64
 !***************  Test Framework CONTRIBUTION  ******************************************************** 
-feature at org.eclipse.test=v20100427,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.test-feature
+feature at org.eclipse.test=v20110503,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.test-feature
 
-plugin at org.eclipse.test=v20100118,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.ant.optional.junit=v20080717,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.test=v20110511,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.ant.optional.junit=v20110503,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.test.performance=v20100122,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.test.performance=v20101027,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 fragment at org.eclipse.test.performance.win32=v20070530,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
 plugin at org.eclipse.test.performance.data=v20050415,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
@@ -575,97 +612,97 @@ plugin at org.eclipse.test.performance.data=v20050415,:pserver:anonymous at dev.eclips
 plugin at org.eclipse.test.dispatcher=HEAD,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/org.eclipse.test.dispatcher
 !***************  TEXT CONTRIBUTION  ******************************************************** 
 
-plugin at org.eclipse.text=v20100601-1300,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jface.text=r361_v20100825-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.workbench.texteditor=r361_v20100714-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.editors=r361_v20100825-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.filebuffers=v20100520-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.text=v20110505-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jface.text=v20110505-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.workbench.texteditor=v20110505-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.editors=v20110517-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.filebuffers=v20110505-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.ui.examples.javaeditor=v20100520-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.examples.javaeditor=v20110524-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.text.tests=v20100520-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jface.text.tests=v20100520-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.filebuffers.tests=v20100520-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.workbench.texteditor.tests=v20100520-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.editors.tests=v20100520-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.text.tests=v20100526-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.text.tests=v20110505-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jface.text.tests=v20110505-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.filebuffers.tests=v20110505-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.workbench.texteditor.tests=v20110505-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.editors.tests=v20110505-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.text.tests=v20110524-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 !***************  UI CONTRIBUTION  ********************************************************* 
 
-plugin at org.eclipse.core.commands=I20100512-1500,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jface=M20110210-1200,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.databinding=I20100601-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.databinding.observable=I20100601-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.databinding.property=I20100601-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.databinding.beans=I20100601-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jface.databinding=I20100601-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui=M20110203-1100,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.ide=M20101201-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.ide.application=M20100707-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.commands=I20110111-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jface=I20110522-1430,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.databinding=I20110111-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.databinding.observable=I20110222-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.databinding.property=I20110222-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.databinding.beans=I20100824-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jface.databinding=I20100907-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui=I20110602-0100,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.ide=I20110519-0100,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.ide.application=I20110306-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 plugin at org.eclipse.ui.presentations.r21=I20100517-1500,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.views=M20110202-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.workbench=M20110210-1200,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.ui.workbench.compatibility=I20100511-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.views=I20110412-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.workbench=I20110519-0100,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.ui.workbench.compatibility=I20110413-1600,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 fragment at org.eclipse.ui.win32=I20100509-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.ui.carbon=M20101124-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.ui.cocoa=M20101124-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.ui.carbon=I20101109-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.ui.cocoa=I20101109-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
 
 plugin at org.eclipse.jface.examples.databinding=I20100601-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.examples.multipageeditor=I20100509-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.examples.propertysheet=I20100509-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.examples.readmetool=I20100509-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.examples.undo=I20100509-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.examples.multipageeditor=I20110413-1600,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.examples.propertysheet=I20110413-1600,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.examples.readmetool=I20110413-1600,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.examples.undo=I20110413-1600,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 plugin at org.eclipse.ui.examples.views.properties.tabbed.article=I20100517-1500,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
 plugin at org.eclipse.ui.examples.fieldassist=I20100601-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 plugin at org.eclipse.ui.examples.contributions=I20100509-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.ui.navigator=I20100601-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.navigator.resources=M20101124-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.navigator=I20110524-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.navigator.resources=I20110421-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.ui.views.properties.tabbed=I20100509-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.views.properties.tabbed=I20110201-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.jface.tests.databinding=I20100601-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jface.tests.databinding.conformance=I20090818-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.tests=M20100825-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.tests.rcp=I20090525-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.tests.navigator=M20101201-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.tests.views.properties.tabbed=M20110202-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.tests.performance=I20100601-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.tests.harness=I20100601-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jface.tests.databinding=I20110405-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jface.tests.databinding.conformance=I20100914-0100,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.tests=I20110602-0100,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.tests.rcp=I20110425-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.tests.navigator=I20110425-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.tests.views.properties.tabbed=I20110405-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.tests.performance=I20110421-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.tests.harness=I20110425-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 !***************  UPDATE CONTRIBUTION  ******************************************************** 
 
 plugin at org.eclipse.update.configurator=v20100512,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.update.core=R36x_v20100629,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.update.core=v20110330,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 plugin at org.eclipse.update.scheduler=v20100512,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 plugin at org.eclipse.update.ui=v20100512,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
 fragment at org.eclipse.update.core.win32=v20100512,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 fragment at org.eclipse.update.core.linux=v20100512,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-
+#
 plugin at org.eclipse.update.tests.core=v20100512,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 !***************  UA CONTRIBUTION  *********************************************
 
 !**** Help
-plugin at org.eclipse.help=v20100524,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.help.appserver=v20100427,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.help.base=r36_20101123,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.help.ui=r36_20101116,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.help.webapp=r36_20101130,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.help=v20110426,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.help.appserver=v20110425,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.help.base=v20110517,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.help.ui=v20110425,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.help.webapp=v20110518,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
 !**** Welcome
-plugin at org.eclipse.ui.intro=v20100427,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.intro.universal=r36_v20100702,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.intro=v20110425,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.intro.universal=v20110510,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
 !**** Cheat sheets
-plugin at org.eclipse.ui.cheatsheets=v20100427,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.cheatsheets=v20110425,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
 !**** Browser
-plugin at org.eclipse.ui.browser=r36_20101216,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.browser=v20110426,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
 !**** Forms
-plugin at org.eclipse.ui.forms=r36_v20100702,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.forms=v20110425,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
 
 !**** Tests
-plugin at org.eclipse.ua.tests=r36_r20100816,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ua.tests.doc=v20100427,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.tests.forms=v20100517,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ua.tests=v20110505,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ua.tests.doc=v20110425,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.tests.forms=v20110425,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
diff --git a/eclipse/featureVersions.properties b/eclipse/featureVersions.properties
index 9e7778f..3c627c0 100644
--- a/eclipse/featureVersions.properties
+++ b/eclipse/featureVersions.properties
@@ -1,35 +1,46 @@
-#Tue Mar 08 14:12:31 EST 2011
-org.eclipse.equinox.compendium.sdk,0.0.0=R36x_v20101014
-org.eclipse.equinox.weaving.sdk,0.0.0=v20100421
-org.eclipse.platform,0.0.0=r362_v20110210
-master-equinox,0.0.0=r362_v20101118
-org.eclipse.rcp,0.0.0=r362_v20101104
-org.eclipse.equinox.p2.sdk,0.0.0=R36x_v20110120
-com.ibm.icu.base,0.0.0=v20090119
-master,0.0.0=v20091019
-org.eclipse.cvs,0.0.0=r362_v20101111
-org.eclipse.equinox.server.simple,0.0.0=v20100510
-org.eclipse.equinox.server.core,0.0.0=R36x_v20101007
-org.eclipse.releng.tools,0.0.0=v20100427
-org.eclipse.equinox.p2.discovery.feature,0.0.0=R36x_v20110210
-org.eclipse.equinox.core.sdk,0.0.0=r36x_v20110210
-org.eclipse.equinox.p2.user.ui,0.0.0=r361_v20100903
-org.eclipse.equinox.server.p2,0.0.0=R36x_v20101007
-org.eclipse.sdk,0.0.0=r362_v20100929
-master-equinox-weaving,0.0.0=v20090817
-master-jetty,0.0.0=r362_v20101014
-org.eclipse.jdt,0.0.0=r362_v20101117-0800
-org.eclipse.equinox.jmx.server.feature,0.0.0=v20081124
-org.eclipse.equinox.server.servletbridge,0.0.0=v20100510
-master-ecf,0.0.0=v20090316
-org.eclipse.equinox.jmx.client.feature,0.0.0=v20081124
-org.eclipse.sdk.examples,0.0.0=r362_v20101014
-org.eclipse.equinox.jmx.common.feature,0.0.0=v20070507
-org.eclipse.equinox.sdk,0.0.0=r362_v20110210b
-org.eclipse.pde.api.tools.ee.fragments,0.0.0=v20100427
-org.eclipse.equinox.serverside.sdk,0.0.0=R36x_v20101014
-org.eclipse.pde,0.0.0=r362_v20110203
-org.eclipse.equinox.server.jetty,0.0.0=v20100510
-org.eclipse.equinox.executable,0.0.0=R36x_v20110125
-org.eclipse.help,0.0.0=r362_v20101111
-master-equinox-p2,0.0.0=v20091106
+#Mon Jun 27 11:22:02 EDT 2011
+org.eclipse.equinox.p2.core.feature,0.0.0=v20110519
+master-equinox,0.0.0=v20110511
+org.eclipse.equinox.p2.extras.feature,0.0.0=v20110519
+master-equinox-weaving,0.0.0=v20110505
+org.eclipse.jdt,0.0.0=v20110520-0800
+org.eclipse.core.runtime.feature,0.0.0=v20110124
+master-ecf,0.0.0=v20110503
+org.eclipse.equinox.jmx.client.feature,0.0.0=v20110511
+org.eclipse.equinox.jmx.common.feature,0.0.0=v20110511
+org.eclipse.equinox.server.p2,0.0.0=v20110502
+org.eclipse.pde.junit.runtime.addon,0.0.0=v20110331
+org.eclipse.pde.api.tools.ee.fragments,0.0.0=v20110123
+master-equinox-p2,0.0.0=v20110503
+org.eclipse.pde.build.product.feature,0.0.0=v20110123
+org.eclipse.equinox.p2.user.ui,0.0.0=v20110526
+com.ibm.icu.base,0.0.0=v20110302
+org.eclipse.equinox.core.sdk,0.0.0=v20110506-0800
+org.eclipse.equinox.p2.rcp.feature,0.0.0=v20110519
+org.eclipse.rcp,0.0.0=v20110216
+org.eclipse.equinox.p2.discovery.feature,0.0.0=v20110519
+org.eclipse.equinox.starterkit.product.feature,0.0.0=v20110502
+org.eclipse.pde.junit.runtime.standalone,0.0.0=v20110331
+org.eclipse.cvs,0.0.0=v20110520-0800
+org.eclipse.equinox.server.jetty,0.0.0=v20110502
+org.eclipse.equinox.core.feature,0.0.0=v20110502
+org.eclipse.equinox.sdk,0.0.0=v20110502
+org.eclipse.license,1.0.0=v20110208
+org.eclipse.platform,0.0.0=v20110530
+org.eclipse.pde,0.0.0=v20110504-0800
+org.eclipse.equinox.executable,0.0.0=v20110530
+org.eclipse.equinox.incubator.feature,0.0.0=v20110511
+org.eclipse.equinox.compendium.sdk,0.0.0=v20110502
+org.eclipse.releng.tools,0.0.0=v20110503
+org.eclipse.equinox.serverside.sdk,0.0.0=v20110502
+org.eclipse.equinox.weaving.sdk,0.0.0=v20110502
+org.eclipse.equinox.server.simple,0.0.0=v20110502
+org.eclipse.help,0.0.0=v20110327
+org.eclipse.equinox.jmx.server.feature,0.0.0=v20110511
+org.eclipse.equinox.server.servletbridge,0.0.0=v20110502
+org.eclipse.equinox.p2.sdk,0.0.0=v20110519
+org.eclipse.equinox.server.core,0.0.0=v20110502
+master,0.0.0=v20110426
+master-jetty,0.0.0=v20110326
+org.eclipse.sdk.examples,0.0.0=v20110503
+org.eclipse.sdk,0.0.0=v20110426
diff --git a/eclipse/features/com.ibm.icu.base/.project b/eclipse/features/com.ibm.icu.base/.project
new file mode 100644
index 0000000..78d0ab1
--- /dev/null
+++ b/eclipse/features/com.ibm.icu.base/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.ibm.icu.base</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/eclipse/features/com.ibm.icu.base/feature.xml b/eclipse/features/com.ibm.icu.base/feature.xml
index e77efb0..2cc6ab2 100644
--- a/eclipse/features/com.ibm.icu.base/feature.xml
+++ b/eclipse/features/com.ibm.icu.base/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="com.ibm.icu.base"
-      version="1.1.0.qualifier">
+      version="1.2.0.qualifier">
 
    <plugin
          id="com.ibm.icu.base"
diff --git a/eclipse/features/master-ecf/build.properties b/eclipse/features/master-ecf/build.properties
index a432875..2ed53fb 100644
--- a/eclipse/features/master-ecf/build.properties
+++ b/eclipse/features/master-ecf/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
+# Copyright (c) 2005, 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
diff --git a/eclipse/features/master-equinox-p2/build.properties b/eclipse/features/master-equinox-p2/build.properties
index a432875..2ed53fb 100644
--- a/eclipse/features/master-equinox-p2/build.properties
+++ b/eclipse/features/master-equinox-p2/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
+# Copyright (c) 2005, 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
diff --git a/eclipse/features/master-equinox-p2/feature.xml b/eclipse/features/master-equinox-p2/feature.xml
index d407bd4..75c9b31 100644
--- a/eclipse/features/master-equinox-p2/feature.xml
+++ b/eclipse/features/master-equinox-p2/feature.xml
@@ -2,8 +2,8 @@
 <feature
       id="master-equinox-p2"
       label="build utility feature for equinox p2 plugins"
-      version="1.0.0.qualifier">
-  
+      version="1.0.1.qualifier">
+
    <plugin
          id="org.eclipse.equinox.p2.installer"
          download-size="0"
diff --git a/eclipse/features/master-equinox-weaving/build.properties b/eclipse/features/master-equinox-weaving/build.properties
index a432875..4692721 100644
--- a/eclipse/features/master-equinox-weaving/build.properties
+++ b/eclipse/features/master-equinox-weaving/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
+# Copyright (c) 2005, 2009 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
diff --git a/eclipse/features/master-equinox-weaving/feature.xml b/eclipse/features/master-equinox-weaving/feature.xml
index 160ed04..18259f0 100644
--- a/eclipse/features/master-equinox-weaving/feature.xml
+++ b/eclipse/features/master-equinox-weaving/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="master-equinox-weaving"
       label="build utility feature for bundles required to compile equinox weaving bundles"
-      version="1.0.0.qualifier">
+      version="1.0.100.qualifier">
 
   <plugin
          id="org.aspectj.weaver"
diff --git a/eclipse/features/master-equinox/build.properties b/eclipse/features/master-equinox/build.properties
index 62626c8..ed66d7e 100644
--- a/eclipse/features/master-equinox/build.properties
+++ b/eclipse/features/master-equinox/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
+# Copyright (c) 2005, 2010 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
diff --git a/eclipse/features/master-equinox/feature.xml b/eclipse/features/master-equinox/feature.xml
index f1fd3b9..91c276d 100644
--- a/eclipse/features/master-equinox/feature.xml
+++ b/eclipse/features/master-equinox/feature.xml
@@ -2,22 +2,11 @@
 <feature
       id="master-equinox"
       label="build utility feature for equinox plugins"
-      version="1.1.1.qualifier">
+      version="1.1.0.qualifier">
 
    <includes
          id="org.eclipse.equinox.sdk"
          version="0.0.0"/>
-
-<!--   <includes
-         id="org.eclipse.equinox.source"
-         version="0.0.0"/> -->       
-                  	 
-    <plugin
-         id="org.eclipse.equinox.initializer"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>                   
            
     <plugin
          id="org.eclipse.equinox.supplement"
@@ -51,7 +40,7 @@
          id="org.eclipse.equinox.http.jetty"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier" 
+         version="2.0.100.qualifier" 
          unpack="false"/>
            
     <plugin
@@ -116,19 +105,18 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>        
-         
+    
+    <plugin
+         id="org.apache.felix.gogo.runtime"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>      
+      
   <includes
-         id="org.eclipse.equinox.jmx.common.feature"
-         version="0.0.0"/>
- 
-   <includes
-         id="org.eclipse.equinox.jmx.client.feature"
+         id="org.eclipse.equinox.incubator.feature"
          version="0.0.0"/>
-   
-   <includes
-         id="org.eclipse.equinox.jmx.server.feature"
-         version="0.0.0"/>         
-         
+          
  <includes
          id="master-equinox-p2"
          version="0.0.0"/>        
@@ -140,5 +128,13 @@
  <includes
          id="org.eclipse.equinox.weaving.sdk"
          version="0.0.0"/>    
+         
+ <includes
+         id="org.eclipse.equinox.starterkit.product.feature"
+         version="0.0.0"/>      
+    
+ <includes
+         id="org.eclipse.pde.build.product.feature"
+         version="0.0.0"/>
                   
 </feature>
diff --git a/eclipse/features/master-jetty/feature.xml b/eclipse/features/master-jetty/feature.xml
index 7151d93..22ae41a 100644
--- a/eclipse/features/master-jetty/feature.xml
+++ b/eclipse/features/master-jetty/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="master-jetty"
       label="build utility feature for equinox http jetty plugins"
-      version="1.0.1.qualifier">
+      version="1.1.0.qualifier">
 
    <plugin
          id="org.eclipse.osgi"
@@ -29,7 +29,7 @@
          id="org.eclipse.equinox.http.jetty"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.0.100.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/eclipse/features/master/feature.xml b/eclipse/features/master/feature.xml
index 5cad475..821d746 100644
--- a/eclipse/features/master/feature.xml
+++ b/eclipse/features/master/feature.xml
@@ -13,7 +13,7 @@
          
    <includes
          id="org.eclipse.pde.api.tools.ee.fragments"
-         version="0.0.0"/>
+         version="0.0.0"/> 
 
    <includes
          id="org.eclipse.sdk"
@@ -36,6 +36,14 @@
          version="0.0.0"/>
          
     <includes
+         id="org.eclipse.pde.junit.runtime.addon"
+         version="0.0.0"/>
+    
+    <includes
+         id="org.eclipse.pde.junit.runtime.standalone"
+         version="0.0.0"/>
+         
+    <includes
          id="org.eclipse.equinox.executable"
          version="0.0.0"/>  
          
@@ -51,14 +59,6 @@
          install-size="0"
          version="0.0.0"
          fragment="true"
-         unpack="false"/>
-         
-   <plugin
-         id="org.eclipse.swt.motif.solaris.sparc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>       
-          
+         unpack="false"/>    
+           
 </feature>
diff --git a/eclipse/features/org.eclipse.core.runtime.feature/.project b/eclipse/features/org.eclipse.core.runtime.feature/.project
new file mode 100644
index 0000000..3cb05c5
--- /dev/null
+++ b/eclipse/features/org.eclipse.core.runtime.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.core.runtime.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/eclipse/features/org.eclipse.core.runtime.feature/build.properties b/eclipse/features/org.eclipse.core.runtime.feature/build.properties
new file mode 100644
index 0000000..554e179
--- /dev/null
+++ b/eclipse/features/org.eclipse.core.runtime.feature/build.properties
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+               feature.properties               
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.core.runtime.feature/feature.properties b/eclipse/features/org.eclipse.core.runtime.feature/feature.properties
new file mode 100644
index 0000000..0c190eb
--- /dev/null
+++ b/eclipse/features/org.eclipse.core.runtime.feature/feature.properties
@@ -0,0 +1,33 @@
+###############################################################################
+# Copyright (c) 2010 EclipseSource Inc. and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     EclipseSource - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Core Runtime Infrastructure
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse Equinox Project
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2010 EclipseSource and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+    EclipseSource - initial API and implementation\n
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.core.runtime.feature/feature.xml b/eclipse/features/org.eclipse.core.runtime.feature/feature.xml
new file mode 100644
index 0000000..1c06103
--- /dev/null
+++ b/eclipse/features/org.eclipse.core.runtime.feature/feature.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.core.runtime.feature"
+      label="%featureName"
+      version="1.0.0.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier"> 
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <includes
+         id="org.eclipse.equinox.core.feature"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.core.runtime"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.variables"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.contenttype"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.preferences"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.expressions"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/eclipse/features/org.eclipse.cvs/build.properties b/eclipse/features/org.eclipse.cvs/build.properties
index ce791ec..6919512 100644
--- a/eclipse/features/org.eclipse.cvs/build.properties
+++ b/eclipse/features/org.eclipse.cvs/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2007 IBM Corporation and others.
+# Copyright (c) 2000, 2011 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -10,8 +10,6 @@
 ###############################################################################
 bin.includes = feature.xml,\
                feature.properties,\
-               license.html,\
-               epl-v10.html,\
                eclipse_update_120.jpg
                
 root=rootfiles
diff --git a/eclipse/features/org.eclipse.cvs/epl-v10.html b/eclipse/features/org.eclipse.cvs/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/eclipse/features/org.eclipse.cvs/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.cvs/feature.properties b/eclipse/features/org.eclipse.cvs/feature.properties
index 871667c..1d20b81 100644
--- a/eclipse/features/org.eclipse.cvs/feature.properties
+++ b/eclipse/features/org.eclipse.cvs/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2010 IBM Corporation and others.
+# Copyright (c) 2000, 2011 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -20,18 +20,12 @@ featureName=Eclipse CVS Client
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Project Updates
-
-# "secondarySiteName" property - label for the secondary update site
-secondaryUpdateSiteName=Helios Discovery Site
-
 # "description" property - description of the feature
-description=Eclipse CVS Client. (Binary runtime and user documentation.)
+description=Eclipse CVS Client (binary runtime and user documentation).
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2000, 2009 IBM Corporation and others.\n\
+Copyright (c) 2000, 2011 IBM Corporation and others.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
@@ -39,135 +33,4 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
\ No newline at end of file
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.cvs/feature.xml b/eclipse/features/org.eclipse.cvs/feature.xml
index 41353a0..bf58a63 100644
--- a/eclipse/features/org.eclipse.cvs/feature.xml
+++ b/eclipse/features/org.eclipse.cvs/feature.xml
@@ -2,16 +2,18 @@
 <feature
       id="org.eclipse.cvs"
       label="%featureName"
-      version="1.2.1.qualifier"
-      provider-name="%providerName">
+      version="1.3.100.qualifier"
+      provider-name="%providerName"   
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
 
    <description>
       %description
    </description>
-
+   
    <copyright>
       %copyright
-   </copyright>
+   </copyright>   
 
    <license url="%licenseURL">
       %license
@@ -24,7 +26,7 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.platform" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.platform" version="3.7.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
@@ -39,7 +41,7 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>
+         unpack="false"/>   
 
    <plugin
          id="org.eclipse.team.cvs.ssh2"
diff --git a/eclipse/features/org.eclipse.cvs/license.html b/eclipse/features/org.eclipse.cvs/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/eclipse/features/org.eclipse.cvs/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/eclipse/features/org.eclipse.cvs/rootfiles/notice.html b/eclipse/features/org.eclipse.cvs/rootfiles/notice.html
index c184ca3..dc5aefd 100644
--- a/eclipse/features/org.eclipse.cvs/rootfiles/notice.html
+++ b/eclipse/features/org.eclipse.cvs/rootfiles/notice.html
@@ -1,19 +1,18 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+
+
 
-<body lang="EN-US">
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Eclipse Foundation Software User Agreement</title>
+</head><body lang="EN-US">
 <h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
+<p>February 1, 2011</p>
 
 <h3>Usage Of Content</h3>
 
 <p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
    CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
    OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
    NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
@@ -21,43 +20,73 @@
 
 <h3>Applicable Licenses</h3>
 
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
+<p>Unless otherwise indicated, all Content made available by the Eclipse
+ Foundation is provided to you under the terms and conditions of the 
+Eclipse Public License Version 1.0
+   ("EPL").  A copy of the EPL is provided with this Content and is also
+ available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, "Program" will mean the Content.</p>
 
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
+<p>Content includes, but is not limited to, source code, object code, 
+documentation and other files maintained in the Eclipse Foundation 
+source code
+   repository ("Repository") in software modules ("Modules") and made 
+available as downloadable archives ("Downloads").</p>
 
 <ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+       <li>Content may be structured and packaged into modules to 
+facilitate delivering, extending, and upgrading the Content.  Typical 
+modules may include plug-ins ("Plug-ins"), plug-in fragments 
+("Fragments"), and features ("Features").</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or 
+Fragments and associated material.  Each Feature may be packaged as a 
+sub-directory in a directory named "features".  Within a Feature, files 
+named "feature.xml" may contain a list of the names and version numbers 
+of the Plug-ins
       and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
+       <li>Features may also include other Features ("Included 
+Features"). Within a Feature, files named "feature.xml" may contain a 
+list of the names and version numbers of Included Features.</li>
 </ul>
 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
+<p>The terms and conditions governing Plug-ins and Fragments should be 
+contained in files named "about.html" ("Abouts"). The terms and 
+conditions governing Features and
+Included Features should be contained in files named "license.html" 
+("Feature Licenses").  Abouts and Feature Licenses may be located in any
+ directory of a Download or Module
 including, but not limited to the following locations:</p>
 
 <ul>
        <li>The top-level (root) directory</li>
        <li>Plug-in and Fragment directories</li>
        <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
        <li>Feature directories</li>
 </ul>
 
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+<p>Note: if a Feature made available by the Eclipse Foundation is 
+installed using the Provisioning Technology (as defined below), you must
+ agree to a license ("Feature Update License") during the
+installation process.  If the Feature contains Included Features, the 
+Feature Update License should either provide you with the terms and 
+conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be 
+found in the "license" property of files named "feature.properties" 
+found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the 
+terms and conditions (or references to such terms and conditions) that 
+govern your use of the associated Content in
 that directory.</p>
 
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER 
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.
+  SOME OF THESE
 OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
 
 <ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
        <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
        <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
        <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
@@ -65,43 +94,69 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
        <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
 </ul>
 
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND 
+CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, 
+or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions 
+govern that particular Content.</p>
 
 
 <h3>Use of Provisioning Technology</h3>
 
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+<p>The Eclipse Foundation makes available provisioning software, 
+examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager ("Provisioning Technology") for the purpose of 
+allowing users to install software, documentation, information and/or
+   other materials (collectively "Installable Software"). This 
+capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about 
+packaging Installable Software is available at <a href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   ("Specification").</p>
+
+<p>You may use Provisioning Technology to allow other parties to install
+ Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to
+ be presented to, and accepted by, the users of the Provisioning 
+Technology
+   in accordance with the Specification. By using Provisioning 
+Technology in such a manner and making it available in accordance with 
+the
+   Specification, you further acknowledge your agreement to, and the 
+acquisition of all necessary rights to permit the following:</p>
 
 <ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+       <li>A series of actions may occur ("Provisioning Process") in 
+which a user may execute the Provisioning Technology
+       on a machine ("Target Machine") with the intent of installing, 
+extending or updating the functionality of an Eclipse-based
        product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       <li>During the Provisioning Process, the Provisioning Technology 
+may cause third party Installable Software or a portion thereof to be
        accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+       <li>Pursuant to the Specification, you will provide to the user 
+the terms and conditions that govern the use of the Installable
+       Software ("Installable Software Agreement") and such Installable 
+Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable 
+Software Agreement must inform the user of the terms and conditions that
+ govern
+       the Installable Software and must solicit acceptance by the end 
+user in the manner prescribed in such Installable Software Agreement. 
+Upon such
+       indication of agreement by the user, the provisioning Technology 
+will complete installation of the Installable Software.</li>
 </ol>
 
 <h3>Cryptography</h3>
 
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+<p>Content may contain encryption software. The country in which you are
+ currently may have restrictions on the import, possession, and use, 
+and/or re-export to
+   another country, of encryption software. BEFORE using any encryption 
+software, please check the country's laws, regulations and policies 
+concerning the import,
+   possession, or use, and re-export of encryption software, to see if 
+this is permitted.</p>
 
 <p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
+</body></html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.cvs/sourceTemplateFeature/epl-v10.html b/eclipse/features/org.eclipse.cvs/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/eclipse/features/org.eclipse.cvs/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.cvs/sourceTemplateFeature/feature.properties b/eclipse/features/org.eclipse.cvs/sourceTemplateFeature/feature.properties
index b7a1aec..f898707 100644
--- a/eclipse/features/org.eclipse.cvs/sourceTemplateFeature/feature.properties
+++ b/eclipse/features/org.eclipse.cvs/sourceTemplateFeature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2010 IBM Corporation and others.
+# Copyright (c) 2000, 2011 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -21,14 +21,13 @@ featureName=Eclipse CVS Client Resources
 providerName=Eclipse.org
 
 # "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Project Updates
 
 # "description" property - description of the feature
 description=API documentation and source code zips for Eclipse CVS client.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2000, 2009 IBM Corporation and others.\n\
+Copyright (c) 2000, 2011 IBM Corporation and others.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
@@ -36,135 +35,4 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
\ No newline at end of file
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.cvs/sourceTemplateFeature/license.html b/eclipse/features/org.eclipse.cvs/sourceTemplateFeature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/eclipse/features/org.eclipse.cvs/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/eclipse/features/org.eclipse.cvs/sourceTemplatePlugin/about.properties b/eclipse/features/org.eclipse.cvs/sourceTemplatePlugin/about.properties
index 1f6b31f..df3e1e0 100644
--- a/eclipse/features/org.eclipse.cvs/sourceTemplatePlugin/about.properties
+++ b/eclipse/features/org.eclipse.cvs/sourceTemplatePlugin/about.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-#  Copyright (c) 2000, 2009 IBM Corporation and others.
+#  Copyright (c) 2000, 2011 IBM Corporation and others.
 #  All rights reserved. This program and the accompanying materials
 #  are made available under the terms of the Eclipse Public License v1.0
 #  which accompanies this distribution, and is available at
@@ -19,6 +19,6 @@ blurb=Eclipse CVS Client\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Eclipse contributors and others 2000, 2009.  All rights reserved.\n\
+(c) Copyright Eclipse contributors and others 2000, 2011.  All rights reserved.\n\
 Visit http://www.eclipse.org/eclipse/platform-cvs/
 
diff --git a/eclipse/features/org.eclipse.equinox.compendium.sdk/build.properties b/eclipse/features/org.eclipse.equinox.compendium.sdk/build.properties
index 70e92a7..3e3ffce 100644
--- a/eclipse/features/org.eclipse.equinox.compendium.sdk/build.properties
+++ b/eclipse/features/org.eclipse.equinox.compendium.sdk/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2009 EclipseSource and others.
+# Copyright (c) 2009, 2011 EclipseSource and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
 # Contributors:
 #     EclipseSource - initial API and implementation
 ###############################################################################
-bin.includes = feature.xml,license.html,epl-v10.html,license.html,feature.properties
+bin.includes = feature.xml,feature.properties
 
 generate.plugin at org.eclipse.equinox.app.source=org.eclipse.equinox.app
 generate.plugin at org.eclipse.equinox.cm.source=org.eclipse.equinox.cm
@@ -23,3 +23,4 @@ generate.plugin at org.eclipse.equinox.preferences.source=org.eclipse.equinox.prefe
 generate.plugin at org.eclipse.equinox.useradmin.source=org.eclipse.equinox.useradmin
 generate.plugin at org.eclipse.equinox.wireadmin.source=org.eclipse.equinox.wireadmin
 generate.plugin at org.eclipse.equinox.util.source=org.eclipse.equinox.util
+generate.plugin at org.eclipse.equinox.coordinator.source=org.eclipse.equinox.coordinator 
diff --git a/eclipse/features/org.eclipse.equinox.compendium.sdk/epl-v10.html b/eclipse/features/org.eclipse.equinox.compendium.sdk/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/eclipse/features/org.eclipse.equinox.compendium.sdk/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.compendium.sdk/feature.properties b/eclipse/features/org.eclipse.equinox.compendium.sdk/feature.properties
old mode 100644
new mode 100755
index 9be70e8..efc68bc
--- a/eclipse/features/org.eclipse.equinox.compendium.sdk/feature.properties
+++ b/eclipse/features/org.eclipse.equinox.compendium.sdk/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2009 EclipseSource and others.
+# Copyright (c) 2009, 2011 EclipseSource and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -39,135 +39,4 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
     EclipseSource - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.compendium.sdk/feature.xml b/eclipse/features/org.eclipse.equinox.compendium.sdk/feature.xml
index 54ee035..d06d857 100644
--- a/eclipse/features/org.eclipse.equinox.compendium.sdk/feature.xml
+++ b/eclipse/features/org.eclipse.equinox.compendium.sdk/feature.xml
@@ -2,8 +2,10 @@
 <feature
       id="org.eclipse.equinox.compendium.sdk"
       label="%featureName"
-      version="3.6.1.qualifier"
-      provider-name="%providerName">
+      version="3.7.0.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier"> 
 
    <description>
       %description
@@ -32,6 +34,20 @@
          unpack="false"/>
 
    <plugin
+         id="org.eclipse.equinox.coordinator"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.coordinator.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
          id="org.eclipse.equinox.cm"
          download-size="0"
          install-size="0"
diff --git a/eclipse/features/org.eclipse.equinox.compendium.sdk/license.html b/eclipse/features/org.eclipse.equinox.compendium.sdk/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/eclipse/features/org.eclipse.equinox.compendium.sdk/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/eclipse/features/org.eclipse.equinox.core.feature/.project b/eclipse/features/org.eclipse.equinox.core.feature/.project
new file mode 100644
index 0000000..988ebaa
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.core.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.equinox.core.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/eclipse/features/org.eclipse.equinox.core.feature/build.properties b/eclipse/features/org.eclipse.equinox.core.feature/build.properties
new file mode 100644
index 0000000..73379cd
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.core.feature/build.properties
@@ -0,0 +1,14 @@
+###############################################################################
+# Copyright (c) 2011 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+bin.includes = feature.xml,\
+               feature.properties
+root.win32.win32.x86=file:executables/win32.win32.x86/eclipsec.exe
+root.win32.win32.x86_64=file:executables/win32.win32.x86_64/eclipsec.exe
diff --git a/eclipse/features/org.eclipse.equinox.core.feature/feature.properties b/eclipse/features/org.eclipse.equinox.core.feature/feature.properties
new file mode 100644
index 0000000..99844ea
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.core.feature/feature.properties
@@ -0,0 +1,33 @@
+###############################################################################
+# Copyright (c) 2010, 2011 EclipseSource Inc. and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     EclipseSource - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Equinox Core Function
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse Equinox Project
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2010 EclipseSource and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+    EclipseSource - initial API and implementation\n
+################ end of copyright property ####################################
diff --git a/eclipse/features/org.eclipse.equinox.core.feature/feature.xml b/eclipse/features/org.eclipse.equinox.core.feature/feature.xml
new file mode 100644
index 0000000..2df68fe
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.core.feature/feature.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.equinox.core.feature"
+      label="%featureName"
+      version="1.0.0.qualifier"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier"> 
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <plugin
+         id="org.eclipse.osgi"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.osgi.services"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.common"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.ds"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.util"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.jobs"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.registry"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.simpleconfigurator"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.app"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/eclipse/features/org.eclipse.equinox.core.sdk/build.properties b/eclipse/features/org.eclipse.equinox.core.sdk/build.properties
index 532bf01..67762be 100644
--- a/eclipse/features/org.eclipse.equinox.core.sdk/build.properties
+++ b/eclipse/features/org.eclipse.equinox.core.sdk/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2009 EclipseSource and others.
+# Copyright (c) 2009, 2011 EclipseSource and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
 # Contributors:
 #     EclipseSource - initial API and implementation
 ###############################################################################
-bin.includes = feature.xml,license.html,epl-v10.html,license.html,feature.properties
+bin.includes = feature.xml,feature.properties
 
 generate.plugin at org.eclipse.equinox.common.source=org.eclipse.equinox.common
 generate.plugin at org.eclipse.equinox.concurrent.source=org.eclipse.equinox.concurrent
@@ -22,6 +22,7 @@ generate.plugin at org.eclipse.osgi.services.source=org.eclipse.osgi.services
 generate.plugin at org.eclipse.osgi.source=org.eclipse.osgi
 generate.plugin at org.eclipse.osgi.util.source=org.eclipse.osgi.util
 generate.plugin at org.eclipse.equinox.security.win32.x86.source=org.eclipse.equinox.security.win32.x86
+generate.plugin at org.eclipse.equinox.security.win32.x86_64.source=org.eclipse.equinox.security.win32.x86_64
 generate.plugin at org.eclipse.equinox.security.macosx.source=org.eclipse.equinox.security.macosx
 generate.plugin at org.eclipse.equinox.security.source=org.eclipse.equinox.security
 generate.plugin at org.eclipse.equinox.security.ui.source=org.eclipse.equinox.security.ui
diff --git a/eclipse/features/org.eclipse.equinox.core.sdk/epl-v10.html b/eclipse/features/org.eclipse.equinox.core.sdk/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/eclipse/features/org.eclipse.equinox.core.sdk/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.core.sdk/feature.properties b/eclipse/features/org.eclipse.equinox.core.sdk/feature.properties
old mode 100644
new mode 100755
index f9c9561..c6ca5fa
--- a/eclipse/features/org.eclipse.equinox.core.sdk/feature.properties
+++ b/eclipse/features/org.eclipse.equinox.core.sdk/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2009 EclipseSource and others.
+# Copyright (c) 2009, 2011 EclipseSource and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -40,135 +40,4 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
     EclipseSource - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.core.sdk/feature.xml b/eclipse/features/org.eclipse.equinox.core.sdk/feature.xml
index c0e9d25..c91e25f 100644
--- a/eclipse/features/org.eclipse.equinox.core.sdk/feature.xml
+++ b/eclipse/features/org.eclipse.equinox.core.sdk/feature.xml
@@ -2,9 +2,11 @@
 <feature
       id="org.eclipse.equinox.core.sdk"
       label="%featureName"
-      version="3.6.1.qualifier"
-      provider-name="%providerName">
-
+      version="3.7.0.qualifier"
+      provider-name="%providerName" 
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
+      
    <description>
       %description
    </description>
@@ -200,6 +202,25 @@
          unpack="false"/>
 
    <plugin
+         id="org.eclipse.equinox.security.win32.x86_64"
+         os="win32"
+         arch="x86_64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.security.win32.x86_64.source"
+         os="win32"
+         arch="x86_64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
          id="org.eclipse.equinox.security.macosx"
          os="macosx"
          arch="x86"
diff --git a/eclipse/features/org.eclipse.equinox.core.sdk/license.html b/eclipse/features/org.eclipse.equinox.core.sdk/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/eclipse/features/org.eclipse.equinox.core.sdk/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/eclipse/features/org.eclipse.equinox.executable/.cproject b/eclipse/features/org.eclipse.equinox.executable/.cproject
index 214395b..a7f3cb9 100644
--- a/eclipse/features/org.eclipse.equinox.executable/.cproject
+++ b/eclipse/features/org.eclipse.equinox.executable/.cproject
@@ -1,49 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?><?fileVersion 4.0.0?><cproject>
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
 		<cconfiguration id="converted.config.1797282818">
-			<storageModule moduleId="scannerConfiguration">
-				<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
-				<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-					<buildOutputProvider>
-						<openAction enabled="true" filePath=""/>
-						<parser enabled="true"/>
-					</buildOutputProvider>
-					<scannerInfoProvider id="specsFile">
-						<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-						<parser enabled="true"/>
-					</scannerInfoProvider>
-				</profile>
-				<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-					<buildOutputProvider>
-						<openAction enabled="false" filePath=""/>
-						<parser enabled="true"/>
-					</buildOutputProvider>
-					<scannerInfoProvider id="makefileGenerator">
-						<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-						<parser enabled="false"/>
-					</scannerInfoProvider>
-				</profile>
-				<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-					<buildOutputProvider>
-						<openAction enabled="false" filePath=""/>
-						<parser enabled="true"/>
-					</buildOutputProvider>
-					<scannerInfoProvider id="specsFile">
-						<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-						<parser enabled="false"/>
-					</scannerInfoProvider>
-				</profile>
-				<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-					<buildOutputProvider>
-						<openAction enabled="false" filePath=""/>
-						<parser enabled="true"/>
-					</buildOutputProvider>
-					<scannerInfoProvider id="specsFile">
-						<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-						<parser enabled="false"/>
-					</scannerInfoProvider>
-				</profile>
-			</storageModule>
 			<storageModule buildSystemId="org.eclipse.cdt.core.defaultConfigDataProvider" id="converted.config.1797282818" moduleId="org.eclipse.cdt.core.settings" name="convertedConfig">
 				<externalSettings/>
 				<extensions>
@@ -55,15 +12,6 @@
 			<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 			<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
-			<storageModule moduleId="org.eclipse.cdt.core.pathentry">
-				<pathentry kind="mac" name="JNIEXPORT" path="" value=""/>
-				<pathentry include="/usr/X11R6/include" kind="inc" path="" system="true"/>
-				<pathentry include="/opt/gnome/include/gtk-2.0" kind="inc" path="" system="true"/>
-				<pathentry include="/opt/gnome/include/glib-2.0" kind="inc" path="" system="true"/>
-				<pathentry kind="src" path=""/>
-				<pathentry kind="out" path=""/>
-				<pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/>
-			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
 				<buildTargets>
 					<target name="linux-all" path="library/gtk" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
@@ -134,4 +82,63 @@
 			</storageModule>
 		</cconfiguration>
 	</storageModule>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
+		<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+			<buildOutputProvider>
+				<openAction enabled="true" filePath=""/>
+				<parser enabled="true"/>
+			</buildOutputProvider>
+			<scannerInfoProvider id="specsFile">
+				<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+				<parser enabled="true"/>
+			</scannerInfoProvider>
+		</profile>
+		<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+			<buildOutputProvider>
+				<openAction enabled="false" filePath=""/>
+				<parser enabled="true"/>
+			</buildOutputProvider>
+			<scannerInfoProvider id="makefileGenerator">
+				<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+				<parser enabled="false"/>
+			</scannerInfoProvider>
+		</profile>
+		<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+			<buildOutputProvider>
+				<openAction enabled="false" filePath=""/>
+				<parser enabled="true"/>
+			</buildOutputProvider>
+			<scannerInfoProvider id="specsFile">
+				<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+				<parser enabled="false"/>
+			</scannerInfoProvider>
+		</profile>
+		<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+			<buildOutputProvider>
+				<openAction enabled="false" filePath=""/>
+				<parser enabled="true"/>
+			</buildOutputProvider>
+			<scannerInfoProvider id="specsFile">
+				<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+				<parser enabled="false"/>
+			</scannerInfoProvider>
+		</profile>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.pathentry">
+		<pathentry kind="mac" name="JNIEXPORT" path="" value=""/>
+		<pathentry kind="mac" name="JNICALL" path="" value=""/>
+		<pathentry include="/usr/X11R6/include" kind="inc" path="" system="true"/>
+		<pathentry include="/opt/gnome/include/gtk-2.0" kind="inc" path="" system="true"/>
+		<pathentry include="/opt/gnome/include/glib-2.0" kind="inc" path="" system="true"/>
+		<pathentry include="/usr/include/gtk-2.0" kind="inc" path="" system="true"/>
+		<pathentry include="/usr/lib64/gtk-2.0/include" kind="inc" path="" system="true"/>
+		<pathentry include="/usr/include/atk-1.0" kind="inc" path="" system="true"/>
+		<pathentry include="/usr/include/glib-2.0 " kind="inc" path="" system="true"/>
+		<pathentry include="/usr/lib64/glib-2.0/include" kind="inc" path="" system="true"/>
+		<pathentry kind="src" path=""/>
+		<pathentry kind="out" path=""/>
+		<pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
 </cproject>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.executable/.project b/eclipse/features/org.eclipse.equinox.executable/.project
index e9419d7..f682906 100644
--- a/eclipse/features/org.eclipse.equinox.executable/.project
+++ b/eclipse/features/org.eclipse.equinox.executable/.project
@@ -19,7 +19,7 @@
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.build.arguments</key>
-					<value></value>
+					<value>-f make_${system:OS}.mak</value>
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.build.command</key>
@@ -27,7 +27,7 @@
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.build.location</key>
-					<value>\org.eclipse.equinox.executable\library\${system_property:osgi.ws}</value>
+					<value>/org.eclipse.equinox.executable/library/${system_property:osgi.ws}</value>
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.build.target.auto</key>
@@ -59,7 +59,7 @@
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.environment</key>
-					<value>DEFAULT_WS=${system_property:osgi.ws}|DEFAULT_OS=${system_property:osgi.os}|DEFAULT_OS_ARCH=${system_property:osgi.arch}|X11_HOME=/usr/X11R6|PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:/opt/kde3/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/share/pkgconfig|MOTIF_HOME=/usr/X11|</value>
+					<value>DEFAULT_OS=${system_property:osgi.os}|DEFAULT_OS_ARCH=${system_property:osgi.arch}|X11_HOME=/usr/X11R6|DEFAULT_WS=${system_property:osgi.ws}|JAVA_HOME=${system_property:java.home}/..|MOTIF_HOME=/usr/X11|PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:/opt/kde3/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/share/pkgconfig|</value>
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.stopOnError</key>
@@ -67,7 +67,7 @@
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
-					<value>true</value>
+					<value>false</value>
 				</dictionary>
 			</arguments>
 		</buildCommand>
diff --git a/eclipse/features/org.eclipse.equinox.executable/.settings/org.eclipse.cdt.core.prefs b/eclipse/features/org.eclipse.equinox.executable/.settings/org.eclipse.cdt.core.prefs
index 06ad8fe..9a13d6d 100644
--- a/eclipse/features/org.eclipse.equinox.executable/.settings/org.eclipse.cdt.core.prefs
+++ b/eclipse/features/org.eclipse.equinox.executable/.settings/org.eclipse.cdt.core.prefs
@@ -1,154 +1,163 @@
-#Thu Feb 04 13:33:58 EST 2010
-org.eclipse.cdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_comma_in_template_arguments=insert
+#Mon Mar 21 13:05:40 EDT 2011
+eclipse.preferences.version=1
+indexer/filesToParseUpFront=
+indexer/indexAllFiles=true
+indexer/indexUnusedHeadersWithDefaultLang=false
+indexer/indexerId=org.eclipse.cdt.core.fastIndexer
+indexer/skipFilesLargerThanMB=8
+indexer/skipImplicitReferences=false
+indexer/skipMacroReferences=false
+indexer/skipReferences=false
+indexer/skipTypeReferences=false
+indexer/useHeuristicIncludeResolution=true
+indexerId=org.eclipse.cdt.core.fastIndexer
+org.eclipse.cdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.cdt.core.formatter.alignment_for_base_clause_in_type_declaration=16
+org.eclipse.cdt.core.formatter.alignment_for_compact_if=0
+org.eclipse.cdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.cdt.core.formatter.alignment_for_declarator_list=16
+org.eclipse.cdt.core.formatter.alignment_for_enumerator_list=16
+org.eclipse.cdt.core.formatter.alignment_for_expression_list=0
+org.eclipse.cdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.cdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.cdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.cdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.cdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.cdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.cdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.cdt.core.formatter.brace_position_for_namespace_declaration=end_of_line
+org.eclipse.cdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.cdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.cdt.core.formatter.compact_else_if=true
 org.eclipse.cdt.core.formatter.continuation_indentation=2
-org.eclipse.cdt.core.formatter.insert_space_before_colon_in_base_clause=insert
-org.eclipse.cdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.cdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.cdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.cdt.core.formatter.indent_access_specifier_compare_to_type_header=false
+org.eclipse.cdt.core.formatter.indent_body_declarations_compare_to_access_specifier=true
+org.eclipse.cdt.core.formatter.indent_body_declarations_compare_to_namespace_header=true
+org.eclipse.cdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.cdt.core.formatter.indent_declaration_compare_to_template_header=false
+org.eclipse.cdt.core.formatter.indent_empty_lines=false
+org.eclipse.cdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.cdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.cdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.cdt.core.formatter.indent_switchstatements_compare_to_switch=true
+org.eclipse.cdt.core.formatter.indentation.size=4
+org.eclipse.cdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.cdt.core.formatter.insert_new_line_after_template_declaration=do not insert
+org.eclipse.cdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.cdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.cdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.cdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.cdt.core.formatter.insert_new_line_before_identifier_in_function_declaration=do not insert
+org.eclipse.cdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.cdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.cdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.cdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.cdt.core.formatter.insert_space_after_closing_angle_bracket_in_template_arguments=insert
+org.eclipse.cdt.core.formatter.insert_space_after_closing_angle_bracket_in_template_parameters=insert
+org.eclipse.cdt.core.formatter.insert_space_after_closing_brace_in_block=insert
 org.eclipse.cdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.cdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.cdt.core.formatter.insert_space_after_colon_in_base_clause=insert
 org.eclipse.cdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.cdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.cdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.cdt.core.formatter.alignment_for_declarator_list=16
-org.eclipse.cdt.core.formatter.tabulation.size=4
-org.eclipse.cdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.cdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.cdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.cdt.core.formatter.indent_access_specifier_compare_to_type_header=false
-org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.cdt.core.formatter.tabulation.char=tab
-org.eclipse.cdt.core.formatter.lineSplit=800
 org.eclipse.cdt.core.formatter.insert_space_after_colon_in_conditional=insert
 org.eclipse.cdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
 org.eclipse.cdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.cdt.core.formatter.insert_new_line_after_template_declaration=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_comma_in_base_types=insert
+org.eclipse.cdt.core.formatter.insert_space_after_comma_in_declarator_list=insert
+org.eclipse.cdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
 org.eclipse.cdt.core.formatter.insert_space_after_comma_in_expression_list=insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_expression_list=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.cdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.cdt.core.formatter.insert_space_after_comma_in_template_arguments=insert
+org.eclipse.cdt.core.formatter.insert_space_after_comma_in_template_parameters=insert
+org.eclipse.cdt.core.formatter.insert_space_after_opening_angle_bracket_in_template_arguments=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_opening_angle_bracket_in_template_parameters=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.cdt.core.formatter.insert_space_after_opening_bracket=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
 org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_closing_angle_bracket_in_template_arguments=insert
-org.eclipse.cdt.core.formatter.insert_new_line_before_identifier_in_function_declaration=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.cdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.cdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.cdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_exception_specification=do not insert
 org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_exception_specification=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_angle_bracket_in_template_parameters=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.cdt.core.formatter.alignment_for_base_clause_in_type_declaration=16
+org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
 org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_question_in_conditional=insert
 org.eclipse.cdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.cdt.core.formatter.insert_space_before_colon_in_default=insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_bracket=do not insert
-org.eclipse.cdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.cdt.core.formatter.insert_space_after_comma_in_base_types=insert
-org.eclipse.cdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.cdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.cdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.cdt.core.formatter.insert_space_before_closing_angle_bracket_in_template_arguments=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_closing_angle_bracket_in_template_parameters=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.cdt.core.formatter.insert_space_before_closing_bracket=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_exception_specification=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
 org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_comma_in_declarator_list=insert
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_declarator_list=do not insert
-org.eclipse.cdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.cdt.core.formatter.alignment_for_compact_if=0
-org.eclipse.cdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.cdt.core.formatter.insert_space_after_opening_bracket=do not insert
-org.eclipse.cdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.cdt.core.formatter.indent_empty_lines=false
-org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.cdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.cdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.cdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.cdt.core.formatter.alignment_for_enumerator_list=16
-org.eclipse.cdt.core.formatter.indent_body_declarations_compare_to_namespace_header=true
-org.eclipse.cdt.core.formatter.insert_space_after_closing_angle_bracket_in_template_parameters=insert
-org.eclipse.cdt.core.formatter.insert_space_after_comma_in_template_parameters=insert
+org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
 org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_exception_specification=insert
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_colon_in_base_clause=insert
-org.eclipse.cdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-indexer/indexerId=org.eclipse.cdt.core.fastIndexer
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.cdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.cdt.core.formatter.insert_space_before_closing_bracket=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_colon_in_base_clause=insert
+org.eclipse.cdt.core.formatter.insert_space_before_colon_in_case=insert
 org.eclipse.cdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.cdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.cdt.core.formatter.insert_space_before_colon_in_default=insert
+org.eclipse.cdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
 org.eclipse.cdt.core.formatter.insert_space_before_comma_in_base_types=do not insert
-org.eclipse.cdt.core.formatter.indentation.size=4
+org.eclipse.cdt.core.formatter.insert_space_before_comma_in_declarator_list=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_comma_in_expression_list=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_comma_in_template_arguments=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_comma_in_template_parameters=do not insert
 org.eclipse.cdt.core.formatter.insert_space_before_opening_angle_bracket_in_template_arguments=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.cdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.cdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.cdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.cdt.core.formatter.insert_space_before_colon_in_case=insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.cdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.cdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.cdt.core.formatter.indent_declaration_compare_to_template_header=false
-org.eclipse.cdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-eclipse.preferences.version=1
-org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.cdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.cdt.core.formatter.insert_space_before_opening_angle_bracket_in_template_parameters=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_namespace_declaration=insert
 org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.cdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.cdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.cdt.core.formatter.compact_else_if=true
-org.eclipse.cdt.core.formatter.indent_body_declarations_compare_to_access_specifier=true
-org.eclipse.cdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.cdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_bracket=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_exception_specification=insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
 org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_angle_bracket_in_template_parameters=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.cdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.cdt.core.formatter.brace_position_for_namespace_declaration=end_of_line
-org.eclipse.cdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_template_parameters=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_template_arguments=do not insert
-org.eclipse.cdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.cdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.cdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.cdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.cdt.core.formatter.insert_space_between_empty_brackets=do not insert
 org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_exception_specification=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_angle_bracket_in_template_arguments=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.cdt.core.formatter.alignment_for_expression_list=0
-indexerId=org.eclipse.cdt.core.fastIndexer
-org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.cdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.cdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.cdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.cdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.cdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.cdt.core.formatter.lineSplit=800
 org.eclipse.cdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.cdt.core.formatter.insert_space_after_opening_angle_bracket_in_template_parameters=do not insert
+org.eclipse.cdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.cdt.core.formatter.tabulation.char=tab
+org.eclipse.cdt.core.formatter.tabulation.size=4
 org.eclipse.cdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.cdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.cdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_angle_bracket_in_template_arguments=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_namespace_declaration=insert
-org.eclipse.cdt.core.formatter.insert_space_between_empty_brackets=do not insert
diff --git a/eclipse/features/org.eclipse.equinox.executable/bin/carbon/macosx/ppc/Eclipse.app/Contents/Info.plist b/eclipse/features/org.eclipse.equinox.executable/bin/carbon/macosx/ppc/Eclipse.app/Contents/Info.plist
index ca325a6..c55909d 100644
--- a/eclipse/features/org.eclipse.equinox.executable/bin/carbon/macosx/ppc/Eclipse.app/Contents/Info.plist
+++ b/eclipse/features/org.eclipse.equinox.executable/bin/carbon/macosx/ppc/Eclipse.app/Contents/Info.plist
@@ -6,7 +6,7 @@
 	<key>CFBundleExecutable</key>
 		<string>eclipse</string>
 	<key>CFBundleGetInfoString</key>
-		<string>Eclipse 3.6 for Mac OS X, Copyright IBM Corp. and others 2002, 2010. All rights reserved.</string>
+		<string>Eclipse 3.7 for Mac OS X, Copyright IBM Corp. and others 2002, 2011. All rights reserved.</string>
 	<key>CFBundleIconFile</key>
 		<string>Eclipse.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -18,11 +18,11 @@
 	<key>CFBundlePackageType</key>
 		<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-		<string>3.6</string>
+		<string>3.7</string>
 	<key>CFBundleSignature</key>
 		<string>????</string>
 	<key>CFBundleVersion</key>
-		<string>3.6</string>
+		<string>3.7</string>
 	<key>CFBundleDevelopmentRegion</key>
 		<string>English</string>
 	<key>CFBundleLocalizations</key>
diff --git a/eclipse/features/org.eclipse.equinox.executable/bin/carbon/macosx/x86/Eclipse.app/Contents/Info.plist b/eclipse/features/org.eclipse.equinox.executable/bin/carbon/macosx/x86/Eclipse.app/Contents/Info.plist
index 3f47b4b..4106f51 100644
--- a/eclipse/features/org.eclipse.equinox.executable/bin/carbon/macosx/x86/Eclipse.app/Contents/Info.plist
+++ b/eclipse/features/org.eclipse.equinox.executable/bin/carbon/macosx/x86/Eclipse.app/Contents/Info.plist
@@ -6,7 +6,7 @@
 	<key>CFBundleExecutable</key>
 		<string>eclipse</string>
 	<key>CFBundleGetInfoString</key>
-		<string>Eclipse 3.6 for Mac OS X, Copyright IBM Corp. and others 2002, 2010. All rights reserved.</string>
+		<string>Eclipse 3.7 for Mac OS X, Copyright IBM Corp. and others 2002, 2011. All rights reserved.</string>
 	<key>CFBundleIconFile</key>
 		<string>Eclipse.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -18,11 +18,11 @@
 	<key>CFBundlePackageType</key>
 		<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-		<string>3.6</string>
+		<string>3.7</string>
 	<key>CFBundleSignature</key>
 		<string>????</string>
 	<key>CFBundleVersion</key>
-		<string>3.6</string>
+		<string>3.7</string>
 	<key>CFBundleDevelopmentRegion</key>
 		<string>English</string>
 	<key>CFBundleLocalizations</key>
diff --git a/eclipse/features/org.eclipse.equinox.executable/bin/cocoa/macosx/ppc/Eclipse.app/Contents/Info.plist b/eclipse/features/org.eclipse.equinox.executable/bin/cocoa/macosx/ppc/Eclipse.app/Contents/Info.plist
index ca325a6..c55909d 100644
--- a/eclipse/features/org.eclipse.equinox.executable/bin/cocoa/macosx/ppc/Eclipse.app/Contents/Info.plist
+++ b/eclipse/features/org.eclipse.equinox.executable/bin/cocoa/macosx/ppc/Eclipse.app/Contents/Info.plist
@@ -6,7 +6,7 @@
 	<key>CFBundleExecutable</key>
 		<string>eclipse</string>
 	<key>CFBundleGetInfoString</key>
-		<string>Eclipse 3.6 for Mac OS X, Copyright IBM Corp. and others 2002, 2010. All rights reserved.</string>
+		<string>Eclipse 3.7 for Mac OS X, Copyright IBM Corp. and others 2002, 2011. All rights reserved.</string>
 	<key>CFBundleIconFile</key>
 		<string>Eclipse.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -18,11 +18,11 @@
 	<key>CFBundlePackageType</key>
 		<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-		<string>3.6</string>
+		<string>3.7</string>
 	<key>CFBundleSignature</key>
 		<string>????</string>
 	<key>CFBundleVersion</key>
-		<string>3.6</string>
+		<string>3.7</string>
 	<key>CFBundleDevelopmentRegion</key>
 		<string>English</string>
 	<key>CFBundleLocalizations</key>
diff --git a/eclipse/features/org.eclipse.equinox.executable/bin/cocoa/macosx/x86/Eclipse.app/Contents/Info.plist b/eclipse/features/org.eclipse.equinox.executable/bin/cocoa/macosx/x86/Eclipse.app/Contents/Info.plist
index ca325a6..c55909d 100644
--- a/eclipse/features/org.eclipse.equinox.executable/bin/cocoa/macosx/x86/Eclipse.app/Contents/Info.plist
+++ b/eclipse/features/org.eclipse.equinox.executable/bin/cocoa/macosx/x86/Eclipse.app/Contents/Info.plist
@@ -6,7 +6,7 @@
 	<key>CFBundleExecutable</key>
 		<string>eclipse</string>
 	<key>CFBundleGetInfoString</key>
-		<string>Eclipse 3.6 for Mac OS X, Copyright IBM Corp. and others 2002, 2010. All rights reserved.</string>
+		<string>Eclipse 3.7 for Mac OS X, Copyright IBM Corp. and others 2002, 2011. All rights reserved.</string>
 	<key>CFBundleIconFile</key>
 		<string>Eclipse.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -18,11 +18,11 @@
 	<key>CFBundlePackageType</key>
 		<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-		<string>3.6</string>
+		<string>3.7</string>
 	<key>CFBundleSignature</key>
 		<string>????</string>
 	<key>CFBundleVersion</key>
-		<string>3.6</string>
+		<string>3.7</string>
 	<key>CFBundleDevelopmentRegion</key>
 		<string>English</string>
 	<key>CFBundleLocalizations</key>
diff --git a/eclipse/features/org.eclipse.equinox.executable/bin/cocoa/macosx/x86_64/Eclipse.app/Contents/Info.plist b/eclipse/features/org.eclipse.equinox.executable/bin/cocoa/macosx/x86_64/Eclipse.app/Contents/Info.plist
index ca325a6..c55909d 100644
--- a/eclipse/features/org.eclipse.equinox.executable/bin/cocoa/macosx/x86_64/Eclipse.app/Contents/Info.plist
+++ b/eclipse/features/org.eclipse.equinox.executable/bin/cocoa/macosx/x86_64/Eclipse.app/Contents/Info.plist
@@ -6,7 +6,7 @@
 	<key>CFBundleExecutable</key>
 		<string>eclipse</string>
 	<key>CFBundleGetInfoString</key>
-		<string>Eclipse 3.6 for Mac OS X, Copyright IBM Corp. and others 2002, 2010. All rights reserved.</string>
+		<string>Eclipse 3.7 for Mac OS X, Copyright IBM Corp. and others 2002, 2011. All rights reserved.</string>
 	<key>CFBundleIconFile</key>
 		<string>Eclipse.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -18,11 +18,11 @@
 	<key>CFBundlePackageType</key>
 		<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-		<string>3.6</string>
+		<string>3.7</string>
 	<key>CFBundleSignature</key>
 		<string>????</string>
 	<key>CFBundleVersion</key>
-		<string>3.6</string>
+		<string>3.7</string>
 	<key>CFBundleDevelopmentRegion</key>
 		<string>English</string>
 	<key>CFBundleLocalizations</key>
diff --git a/eclipse/features/org.eclipse.equinox.executable/build.properties b/eclipse/features/org.eclipse.equinox.executable/build.properties
index d156bd9..f2a6cf1 100644
--- a/eclipse/features/org.eclipse.equinox.executable/build.properties
+++ b/eclipse/features/org.eclipse.equinox.executable/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2010 IBM Corporation and others.
+# Copyright (c) 2000, 2011 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -18,8 +18,6 @@ bin.includes = bin/,\
                gtk_root/,\
                motif_root/,\
                target.build.xml,\
-               license.html,\
-               epl-v10.html,\
                eclipse_update_120.jpg,\
                contributed/
 
diff --git a/eclipse/features/org.eclipse.equinox.executable/epl-v10.html b/eclipse/features/org.eclipse.equinox.executable/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/eclipse/features/org.eclipse.equinox.executable/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.executable/feature.properties b/eclipse/features/org.eclipse.equinox.executable/feature.properties
index bc7b44d..eabbc97 100644
--- a/eclipse/features/org.eclipse.equinox.executable/feature.properties
+++ b/eclipse/features/org.eclipse.equinox.executable/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
+# Copyright (c) 2000, 2011 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -22,134 +22,3 @@ providerName=Eclipse.org
 
 # "description" property - description of the feature
 description=Platform specific launchers.
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to by "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/eclipse/features/org.eclipse.equinox.executable/feature.xml b/eclipse/features/org.eclipse.equinox.executable/feature.xml
index b8b7ea3..d8dfaa6 100644
--- a/eclipse/features/org.eclipse.equinox.executable/feature.xml
+++ b/eclipse/features/org.eclipse.equinox.executable/feature.xml
@@ -2,7 +2,9 @@
 <feature
       id="org.eclipse.equinox.executable"
       label="%featureName"
-      version="3.4.2.qualifier">
+      version="3.5.0.qualifier"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
 
    <description>
       %description
@@ -28,8 +30,8 @@
          install-size="0"
          version="0.0.0"
          fragment="true"/>
-         
-	<plugin
+
+   <plugin
          id="org.eclipse.equinox.launcher.gtk.solaris.x86"
          os="solaris"
          ws="gtk"
@@ -38,8 +40,8 @@
          install-size="0"
          version="0.0.0"
          fragment="true"/>
-            
-	<plugin
+
+   <plugin
          id="org.eclipse.equinox.launcher.motif.solaris.sparc"
          os="solaris"
          ws="motif"
@@ -57,7 +59,7 @@
          install-size="0"
          version="0.0.0"
          fragment="true"/>
-         
+
    <plugin
          id="org.eclipse.equinox.launcher.cocoa.macosx"
          os="macosx"
@@ -67,7 +69,7 @@
          install-size="0"
          version="0.0.0"
          fragment="true"/>
-           
+
    <plugin
          id="org.eclipse.equinox.launcher.cocoa.macosx"
          os="macosx"
@@ -77,8 +79,8 @@
          install-size="0"
          version="0.0.0"
          fragment="true"/>
-         
-	<plugin
+
+   <plugin
          id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64"
          os="macosx"
          ws="cocoa"
@@ -107,7 +109,7 @@
          install-size="0"
          version="0.0.0"
          fragment="true"/>
-         
+
    <plugin
          id="org.eclipse.equinox.launcher.gtk.linux.x86"
          os="linux"
@@ -148,6 +150,26 @@
          version="0.0.0"
          fragment="true"/>
 
+	<plugin
+         id="org.eclipse.equinox.launcher.gtk.aix.ppc"
+         os="aix"
+         ws="gtk"
+         arch="ppc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.launcher.gtk.hpux.ia64_32"
+         os="hpux"
+         ws="gtk"
+         arch="ia64_32"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+                  
    <plugin
          id="org.eclipse.equinox.launcher.motif.hpux.ia64_32"
          os="hpux"
@@ -177,7 +199,7 @@
          install-size="0"
          version="0.0.0"
          fragment="true"/>
-         
+
    <plugin
          id="org.eclipse.equinox.launcher.win32.win32.x86_64"
          os="win32"
@@ -197,7 +219,7 @@
          install-size="0"
          version="0.0.0"
          fragment="true"/>
-         
+
    <plugin
          id="org.eclipse.equinox.launcher.wpf.win32.x86"
          os="win32"
@@ -228,5 +250,4 @@
          version="0.0.0"
          fragment="true"/>
 
-
 </feature>
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 100755
new mode 100644
index 413176d..078257a
--- a/eclipse/features/org.eclipse.equinox.executable/library/carbon/build.sh
+++ b/eclipse/features/org.eclipse.equinox.executable/library/carbon/build.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #*******************************************************************************
-# Copyright (c) 2000, 2005 IBM Corporation and others.
+# Copyright (c) 2000, 2009 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/carbon/eclipseCarbon.c b/eclipse/features/org.eclipse.equinox.executable/library/carbon/eclipseCarbon.c
index 4773996..c91f213 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/carbon/eclipseCarbon.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/carbon/eclipseCarbon.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/carbon/eclipseCarbonCommon.c b/eclipse/features/org.eclipse.equinox.executable/library/carbon/eclipseCarbonCommon.c
index 82e9719..017c691 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/carbon/eclipseCarbonCommon.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/carbon/eclipseCarbonCommon.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/carbon/eclipseCarbonMain.c b/eclipse/features/org.eclipse.equinox.executable/library/carbon/eclipseCarbonMain.c
index cef62d2..51cafc2 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/carbon/eclipseCarbonMain.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/carbon/eclipseCarbonMain.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2009 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/carbon/eclipseMain.c b/eclipse/features/org.eclipse.equinox.executable/library/carbon/eclipseMain.c
index 4d54251..c0eaffa 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/carbon/eclipseMain.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/carbon/eclipseMain.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
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 100644
new mode 100755
index c12d29e..34843b7
--- a/eclipse/features/org.eclipse.equinox.executable/library/carbon/make_carbon.mak
+++ b/eclipse/features/org.eclipse.equinox.executable/library/carbon/make_carbon.mak
@@ -1,5 +1,5 @@
 #**********************************************************************
-# Copyright (c) 2000, 2005 IBM Corporation and others.
+# Copyright (c) 2000, 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at 
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 100644
new mode 100755
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/eclipse.c b/eclipse/features/org.eclipse.equinox.executable/library/eclipse.c
index 4709007..410e62c 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/eclipse.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/eclipse.c
@@ -9,6 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *     Kevin Cornell (Rational Software Corporation)
  *	   Markus Schorn (Wind River Systems), bug 193340
+ *	   Martin Oberhuber (Wind River) - [149994] Add --launcher.appendVmargs
  *******************************************************************************/
 
 /* Eclipse Program Launcher
@@ -233,6 +234,8 @@ home directory.");
 #define LIBRARY		  _T_ECLIPSE("--launcher.library")
 #define SUPRESSERRORS _T_ECLIPSE("--launcher.suppressErrors")
 #define INI			  _T_ECLIPSE("--launcher.ini")
+#define APPEND_VMARGS _T_ECLIPSE("--launcher.appendVmargs")
+#define OVERRIDE_VMARGS _T_ECLIPSE("--launcher.overrideVmargs")
 #define SECOND_THREAD _T_ECLIPSE("--launcher.secondThread")
 #define PERM_GEN	  _T_ECLIPSE("--launcher.XXMaxPermSize")
 
@@ -254,6 +257,7 @@ static int     debug         = 0;				/* True: output debugging info	*/
 static int     noSplash      = 0;				/* True: do not show splash win	*/
 static int	   suppressErrors = 0;				/* True: do not display errors dialogs */
        int     secondThread  = 0;				/* True: start the VM on a second thread */
+static int     appendVmargs = 0;                /* True: append cmdline vmargs to launcher.ini vmargs */
        
 static _TCHAR*  showSplashArg = NULL;			/* showsplash data (main launcher window) */
 static _TCHAR*  splashBitmap  = NULL;			/* the actual splash bitmap */
@@ -264,6 +268,7 @@ static _TCHAR*  permGen  	  = NULL;			/* perm gen size for sun */
 static _TCHAR**  filePath	  = NULL;			/* list of files to open */
 static _TCHAR*  timeoutString = NULL;			/* timeout value for opening a file */
 static _TCHAR*  defaultAction = NULL;			/* default action for non '-' command line arguments */ 
+static _TCHAR*  iniFile       = NULL;			/* the launcher.ini file set if  --launcher.ini was specified */
 
 /* variables for ee options */
 static _TCHAR* eeExecutable = NULL;
@@ -289,6 +294,7 @@ typedef struct
 							/* don't assign it and only remove (remove - 1) arguments  */
 #define ADJUST_PATH		4  	/* value is a path, do processing on relative paths to try and make them absolute */
 #define VALUE_IS_LIST	8  	/* value is a pointer to a tokenized _TCHAR* string for EE files, or a _TCHAR** list for the command line */
+#define INVERT_FLAG    16   /* invert the meaning of a flag, i.e. reset it */
 
 static Option options[] = {
     { CONSOLE,		&needConsole,	VALUE_IS_FLAG,	0 },
@@ -297,8 +303,10 @@ static Option options[] = {
     { NOSPLASH,     &noSplash,      VALUE_IS_FLAG,	1 },
     { SUPRESSERRORS, &suppressErrors, VALUE_IS_FLAG, 1},
     { SECOND_THREAD, &secondThread, VALUE_IS_FLAG,  1 },
+    { APPEND_VMARGS, &appendVmargs,	VALUE_IS_FLAG, 1 },
+    { OVERRIDE_VMARGS, &appendVmargs, VALUE_IS_FLAG | INVERT_FLAG, 1 },
     { LIBRARY,		NULL,			0,			2 }, /* library was parsed by exe, just remove it */
-    { INI,			NULL, 			0,			2 }, /* same with ini */
+    { INI,			&iniFile, 		0,			2 },
     { OS,			&osArg,			0,			2 },
     { OSARCH,		&osArchArg,		0,			2 },
     { SHOWSPLASH,   &showSplashArg,	OPTIONAL_VALUE,	2 },
@@ -331,6 +339,7 @@ static int nEEargs = 0;
 /* Local methods */
 static void     parseArgs( int* argc, _TCHAR* argv[] );
 static void 	processDefaultAction(int argc, _TCHAR* argv[]);
+static void 	mergeUserVMArgs( _TCHAR **vmArgs[] );
 static void     getVMCommand( int launchMode, int argc, _TCHAR* argv[], _TCHAR **vmArgv[], _TCHAR **progArgv[] );
 static int 		determineVM(_TCHAR** msg);
 static int 		vmEEProps(_TCHAR* eeFile, _TCHAR** msg);
@@ -426,8 +435,14 @@ JNIEXPORT int run(int argc, _TCHAR* argv[], _TCHAR* vmArgs[])
     	exit( 1 );
     }
 
-    /* platform specific processing of user's vmargs */
-    processVMArgs(&vmArgs);
+    if (vmArgs != NULL) {
+    	/* reconcile VM Args from commandline with launcher.ini (append or override),
+    	 * this always allocates new memory */
+    	mergeUserVMArgs(&vmArgs);
+    	/* platform specific processing of user's vmargs */
+    	processVMArgs(&vmArgs);
+    }
+    
     launchMode = determineVM(&msg);
     if (launchMode == -1) {
     	/* problem */
@@ -640,11 +655,12 @@ JNIEXPORT int run(int argc, _TCHAR* argv[], _TCHAR* vmArgs[])
     free( programDir );
     free( program );
     free( officialName );
-    if ( vmCommand != NULL )	 free( vmCommand );
-    if ( launchMode == LAUNCH_JNI ) free( cp );
-    if ( cpValue != NULL)		 free( cpValue );
-    if ( exitData != NULL )		 free( exitData );
-    if ( splashBitmap != NULL )  free( splashBitmap );
+    if(vmCommand != NULL)	 	 free(vmCommand);
+    if(launchMode == LAUNCH_JNI) free(cp);
+    if(cpValue != NULL)		 	 free(cpValue);
+    if(exitData != NULL)		 free(exitData);
+    if(splashBitmap != NULL)  	 free(splashBitmap);
+    if(vmArgs != NULL)			 free(vmArgs);
 
     if (javaResults == NULL)
     	return -1;
@@ -724,18 +740,18 @@ static void parseArgs(int* pArgc, _TCHAR* argv[]) {
 			/* If the option requires a value and there is one, extract the value. */
 			if (option->value != NULL) {
 				if (option->flag & VALUE_IS_FLAG)
-					*((int *) option->value) = 1;
+					*((int *) option->value) = (option->flag & INVERT_FLAG) ? 0 : 1;
 				else {
 					int count = 1;
 					if (option->flag & VALUE_IS_LIST) {
 						/* count how many args, this is the -argument itself + following the non'-' args */
-						while(count + index < *pArgc && argv[count + index][0] != _T_ECLIPSE('-'))
+						while (count + index < *pArgc && argv[count + index][0] != _T_ECLIPSE('-'))
 							count++;
-						
+
 						/* allocate memory for a _TCHAR* list and initialize it with NULLs*/
 						*((void**) option->value) = malloc(count * sizeof(_TCHAR *));
 						memset(*((void **) option->value), 0, count * sizeof(_TCHAR *));
-						
+
 						if (option->remove != 0)
 							option->remove = count;
 					}
@@ -750,7 +766,7 @@ static void parseArgs(int* pArgc, _TCHAR* argv[]) {
 									(*((_TCHAR***) option->value))[i] = next;
 								else
 									*((_TCHAR**) option->value) = next;
-							} else if (option->flag & OPTIONAL_VALUE){
+							} else if (option->flag & OPTIONAL_VALUE) {
 								/* value was optional, and the next arg starts with '-' */
 								optional = 1;
 							}
@@ -800,24 +816,62 @@ static _TCHAR** parseArgList( _TCHAR* data ) {
     return execArg;
 }
 
-static void adjustVMArgs( _TCHAR *javaVM, _TCHAR *jniLib, _TCHAR **vmArgv[] ) {
+/* Return the list of args from the launcher ini file (if it exists). Caller is responsible to free(). */
+static _TCHAR** getConfigArgs() {
+	_TCHAR** configArgv = NULL;
+	_TCHAR * configFile = NULL;
+	int configArgc = 0;
+	int ret = 0;
+
+	configFile = (iniFile != NULL) ? iniFile : getIniFile(program, consoleLauncher);
+	ret = readConfigFile(configFile, &configArgc, &configArgv);
+	if (ret == 0)
+		return configArgv;
+	return NULL;
+}
+
+/** Append Commandline VM Args to VM Args that came from the launcher.ini
+ *  Always returns new memory even if no new arguments were appended */
+static void mergeUserVMArgs(_TCHAR **vmArgs[]) {
+	_TCHAR** configVMArgs = NULL;
+	_TCHAR** configArgs = NULL;
+
+	if (appendVmargs != 0 && indexOf(VMARGS, initialArgv) > 0) {
+		/* Get vmargs from the launcher.ini, if any */
+		configArgs = getConfigArgs();
+		if (configArgs != NULL) {
+			int vmArg = indexOf(VMARGS, configArgs);
+			if (vmArg >= 0)
+				configVMArgs = configArgs + vmArg + 1;
+		}
+	}
+
+	/* This always allocates new memory so we don't need to guess if it is safe
+	 * to free later  */
+	*vmArgs = concatArgs(configVMArgs, *vmArgs);
+	if (configArgs != NULL)
+		free(configArgs);
+}
+
+static void adjustVMArgs(_TCHAR *javaVM, _TCHAR *jniLib, _TCHAR **vmArgv[]) {
 	/* Sun VMs need some extra perm gen space */
-	if (permGen != NULL && isSunVM(javaVM, jniLib)) {
+	/* Detecting Sun VM is expensive - only do so if necessary */
+	if (permGen != NULL) {
 		int specified = 0, i = -1;
-		
+
 		/* first check to see if it is already specified */
-		while ( (*vmArgv)[++i] != NULL) {
+		while ((*vmArgv)[++i] != NULL) {
 			/* we are also counting the number of args here */
 			if (!specified && _tcsncmp((*vmArgv)[i], XXPERMGEN, _tcslen(XXPERMGEN)) == 0) {
 				specified = 1;
 			}
 		}
-		
-		if (!specified) {
+
+		if (!specified && isSunVM(javaVM, jniLib)) {
 			_TCHAR ** oldArgs = *vmArgv;
 			_TCHAR *newArg = malloc((_tcslen(XXPERMGEN) + _tcslen(permGen) + 1) * sizeof(_TCHAR));
 			_stprintf(newArg, _T_ECLIPSE("%s%s"), XXPERMGEN, permGen);
-			
+
 			*vmArgv = malloc((i + 2) * sizeof(_TCHAR *));
 			memcpy(*vmArgv, oldArgs, i * sizeof(_TCHAR *));
 			(*vmArgv)[i] = newArg;
@@ -825,6 +879,7 @@ static void adjustVMArgs( _TCHAR *javaVM, _TCHAR *jniLib, _TCHAR **vmArgv[] ) {
 		}
 	}
 }
+
 /*
  * Get the command and arguments to start the Java VM.
  *
@@ -888,11 +943,11 @@ static void getVMCommand( int launchMode, int argc, _TCHAR* argv[], _TCHAR **vmA
 	
 	/* Program arguments */
     /*  OS <os> + WS <ws> + ARCH <arch> + LAUNCHER <launcher> + NAME <officialName> +
-     *  + LIBRARY <library> + SHOWSPLASH <cmd> + EXITDATA <cmd> + STARTUP <jar> + argv[] + VM + <vm> + 
+     *  + LIBRARY <library> + SHOWSPLASH <cmd> + EXITDATA <cmd> + STARTUP <jar> + OVERRIDE/APPEND + argv[] + VM + <vm> +
      * VMARGS + vmArg + requiredVMargs
      *  + NULL)
      */
-    totalProgArgs  = 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + argc + 2 + 1 + nVMarg + nEEargs + nReqVMarg + 1;
+    totalProgArgs  = 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 1 + argc + 2 + 1 + nVMarg + nEEargs + nReqVMarg + 1;
 	*progArgv = malloc( totalProgArgs * sizeof( _TCHAR* ) );
     dst = 0;
     
@@ -932,6 +987,9 @@ static void getVMCommand( int launchMode, int argc, _TCHAR* argv[], _TCHAR **vmA
 	(*progArgv)[ dst++ ] = STARTUP;
 	(*progArgv)[ dst++ ] = jarFile;
     
+	/* override or append vm args */
+	(*progArgv)[ dst++ ] = appendVmargs ? APPEND_VMARGS : OVERRIDE_VMARGS;
+
 	/* Append the exit data command. */
 	if (sharedID) {
 		(*progArgv)[ dst++ ] = EXITDATA;
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/eclipseCommon.c b/eclipse/features/org.eclipse.equinox.executable/library/eclipseCommon.c
index 56c1a71..923b3c2 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/eclipseCommon.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/eclipseCommon.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
+ * Copyright (c) 2006, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
@@ -276,8 +276,8 @@ _TCHAR* findSymlinkCommand( _TCHAR* command, int resolve )
 	                }
 #endif
 	                /* Determine if the executable resides in this directory. */
-	                if (cmdPath[0] == _T_ECLIPSE('.') &&
-	                   (_tcslen(cmdPath) == 1 || (_tcslen(cmdPath) == 2 && IS_DIR_SEPARATOR(cmdPath[1]))))
+	                if (_tcslen(cmdPath) == 0 || /*an empty path entry is treated as '.' */
+	                	(cmdPath[0] == _T_ECLIPSE('.') && (_tcslen(cmdPath) == 1 || (_tcslen(cmdPath) == 2 && IS_DIR_SEPARATOR(cmdPath[1])))))
 	                {
 	                	_tgetcwd( cmdPath, MAX_PATH_LENGTH );
 	                }
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/eclipseConfig.c b/eclipse/features/org.eclipse.equinox.executable/library/eclipseConfig.c
index 29e7f33..bc7a5cd 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/eclipseConfig.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/eclipseConfig.c
@@ -38,6 +38,20 @@ int readIniFile(_TCHAR* program, int *argc, _TCHAR ***argv)
 	int result;
 	
 	if (program == NULL || argc == NULL || argv == NULL) return -1;
+	
+#if defined(_WIN32) && defined(_WIN32_CONSOLE)	
+	config_file = getIniFile(program, 1);
+#else
+	config_file = getIniFile(program, 0);
+#endif
+	
+	result = readConfigFile(config_file, argc, argv);
+	free(config_file);
+	return result;
+}
+
+_TCHAR* getIniFile(_TCHAR* program, int consoleLauncher){
+	_TCHAR* config_file = NULL;
 
 	/* Get a copy with room for .ini at the end */
 	config_file = malloc( (_tcslen(program) + 5) * sizeof(_TCHAR));
@@ -53,8 +67,7 @@ int readIniFile(_TCHAR* program, int *argc, _TCHAR ***argv)
 			extension = config_file + _tcslen(config_file);
 		}
 		_tcscpy(extension, _T_ECLIPSE(".ini"));
-#ifdef _WIN32_CONSOLE
-		{
+		if(consoleLauncher){
 			/* We are the console version, if the ini file does not exist, try
 			 * removing the 'c' from the end of the program name */
 			struct _stat stats; 
@@ -62,16 +75,12 @@ int readIniFile(_TCHAR* program, int *argc, _TCHAR ***argv)
 				_tcscpy(extension - 1, extension);
 			}
 		}
-#endif
 	}
 #else
 	/* Append the extension */
 	strcat(config_file, ".ini");
 #endif
-	
-	result = readConfigFile(config_file, argc, argv);
-	free(config_file);
-	return result;
+	return config_file;
 }
 
 int readConfigFile( _TCHAR * config_file, int *argc, _TCHAR ***argv )
@@ -85,6 +94,7 @@ int readConfigFile( _TCHAR * config_file, int *argc, _TCHAR ***argv )
 	size_t bufferSize = 1024;
 	size_t length;
 	
+	
 	/* Open the config file as a text file 
 	 * Note that carriage return-linefeed combination \r\n are automatically
 	 * translated into single linefeeds on input in the t (translated) mode
@@ -96,7 +106,6 @@ int readConfigFile( _TCHAR * config_file, int *argc, _TCHAR ***argv )
 	/* allocate buffers */
 	buffer =  (_TCHAR*)malloc(bufferSize * sizeof(_TCHAR));
 	argument = (_TCHAR*)malloc(bufferSize * sizeof(_TCHAR));
-
 	*argv = (_TCHAR **)malloc((1 + maxArgs) * sizeof(_TCHAR*));
 	
 	index = 0;
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/eclipseConfig.h b/eclipse/features/org.eclipse.equinox.executable/library/eclipseConfig.h
index 5315beb..cd8ef9c 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/eclipseConfig.h
+++ b/eclipse/features/org.eclipse.equinox.executable/library/eclipseConfig.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
@@ -24,11 +24,24 @@
  *
  * This method will call readConfigFile to read the actual ini file
  *
+ * This method will use getIniFile with a value for consoleLauncher that
+ * is determined at compile time.  Clients who are not the actual
+ * win32 console executable should instead use getIniFile and readConfigFile.
+ *
  * Returns 0 if success.
  */
 extern int readIniFile(_TCHAR* program, int *argc, _TCHAR ***argv);
 
 /**
+ * Return the path to the launcher ini file for the corresponding program 
+ * argument. On win32, an "eclipsec.exe' console launcher can use the "eclipse.ini"
+ * ini file.
+ * consoleLauncher : whether or not we are using the win32 "eclipsec" console launcher
+ *                   has no affect on other platforms 
+ */
+extern _TCHAR* getIniFile(_TCHAR* program, int consoleLauncher);
+
+/**
  * Reads the given configuration file 
  * The argument argv refers to a newly allocated array of strings.
  * The first entry is the program name to mimic the expectations
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/eclipseMain.c b/eclipse/features/org.eclipse.equinox.executable/library/eclipseMain.c
index fe52730..c45f365 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/eclipseMain.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/eclipseMain.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
@@ -14,6 +14,11 @@
 #include "eclipseCommon.h"
 #include "eclipseConfig.h"
 
+#ifdef _WIN32
+#include <direct.h>
+#else
+#include <unistd.h>
+#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -52,6 +57,7 @@ static _TCHAR* 	getDefaultOfficialName(_TCHAR* program);
 static _TCHAR*  findProgram(_TCHAR* argv[]);
 static _TCHAR*  findLibrary(_TCHAR* library, _TCHAR* program);
 static _TCHAR*  checkForIni(int argc, _TCHAR* argv[]);
+static _TCHAR*  getDirFromProgram(_TCHAR* program);
  
 static int initialArgc;
 static _TCHAR** initialArgv;
@@ -70,7 +76,7 @@ int main(int argc, char* argv[]) {
 	* Run the UNICODE version, convert the arguments from MBCS to UNICODE
 	*/
 	int i, result;
-	wchar_t **newArgv = malloc(argc * sizeof(wchar_t *));
+	wchar_t **newArgv = malloc((argc + 1) * sizeof(wchar_t *));
 	for (i=0; i<argc; i++) {
 		char *oldArg = argv[i];
 		int numChars = MultiByteToWideChar(CP_ACP, 0, oldArg, -1, NULL, 0);
@@ -79,6 +85,7 @@ int main(int argc, char* argv[]) {
 		MultiByteToWideChar(CP_ACP, 0, oldArg, -1, newArg, numChars);
 		newArgv[i] = newArg;
 	}
+	newArgv[i] = NULL;
 	result = mainW(argc, newArgv);
 	for (i=0; i<argc; i++) {
 		free(newArgv[i]);
@@ -152,7 +159,7 @@ int main( int argc, _TCHAR* argv[] )
 	officialName = name != NULL ? _tcsdup( name ) : getDefaultOfficialName(program);
 	
 	/* Find the directory where the Eclipse program is installed. */
-    programDir = getProgramDir(program);
+    programDir = getDirFromProgram(program);
 
 	/* Find the eclipse library */
     eclipseLibrary = findLibrary(eclipseLibrary, program);
@@ -312,7 +319,7 @@ static int createUserArgs(int configArgc, _TCHAR **configArgv, int *argc, _TCHAR
  * This function takes the directory where program executable resides and
  * determines the installation directory.
  */
-_TCHAR* getProgramDir(_TCHAR* program)
+_TCHAR* getDirFromProgram(_TCHAR* program)
 {
 	_TCHAR*  ch;
 	
@@ -328,10 +335,16 @@ _TCHAR* getProgramDir(_TCHAR* program)
    		return programDir;
     }
 
-	/* Can't figure out from the program */
+	/* Can't figure out from the program, lets use the cwd */
 	free(programDir);
-	programDir = NULL;
-	return NULL;
+	programDir = malloc( MAX_PATH_LENGTH * sizeof (_TCHAR));
+	_tgetcwd( programDir, MAX_PATH_LENGTH );
+	return programDir;
+}
+
+_TCHAR* getProgramDir()
+{
+	return programDir;
 }
 
 _TCHAR* getOfficialName() {
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/eclipseMozilla.c b/eclipse/features/org.eclipse.equinox.executable/library/eclipseMozilla.c
index 956ae17..a599589 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/eclipseMozilla.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/eclipseMozilla.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
@@ -20,25 +20,24 @@
 #include <dirent.h>
 #include <sys/stat.h>
 
+static char* prefixes[] = {
+	"xulrunner-1",
+	"mozilla-seamonkey-1",
+	"seamonkey-1",
+	"mozilla-1",
+	"mozilla-firefox-2",
+	"firefox-2",
+	"mozilla-firefox-3",
+	"firefox-3",
+	NULL
+};
+static const int XULRUNNER_INDEX = 0;
 
 /* Filter function used by fixEnvForMozilla() for finding directories
  * with a desired prefix.
  */
 int filter(const struct dirent *dir)
 {
-	char* prefixes[] = {
-		"xulrunner\0",
-		"xulrunner-1",
-		"mozilla-seamonkey-1",
-		"seamonkey-1",
-		"mozilla-1",
-		"mozilla-firefox-2",
-		"firefox-2",
-		"mozilla-firefox-3",
-		"firefox-3",
-		NULL
-	};
-	int XULRUNNER_INDEX = 0;
 #if defined(__amd64__) || defined(__x86_64__) || defined(__powerpc64__)
 	char* root = "/usr/lib64/";
 #else
@@ -186,8 +185,17 @@ void fixEnvForMozilla() {
 				{
 					if (sscanf(buffer, "GRE_PATH=%s", path) == 1)
 					{
-						grePath = strdup(path);
-						break;
+						int index = 0;
+						char* prefix = prefixes [index];
+						while (prefix != NULL)
+						{
+							if (strstr(path, prefix))
+							{
+								grePath = strdup(path);
+								break;
+							}
+							prefix = prefixes [++index];
+						}
 					}
 				}
 				fclose(file);
@@ -230,57 +238,21 @@ void fixEnvForMozilla() {
 #endif
 			}
 
+#if defined (SOLARIS)
 			if (grePath == NULL)
 			{
 				/* some other typical installation locations */
 				char* dirs[] = {
-#if defined(__amd64__) || defined(__x86_64__) || defined(__powerpc64__)
-					"/usr/lib64/xulrunner/",
-					"/usr/lib64/mozilla-firefox/",
-					"/usr/lib64/firefox/",
-					"/usr/lib64/mozilla-seamonkey/",
-					"/usr/lib64/seamonkey/",
-					"/usr/lib64/mozilla/",
-#endif
-#if defined (SOLARIS)
-					"/usr/sfw/lib/xulrunner/",
-					"/usr/sfw/lib/mozilla-firefox/",
-					"/usr/sfw/lib/firefox/",
-					"/usr/sfw/lib/mozilla/",
-					"/usr/sfw/lib/mozilla-seamonkey/",
-					"/usr/sfw/lib/seamonkey/",
-#endif
-					"/usr/lib/xulrunner/",
-					"/usr/lib/mozilla-firefox/",
-					"/usr/lib/firefox/",
-					"/usr/lib/mozilla-seamonkey/",
-					"/usr/lib/seamonkey/",
-					"/usr/lib/mozilla/",
-					"/usr/local/xulrunner/",
-					"/opt/xulrunner/",
-					"/usr/local/mozilla-firefox/",
-					"/usr/local/firefox/",
-					"/opt/mozilla-firefox/",
-					"/opt/firefox/",
-					"/usr/local/mozilla-seamonkey/",
-					"/usr/local/seamonkey/",
-					"/opt/mozilla-seamonkey/",
-					"/opt/seamonkey/",
-					"/usr/local/mozilla/",
-					"/opt/mozilla/",
+					"/usr/sfw/lib/mozilla/",	/* Solaris location */
+					"/usr/lib/firefox/",			/* OpenSolaris location */
 					NULL
 				};
 
-#if defined (SOLARIS)
 				/*
 				 * The solaris compiler does not do static linking, so just check
 				 * for a common lib to ensure that the install seems valid.
 				 */
 				char* testlib = "libxpcom.so";
-#else
-				/* Ensure that the install is dynamically-linked and is built with GTK2 */
-				char* testlib = "components/libwidget_gtk2.so";
-#endif
 
 				struct stat buf;
 				int index = 0;
@@ -301,18 +273,18 @@ void fixEnvForMozilla() {
 					dir = dirs [index++];
 				}
 			}
+#endif // SOLARIS
 		}
 
 		if (grePath != NULL)
 		{
-			/* If grePath contains "xul" then do not change the LD_LIBRARY_PATH,
+			/* If grePath contains "xulrunner" then do not change the LD_LIBRARY_PATH,
 			 * since it is likely that a xulrunner (not a mozilla or firefox)
 			 * will be found at runtime.  Note that MOZILLA_FIVE_HOME is still
 			 * updated if grePath contains "xul" since this variable can act as
 			 * a backup GRE to try if an initially-detected one fails to load.
 			 */
-			char* current = strrchr(grePath, 'x');
-			if (current == NULL || strncmp(current, "xul", 3) != 0) {
+			if (!strstr(grePath, "xulrunner")) {
 				ldPath = (char*)realloc(ldPath, strlen(ldPath) + strlen(grePath) + 2);
 				if (strlen(ldPath) > 0) strcat(ldPath, ":");
 				strcat(ldPath, grePath);
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/eclipseMozilla.h b/eclipse/features/org.eclipse.equinox.executable/library/eclipseMozilla.h
index 42b4f00..e227741 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/eclipseMozilla.h
+++ b/eclipse/features/org.eclipse.equinox.executable/library/eclipseMozilla.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/eclipseNix.c b/eclipse/features/org.eclipse.equinox.executable/library/eclipseNix.c
index 37a08ef..bc57e22 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/eclipseNix.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/eclipseNix.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
+ * Copyright (c) 2008, 2009 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/eclipseOS.h b/eclipse/features/org.eclipse.equinox.executable/library/eclipseOS.h
index 859bad4..a0e0902 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/eclipseOS.h
+++ b/eclipse/features/org.eclipse.equinox.executable/library/eclipseOS.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/eclipseShm.c b/eclipse/features/org.eclipse.equinox.executable/library/eclipseShm.c
index 9934fe5..e46c1f5 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/eclipseShm.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/eclipseShm.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/eclipseShm.h b/eclipse/features/org.eclipse.equinox.executable/library/eclipseShm.h
index 750d780..9cac1aa 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/eclipseShm.h
+++ b/eclipse/features/org.eclipse.equinox.executable/library/eclipseShm.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/eclipseUnicode.h b/eclipse/features/org.eclipse.equinox.executable/library/eclipseUnicode.h
index 546a36e..f98b77d 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/eclipseUnicode.h
+++ b/eclipse/features/org.eclipse.equinox.executable/library/eclipseUnicode.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/eclipseUtil.c b/eclipse/features/org.eclipse.equinox.executable/library/eclipseUtil.c
index 9ed7b68..09eb9fd 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/eclipseUtil.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/eclipseUtil.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
@@ -8,6 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *     Kevin Cornell (Rational Software Corporation)
+ *	   Martin Oberhuber (Wind River) - [149994] Add --launcher.appendVmargs
  *******************************************************************************/
 
 /* Eclipse Launcher Utility Methods */
@@ -159,6 +160,48 @@ _TCHAR * concatPaths(_TCHAR** strs, _TCHAR separator) {
 }
 
 /*
+ * Concatenates two NULL-terminated arrays of Strings,
+ * returning a new NULL-terminated array.
+ * The returned array must be freed with the regular free().
+ */
+_TCHAR** concatArgs(_TCHAR** l1, _TCHAR** l2) {
+	_TCHAR** newArray = NULL;
+	int size1 = 0;
+	int size2 = 0;
+
+	if (l1 != NULL)
+		while (l1[size1] != NULL) size1++;
+	if (l2 != NULL)
+		while (l2[size2] != NULL) size2++;
+
+	newArray = (_TCHAR **) malloc((size1 + size2 + 1) * sizeof(_TCHAR *));
+	if (size1 > 0) {
+		memcpy(newArray, l1, size1 * sizeof(_TCHAR *));
+	}
+	if (size2 > 0) {
+		memcpy(newArray + size1, l2, size2 * sizeof(_TCHAR *));
+	}
+	newArray[size1 + size2] = NULL;
+	return newArray;
+}
+
+/*
+ * returns the relative position of arg in the NULL-terminated list of args,
+ * or -1 if args does not contain arg.
+ */
+int indexOf(_TCHAR *arg, _TCHAR **args) {
+	int i = -1;
+	if (arg != NULL && args != NULL) {
+		while (args[++i] != NULL) {
+			if (_tcsicmp(arg, args[i]) == 0) {
+				return i;
+			}
+		}
+	}
+	return -1;
+}
+
+/*
  * buffer contains a pathSeparator separated list of paths, check 
  * that it contains all the paths given.  Each path is expected to be
  * terminated with a pathSeparator character.
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/eclipseUtil.h b/eclipse/features/org.eclipse.equinox.executable/library/eclipseUtil.h
index 970aba3..f9d5003 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/eclipseUtil.h
+++ b/eclipse/features/org.eclipse.equinox.executable/library/eclipseUtil.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
@@ -8,6 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *     Kevin Cornell (Rational Software Corporation)
+ *	   Martin Oberhuber (Wind River) - [149994] Add --launcher.appendVmargs
  *******************************************************************************/
 
 #ifndef ECLIPSE_UTIL_H
@@ -37,6 +38,12 @@ extern _TCHAR * checkPathList( _TCHAR* pathList, _TCHAR* programDir, int reverse
 /* take a NULL terminated array of strings and concatenate them together into one string */
 extern _TCHAR * concatStrings(_TCHAR** strs);
 
+/* Concatenates two NULL-terminated arrays of strings into a new array of strings */
+extern _TCHAR** concatArgs(_TCHAR** l1, _TCHAR** l2);
+
+/* Returns the relative position of arg in the NULL-terminated list of args, or -1 */
+extern int indexOf(_TCHAR *arg, _TCHAR **args);
+
 /* take a NULL terminated array of strings and concatenate them together using the give pathSeparator */
 extern _TCHAR* concatPaths(_TCHAR** paths, _TCHAR pathSeparator);
 
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 100755
new mode 100644
index f821793..9608803
--- a/eclipse/features/org.eclipse.equinox.executable/library/gtk/build.sh
+++ b/eclipse/features/org.eclipse.equinox.executable/library/gtk/build.sh
@@ -36,6 +36,7 @@ defaultOS=""
 defaultOSArch=""
 defaultWS="gtk"
 defaultJava=DEFAULT_JAVA_JNI
+defaultJavaHome=""
 javaHome=""
 makefile=""
 if [ "$OS" = "" ];  then
@@ -57,7 +58,7 @@ case $OS in
 			"x86_64")
 				defaultOSArch="x86_64"
 				defaultJava=DEFAULT_JAVA_EXEC
-				[ -d /usr/java64/1.5 ] && javaHome="/usr/java64/1.5"
+				[ -d /usr/java64/1.5 ] && defaultJavaHome="/usr/java64/1.5"
 				OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
 				;;
 			i?86)
@@ -98,12 +99,20 @@ case $OS in
 		makefile="make_aix.mak"
 		defaultOS="aix"
 		defaultOSArch="ppc64"
-		javaHome="/bluebird/teamswt/swt-builddir/JDKs/AIX/PPC64/j564/sdk"
+		[ -d /bluebird/teamswt/swt-builddir/JDKs/AIX/PPC64/j564/sdk ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/JDKs/AIX/PPC64/j564/sdk"
+	;;
+	"HP-UX")
+		makefile="make_hpux.mak"
+		defaultOS="hpux"
+		defaultOSArch="ia64_32"
+		PATH=$PATH:/opt/hp-gcc/bin:/opt/gtk2.6/bin:/opt/gtk2.6/lib/pkgconfig
+		export PATH
+		[ -d /opt/java1.5 ] && defaultJavaHome="/opt/java1.5"
 	;;
 	"SunOS")
 		makefile="make_solaris.mak"
 		defaultOS="solaris"
-		[ -d /usr/jdk/jdk1.5.0_01 ] && javaHome="/usr/jdk/jdk1.5.0_01"
+		[ -d /usr/jdk/jdk1.5.0_01 ] && defaultJavaHome="/usr/jdk/jdk1.5.0_01"
 		OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
 		#PATH=/usr/ccs/bin:/opt/SUNWspro/bin:$PATH
 		PATH=/usr/ccs/bin:/export/home/SUNWspro/bin:$PATH
@@ -161,9 +170,13 @@ DEFAULT_OS_ARCH="$defaultOSArch"
 DEFAULT_WS="$defaultWS"
 DEFAULT_JAVA=$defaultJava
 
-if [ -n  $javaHome ]; then
+origJavaHome=$JAVA_HOME
+if [ -n  "$javaHome" ]; then
 	JAVA_HOME=$javaHome
 	export JAVA_HOME
+elif [ -z "$JAVA_HOME" -a -n  "$defaultJavaHome" ]; then
+	JAVA_HOME="$defaultJavaHome"
+	export JAVA_HOME
 fi
 
 if [ "$defaultOSArch" = "ppc64" ];  then
@@ -198,3 +211,7 @@ if [ "$makefile" != "" ]; then
 else
 	echo "Unknown OS $OS -- build aborted"
 fi
+
+#restore original JAVA_HOME
+JAVA_HOME="$origJavaHome"
+export JAVA_HOME
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/gtk/eclipse.ini b/eclipse/features/org.eclipse.equinox.executable/library/gtk/eclipse.ini
deleted file mode 100644
index f640dd2..0000000
--- a/eclipse/features/org.eclipse.equinox.executable/library/gtk/eclipse.ini
+++ /dev/null
@@ -1,4 +0,0 @@
---launcher.defaultAction
-openFile
---launcher.library
-./eclipse_1305.so
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/gtk/eclipseGtk.c b/eclipse/features/org.eclipse.equinox.executable/library/gtk/eclipseGtk.c
index 9aeee5f..af75837 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/gtk/eclipseGtk.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/gtk/eclipseGtk.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
@@ -35,6 +35,10 @@
 #include <semaphore.h>
 #include <fcntl.h>
 
+#ifdef HPUX
+#define SEM_FAILED (void *)-1
+#endif
+
 /* Global Variables */
 char*  defaultVM     = "java";
 char*  vmLibrary 	 = "libjvm.so";
@@ -52,7 +56,8 @@ static GtkWidget*   image = 0;
 static sem_t* mutex;
 static Atom appWindowAtom, launcherWindowAtom;
 static _TCHAR** openFilePath = NULL; /* the files we want to open */
-static int openFileTimeout = 60; /* number of seconds to wait before timeout */
+static int openFileTimeout = 60; 	 /* number of seconds to wait before timeout */
+static int windowPropertySet = 0;	 /* set to 1 on success */
 
 static struct sigaction quitAction;
 static struct sigaction intAction;
@@ -134,24 +139,19 @@ static char * createSWTWindowString(char * suffix, int semaphore) {
 
 static int setAppWindowPropertyFn() {
 	Window appWindow;
-	GdkWindow *propWindow;
-	GdkAtom propAtom;
+	Atom propAtom;
 	_TCHAR *propVal;
 
 	//Look for the SWT window. If it's there, set a property on it.
 	appWindow = gtk.XGetSelectionOwner(gtk_GDK_DISPLAY, appWindowAtom);
-	//appWindow = XGetSelectionOwner(GDK_DISPLAY(), appWindowAtom);
 	if (appWindow) {
-		propAtom = gtk.gdk_atom_intern("org.eclipse.swt.filePath.message", FALSE);
+		propAtom = gtk.XInternAtom(gtk_GDK_DISPLAY, "org.eclipse.swt.filePath.message", FALSE);
 		//append a colon delimiter in case more than one file gets appended to the app windows property.
 		propVal = concatPaths(openFilePath, _T_ECLIPSE(':'));
-		propWindow = gtk.gdk_window_foreign_new(appWindow);
-		if (propWindow != NULL) {
-			gtk.gdk_property_change(propWindow, propAtom, propAtom, 8, GDK_PROP_MODE_APPEND, (guchar *) propVal, _tcslen(propVal));
-			free(propVal);
-			return 1;
-		} //else the window got destroyed between XGetSelectionOwner and here (?)
+		gtk.XChangeProperty(gtk_GDK_DISPLAY, appWindow, propAtom, propAtom, 8, PropModeAppend, (unsigned char *)propVal, _tcslen(propVal));
 		free(propVal);
+		windowPropertySet = 1;
+		return 1;
 	}
 	return 0;
 }
@@ -335,7 +335,7 @@ char** getArgVM( char* vm )
 JavaResults* launchJavaVM( char* args[] )
 {
 	JavaResults* jvmResults = NULL;
-  	pid_t   jvmProcess;
+  	pid_t   jvmProcess, finishedProcess = 0;
   	int     exitCode;
   	
 #ifdef MOZILLA_FIX
@@ -359,7 +359,22 @@ JavaResults* launchJavaVM( char* args[] )
 	/* If the JVM is still running, wait for it to terminate. */
 	if (jvmProcess != 0)
 	{
-		waitpid(jvmProcess, &exitCode, 0);
+		/* When attempting a file open, we need to spin the event loop
+		 * for setAppWindowTimerProc to run.  When that succeeds or times out, 
+		 * we can stop the event loop and just wait on the child process.
+		 */
+		if (openFilePath != NULL) {
+			struct timespec sleepTime;
+			sleepTime.tv_sec = 0;
+			sleepTime.tv_nsec = 5e+8; // 500 milliseconds
+			
+			while(openFileTimeout > 0 && !windowPropertySet && (finishedProcess = waitpid(jvmProcess, &exitCode, WNOHANG)) == 0) {
+				dispatchMessages();
+				nanosleep(&sleepTime, NULL);
+			}
+		}
+		if (finishedProcess == 0)
+			waitpid(jvmProcess, &exitCode, 0);
       	if (WIFEXITED(exitCode))
       		/* TODO, this should really be a runResult if we could distinguish the launch problem above */
 			jvmResults->launchResult = WEXITSTATUS(exitCode);
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/gtk/eclipseGtk.h b/eclipse/features/org.eclipse.equinox.executable/library/gtk/eclipseGtk.h
index c78ceaa..cdff7f4 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/gtk/eclipseGtk.h
+++ b/eclipse/features/org.eclipse.equinox.executable/library/gtk/eclipseGtk.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2007, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
@@ -54,12 +54,10 @@ struct GTK_PTRS {
 	int			(*gdk_pixbuf_get_width)		(const GdkPixbuf*);
 	int			(*gdk_pixbuf_get_height)	(const GdkPixbuf*);
 	void		(*gdk_set_program_class)	(const char*);
-	GdkWindow*  (*gdk_window_foreign_new)   (GdkNativeWindow);
-	void        (*gdk_property_change)		(GdkWindow*, GdkAtom, GdkAtom, gint, GdkPropMode, const guchar*, gint);
-	GdkAtom     (*gdk_atom_intern)			(const gchar*, gboolean);
 	
 	Window 		(*XGetSelectionOwner)		(Display*, Atom);
 	void		(*XSetSelectionOwner)		(Display*, Atom, Window, Time);
+	void 		(*XChangeProperty)			(Display*, Window, Atom, Atom, int, int, unsigned char *, int);
 	Window 		(*XCreateWindow)			(Display*, Window, int, int, unsigned int, unsigned int, unsigned int, int, unsigned int, Visual*, unsigned long, XSetWindowAttributes*);
 	void		(*XSync)					(Display*, Bool);
 	int			(*XDefaultScreen)			(Display*);
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/gtk/eclipseGtkCommon.c b/eclipse/features/org.eclipse.equinox.executable/library/gtk/eclipseGtkCommon.c
index 84eca11..538601f 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/gtk/eclipseGtkCommon.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/gtk/eclipseGtkCommon.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2009 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/gtk/eclipseGtkInit.c b/eclipse/features/org.eclipse.equinox.executable/library/gtk/eclipseGtkInit.c
index 995c7cf..787f733 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/gtk/eclipseGtkInit.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/gtk/eclipseGtkInit.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2007, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
@@ -44,9 +44,6 @@ static FN_TABLE gtkFunctions[] = { 	FN_TABLE_ENTRY(gtk_adjustment_new),
 								 };
 /* functions from libgdk-x11-2.0 */
 static FN_TABLE gdkFunctions[] = {	FN_TABLE_ENTRY(gdk_set_program_class), 
-									FN_TABLE_ENTRY(gdk_property_change),
-									FN_TABLE_ENTRY(gdk_atom_intern),
-									FN_TABLE_ENTRY(gdk_window_foreign_new),
 									FN_TABLE_ENTRY(gdk_display), /* not a function */
 									{ NULL, NULL } 
 						  		 };
@@ -72,6 +69,7 @@ static FN_TABLE gobjFunctions[] = {	FN_TABLE_ENTRY(g_log_set_handler),
 static FN_TABLE x11Functions[] = {	FN_TABLE_ENTRY(XGetSelectionOwner),
 									FN_TABLE_ENTRY(XSetSelectionOwner),
 									FN_TABLE_ENTRY(XCreateWindow),
+									FN_TABLE_ENTRY(XChangeProperty),
 									FN_TABLE_ENTRY(XSync),
 									FN_TABLE_ENTRY(XRootWindow),
 									FN_TABLE_ENTRY(XDefaultScreen),
@@ -95,16 +93,16 @@ static int loadGtkSymbols( void * library, FN_TABLE * table) {
 
 int loadGtk() {
 #ifdef AIX 
-#define FLAGS RTLD_LAZY | RTLD_MEMBER
+#define DLFLAGS RTLD_LAZY | RTLD_MEMBER
 #else
-#define FLAGS RTLD_LAZY
+#define DLFLAGS RTLD_LAZY
 #endif
 
-	void * objLib = dlopen(GOBJ_LIB, FLAGS);
-	void * gdkLib = dlopen(GDK_LIB, FLAGS);
-	void * pixLib = dlopen(PIXBUF_LIB, FLAGS);
-	void * gtkLib = dlopen(GTK_LIB, FLAGS);
-	void * x11Lib = dlopen(X11_LIB, FLAGS);
+	void * objLib = dlopen(GOBJ_LIB, DLFLAGS);
+	void * gdkLib = dlopen(GDK_LIB, DLFLAGS);
+	void * pixLib = dlopen(PIXBUF_LIB, DLFLAGS);
+	void * gtkLib = dlopen(GTK_LIB, DLFLAGS);
+	void * x11Lib = dlopen(X11_LIB, DLFLAGS);
 	
 	/* initialize ptr struct to 0's */
 	memset(&gtk, 0, sizeof(struct GTK_PTRS));
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/gtk/make_aix.mak b/eclipse/features/org.eclipse.equinox.executable/library/gtk/make_aix.mak
index 05b8acd..d169139 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/gtk/make_aix.mak
+++ b/eclipse/features/org.eclipse.equinox.executable/library/gtk/make_aix.mak
@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2010 IBM Corporation and others.
+# Copyright (c) 2010, 2011 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at 
@@ -38,7 +38,16 @@ EXEC = $(PROGRAM_OUTPUT)
 DLL = $(PROGRAM_LIBRARY)
 #LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lpthread -ldl -lX11
 LIBS = -lpthread -ldl
-GTK_LIBS = -DGTK_LIB="\"libgtk-x11-2.0.a(libgtk-x11-2.0.so.0)\"" -DGDK_LIB="\"libgdk-x11-2.0.a(libgdk-x11-2.0.so.0)\"" -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.a(libgdk_pixbuf-2.0.so.0)\"" -DGOBJ_LIB="\"libgobject-2.0.a(libgobject-2.0.so.0)\"" -DX11_LIB="\"libX11.a(shr_64.o)\""
+
+X11_LIB_ppc = shr4.o
+X11_LIB_ppc64 = shr_64.o
+X11_LIB = -DX11_LIB="\"libX11.a($(X11_LIB_$(DEFAULT_OS_ARCH)))\""
+GTK_LIBS = -DGTK_LIB="\"libgtk-x11-2.0.a(libgtk-x11-2.0.so.0)\"" \
+		   -DGDK_LIB="\"libgdk-x11-2.0.a(libgdk-x11-2.0.so.0)\"" \
+		   -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.a(libgdk_pixbuf-2.0.so.0)\"" \
+		   -DGOBJ_LIB="\"libgobject-2.0.a(libgobject-2.0.so.0)\"" \
+		   $(X11_LIB)
+		   
 LFLAGS = ${M_ARCH} -shared
 CFLAGS = ${M_ARCH} -g -s -Wall\
 	-fpic \
@@ -90,7 +99,8 @@ eclipseNix.o: ../eclipseNix.c
 	$(CC) $(CFLAGS) -c ../eclipseNix.c -o eclipseNix.o
 
 $(EXEC): $(MAIN_OBJS) $(COMMON_OBJS)
-	$(CC) ${M_ARCH} -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
+	$(CC) ${M_ARCH} -Wl,-bM:UR -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
+	sedmgr -c exempt $(EXEC)
 	
 $(DLL): $(DLL_OBJS) $(COMMON_OBJS)
 	$(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/gtk/make_hpux.mak b/eclipse/features/org.eclipse.equinox.executable/library/gtk/make_hpux.mak
new file mode 100644
index 0000000..5d12d90
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.executable/library/gtk/make_hpux.mak
@@ -0,0 +1,99 @@
+#*******************************************************************************
+# Copyright (c) 2000, 2010 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at 
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     IBM Corporation - initial API and implementation
+#     Kevin Cornell (Rational Software Corporation)
+#     Sumit Sarkar (Hewlett-Packard)
+#*******************************************************************************
+include ../make_version.mak
+# Makefile for creating the HPUX/Motif eclipse launcher program.
+
+# This makefile expects the following environment variables set:
+#
+# PROGRAM_OUTPUT  - the filename of the output executable
+# DEFAULT_OS      - the default value of the "-os" switch
+# DEFAULT_OS_ARCH - the default value of the "-arch" switch
+# DEFAULT_WS      - the default value of the "-ws" switch
+# X11_HOME	 - the full path to X11 header files
+# MOTIF_HOME	 - the full path to Motif header files
+
+#ifeq ($(PROGRAM_OUTPUT),)
+#  PROGRAM_OUTPUT=eclipse
+#endif
+
+DEFAULT_JAVA=DEFAULT_JAVA_EXEC
+PROGRAM_LIBRARY=eclipse_$(LIB_VERSION).so
+
+# Define the object modules to be compiled and flags.
+CC=gcc
+MAIN_OBJS = eclipseMain.o
+COMMON_OBJS = eclipseConfig.o eclipseCommon.o eclipseGtkCommon.o eclipseGtkInit.o
+DLL_OBJS	= eclipse.o eclipseGtk.o eclipseUtil.o eclipseJNI.o eclipseShm.o eclipseNix.o
+
+EXEC = $(PROGRAM_OUTPUT)
+DLL = $(PROGRAM_LIBRARY)
+LIBS = -L$(MOTIF_HOME)/lib -L$(X11_HOME)/lib -lpthread -lrt
+GTK_LIBS = -DGTK_LIB="\"libgtk-x11-2.0.so\"" -DGDK_LIB="\"libgdk-x11-2.0.so\"" -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so\"" \
+ -DGOBJ_LIB="\"libgobject-2.0.so\"" -DX11_LIB="\"libX11.so\""
+LFLAGS = -shared -static-libgcc
+# -Wl,--export-dynamic
+CFLAGS = -O -s \
+	-DNETSCAPE_FIX \
+	-DDEFAULT_OS="\"$(DEFAULT_OS)\"" \
+	-DDEFAULT_OS_ARCH="\"$(DEFAULT_OS_ARCH)\"" \
+	-DDEFAULT_WS="\"$(DEFAULT_WS)\"" \
+	-D$(DEFAULT_JAVA) \
+	-DHPUX \
+	$(GTK_LIBS) \
+	-I./ \
+	-I../ \
+	-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/hp-ux \
+	`pkg-config --cflags gtk+-2.0`
+
+all: $(EXEC) $(DLL)
+
+.c.o:
+	$(CC) $(CFLAGS) -c $< -o $@
+
+eclipse.o: ../eclipse.c ../eclipseOS.h ../eclipseCommon.h ../eclipseJNI.h
+	$(CC) $(CFLAGS) -c ../eclipse.c -o $@
+	
+eclipseMain.o: ../eclipseMain.c ../eclipseUnicode.h ../eclipseCommon.h  
+	$(CC) $(CFLAGS) -c ../eclipseMain.c -o $@
+
+eclipseCommon.o: ../eclipseCommon.c ../eclipseCommon.h ../eclipseUnicode.h 
+	$(CC) $(CFLAGS) -c ../eclipseCommon.c -o $@
+	
+eclipseUtil.o: ../eclipseUtil.c ../eclipseUtil.h ../eclipseOS.h
+	$(CC) $(CFLAGS) -c ../eclipseUtil.c -o $@
+
+eclipseJNI.o: ../eclipseJNI.c ../eclipseCommon.h ../eclipseOS.h ../eclipseJNI.h
+	$(CC) $(CFLAGS) -c ../eclipseJNI.c -o $@
+	
+eclipseConfig.o: ../eclipseConfig.c ../eclipseConfig.h ../eclipseOS.h
+	$(CC) $(CFLAGS) -c ../eclipseConfig.c -o $@
+	
+eclipseShm.o: ../eclipseShm.h ../eclipseUnicode.h ../eclipseShm.c
+	$(CC) $(CFLAGS) -c ../eclipseShm.c -o $@
+
+eclipseNix.o: ../eclipseNix.c
+	$(CC) $(CFLAGS) -c ../eclipseNix.c -o $@
+
+$(EXEC): $(MAIN_OBJS) $(COMMON_OBJS)
+	$(CC) -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
+
+$(DLL): $(DLL_OBJS) $(COMMON_OBJS)
+	$(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
+	
+install: all
+	cp $(EXEC) $(OUTPUT_DIR)
+	cp  $(DLL) $(LIBRARY_DIR)
+	rm -f $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS)
+
+clean:
+	rm -f $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS)
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/gtk/make_linux.mak b/eclipse/features/org.eclipse.equinox.executable/library/gtk/make_linux.mak
index a040cd7..9c64a31 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/gtk/make_linux.mak
+++ b/eclipse/features/org.eclipse.equinox.executable/library/gtk/make_linux.mak
@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2000, 2005 IBM Corporation and others.
+# Copyright (c) 2000, 2010 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/gtk/make_solaris.mak b/eclipse/features/org.eclipse.equinox.executable/library/gtk/make_solaris.mak
index 7b9b3f4..0fbca23 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/gtk/make_solaris.mak
+++ b/eclipse/features/org.eclipse.equinox.executable/library/gtk/make_solaris.mak
@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2000, 2007 IBM Corporation and others.
+# Copyright (c) 2000, 2010 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/make_version.mak b/eclipse/features/org.eclipse.equinox.executable/library/make_version.mak
index 05aaff2..3420642 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/make_version.mak
+++ b/eclipse/features/org.eclipse.equinox.executable/library/make_version.mak
@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2006 IBM Corporation and others.
+# Copyright (c) 2006, 2011 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -10,5 +10,5 @@
 #*******************************************************************************
 
 maj_ver=1
-min_ver=312
+min_ver=407
 LIB_VERSION = $(maj_ver)$(min_ver)
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/motif/NgCommon.c b/eclipse/features/org.eclipse.equinox.executable/library/motif/NgCommon.c
index 89ecdf4..2f4e525 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/motif/NgCommon.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/motif/NgCommon.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/motif/NgCommon.h b/eclipse/features/org.eclipse.equinox.executable/library/motif/NgCommon.h
index a4c2589..31252d7 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/motif/NgCommon.h
+++ b/eclipse/features/org.eclipse.equinox.executable/library/motif/NgCommon.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/motif/NgImage.c b/eclipse/features/org.eclipse.equinox.executable/library/motif/NgImage.c
index bd2abf2..056b09d 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/motif/NgImage.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/motif/NgImage.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/motif/NgImage.h b/eclipse/features/org.eclipse.equinox.executable/library/motif/NgImage.h
index c9c711d..a12218f 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/motif/NgImage.h
+++ b/eclipse/features/org.eclipse.equinox.executable/library/motif/NgImage.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/motif/NgImageData.c b/eclipse/features/org.eclipse.equinox.executable/library/motif/NgImageData.c
index d19f1dc..96053b3 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/motif/NgImageData.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/motif/NgImageData.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/motif/NgImageData.h b/eclipse/features/org.eclipse.equinox.executable/library/motif/NgImageData.h
index df3c901..2b0f9f4 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/motif/NgImageData.h
+++ b/eclipse/features/org.eclipse.equinox.executable/library/motif/NgImageData.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/motif/NgWinBMPFileFormat.c b/eclipse/features/org.eclipse.equinox.executable/library/motif/NgWinBMPFileFormat.c
index cf8b77f..57989f6 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/motif/NgWinBMPFileFormat.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/motif/NgWinBMPFileFormat.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/motif/NgWinBMPFileFormat.h b/eclipse/features/org.eclipse.equinox.executable/library/motif/NgWinBMPFileFormat.h
index 3ff010d..8ef7dda 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/motif/NgWinBMPFileFormat.h
+++ b/eclipse/features/org.eclipse.equinox.executable/library/motif/NgWinBMPFileFormat.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
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 100755
new mode 100644
index 12c0942..87241b8
--- a/eclipse/features/org.eclipse.equinox.executable/library/motif/build.sh
+++ b/eclipse/features/org.eclipse.equinox.executable/library/motif/build.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #*******************************************************************************
-# Copyright (c) 2000, 2005 IBM Corporation and others.
+# Copyright (c) 2000, 2009 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/motif/eclipseMotif.c b/eclipse/features/org.eclipse.equinox.executable/library/motif/eclipseMotif.c
index 4d5f8f1..049cb78 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/motif/eclipseMotif.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/motif/eclipseMotif.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/motif/eclipseMotifInit.c b/eclipse/features/org.eclipse.equinox.executable/library/motif/eclipseMotifInit.c
index 84e7295..c9ca22e 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/motif/eclipseMotifInit.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/motif/eclipseMotifInit.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
+ * Copyright (c) 2007, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
@@ -104,13 +104,15 @@ void * loadMotifShimLibrary() {
 		_TCHAR* eclipseMotifLib = _T_ECLIPSE("libeclipse-motif.so");
 		_TCHAR* path = strdup(eclipseLibrary);
 		_TCHAR* c = strrchr(path, '/');
-		if (c == NULL)
+		if (c == NULL) {
+			free(path);
 			return NULL;
+		}
 
 		*c = 0;
 		c = malloc((strlen(path) + 2 + strlen(eclipseMotifLib)) * sizeof(char));
 		_stprintf(c, _T_ECLIPSE("%s/%s"), path, eclipseMotifLib);
-
+		free(path);
 		return dlopen(c, RTLD_LAZY);
 	}
 	return 0;
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/motif/make_hpux_PA_RISC.mak b/eclipse/features/org.eclipse.equinox.executable/library/motif/make_hpux_PA_RISC.mak
index d09d9ef..2552b56 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/motif/make_hpux_PA_RISC.mak
+++ b/eclipse/features/org.eclipse.equinox.executable/library/motif/make_hpux_PA_RISC.mak
@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2000, 2005 IBM Corporation and others.
+# Copyright (c) 2000, 2007 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/motif/make_hpux_ia64_32.mak b/eclipse/features/org.eclipse.equinox.executable/library/motif/make_hpux_ia64_32.mak
index edef221..92667da 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/motif/make_hpux_ia64_32.mak
+++ b/eclipse/features/org.eclipse.equinox.executable/library/motif/make_hpux_ia64_32.mak
@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2000, 2005 IBM Corporation and others.
+# Copyright (c) 2000, 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/motif/make_linux.mak b/eclipse/features/org.eclipse.equinox.executable/library/motif/make_linux.mak
index cd8d51d..a29d1b9 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/motif/make_linux.mak
+++ b/eclipse/features/org.eclipse.equinox.executable/library/motif/make_linux.mak
@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2000, 2005 IBM Corporation and others.
+# Copyright (c) 2000, 2010 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/motif/make_solaris.mak b/eclipse/features/org.eclipse.equinox.executable/library/motif/make_solaris.mak
index d9f7527..3438ce3 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/motif/make_solaris.mak
+++ b/eclipse/features/org.eclipse.equinox.executable/library/motif/make_solaris.mak
@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2000, 2005 IBM Corporation and others.
+# Copyright (c) 2000, 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at 
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 100755
new mode 100644
index 2166d19..ea84059
--- a/eclipse/features/org.eclipse.equinox.executable/library/photon/build.sh
+++ b/eclipse/features/org.eclipse.equinox.executable/library/photon/build.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #*******************************************************************************
-# Copyright (c) 2000, 2005 IBM Corporation and others.
+# Copyright (c) 2000, 2006 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/photon/eclipsePhoton.c b/eclipse/features/org.eclipse.equinox.executable/library/photon/eclipsePhoton.c
index c14cb9b..e5dfbd2 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/photon/eclipsePhoton.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/photon/eclipsePhoton.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/photon/make_qnx.mak b/eclipse/features/org.eclipse.equinox.executable/library/photon/make_qnx.mak
index fac6918..475cf48 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/photon/make_qnx.mak
+++ b/eclipse/features/org.eclipse.equinox.executable/library/photon/make_qnx.mak
@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2000, 2005 IBM Corporation and others.
+# Copyright (c) 2000, 2006 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/win32/build.bat b/eclipse/features/org.eclipse.equinox.executable/library/win32/build.bat
index b1c49fc..803ab6b 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/win32/build.bat
+++ b/eclipse/features/org.eclipse.equinox.executable/library/win32/build.bat
@@ -1,5 +1,5 @@
 @rem *******************************************************************************
- at rem  Copyright (c) 2000, 2005 IBM Corporation and others.
+ at rem  Copyright (c) 2000, 2009 IBM Corporation and others.
 @rem  All rights reserved. This program and the accompanying materials
 @rem  are made available under the terms of the Eclipse Public License v1.0
 @rem  which accompanies this distribution, and is available at 
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 100755
new mode 100644
index 386f81d..f81f52b
--- a/eclipse/features/org.eclipse.equinox.executable/library/win32/build.sh
+++ b/eclipse/features/org.eclipse.equinox.executable/library/win32/build.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #*******************************************************************************
-# Copyright (c) 2000, 2005 IBM Corporation and others.
+# Copyright (c) 2000, 2006 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/win32/eclipse.rc b/eclipse/features/org.eclipse.equinox.executable/library/win32/eclipse.rc
index 723baa7..c057083 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/win32/eclipse.rc
+++ b/eclipse/features/org.eclipse.equinox.executable/library/win32/eclipse.rc
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/win32/eclipseWin.c b/eclipse/features/org.eclipse.equinox.executable/library/win32/eclipseWin.c
index 770b464..3875769 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/win32/eclipseWin.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/win32/eclipseWin.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/win32/eclipseWinCommon.c b/eclipse/features/org.eclipse.equinox.executable/library/win32/eclipseWinCommon.c
index 48f38b3..27546bf 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/win32/eclipseWinCommon.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/win32/eclipseWinCommon.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2009 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/win32/make_mingw.mak b/eclipse/features/org.eclipse.equinox.executable/library/win32/make_mingw.mak
index 9feb80e..aaee41e 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/win32/make_mingw.mak
+++ b/eclipse/features/org.eclipse.equinox.executable/library/win32/make_mingw.mak
@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2000, 2009 IBM Corporation and others.
+# Copyright (c) 2000, 2010 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/wpf/build.bat b/eclipse/features/org.eclipse.equinox.executable/library/wpf/build.bat
index 7d70ff6..be77e3a 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/wpf/build.bat
+++ b/eclipse/features/org.eclipse.equinox.executable/library/wpf/build.bat
@@ -1,5 +1,5 @@
 @rem *******************************************************************************
- at rem  Copyright (c) 2000, 2005 IBM Corporation and others.
+ at rem  Copyright (c) 2000, 2009 IBM Corporation and others.
 @rem  All rights reserved. This program and the accompanying materials
 @rem  are made available under the terms of the Eclipse Public License v1.0
 @rem  which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/wpf/eclipse.rc b/eclipse/features/org.eclipse.equinox.executable/library/wpf/eclipse.rc
index fb54e4e..874a4b9 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/wpf/eclipse.rc
+++ b/eclipse/features/org.eclipse.equinox.executable/library/wpf/eclipse.rc
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/wpf/eclipseWpf.cpp b/eclipse/features/org.eclipse.equinox.executable/library/wpf/eclipseWpf.cpp
index 18b6c51..f965239 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/wpf/eclipseWpf.cpp
+++ b/eclipse/features/org.eclipse.equinox.executable/library/wpf/eclipseWpf.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/wpf/eclipseWpfCommon.cpp b/eclipse/features/org.eclipse.equinox.executable/library/wpf/eclipseWpfCommon.cpp
index a4aa8bf..03ce3fc 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/wpf/eclipseWpfCommon.cpp
+++ b/eclipse/features/org.eclipse.equinox.executable/library/wpf/eclipseWpfCommon.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/wpf/make_wpf.mak b/eclipse/features/org.eclipse.equinox.executable/library/wpf/make_wpf.mak
index bb98952..821bb64 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/wpf/make_wpf.mak
+++ b/eclipse/features/org.eclipse.equinox.executable/library/wpf/make_wpf.mak
@@ -1,5 +1,5 @@
 #******************************************************************************
-# Copyright (c) 2000, 2006 IBM Corporation and others.
+# Copyright (c) 2000, 2007 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at 
diff --git a/eclipse/features/org.eclipse.equinox.executable/license.html b/eclipse/features/org.eclipse.equinox.executable/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/eclipse/features/org.eclipse.equinox.executable/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/eclipse/features/org.eclipse.equinox.executable/target.build.properties b/eclipse/features/org.eclipse.equinox.executable/target.build.properties
index b3817cd..4baa9bb 100644
--- a/eclipse/features/org.eclipse.equinox.executable/target.build.properties
+++ b/eclipse/features/org.eclipse.equinox.executable/target.build.properties
@@ -44,9 +44,11 @@ root.macosx.cocoa.x86_64.permissions.755=${launcherName}.app/Contents/MacOS/${la
 
 root.aix.motif.ppc=bin/motif/aix/ppc
 root.aix.gtk.ppc64=bin/gtk/aix/ppc64
+root.aix.gtk.ppc=bin/gtk/aix/ppc
 
 root.hpux.motif.PA_RISC=bin/motif/hpux/PA_RISC
 root.hpux.motif.ia64_32=bin/motif/hpux/ia64_32
+root.hpux.gtk.ia64_32=bin/gtk/hpux/ia64_32
 
 root.solaris.motif.sparc=contributed/motif/solaris/sparc
 root.solaris.gtk.x86=bin/gtk/solaris/x86
diff --git a/eclipse/features/org.eclipse.equinox.executable/target.build.xml b/eclipse/features/org.eclipse.equinox.executable/target.build.xml
index ed649f2..1d06b9b 100644
--- a/eclipse/features/org.eclipse.equinox.executable/target.build.xml
+++ b/eclipse/features/org.eclipse.equinox.executable/target.build.xml
@@ -102,7 +102,7 @@
 			<fileset dir="${basedir}/bin/carbon/macosx/x86" includes="**"			/>
 		</copy>
 		<chmod perm="755" dir="${feature.base}/macosx.carbon.x86/${collectingFolder}" includes="${launcherName}" /> 
-		<chmod perm="755" dir="${feature.base}/macosx.carbon.x86/${collectingFolder}" includes="Elcipse.app/Contents/MacOS/launcher" /> 
+		<chmod perm="755" dir="${feature.base}/macosx.carbon.x86/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/launcher" /> 
 	</target>
 	<target name="rootFilesmacosx_cocoa_ppc">
 		<mkdir dir="${feature.base}/macosx.cocoa.ppc/${collectingFolder}"/>
@@ -110,7 +110,7 @@
 			<fileset dir="${basedir}/bin/cocoa/macosx/ppc" includes="**"			/>
 		</copy>
 		<chmod perm="755" dir="${feature.base}/macosx.cocoa.ppc/${collectingFolder}" includes="${launcherName}" /> 
-		<chmod perm="755" dir="${feature.base}/macosx.cocoa.ppc/${collectingFolder}" includes="Elcipse.app/Contents/MacOS/launcher" /> 
+		<chmod perm="755" dir="${feature.base}/macosx.cocoa.ppc/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/launcher" /> 
 	</target>
 	<target name="rootFilesmacosx_cocoa_x86">
 		<mkdir dir="${feature.base}/macosx.cocoa.x86/${collectingFolder}"/>
@@ -162,6 +162,14 @@
 		</copy>
 		<chmod perm="755" dir="${feature.base}/aix.gtk.ppc64/${collectingFolder}" includes="launcher" /> 
 	</target>
+	<target name="rootFilesaix_gtk_ppc">
+		<mkdir dir="${feature.base}/aix.gtk.ppc/${collectingFolder}"/>
+		<copy todir="${feature.base}/aix.gtk.ppc/${collectingFolder}" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/bin/gtk/aix/ppc" includes="**"			/>
+			<fileset dir="${basedir}/gtk_root" includes="**"			/>
+		</copy>
+		<chmod perm="755" dir="${feature.base}/aix.gtk.ppc/${collectingFolder}" includes="launcher" /> 
+	</target>
 	<target name="rootFileslinux_gtk_x86_64">
 		<mkdir dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}"/>
 		<copy todir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" failonerror="true" overwrite="true">
@@ -250,6 +258,13 @@
 		</copy>
 		<chmod perm="755" dir="${feature.base}/hpux.motif.ia64_32/${collectingFolder}" includes="launcher" /> 
 	</target>
+	<target name="rootFileshpux_gtk_ia64_32">
+		<mkdir dir="${feature.base}/hpux.gtk.ia64_32/${collectingFolder}"/>
+		<copy todir="${feature.base}/hpux.gtk.ia64_32/${collectingFolder}" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/bin/gtk/hpux/ia64_32" includes="**"			/>
+		</copy>
+		<chmod perm="755" dir="${feature.base}/hpux.gtk.ia64_32/${collectingFolder}" includes="launcher" /> 
+	</target>
 	<target name="rootFilesqnx_photon_x86">
 		<mkdir dir="${feature.base}/qnx.photon.x86/${collectingFolder}"/>
 		<copy todir="${feature.base}/qnx.photon.x86/${collectingFolder}" failonerror="true" overwrite="true">
@@ -278,9 +293,11 @@
 		<antcall target="rootFilessolaris_motif_sparc"/>
 		<antcall target="rootFilesaix_motif_ppc"/>
 		<antcall target="rootFilesaix_gtk_ppc64"/>
+		<antcall target="rootFilesaix_gtk_ppc"/>
 		<antcall target="rootFileshpux_motif_PA_RISC"/>
 		<antcall target="rootFileshpux_motif_ia64"/>
 		<antcall target="rootFileshpux_motif_ia64_32"/>
+		<antcall target="rootFileshpux_gtk_ia64_32"/>
 		<antcall target="rootFilesqnx_photon_x86"/>
 	</target>
 
diff --git a/eclipse/features/org.eclipse.equinox.incubator.feature/.project b/eclipse/features/org.eclipse.equinox.incubator.feature/.project
new file mode 100644
index 0000000..a5156bc
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.incubator.feature/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.equinox.incubator.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/eclipse/features/org.eclipse.equinox.incubator.feature/build.properties b/eclipse/features/org.eclipse.equinox.incubator.feature/build.properties
new file mode 100644
index 0000000..45c21df
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.incubator.feature/build.properties
@@ -0,0 +1,20 @@
+###############################################################################
+# Copyright (c) 2011 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+bin.includes = feature.xml,\
+               feature.properties,\
+               eclipse_update_120.jpg
+               
+generate.feature at org.eclipse.equinox.jmx.client.feature.source=org.eclipse.equinox.jmx.client.feature
+generate.feature at org.eclipse.equinox.jmx.server.feature.source=org.eclipse.equinox.jmx.server.feature
+generate.feature at org.eclipse.equinox.jmx.client.feature.source=org.eclipse.equinox.jmx.client.feature
+generate.plugin at org.eclipse.equinox.initializer.source=org.eclipse.equinox.initializer
+generate.plugin at org.eclipse.equinox.region.source=org.eclipse.equinox.region
+generate.plugin at org.eclipse.equinox.console.supportability.source=org.eclipse.equinox.console.supportability
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.cvs/eclipse_update_120.jpg b/eclipse/features/org.eclipse.equinox.incubator.feature/eclipse_update_120.jpg
similarity index 100%
copy from eclipse/features/org.eclipse.cvs/eclipse_update_120.jpg
copy to eclipse/features/org.eclipse.equinox.incubator.feature/eclipse_update_120.jpg
diff --git a/eclipse/features/org.eclipse.equinox.incubator.feature/feature.properties b/eclipse/features/org.eclipse.equinox.incubator.feature/feature.properties
new file mode 100644
index 0000000..45dc674
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.incubator.feature/feature.properties
@@ -0,0 +1,23 @@
+# "featureName" property - name of the feature
+featureName=Equinox Incubator Bundles Feature (Incubation)
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+updateSiteName=The Eclipse Project Updates
+
+# "description" property - description of the feature
+description=Equinox Incubator Bundles Feature (Incubation)
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2011 IBM Corporation and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+    IBM Corporation - initial API and implementation\n
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.incubator.feature/feature.xml b/eclipse/features/org.eclipse.equinox.incubator.feature/feature.xml
new file mode 100644
index 0000000..5cd08b1
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.incubator.feature/feature.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.equinox.incubator.feature"
+      label="%featureName"
+      version="1.0.0.qualifier"
+      provider-name="%providerName"
+      image="eclipse_update_120.jpg"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <includes
+         id="org.eclipse.equinox.jmx.common.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.equinox.jmx.client.feature"
+         version="0.0.0"/>
+  
+   <includes
+         id="org.eclipse.equinox.jmx.server.feature"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.equinox.initializer"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="org.eclipse.equinox.initializer.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.region"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="org.eclipse.equinox.region.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.console.supportability"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="org.eclipse.equinox.console.supportability.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>       
+
+</feature>
diff --git a/eclipse/features/org.eclipse.equinox.jmx.client.feature/build.properties b/eclipse/features/org.eclipse.equinox.jmx.client.feature/build.properties
index ddfe69f..fa9c826 100644
--- a/eclipse/features/org.eclipse.equinox.jmx.client.feature/build.properties
+++ b/eclipse/features/org.eclipse.equinox.jmx.client.feature/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
+# Copyright (c) 2006,2011 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
diff --git a/eclipse/features/org.eclipse.equinox.jmx.client.feature/feature.xml b/eclipse/features/org.eclipse.equinox.jmx.client.feature/feature.xml
index 1557b63..9603f8a 100644
--- a/eclipse/features/org.eclipse.equinox.jmx.client.feature/feature.xml
+++ b/eclipse/features/org.eclipse.equinox.jmx.client.feature/feature.xml
@@ -2,9 +2,11 @@
 <feature
       id="org.eclipse.equinox.jmx.client.feature"
       label="Resource Monitoring Client Feature (Incubation)"
-      version="1.0.0.qualifier"
-      provider-name="Eclipse.org">
-
+      version="1.0.100.qualifier"
+      provider-name="Eclipse.org"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier"> 
+      
    <description url="http://www.eclipse.org/equinox/incubator/monitoring/index.php">
       Client-side infrastructure for managing OSGi-based systems using
 JMX.
diff --git a/eclipse/features/org.eclipse.equinox.jmx.client.feature/sourceTemplateFeature/build.properties b/eclipse/features/org.eclipse.equinox.jmx.client.feature/sourceTemplateFeature/build.properties
new file mode 100644
index 0000000..1beb2e7
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.jmx.client.feature/sourceTemplateFeature/build.properties
@@ -0,0 +1,14 @@
+###############################################################################
+# Copyright (c) 2011 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+bin.includes =\
+feature.xml,\
+feature.properties,\
+eclipse_update_120.jpg
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.cvs/eclipse_update_120.jpg b/eclipse/features/org.eclipse.equinox.jmx.client.feature/sourceTemplateFeature/eclipse_update_120.jpg
similarity index 100%
copy from eclipse/features/org.eclipse.cvs/eclipse_update_120.jpg
copy to eclipse/features/org.eclipse.equinox.jmx.client.feature/sourceTemplateFeature/eclipse_update_120.jpg
diff --git a/eclipse/features/org.eclipse.equinox.jmx.client.feature/sourceTemplateFeature/feature.properties b/eclipse/features/org.eclipse.equinox.jmx.client.feature/sourceTemplateFeature/feature.properties
new file mode 100644
index 0000000..882f786
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.jmx.client.feature/sourceTemplateFeature/feature.properties
@@ -0,0 +1,38 @@
+###############################################################################
+# Copyright (c) 2011 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Resource Monitoring Client Feature Source (Incubation)
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=Source code for the Resource Monitoring Client Feature (Incubation)
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2006, 2011 IBM Corporation and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+    IBM Corporation - initial API and implementation\n
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.jmx.common.feature/build.properties b/eclipse/features/org.eclipse.equinox.jmx.common.feature/build.properties
index 4442ec0..3bb2be4 100644
--- a/eclipse/features/org.eclipse.equinox.jmx.common.feature/build.properties
+++ b/eclipse/features/org.eclipse.equinox.jmx.common.feature/build.properties
@@ -1,3 +1,13 @@
+###############################################################################
+# Copyright (c) 2011 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = feature.xml,\
                about.html
 src.includes = about.html
diff --git a/eclipse/features/org.eclipse.equinox.jmx.common.feature/feature.xml b/eclipse/features/org.eclipse.equinox.jmx.common.feature/feature.xml
index a338e18..68d4693 100644
--- a/eclipse/features/org.eclipse.equinox.jmx.common.feature/feature.xml
+++ b/eclipse/features/org.eclipse.equinox.jmx.common.feature/feature.xml
@@ -2,8 +2,10 @@
 <feature
       id="org.eclipse.equinox.jmx.common.feature"
       label="Resource Monitoring Common Feature (Incubation)"
-      version="1.0.0.qualifier"
-      provider-name="Eclipse.org">
+      version="1.0.100.qualifier"
+      provider-name="Eclipse.org"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
 
    <description url="http://www.eclipse.org/equinox/incubator/monitoring/index.php">
       Common infrastructure for managing OSGi-based systems using JMX.
diff --git a/eclipse/features/org.eclipse.equinox.jmx.common.feature/sourceTemplateFeature/build.properties b/eclipse/features/org.eclipse.equinox.jmx.common.feature/sourceTemplateFeature/build.properties
new file mode 100644
index 0000000..52be3d7
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.jmx.common.feature/sourceTemplateFeature/build.properties
@@ -0,0 +1,15 @@
+###############################################################################
+# Copyright (c) 2011 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+bin.includes =\
+feature.xml,\
+feature.properties,\
+eclipse_update_120.jpg
+
diff --git a/eclipse/features/org.eclipse.cvs/eclipse_update_120.jpg b/eclipse/features/org.eclipse.equinox.jmx.common.feature/sourceTemplateFeature/eclipse_update_120.jpg
similarity index 100%
copy from eclipse/features/org.eclipse.cvs/eclipse_update_120.jpg
copy to eclipse/features/org.eclipse.equinox.jmx.common.feature/sourceTemplateFeature/eclipse_update_120.jpg
diff --git a/eclipse/features/org.eclipse.equinox.jmx.common.feature/sourceTemplateFeature/feature.properties b/eclipse/features/org.eclipse.equinox.jmx.common.feature/sourceTemplateFeature/feature.properties
new file mode 100644
index 0000000..f68c822
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.jmx.common.feature/sourceTemplateFeature/feature.properties
@@ -0,0 +1,38 @@
+###############################################################################
+# Copyright (c) 2011 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Equinox Incubator Bundles Feature (Incubation)
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=Source code for the Equinox Incubator Bundles Feature  (Incubation)
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2011 IBM Corporation and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+    IBM Corporation - initial API and implementation\n
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.jmx.server.feature/build.properties b/eclipse/features/org.eclipse.equinox.jmx.server.feature/build.properties
index ddfe69f..fa9c826 100644
--- a/eclipse/features/org.eclipse.equinox.jmx.server.feature/build.properties
+++ b/eclipse/features/org.eclipse.equinox.jmx.server.feature/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
+# Copyright (c) 2006,2011 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
diff --git a/eclipse/features/org.eclipse.equinox.jmx.server.feature/feature.xml b/eclipse/features/org.eclipse.equinox.jmx.server.feature/feature.xml
index e7d8364..e759bb2 100644
--- a/eclipse/features/org.eclipse.equinox.jmx.server.feature/feature.xml
+++ b/eclipse/features/org.eclipse.equinox.jmx.server.feature/feature.xml
@@ -2,9 +2,11 @@
 <feature
       id="org.eclipse.equinox.jmx.server.feature"
       label="Resource Monitoring Server Feature (Incubation)"
-      version="1.0.0.qualifier"
-      provider-name="Eclipse.org">
-
+      version="1.0.100.qualifier"
+      provider-name="Eclipse.org"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
+       
    <description url="http://www.eclipse.org/equinox/incubator/monitoring/index.php">
       Server-side infrastructure for managing OSGi-based systems using JMX.
    </description>
diff --git a/eclipse/features/org.eclipse.equinox.jmx.server.feature/sourceTemplateFeature/build.properties b/eclipse/features/org.eclipse.equinox.jmx.server.feature/sourceTemplateFeature/build.properties
new file mode 100644
index 0000000..500fe11
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.jmx.server.feature/sourceTemplateFeature/build.properties
@@ -0,0 +1,14 @@
+###############################################################################
+# Copyright (c) 2011 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+bin.includes =\
+feature.xml,\
+feature.properties,\
+eclipse_update_120.jpg
diff --git a/eclipse/features/org.eclipse.cvs/eclipse_update_120.jpg b/eclipse/features/org.eclipse.equinox.jmx.server.feature/sourceTemplateFeature/eclipse_update_120.jpg
similarity index 100%
copy from eclipse/features/org.eclipse.cvs/eclipse_update_120.jpg
copy to eclipse/features/org.eclipse.equinox.jmx.server.feature/sourceTemplateFeature/eclipse_update_120.jpg
diff --git a/eclipse/features/org.eclipse.equinox.jmx.server.feature/sourceTemplateFeature/feature.properties b/eclipse/features/org.eclipse.equinox.jmx.server.feature/sourceTemplateFeature/feature.properties
new file mode 100644
index 0000000..43beb32
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.jmx.server.feature/sourceTemplateFeature/feature.properties
@@ -0,0 +1,38 @@
+###############################################################################
+# Copyright (c) 2011 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Resource Monitoring Server Feature (Incubation)
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=Source code for the Resource Monitoring Server Feature (Incubation)
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2011 IBM Corporation and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+    IBM Corporation - initial API and implementation\n
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.p2.core.feature/.project b/eclipse/features/org.eclipse.equinox.p2.core.feature/.project
new file mode 100644
index 0000000..4627633
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.p2.core.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.equinox.p2.core.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/eclipse/features/org.eclipse.equinox.p2.core.feature/build.properties b/eclipse/features/org.eclipse.equinox.p2.core.feature/build.properties
new file mode 100644
index 0000000..6e95a6a
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.p2.core.feature/build.properties
@@ -0,0 +1,15 @@
+###############################################################################
+# Copyright (c) 2011 EclipseSource Inc. and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     EclipseSource - initial API and implementation
+#     IBM Corporation - Ongoing development
+###############################################################################
+bin.includes = feature.xml,\
+               feature.properties,\
+               eclipse_update_120.jpg
+src.includes = license.html,epl-v10.html
diff --git a/eclipse/features/org.eclipse.cvs/eclipse_update_120.jpg b/eclipse/features/org.eclipse.equinox.p2.core.feature/eclipse_update_120.jpg
similarity index 100%
copy from eclipse/features/org.eclipse.cvs/eclipse_update_120.jpg
copy to eclipse/features/org.eclipse.equinox.p2.core.feature/eclipse_update_120.jpg
diff --git a/eclipse/features/org.eclipse.equinox.p2.core.feature/feature.properties b/eclipse/features/org.eclipse.equinox.p2.core.feature/feature.properties
new file mode 100644
index 0000000..8e4ff62
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.p2.core.feature/feature.properties
@@ -0,0 +1,35 @@
+###############################################################################
+# Copyright (c) 2010, 2011 EclipseSource Inc. and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     EclipseSource - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Equinox p2 Core Function
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org - Equinox
+
+description=Provides a minimal headless provisioning system.
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2010 EclipseSource Inc. and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+    EclipseSource - initial API and implementation\n
+################ end of copyright property ####################################
diff --git a/eclipse/features/org.eclipse.equinox.p2.core.feature/feature.xml b/eclipse/features/org.eclipse.equinox.p2.core.feature/feature.xml
new file mode 100644
index 0000000..5b02fda
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.p2.core.feature/feature.xml
@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.equinox.p2.core.feature"
+      label="%featureName"
+      version="1.0.0.qualifier"
+      provider-name="%providerName"
+      image="eclipse_update_120.jpg"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
+
+   <description>
+      %description
+   </description>
+   
+   <copyright url="%copyrightURL">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <plugin
+         id="org.eclipse.equinox.p2.artifact.repository"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.console"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.director"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.engine"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.garbagecollector"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.metadata"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.metadata.repository"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.repository"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.touchpoint.eclipse"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.touchpoint.natives"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.simpleconfigurator.manipulator"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.sat4j.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.sat4j.pb"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.filetransfer"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.identity"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.provider.filetransfer"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.provider.filetransfer.httpclient"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.provider.filetransfer.ssl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.ssl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.commons.codec"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.commons.httpclient"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.commons.logging"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.frameworkadmin"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.frameworkadmin.equinox"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.preferences"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.security"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.jarprocessor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.ql"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.transport.ecf"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.operations"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.security.macosx"
+         os="macosx"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.security.win32.x86"
+         os="win32"
+         arch="x86"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.security.win32.x86_64"
+         os="win32"
+         arch="x86_64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+</feature>
diff --git a/eclipse/features/org.eclipse.equinox.p2.core.feature/pom.xml b/eclipse/features/org.eclipse.equinox.p2.core.feature/pom.xml
new file mode 100644
index 0000000..7758117
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.p2.core.feature/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>org.eclipse.equinox.p2-parent</artifactId>
+    <groupId>org.eclipse</groupId>
+    <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+  </parent>
+  <groupId>org.eclipse</groupId>
+  <artifactId>org.eclipse.equinox.p2.core.feature</artifactId>
+  <version>1.0.0.qualifier</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/eclipse/features/org.eclipse.equinox.p2.core.feature/sourceTemplateFeature/build.properties b/eclipse/features/org.eclipse.equinox.p2.core.feature/sourceTemplateFeature/build.properties
new file mode 100644
index 0000000..4dd5929
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.p2.core.feature/sourceTemplateFeature/build.properties
@@ -0,0 +1,13 @@
+###############################################################################
+# Copyright (c) 2011 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+bin.includes = feature.xml,\
+               feature.properties
+
diff --git a/eclipse/features/org.eclipse.equinox.p2.core.feature/sourceTemplateFeature/feature.properties b/eclipse/features/org.eclipse.equinox.p2.core.feature/sourceTemplateFeature/feature.properties
new file mode 100644
index 0000000..875491f
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.p2.core.feature/sourceTemplateFeature/feature.properties
@@ -0,0 +1,38 @@
+###############################################################################
+# Copyright (c) 2011 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Equinox p2 Core Function Source
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org - Equinox
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=Source code for the Equinox provisioning platform
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2011 IBM Corporation and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+    IBM Corporation - initial API and implementation\n
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.p2.discovery.feature/build.properties b/eclipse/features/org.eclipse.equinox.p2.discovery.feature/build.properties
index 0d20533..0bcdf98 100644
--- a/eclipse/features/org.eclipse.equinox.p2.discovery.feature/build.properties
+++ b/eclipse/features/org.eclipse.equinox.p2.discovery.feature/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2010 Tasktop Technologies and others.
+# Copyright (c) 2010, 2011 Tasktop Technologies and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -8,4 +8,4 @@
 # Contributors:
 #     Tasktop Technologies - initial API and implementation
 ###############################################################################
-bin.includes = feature.xml,license.html,epl-v10.html,license.html,feature.properties
+bin.includes = feature.xml,feature.properties
diff --git a/eclipse/features/org.eclipse.equinox.p2.discovery.feature/epl-v10.html b/eclipse/features/org.eclipse.equinox.p2.discovery.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/eclipse/features/org.eclipse.equinox.p2.discovery.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
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 100644
new mode 100755
index 6bd1ba0..f075c0c
--- a/eclipse/features/org.eclipse.equinox.p2.discovery.feature/feature.properties
+++ b/eclipse/features/org.eclipse.equinox.p2.discovery.feature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2010 Tasktop Technologies and others.
+# Copyright (c) 2010, 2011 Tasktop Technologies and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -18,7 +18,7 @@
 featureName=Equinox p2 Discovery
 
 # "providerName" property - name of the company that provides the feature
-providerName=Eclipse Equinox Project
+providerName=Eclipse.org - Equinox
 
 # "updateSiteName" property - label for the update site
 updateSiteName=The Equinox Project Repository
@@ -37,135 +37,4 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
     Tasktop Technologies - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
\ No newline at end of file
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.p2.discovery.feature/feature.xml b/eclipse/features/org.eclipse.equinox.p2.discovery.feature/feature.xml
index 3b4abb6..c23282f 100644
--- a/eclipse/features/org.eclipse.equinox.p2.discovery.feature/feature.xml
+++ b/eclipse/features/org.eclipse.equinox.p2.discovery.feature/feature.xml
@@ -2,8 +2,10 @@
 <feature
       id="org.eclipse.equinox.p2.discovery.feature"
       label="%featureName"
-      version="1.0.1.qualifier"
-      provider-name="%providerName">
+      version="1.0.100.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier"> 
 
    <description>
       %description
diff --git a/eclipse/features/org.eclipse.equinox.p2.discovery.feature/license.html b/eclipse/features/org.eclipse.equinox.p2.discovery.feature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/eclipse/features/org.eclipse.equinox.p2.discovery.feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/eclipse/features/org.eclipse.equinox.p2.discovery.feature/pom.xml b/eclipse/features/org.eclipse.equinox.p2.discovery.feature/pom.xml
new file mode 100644
index 0000000..6e247e4
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.p2.discovery.feature/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>org.eclipse.equinox.p2-parent</artifactId>
+    <groupId>org.eclipse</groupId>
+    <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+  </parent>
+  <groupId>org.eclipse</groupId>
+  <artifactId>org.eclipse.equinox.p2.discovery.feature</artifactId>
+  <version>1.0.100.qualifier</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/eclipse/features/org.eclipse.equinox.p2.discovery.feature/sourceTemplateFeature/build.properties b/eclipse/features/org.eclipse.equinox.p2.discovery.feature/sourceTemplateFeature/build.properties
index 5278417..0e90d79 100644
--- a/eclipse/features/org.eclipse.equinox.p2.discovery.feature/sourceTemplateFeature/build.properties
+++ b/eclipse/features/org.eclipse.equinox.p2.discovery.feature/sourceTemplateFeature/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
+# Copyright (c) 2008, 2010 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
diff --git a/eclipse/features/org.eclipse.equinox.p2.discovery.feature/sourceTemplateFeature/epl-v10.html b/eclipse/features/org.eclipse.equinox.p2.discovery.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/eclipse/features/org.eclipse.equinox.p2.discovery.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.p2.discovery.feature/sourceTemplateFeature/feature.properties b/eclipse/features/org.eclipse.equinox.p2.discovery.feature/sourceTemplateFeature/feature.properties
index 3b5a98e..b9821a7 100644
--- a/eclipse/features/org.eclipse.equinox.p2.discovery.feature/sourceTemplateFeature/feature.properties
+++ b/eclipse/features/org.eclipse.equinox.p2.discovery.feature/sourceTemplateFeature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2008, 2009 IBM Corporation and others.
+# Copyright (c) 2008, 2011 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -36,109 +36,4 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
     Sonatype Inc. - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.p2.discovery.feature/sourceTemplateFeature/license.html b/eclipse/features/org.eclipse.equinox.p2.discovery.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/eclipse/features/org.eclipse.equinox.p2.discovery.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
-   modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/eclipse/features/org.eclipse.equinox.p2.extras.feature/.project b/eclipse/features/org.eclipse.equinox.p2.extras.feature/.project
new file mode 100644
index 0000000..9a5320b
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.p2.extras.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.equinox.p2.extras.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/eclipse/features/org.eclipse.equinox.p2.extras.feature/build.properties b/eclipse/features/org.eclipse.equinox.p2.extras.feature/build.properties
new file mode 100644
index 0000000..70e0467
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.p2.extras.feature/build.properties
@@ -0,0 +1,15 @@
+###############################################################################
+# Copyright (c) 2011 EclipseSource Inc. and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     EclipseSource - initial API and implementation
+#     IBM Corporation - Ongoing development
+###############################################################################
+bin.includes = feature.xml,\
+               feature.properties,\
+               eclipse_update_120.jpg
+src.includes = license.html,epl-v10.html
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.cvs/eclipse_update_120.jpg b/eclipse/features/org.eclipse.equinox.p2.extras.feature/eclipse_update_120.jpg
similarity index 100%
copy from eclipse/features/org.eclipse.cvs/eclipse_update_120.jpg
copy to eclipse/features/org.eclipse.equinox.p2.extras.feature/eclipse_update_120.jpg
diff --git a/eclipse/features/org.eclipse.equinox.p2.extras.feature/feature.properties b/eclipse/features/org.eclipse.equinox.p2.extras.feature/feature.properties
new file mode 100644
index 0000000..5b28e4c
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.p2.extras.feature/feature.properties
@@ -0,0 +1,35 @@
+###############################################################################
+# Copyright (c) 2010, 2011 EclipseSource Inc. and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     EclipseSource - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Add-on Function for p2
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org - Equinox
+
+description=Provides some backward compatibility support (e.g. drop-ins, legacy update site) and the metadata generation facility.
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2010 EclipseSource Inc. and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+    EclipseSource - initial API and implementation\n
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.p2.extras.feature/feature.xml b/eclipse/features/org.eclipse.equinox.p2.extras.feature/feature.xml
new file mode 100644
index 0000000..959854c
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.p2.extras.feature/feature.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.equinox.p2.extras.feature"
+      label="%featureName"
+      version="1.0.0.qualifier"
+      provider-name="%providerName"
+      image="eclipse_update_120.jpg"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
+
+   <description>
+      %description
+   </description>
+
+   <copyright url="%copyrightURL">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <includes
+         id="org.eclipse.equinox.p2.core.feature"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.director.app"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.directorywatcher"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.reconciler.dropins"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.publisher"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.extensionlocation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.repository.tools"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.publisher.eclipse"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+</feature>
diff --git a/eclipse/features/org.eclipse.equinox.p2.extras.feature/pom.xml b/eclipse/features/org.eclipse.equinox.p2.extras.feature/pom.xml
new file mode 100644
index 0000000..02e40cb
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.p2.extras.feature/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>org.eclipse.equinox.p2-parent</artifactId>
+    <groupId>org.eclipse</groupId>
+    <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+  </parent>
+  <groupId>org.eclipse</groupId>
+  <artifactId>org.eclipse.equinox.p2.extras.feature</artifactId>
+  <version>1.0.0.qualifier</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/eclipse/features/org.eclipse.equinox.p2.extras.feature/sourceTemplateFeature/build.properties b/eclipse/features/org.eclipse.equinox.p2.extras.feature/sourceTemplateFeature/build.properties
new file mode 100644
index 0000000..8586881
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.p2.extras.feature/sourceTemplateFeature/build.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2011 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+bin.includes = feature.xml,\
+               feature.properties
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.p2.extras.feature/sourceTemplateFeature/feature.properties b/eclipse/features/org.eclipse.equinox.p2.extras.feature/sourceTemplateFeature/feature.properties
new file mode 100644
index 0000000..5cdc2dd
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.p2.extras.feature/sourceTemplateFeature/feature.properties
@@ -0,0 +1,38 @@
+###############################################################################
+# Copyright (c) 2008, 2011 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Equinox p2 RCP Management Facilities
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org - Equinox
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=Source code for the Equinox provisioning platform
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2008, 2011 IBM Corporation and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+    IBM Corporation - initial API and implementation\n
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.p2.rcp.feature/.project b/eclipse/features/org.eclipse.equinox.p2.rcp.feature/.project
new file mode 100644
index 0000000..e46a3be
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.p2.rcp.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.equinox.p2.rcp.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/eclipse/features/org.eclipse.equinox.p2.rcp.feature/build.properties b/eclipse/features/org.eclipse.equinox.p2.rcp.feature/build.properties
new file mode 100644
index 0000000..b6cf6c3
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.p2.rcp.feature/build.properties
@@ -0,0 +1,15 @@
+###############################################################################
+# Copyright (c) 2011 EclipseSource Inc. and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     EclipseSource - initial API and implementation
+#     IBM Corporation - Ongoing development
+###############################################################################
+bin.includes = feature.xml,\
+               feature.properties,\
+               eclipse_update_120.jpg               
+src.includes = license.html,epl-v10.html
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.cvs/eclipse_update_120.jpg b/eclipse/features/org.eclipse.equinox.p2.rcp.feature/eclipse_update_120.jpg
similarity index 100%
copy from eclipse/features/org.eclipse.cvs/eclipse_update_120.jpg
copy to eclipse/features/org.eclipse.equinox.p2.rcp.feature/eclipse_update_120.jpg
diff --git a/eclipse/features/org.eclipse.equinox.p2.rcp.feature/feature.properties b/eclipse/features/org.eclipse.equinox.p2.rcp.feature/feature.properties
new file mode 100644
index 0000000..bffd487
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.p2.rcp.feature/feature.properties
@@ -0,0 +1,35 @@
+###############################################################################
+# Copyright (c) 2011 EclipseSource Inc. and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     EclipseSource - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Equinox p2 RCP Management Facilities
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org - Equinox
+
+description=Provides SWT based UI component for p2.
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2011 EclipseSource Inc. and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+    EclipseSource - initial API and implementation\n
+################ end of copyright property ####################################
diff --git a/eclipse/features/org.eclipse.equinox.p2.rcp.feature/feature.xml b/eclipse/features/org.eclipse.equinox.p2.rcp.feature/feature.xml
new file mode 100644
index 0000000..c25b66a
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.p2.rcp.feature/feature.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.equinox.p2.rcp.feature"
+      label="%featureName"
+      version="1.0.0.qualifier"
+      provider-name="%providerName"
+      image="eclipse_update_120.jpg"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
+
+   <description>
+      %description
+   </description>
+
+   <copyright url="%copyrightURL">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <includes
+         id="org.eclipse.equinox.p2.core.feature"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.ui.sdk.scheduler"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.updatechecker"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.security.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.ui.sdk"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/eclipse/features/org.eclipse.equinox.p2.rcp.feature/sourceTemplateFeature/build.properties b/eclipse/features/org.eclipse.equinox.p2.rcp.feature/sourceTemplateFeature/build.properties
new file mode 100644
index 0000000..8586881
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.p2.rcp.feature/sourceTemplateFeature/build.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2011 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+bin.includes = feature.xml,\
+               feature.properties
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.p2.rcp.feature/sourceTemplateFeature/feature.properties b/eclipse/features/org.eclipse.equinox.p2.rcp.feature/sourceTemplateFeature/feature.properties
new file mode 100644
index 0000000..51f1c65
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.p2.rcp.feature/sourceTemplateFeature/feature.properties
@@ -0,0 +1,38 @@
+###############################################################################
+# Copyright (c) 2008, 2011 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Equinox p2 RCP Management Facilities Source
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org - Equinox
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=Source code for the Equinox provisioning platform
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2008, 2011 IBM Corporation and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+    IBM Corporation - initial API and implementation\n
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.p2.sdk/build.properties b/eclipse/features/org.eclipse.equinox.p2.sdk/build.properties
index be846fa..fb595f4 100644
--- a/eclipse/features/org.eclipse.equinox.p2.sdk/build.properties
+++ b/eclipse/features/org.eclipse.equinox.p2.sdk/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2009, 2010 EclipseSource and others.
+# Copyright (c) 2009, 2011 EclipseSource and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -9,7 +9,7 @@
 #     EclipseSource - initial API and implementation
 #		IBM - Ongoing changes
 ###############################################################################
-bin.includes = feature.xml,license.html,epl-v10.html,license.html,feature.properties
+bin.includes = feature.xml,feature.properties
 
 generate.plugin at org.apache.commons.codec.source=org.apache.commons.codec
 generate.plugin at org.apache.commons.httpclient.source=org.apache.commons.httpclient
@@ -35,7 +35,6 @@ generate.plugin at org.eclipse.equinox.p2.extensionlocation.source=org.eclipse.equi
 generate.plugin at org.eclipse.equinox.p2.garbagecollector.source=org.eclipse.equinox.p2.garbagecollector
 generate.plugin at org.eclipse.equinox.p2.installer.source=org.eclipse.equinox.p2.installer
 generate.plugin at org.eclipse.equinox.p2.jarprocessor.source=org.eclipse.equinox.p2.jarprocessor
-generate.plugin at org.eclipse.equinox.p2.metadata.generator.source=org.eclipse.equinox.p2.metadata.generator
 generate.plugin at org.eclipse.equinox.p2.metadata.repository.source=org.eclipse.equinox.p2.metadata.repository
 generate.plugin at org.eclipse.equinox.p2.metadata.source=org.eclipse.equinox.p2.metadata
 generate.plugin at org.eclipse.equinox.p2.operations.source=org.eclipse.equinox.p2.operations
@@ -48,6 +47,7 @@ generate.plugin at org.eclipse.equinox.p2.touchpoint.eclipse.source=org.eclipse.equ
 generate.plugin at org.eclipse.equinox.p2.touchpoint.natives.source=org.eclipse.equinox.p2.touchpoint.natives
 generate.plugin at org.eclipse.equinox.p2.ui.admin.rcp.source=org.eclipse.equinox.p2.ui.admin.rcp
 generate.plugin at org.eclipse.equinox.p2.ui.admin.source=org.eclipse.equinox.p2.ui.admin
+generate.plugin at org.eclipse.equinox.p2.ui.importexport.source=org.eclipse.equinox.p2.ui.importexport
 generate.plugin at org.eclipse.equinox.p2.ui.sdk.scheduler.source=org.eclipse.equinox.p2.ui.sdk.scheduler
 generate.plugin at org.eclipse.equinox.p2.ui.sdk.source=org.eclipse.equinox.p2.ui.sdk
 generate.plugin at org.eclipse.equinox.p2.ui.source=org.eclipse.equinox.p2.ui
@@ -55,3 +55,4 @@ generate.plugin at org.eclipse.equinox.p2.updatechecker.source=org.eclipse.equinox.
 generate.plugin at org.eclipse.equinox.p2.updatesite.source=org.eclipse.equinox.p2.updatesite
 generate.plugin at org.eclipse.equinox.simpleconfigurator.manipulator.source=org.eclipse.equinox.simpleconfigurator.manipulator
 generate.plugin at org.eclipse.equinox.simpleconfigurator.source=org.eclipse.equinox.simpleconfigurator
+generate.plugin at org.eclipse.equinox.p2.publisher.eclipse.source=org.eclipse.equinox.p2.publisher.eclipse
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.p2.sdk/epl-v10.html b/eclipse/features/org.eclipse.equinox.p2.sdk/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/eclipse/features/org.eclipse.equinox.p2.sdk/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.p2.sdk/feature.properties b/eclipse/features/org.eclipse.equinox.p2.sdk/feature.properties
old mode 100644
new mode 100755
index 0753b2f..6ad4d09
--- a/eclipse/features/org.eclipse.equinox.p2.sdk/feature.properties
+++ b/eclipse/features/org.eclipse.equinox.p2.sdk/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2009, 2010 EclipseSource and others.
+# Copyright (c) 2009, 2011 EclipseSource and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -18,7 +18,7 @@
 featureName=Equinox p2 SDK
 
 # "providerName" property - name of the company that provides the feature
-providerName=Eclipse Equinox Project
+providerName=Eclipse.org - Equinox
 
 # "updateSiteName" property - label for the update site
 updateSiteName=The Equinox Project Repository
@@ -40,135 +40,4 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 Contributors:\n\
     EclipseSource - initial API and implementation\n
     IBM - ongoing development\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.p2.sdk/feature.xml b/eclipse/features/org.eclipse.equinox.p2.sdk/feature.xml
index c5b9753..9f734fb 100644
--- a/eclipse/features/org.eclipse.equinox.p2.sdk/feature.xml
+++ b/eclipse/features/org.eclipse.equinox.p2.sdk/feature.xml
@@ -2,8 +2,10 @@
 <feature
       id="org.eclipse.equinox.p2.sdk"
       label="%featureName"
-      version="3.6.2.qualifier"
-      provider-name="%providerName">
+      version="3.7.0.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
 
    <description>
       %description
@@ -225,20 +227,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.equinox.p2.metadata.generator"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.metadata.generator.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.equinox.p2.metadata.repository"
          download-size="0"
          install-size="0"
@@ -370,7 +358,21 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
+         
+   <plugin
+         id="org.eclipse.equinox.p2.ui.importexport"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+    <plugin
+         id="org.eclipse.equinox.p2.ui.importexport.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
    <plugin
          id="org.eclipse.equinox.p2.ui"
          download-size="0"
@@ -654,4 +656,25 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.equinox.p2.transport.ecf"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.publisher.eclipse"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="org.eclipse.equinox.p2.publisher.eclipse.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
 </feature>
diff --git a/eclipse/features/org.eclipse.equinox.p2.sdk/license.html b/eclipse/features/org.eclipse.equinox.p2.sdk/license.html
deleted file mode 100644
index 7ed55df..0000000
--- a/eclipse/features/org.eclipse.equinox.p2.sdk/license.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/eclipse/features/org.eclipse.equinox.p2.sdk/pom.xml b/eclipse/features/org.eclipse.equinox.p2.sdk/pom.xml
new file mode 100644
index 0000000..d53b10f
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.p2.sdk/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>org.eclipse.equinox.p2-parent</artifactId>
+    <groupId>org.eclipse</groupId>
+    <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+  </parent>
+  <groupId>org.eclipse</groupId>
+  <artifactId>org.eclipse.equinox.p2.sdk</artifactId>
+  <version>1.0.0.qualifier</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/eclipse/features/org.eclipse.equinox.p2.user.ui/build.properties b/eclipse/features/org.eclipse.equinox.p2.user.ui/build.properties
index 9e53b4e..33ddf03 100644
--- a/eclipse/features/org.eclipse.equinox.p2.user.ui/build.properties
+++ b/eclipse/features/org.eclipse.equinox.p2.user.ui/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
+# Copyright (c) 2008, 2011 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -9,8 +9,5 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = feature.xml,\
-               license.html,\
-               epl-v10.html,\
                feature.properties,\
-               eclipse_update_120.jpg
-src.includes = license.html,epl-v10.html
+               eclipse_update_120.jpg
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.p2.user.ui/epl-v10.html b/eclipse/features/org.eclipse.equinox.p2.user.ui/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/eclipse/features/org.eclipse.equinox.p2.user.ui/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.p2.user.ui/feature.properties b/eclipse/features/org.eclipse.equinox.p2.user.ui/feature.properties
index 2e92995..6f8067d 100644
--- a/eclipse/features/org.eclipse.equinox.p2.user.ui/feature.properties
+++ b/eclipse/features/org.eclipse.equinox.p2.user.ui/feature.properties
@@ -1,14 +1,24 @@
+###############################################################################
+# Copyright (c) 2011 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 # "featureName" property - name of the feature
-featureName=Equinox p2 Provisioning 
+featureName=Equinox p2 Provisioning for IDEs.
 
 # "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
+providerName=Eclipse.org - Equinox
 
 # "updateSiteName" property - label for the update site
 updateSiteName=The Eclipse Project Updates
 
 # "description" property - description of the feature
-description=Eclipse Provisioning Platform
+description=Eclipse p2 Provisioning Platform for use in IDE related scenarios
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
@@ -20,135 +30,4 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.p2.user.ui/feature.xml b/eclipse/features/org.eclipse.equinox.p2.user.ui/feature.xml
index a65d54e..c2507b9 100644
--- a/eclipse/features/org.eclipse.equinox.p2.user.ui/feature.xml
+++ b/eclipse/features/org.eclipse.equinox.p2.user.ui/feature.xml
@@ -2,9 +2,11 @@
 <feature
       id="org.eclipse.equinox.p2.user.ui"
       label="%featureName"
-      version="2.0.1.qualifier"
+      version="2.1.1.qualifier"
       provider-name="%providerName"
-      image="eclipse_update_120.jpg">
+      image="eclipse_update_120.jpg"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
 
    <description>
       %description
@@ -18,153 +20,18 @@
       %license
    </license>
 
-   <plugin
-         id="org.eclipse.equinox.p2.director"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.engine"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.jarprocessor"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.metadata"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.metadata.repository"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.artifact.repository"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.touchpoint.eclipse"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.touchpoint.natives"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.frameworkadmin"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.frameworkadmin.equinox"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.console"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.simpleconfigurator.manipulator"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.ui.sdk"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.ui.sdk.scheduler"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.updatechecker"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.garbagecollector"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.directorywatcher"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.reconciler.dropins"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.metadata.generator"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
+   <includes
+         id="org.eclipse.equinox.p2.core.feature"
+         version="0.0.0"/>     
+ 
+   <includes
+         id="org.eclipse.equinox.p2.extras.feature"
+         version="0.0.0"/>
+         
+    <includes
+         id="org.eclipse.equinox.p2.rcp.feature"
+         version="0.0.0"/>
+  
    <plugin
          id="org.eclipse.equinox.p2.updatesite"
          download-size="0"
@@ -173,157 +40,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.sat4j.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.sat4j.pb"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.security"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.security.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.extensionlocation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.director.app"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.publisher"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.repository.tools"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.repository"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ecf"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ecf.filetransfer"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ecf.identity"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ecf.provider.filetransfer"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ecf.provider.filetransfer.ssl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ecf.provider.filetransfer.httpclient"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ecf.ssl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.codec"
-         download-size="0"
-         install-size="0"
-         version="1.3.0.qualifier"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.httpclient"
-         download-size="0"
-         install-size="0"
-         version="3.1.0.qualifier"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.logging"
-         download-size="0"
-         install-size="0"
-         version="1.0.4.qualifier"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.operations"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.ql"
+         id="org.eclipse.equinox.p2.ui.importexport"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/eclipse/features/org.eclipse.equinox.p2.user.ui/license.html b/eclipse/features/org.eclipse.equinox.p2.user.ui/license.html
deleted file mode 100644
index 61d632d..0000000
--- a/eclipse/features/org.eclipse.equinox.p2.user.ui/license.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.p2.user.ui/sourceTemplateFeature/build.properties b/eclipse/features/org.eclipse.equinox.p2.user.ui/sourceTemplateFeature/build.properties
index 5278417..b5672da 100644
--- a/eclipse/features/org.eclipse.equinox.p2.user.ui/sourceTemplateFeature/build.properties
+++ b/eclipse/features/org.eclipse.equinox.p2.user.ui/sourceTemplateFeature/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
+# Copyright (c) 2008, 2011 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -9,8 +9,10 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
 feature.xml,\
 feature.properties,\
-license.html
+eclipse_update_120.jpg
+
+generate.feature at org.eclipse.equinox.p2.extras.feature.source=org.eclipse.equinox.p2.extras.feature
+generate.feature at org.eclipse.equinox.p2.rcp.feature.source=org.eclipse.equinox.p2.rcp.feature
+generate.feature at org.eclipse.equinox.p2.core.feature.source=org.eclipse.equinox.p2.core.feature
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.p2.user.ui/sourceTemplateFeature/epl-v10.html b/eclipse/features/org.eclipse.equinox.p2.user.ui/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/eclipse/features/org.eclipse.equinox.p2.user.ui/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.p2.user.ui/sourceTemplateFeature/feature.properties b/eclipse/features/org.eclipse.equinox.p2.user.ui/sourceTemplateFeature/feature.properties
index cd4e3c5..f7c0cc4 100644
--- a/eclipse/features/org.eclipse.equinox.p2.user.ui/sourceTemplateFeature/feature.properties
+++ b/eclipse/features/org.eclipse.equinox.p2.user.ui/sourceTemplateFeature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2008, 2009 IBM Corporation and others.
+# Copyright (c) 2008, 2011 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -21,7 +21,6 @@ featureName=Eclipse p2 Provisioning Developer Resources
 providerName=Eclipse.org
 
 # "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Project Updates
 
 # "description" property - description of the feature
 description=Source code for the Equinox provisioning platform
@@ -36,135 +35,4 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.p2.user.ui/sourceTemplateFeature/license.html b/eclipse/features/org.eclipse.equinox.p2.user.ui/sourceTemplateFeature/license.html
deleted file mode 100644
index 61d632d..0000000
--- a/eclipse/features/org.eclipse.equinox.p2.user.ui/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.sdk/.project b/eclipse/features/org.eclipse.equinox.sdk/.project
old mode 100644
new mode 100755
diff --git a/eclipse/features/org.eclipse.equinox.sdk/build.properties b/eclipse/features/org.eclipse.equinox.sdk/build.properties
old mode 100644
new mode 100755
index 67218f2..c9efdba
--- a/eclipse/features/org.eclipse.equinox.sdk/build.properties
+++ b/eclipse/features/org.eclipse.equinox.sdk/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2009 EclipseSource and others.
+# Copyright (c) 2009, 2011 EclipseSource and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -8,4 +8,4 @@
 # Contributors:
 #     EclipseSource - initial API and implementation
 ###############################################################################
-bin.includes = feature.xml,license.html,epl-v10.html,license.html,feature.properties
\ No newline at end of file
+bin.includes = feature.xml,feature.properties
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.sdk/epl-v10.html b/eclipse/features/org.eclipse.equinox.sdk/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/eclipse/features/org.eclipse.equinox.sdk/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.sdk/feature.properties b/eclipse/features/org.eclipse.equinox.sdk/feature.properties
index e07bdb6..f76fd7c 100644
--- a/eclipse/features/org.eclipse.equinox.sdk/feature.properties
+++ b/eclipse/features/org.eclipse.equinox.sdk/feature.properties
@@ -21,9 +21,6 @@ featureName=Equinox Target Components
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse Equinox Project
 
-# "updateSiteName" property - label for the update site
-updateSiteName=The Equinox Project Repository
-
 # "description" property - description of the feature
 description=All of the bundles and source that are produced by the Equinox project.  \
 This includes basic OSGi framework support, all implemented compendium services, \
@@ -34,7 +31,7 @@ deployed with end-user systems.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2009, 2011 EclipseSource and others.\n\
+Copyright (c) 2009, 2010 EclipseSource and others.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
@@ -42,135 +39,4 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
     EclipseSource - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
\ No newline at end of file
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.sdk/feature.xml b/eclipse/features/org.eclipse.equinox.sdk/feature.xml
old mode 100644
new mode 100755
index e172d16..6e20fa3
--- a/eclipse/features/org.eclipse.equinox.sdk/feature.xml
+++ b/eclipse/features/org.eclipse.equinox.sdk/feature.xml
@@ -2,9 +2,11 @@
 <feature
       id="org.eclipse.equinox.sdk"
       label="%featureName"
-      version="3.6.2.qualifier"
-      provider-name="%providerName">
-
+      version="3.7.0.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
+      
    <description>
       %description
    </description>
@@ -39,6 +41,27 @@
 
    <includes
          id="org.eclipse.equinox.weaving.sdk"
+         version="0.0.0"/>  
+         
+   <includes
+         id="org.eclipse.equinox.core.feature"
          version="0.0.0"/>
+   
+   <includes
+         id="org.eclipse.equinox.p2.core.feature"
+         version="0.0.0"/>
+         
+   <includes
+         id="org.eclipse.equinox.p2.extras.feature"
+         version="0.0.0"/>
+         
+   <includes
+         id="org.eclipse.equinox.p2.rcp.feature"
+         version="0.0.0"/>
+         
+   <includes
+         id="org.eclipse.core.runtime.feature"
+         version="0.0.0"/>  
+      
 
 </feature>
diff --git a/eclipse/features/org.eclipse.equinox.sdk/license.html b/eclipse/features/org.eclipse.equinox.sdk/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/eclipse/features/org.eclipse.equinox.sdk/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/eclipse/features/org.eclipse.equinox.server.core/build.properties b/eclipse/features/org.eclipse.equinox.server.core/build.properties
index 2cbd854..8586881 100644
--- a/eclipse/features/org.eclipse.equinox.server.core/build.properties
+++ b/eclipse/features/org.eclipse.equinox.server.core/build.properties
@@ -1,3 +1,12 @@
+###############################################################################
+# Copyright (c) 2011 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = feature.xml,\
-               feature.properties,\
-               license.html
+               feature.properties
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.server.core/feature.properties b/eclipse/features/org.eclipse.equinox.server.core/feature.properties
index 16cfd21..5f364ba 100644
--- a/eclipse/features/org.eclipse.equinox.server.core/feature.properties
+++ b/eclipse/features/org.eclipse.equinox.server.core/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2010 IBM, Composent, Inc. and others.
+# Copyright (c) 2010, 2011 IBM, Composent, Inc. and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -30,135 +30,4 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
     IBM - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.server.core/feature.xml b/eclipse/features/org.eclipse.equinox.server.core/feature.xml
index 87e158d..13c09ef 100644
--- a/eclipse/features/org.eclipse.equinox.server.core/feature.xml
+++ b/eclipse/features/org.eclipse.equinox.server.core/feature.xml
@@ -2,9 +2,11 @@
 <feature
       id="org.eclipse.equinox.server.core"
       label="%featureName"
-      version="1.0.1.qualifier"
-      provider-name="%providerName">
-
+      version="1.1.0.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
+       
    <copyright>
       %copyright
    </copyright>
diff --git a/eclipse/features/org.eclipse.equinox.server.core/license.html b/eclipse/features/org.eclipse.equinox.server.core/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/eclipse/features/org.eclipse.equinox.server.core/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/eclipse/features/org.eclipse.equinox.server.jetty/build.properties b/eclipse/features/org.eclipse.equinox.server.jetty/build.properties
index 2cbd854..020c38b 100644
--- a/eclipse/features/org.eclipse.equinox.server.jetty/build.properties
+++ b/eclipse/features/org.eclipse.equinox.server.jetty/build.properties
@@ -1,3 +1,12 @@
+###############################################################################
+# Copyright (c) 2011 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = feature.xml,\
-               feature.properties,\
-               license.html
+               feature.properties
diff --git a/eclipse/features/org.eclipse.equinox.server.jetty/feature.properties b/eclipse/features/org.eclipse.equinox.server.jetty/feature.properties
index 4904648..87be371 100644
--- a/eclipse/features/org.eclipse.equinox.server.jetty/feature.properties
+++ b/eclipse/features/org.eclipse.equinox.server.jetty/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2010 IBM, Composent, Inc.  and others.
+# Copyright (c) 2010, 2011 IBM, Composent, Inc.  and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -30,135 +30,4 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
     IBM - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.server.jetty/feature.xml b/eclipse/features/org.eclipse.equinox.server.jetty/feature.xml
index 60b2409..0191e1c 100644
--- a/eclipse/features/org.eclipse.equinox.server.jetty/feature.xml
+++ b/eclipse/features/org.eclipse.equinox.server.jetty/feature.xml
@@ -2,8 +2,10 @@
 <feature
       id="org.eclipse.equinox.server.jetty"
       label="%featureName"
-      version="1.0.0.qualifier"
-      provider-name="%providerName">
+      version="1.0.100.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
 
    <copyright>
       %copyright
@@ -12,6 +14,7 @@
    <license url="%licenseURL">
       %license
    </license>
+
    <plugin
          id="javax.servlet"
          download-size="0"
diff --git a/eclipse/features/org.eclipse.equinox.server.jetty/license.html b/eclipse/features/org.eclipse.equinox.server.jetty/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/eclipse/features/org.eclipse.equinox.server.jetty/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/eclipse/features/org.eclipse.equinox.server.p2/build.properties b/eclipse/features/org.eclipse.equinox.server.p2/build.properties
index d34bea2..3b28786 100644
--- a/eclipse/features/org.eclipse.equinox.server.p2/build.properties
+++ b/eclipse/features/org.eclipse.equinox.server.p2/build.properties
@@ -1,12 +1,16 @@
+###############################################################################
+# Copyright (c) 2011 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = feature.xml,\
-               about.html,\
                build.properties,\
-               epl-v10.html,\
+               feature.properties
+src.includes = build.properties,\
                feature.properties,\
-               license.html
-src.includes = about.html,\
-               build.properties,\
-               epl-v10.html,\
-               feature.properties,\
-               feature.xml,\
-               license.html
+               feature.xml
diff --git a/eclipse/features/org.eclipse.equinox.server.p2/feature.properties b/eclipse/features/org.eclipse.equinox.server.p2/feature.properties
index 4271e98..fc734b0 100644
--- a/eclipse/features/org.eclipse.equinox.server.p2/feature.properties
+++ b/eclipse/features/org.eclipse.equinox.server.p2/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2010 IBM, Composent, Inc. and others.
+# Copyright (c) 2010, 2011 IBM, Composent, Inc. and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -30,135 +30,4 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
     IBM - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.server.p2/feature.xml b/eclipse/features/org.eclipse.equinox.server.p2/feature.xml
index 5d9fbd4..bcfa619 100644
--- a/eclipse/features/org.eclipse.equinox.server.p2/feature.xml
+++ b/eclipse/features/org.eclipse.equinox.server.p2/feature.xml
@@ -2,8 +2,10 @@
 <feature
       id="org.eclipse.equinox.server.p2"
       label="%featureName"
-      version="1.0.1.qualifier"
-      provider-name="%providerName">
+      version="1.1.0.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
 
    <copyright url="%copyrightURL">
       %copyright
@@ -240,4 +242,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.equinox.p2.transport.ecf"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/eclipse/features/org.eclipse.equinox.server.p2/license.html b/eclipse/features/org.eclipse.equinox.server.p2/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/eclipse/features/org.eclipse.equinox.server.p2/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/eclipse/features/org.eclipse.equinox.server.servletbridge/build.properties b/eclipse/features/org.eclipse.equinox.server.servletbridge/build.properties
index 0bb82c9..170d1ec 100644
--- a/eclipse/features/org.eclipse.equinox.server.servletbridge/build.properties
+++ b/eclipse/features/org.eclipse.equinox.server.servletbridge/build.properties
@@ -1,5 +1,14 @@
+###############################################################################
+# Copyright (c) 2011 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 root=rootfiles
 bin.includes = feature.xml,\
                rootfiles/,\
-               license.html,\
                feature.properties
diff --git a/eclipse/features/org.eclipse.equinox.server.servletbridge/feature.properties b/eclipse/features/org.eclipse.equinox.server.servletbridge/feature.properties
index dee3d74..0a3dc2b 100644
--- a/eclipse/features/org.eclipse.equinox.server.servletbridge/feature.properties
+++ b/eclipse/features/org.eclipse.equinox.server.servletbridge/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2010 IBM, Composent, Inc. and others.
+# Copyright (c) 2010, 2011 IBM, Composent, Inc. and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -30,135 +30,4 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
     IBM - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.server.servletbridge/feature.xml b/eclipse/features/org.eclipse.equinox.server.servletbridge/feature.xml
index 82874e4..c37476b 100644
--- a/eclipse/features/org.eclipse.equinox.server.servletbridge/feature.xml
+++ b/eclipse/features/org.eclipse.equinox.server.servletbridge/feature.xml
@@ -2,8 +2,10 @@
 <feature
       id="org.eclipse.equinox.server.servletbridge"
       label="%featureName"
-      version="1.0.0.qualifier"
-      provider-name="%providerName">
+      version="1.0.100.qualifier"
+      provider-name="%providerName" 
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
 
    <copyright>
       %copyright
diff --git a/eclipse/features/org.eclipse.equinox.server.servletbridge/license.html b/eclipse/features/org.eclipse.equinox.server.servletbridge/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/eclipse/features/org.eclipse.equinox.server.servletbridge/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/eclipse/features/org.eclipse.equinox.server.simple/build.properties b/eclipse/features/org.eclipse.equinox.server.simple/build.properties
index 2cbd854..020c38b 100644
--- a/eclipse/features/org.eclipse.equinox.server.simple/build.properties
+++ b/eclipse/features/org.eclipse.equinox.server.simple/build.properties
@@ -1,3 +1,12 @@
+###############################################################################
+# Copyright (c) 2011 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = feature.xml,\
-               feature.properties,\
-               license.html
+               feature.properties
diff --git a/eclipse/features/org.eclipse.equinox.server.simple/feature.properties b/eclipse/features/org.eclipse.equinox.server.simple/feature.properties
index 3f8befb..4283002 100644
--- a/eclipse/features/org.eclipse.equinox.server.simple/feature.properties
+++ b/eclipse/features/org.eclipse.equinox.server.simple/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2010 IBM, Composent, Inc. and others.
+# Copyright (c) 2010, 2011 IBM, Composent, Inc. and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -30,135 +30,4 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
     IBM - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.server.simple/feature.xml b/eclipse/features/org.eclipse.equinox.server.simple/feature.xml
index 25d59c0..f8de682 100644
--- a/eclipse/features/org.eclipse.equinox.server.simple/feature.xml
+++ b/eclipse/features/org.eclipse.equinox.server.simple/feature.xml
@@ -2,9 +2,11 @@
 <feature
       id="org.eclipse.equinox.server.simple"
       label="%featureName"
-      version="1.0.0.qualifier"
-      provider-name="%providerName">
-
+      version="1.0.100.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
+      
    <copyright>
       %copyright
    </copyright>
diff --git a/eclipse/features/org.eclipse.equinox.server.simple/license.html b/eclipse/features/org.eclipse.equinox.server.simple/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/eclipse/features/org.eclipse.equinox.server.simple/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/eclipse/features/org.eclipse.equinox.serverside.sdk/build.properties b/eclipse/features/org.eclipse.equinox.serverside.sdk/build.properties
index 36874c0..d31807c 100644
--- a/eclipse/features/org.eclipse.equinox.serverside.sdk/build.properties
+++ b/eclipse/features/org.eclipse.equinox.serverside.sdk/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2009 EclipseSource and others.
+# Copyright (c) 2009, 2011 EclipseSource and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
 # Contributors:
 #     EclipseSource - initial API and implementation
 ###############################################################################
-bin.includes = feature.xml,license.html,epl-v10.html,license.html,feature.properties
+bin.includes = feature.xml,feature.properties
 
 generate.plugin at javax.servlet.jsp.source=javax.servlet.jsp
 generate.plugin at javax.servlet.source=javax.servlet
diff --git a/eclipse/features/org.eclipse.equinox.serverside.sdk/epl-v10.html b/eclipse/features/org.eclipse.equinox.serverside.sdk/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/eclipse/features/org.eclipse.equinox.serverside.sdk/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.serverside.sdk/feature.properties b/eclipse/features/org.eclipse.equinox.serverside.sdk/feature.properties
old mode 100644
new mode 100755
index 38d7b1d..d465011
--- a/eclipse/features/org.eclipse.equinox.serverside.sdk/feature.properties
+++ b/eclipse/features/org.eclipse.equinox.serverside.sdk/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2009 EclipseSource and others.
+# Copyright (c) 2009, 2011 EclipseSource and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -41,135 +41,4 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
     EclipseSource - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.serverside.sdk/feature.xml b/eclipse/features/org.eclipse.equinox.serverside.sdk/feature.xml
index 2292b9a..469fd16 100644
--- a/eclipse/features/org.eclipse.equinox.serverside.sdk/feature.xml
+++ b/eclipse/features/org.eclipse.equinox.serverside.sdk/feature.xml
@@ -2,8 +2,10 @@
 <feature
       id="org.eclipse.equinox.serverside.sdk"
       label="%featureName"
-      version="3.6.1.qualifier"
-      provider-name="%providerName">
+      version="3.7.0.qualifier"
+      provider-name="%providerName" 
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
 
    <description>
       %description
@@ -83,7 +85,7 @@
          id="org.eclipse.equinox.http.jetty"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.0.100.qualifier"
          unpack="false"/>
 
    <plugin
diff --git a/eclipse/features/org.eclipse.equinox.serverside.sdk/license.html b/eclipse/features/org.eclipse.equinox.serverside.sdk/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/eclipse/features/org.eclipse.equinox.serverside.sdk/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/eclipse/features/org.eclipse.equinox.starterkit.product.feature/.project b/eclipse/features/org.eclipse.equinox.starterkit.product.feature/.project
new file mode 100644
index 0000000..ec88986
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.starterkit.product.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.equinox.starterkit.product.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/eclipse/features/org.eclipse.equinox.starterkit.product.feature/build.properties b/eclipse/features/org.eclipse.equinox.starterkit.product.feature/build.properties
new file mode 100644
index 0000000..1b27871
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.starterkit.product.feature/build.properties
@@ -0,0 +1,14 @@
+###############################################################################
+# Copyright (c) 2011 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+bin.includes = feature.xml,\
+               feature.properties               
+root.win32.win32.x86=file:executables/win32.win32.x86/eclipsec.exe
+root.win32.win32.x86_64=file:executables/win32.win32.x86_64/eclipsec.exe
diff --git a/eclipse/features/org.eclipse.equinox.starterkit.product.feature/feature.properties b/eclipse/features/org.eclipse.equinox.starterkit.product.feature/feature.properties
new file mode 100644
index 0000000..99f5c06
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.starterkit.product.feature/feature.properties
@@ -0,0 +1,33 @@
+###############################################################################
+# Copyright (c) 2010, 2011 EclipseSource Inc. and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     EclipseSource - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Equinox OSGi Starter Kit Configuration
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse Equinox Project
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2010 EclipseSource and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+    EclipseSource - initial API and implementation\n
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.starterkit.product.feature/feature.xml b/eclipse/features/org.eclipse.equinox.starterkit.product.feature/feature.xml
new file mode 100644
index 0000000..b82ce8f
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.starterkit.product.feature/feature.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.equinox.starterkit.product.feature"
+      label="%featureName"
+      version="1.0.0.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
+      
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <includes
+         id="org.eclipse.equinox.p2.core.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.equinox.core.feature"
+         version="0.0.0"/>
+
+</feature>
diff --git a/eclipse/features/org.eclipse.equinox.starterkit.product.feature/product/EclipseRTOSGiStarterKit.product b/eclipse/features/org.eclipse.equinox.starterkit.product.feature/product/EclipseRTOSGiStarterKit.product
new file mode 100644
index 0000000..90d2add
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.starterkit.product.feature/product/EclipseRTOSGiStarterKit.product
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="EclipseRT OSGi Starter Kit" uid="org.eclipse.rt.osgistarterkit.product" version="1.0.0. at qualifier@" useFeatures="true" includeLaunchers="true">
+
+   <configIni use="default">
+   </configIni>
+
+   <launcherArgs>
+      <programArgs>-console -nosplash -consolelog -noexit</programArgs>
+      <vmArgs>-Declipse.ignoreApp=true</vmArgs>
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+   </launcherArgs>
+
+   <windowImages/>
+
+   <launcher name="rt">
+      <macosx icon="/org.eclipse.equinox.starterkit.product.feature/rt.icns"/>
+      <solaris/>
+      <win useIco="true">
+         <ico path="/org.eclipse.equinox.starterkit.product.feature/rt.ico"/>
+         <bmp/>
+      </win>
+   </launcher>
+
+   <vm>
+   </vm>
+
+   <license>
+        <url>http://eclipse.org/legal/epl/notice.php</url>
+        <text>
+   Eclipse Foundation Software User Agreement
+April 14, 2010
+
+Usage Of Content
+
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS
+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+BELOW, THEN YOU MAY NOT USE THE CONTENT.
+
+Applicable Licenses
+
+Unless otherwise indicated, all Content made available by the
+Eclipse Foundation is provided to you under the terms and conditions of
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.
+For purposes of the EPL, "Program" will mean the Content.
+
+Content includes, but is not limited to, source code, object code,
+documentation and other files maintained in the Eclipse Foundation source code
+repository ("Repository") in software modules ("Modules") and made available
+as downloadable archives ("Downloads").
+
+       - Content may be structured and packaged into modules to facilitate delivering,
+         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),
+         plug-in fragments ("Fragments"), and features ("Features").
+       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)
+         in a directory named "plugins".
+       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.
+         Each Feature may be packaged as a sub-directory in a directory named "features".
+         Within a Feature, files named "feature.xml" may contain a list of the names and version
+         numbers of the Plug-ins and/or Fragments associated with that Feature.
+       - Features may also include other Features ("Included Features"). Within a Feature, files
+         named "feature.xml" may contain a list of the names and version numbers of Included Features.
+
+The terms and conditions governing Plug-ins and Fragments should be
+contained in files named "about.html" ("Abouts"). The terms and
+conditions governing Features and Included Features should be contained
+in files named "license.html" ("Feature Licenses"). Abouts and Feature
+Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:
+
+       - The top-level (root) directory
+       - Plug-in and Fragment directories
+       - Inside Plug-ins and Fragments packaged as JARs
+       - Sub-directories of the directory named "src" of certain Plug-ins
+       - Feature directories
+
+Note: if a Feature made available by the Eclipse Foundation is installed using the
+Provisioning Technology (as defined below), you must agree to a license ("Feature 
+Update License") during the installation process. If the Feature contains
+Included Features, the Feature Update License should either provide you
+with the terms and conditions governing the Included Features or inform
+you where you can locate them. Feature Update Licenses may be found in
+the "license" property of files named "feature.properties" found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the
+terms and conditions (or references to such terms and conditions) that
+govern your use of the associated Content in that directory.
+
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
+
+       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
+       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
+       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
+       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
+       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
+
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License
+is provided, please contact the Eclipse Foundation to determine what terms and conditions
+govern that particular Content.
+
+Use of Provisioning Technology
+
+The Eclipse Foundation makes available provisioning software, examples of which include,
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for
+the purpose of allowing users to install software, documentation, information and/or
+other materials (collectively "Installable Software"). This capability is provided with
+the intent of allowing such users to install, extend and update Eclipse-based products.
+Information about packaging Installable Software is available at
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").
+
+You may use Provisioning Technology to allow other parties to install Installable Software.
+You shall be responsible for enabling the applicable license agreements relating to the
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+in accordance with the Specification. By using Provisioning Technology in such a manner and
+making it available in accordance with the Specification, you further acknowledge your
+agreement to, and the acquisition of all necessary rights to permit the following:
+
+       1. A series of actions may occur ("Provisioning Process") in which a user may execute
+          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,
+          extending or updating the functionality of an Eclipse-based product.
+       2. During the Provisioning Process, the Provisioning Technology may cause third party
+          Installable Software or a portion thereof to be accessed and copied to the Target Machine.
+       3. Pursuant to the Specification, you will provide to the user the terms and conditions that
+          govern the use of the Installable Software ("Installable Software Agreement") and such
+          Installable Software Agreement shall be accessed from the Target Machine in accordance
+          with the Specification. Such Installable Software Agreement must inform the user of the
+          terms and conditions that govern the Installable Software and must solicit acceptance by
+          the end user in the manner prescribed in such Installable Software Agreement. Upon such
+          indication of agreement by the user, the provisioning Technology will complete installation
+          of the Installable Software.
+
+Cryptography
+
+Content may contain encryption software. The country in which you are
+currently may have restrictions on the import, possession, and use,
+and/or re-export to another country, of encryption software. BEFORE
+using any encryption software, please check the country's laws,
+regulations and policies concerning the import, possession, or use, and
+re-export of encryption software, to see if this is permitted.
+
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
+         </text>
+   </license>
+
+   <plugins>
+   </plugins>
+
+   <features>
+      <feature id="org.eclipse.equinox.starterkit.product.feature"/>
+      <feature id="org.eclipse.osgi.configuration"/>
+   </features>
+
+   <configurations>
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.frameworkadmin.equinox" autoStart="true" startLevel="3" />
+      <plugin id="org.eclipse.equinox.p2.console" autoStart="true" startLevel="3" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator.manipulator" autoStart="true" startLevel="3" />
+      <property name="eclipse.ignoreApp" value="true" />
+      <property name="osgi.noShutdown" value="true" />
+   </configurations>
+
+</product>
diff --git a/eclipse/features/org.eclipse.equinox.starterkit.product.feature/product/p2.inf b/eclipse/features/org.eclipse.equinox.starterkit.product.feature/product/p2.inf
new file mode 100644
index 0000000..8818fac
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.starterkit.product.feature/product/p2.inf
@@ -0,0 +1,17 @@
+instructions.configure=
+requires.1.namespace=org.eclipse.equinox.p2.iu
+requires.1.name=toolingorg.eclipse.rt.osgistarterkit.macosx
+requires.1.filter=(osgi.os=macosx)
+requires.1.range=[1.0.0,1.0.0]
+requires.1.greedy=true
+
+units.1.id=toolingorg.eclipse.rt.osgistarterkit.macosx
+units.1.version=1.0.0
+units.1.provides.1.namespace=org.eclipse.equinox.p2.iu
+units.1.provides.1.name=toolingorg.eclipse.rt.osgistarterkit.macosx
+units.1.provides.1.version=1.0.0
+units.1.filter=(osgi.os=macosx)
+units.1.touchpoint.id=org.eclipse.equinox.p2.osgi
+units.1.touchpoint.version=1.0.0
+units.1.instructions.configure=ln(linkTarget:rt.app/Contents/MacOS/rt,targetDir:${installFolder},linkName:rt);
+
diff --git a/eclipse/features/org.eclipse.equinox.starterkit.product.feature/rt.icns b/eclipse/features/org.eclipse.equinox.starterkit.product.feature/rt.icns
new file mode 100644
index 0000000..f7c492d
Binary files /dev/null and b/eclipse/features/org.eclipse.equinox.starterkit.product.feature/rt.icns differ
diff --git a/eclipse/features/org.eclipse.equinox.starterkit.product.feature/rt.ico b/eclipse/features/org.eclipse.equinox.starterkit.product.feature/rt.ico
new file mode 100644
index 0000000..8ac4937
Binary files /dev/null and b/eclipse/features/org.eclipse.equinox.starterkit.product.feature/rt.ico differ
diff --git a/eclipse/features/org.eclipse.equinox.weaving.sdk/build.properties b/eclipse/features/org.eclipse.equinox.weaving.sdk/build.properties
index 11b7580..f1d0c0e 100644
--- a/eclipse/features/org.eclipse.equinox.weaving.sdk/build.properties
+++ b/eclipse/features/org.eclipse.equinox.weaving.sdk/build.properties
@@ -1,7 +1,15 @@
+###############################################################################
+# Copyright (c) 2011 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = feature.xml,\
-               epl-v10.html,\
-               feature.properties,\
-               license.html
+               feature.properties
 
 generate.plugin at org.eclipse.equinox.weaving.aspectj.source=org.eclipse.equinox.weaving.aspectj
 generate.plugin at org.eclipse.equinox.weaving.caching.source=org.eclipse.equinox.weaving.caching
diff --git a/eclipse/features/org.eclipse.equinox.weaving.sdk/epl-v10.html b/eclipse/features/org.eclipse.equinox.weaving.sdk/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/eclipse/features/org.eclipse.equinox.weaving.sdk/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.weaving.sdk/feature.properties b/eclipse/features/org.eclipse.equinox.weaving.sdk/feature.properties
old mode 100644
new mode 100755
index f93b673..9d6a11a
--- a/eclipse/features/org.eclipse.equinox.weaving.sdk/feature.properties
+++ b/eclipse/features/org.eclipse.equinox.weaving.sdk/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2009 IBM Corporation and others.
+# Copyright (c) 2009, 2011 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -37,134 +37,3 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 Contributors:\n\
     IBM - initial API and implementation\n
 ################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/eclipse/features/org.eclipse.equinox.weaving.sdk/feature.xml b/eclipse/features/org.eclipse.equinox.weaving.sdk/feature.xml
index 5011347..373e2e9 100644
--- a/eclipse/features/org.eclipse.equinox.weaving.sdk/feature.xml
+++ b/eclipse/features/org.eclipse.equinox.weaving.sdk/feature.xml
@@ -2,9 +2,11 @@
 <feature
       id="org.eclipse.equinox.weaving.sdk"
       label="%featureName"
-      version="1.0.0.qualifier"
-      provider-name="%providerName">
-
+      version="1.0.100.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
+      
    <description>
       %description
    </description>
diff --git a/eclipse/features/org.eclipse.equinox.weaving.sdk/license.html b/eclipse/features/org.eclipse.equinox.weaving.sdk/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/eclipse/features/org.eclipse.equinox.weaving.sdk/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/eclipse/features/org.eclipse.help/build.properties b/eclipse/features/org.eclipse.help/build.properties
index 1cf756c..67ee8a2 100644
--- a/eclipse/features/org.eclipse.help/build.properties
+++ b/eclipse/features/org.eclipse.help/build.properties
@@ -10,7 +10,5 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = feature.xml,\
-               license.html,\
-               epl-v10.html,\
                eclipse_update_120.jpg,\
                feature.properties
diff --git a/eclipse/features/org.eclipse.help/feature.properties b/eclipse/features/org.eclipse.help/feature.properties
index a2fbb4e..9407eaa 100644
--- a/eclipse/features/org.eclipse.help/feature.properties
+++ b/eclipse/features/org.eclipse.help/feature.properties
@@ -20,9 +20,6 @@ featureName=Eclipse Help System
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Project Updates
-
 # "description" property - description of the feature
 description=Eclipse help system.
 
@@ -36,135 +33,4 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
\ No newline at end of file
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.help/feature.xml b/eclipse/features/org.eclipse.help/feature.xml
index ab10824..4318c86 100644
--- a/eclipse/features/org.eclipse.help/feature.xml
+++ b/eclipse/features/org.eclipse.help/feature.xml
@@ -2,10 +2,12 @@
 <feature
       id="org.eclipse.help"
       label="%featureName"
-      version="1.2.1.qualifier"
+      version="1.3.0.qualifier"
       provider-name="%providerName"
-      plugin="org.eclipse.help.base">
-
+      plugin="org.eclipse.help.base"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">    
+      
    <description>
       %description
    </description>
@@ -18,6 +20,7 @@
       %license
    </license>
 
+   
    <plugin
          id="javax.servlet"
          download-size="0"
@@ -31,7 +34,7 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
+  
    <plugin
          id="org.apache.commons.el"
          download-size="0"
@@ -66,12 +69,19 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+         
+    <plugin
+         id="org.apache.lucene.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.equinox.http.jetty"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.0.100.qualifier"
          unpack="false"/>
 
    <plugin
@@ -122,19 +132,19 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
+   
    <plugin
          id="org.mortbay.jetty.server"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
+   
    <plugin
          id="org.mortbay.jetty.util"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
+  
 </feature>
diff --git a/eclipse/features/org.eclipse.help/license.html b/eclipse/features/org.eclipse.help/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/eclipse/features/org.eclipse.help/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/eclipse/features/org.eclipse.help/sourceTemplateFeature/build.properties b/eclipse/features/org.eclipse.help/sourceTemplateFeature/build.properties
deleted file mode 100644
index 2d6470e..0000000
--- a/eclipse/features/org.eclipse.help/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-#  Copyright (c) 2008, 2009 IBM Corporation and others.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
-# 
-#  Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
-
diff --git a/eclipse/features/org.eclipse.help/sourceTemplateFeature/epl-v10.html b/eclipse/features/org.eclipse.help/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/eclipse/features/org.eclipse.help/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.help/sourceTemplateFeature/feature.properties b/eclipse/features/org.eclipse.help/sourceTemplateFeature/feature.properties
index ce81b21..b6bac2b 100644
--- a/eclipse/features/org.eclipse.help/sourceTemplateFeature/feature.properties
+++ b/eclipse/features/org.eclipse.help/sourceTemplateFeature/feature.properties
@@ -20,15 +20,12 @@ featureName=Eclipse Help Developer Resources
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Project Updates
-
 # "description" property - description of the feature
 description=Source code for the Eclipse help system.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2000, 2009 IBM Corporation and others.\n\
+Copyright (c) 2000, 2010 IBM Corporation and others.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
@@ -36,135 +33,4 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
\ No newline at end of file
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.help/sourceTemplateFeature/license.html b/eclipse/features/org.eclipse.help/sourceTemplateFeature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/eclipse/features/org.eclipse.help/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/eclipse/features/org.eclipse.jdt/build.properties b/eclipse/features/org.eclipse.jdt/build.properties
index d4560d3..bb50a5e 100644
--- a/eclipse/features/org.eclipse.jdt/build.properties
+++ b/eclipse/features/org.eclipse.jdt/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2008 IBM Corporation and others.
+# Copyright (c) 2000, 2011 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -9,11 +9,9 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes=\
-epl-v10.html,\
 feature.xml,\
 feature.properties,\
-eclipse_update_120.jpg,\
-license.html
+eclipse_update_120.jpg
 
 root=rootfiles
 
diff --git a/eclipse/features/org.eclipse.jdt/epl-v10.html b/eclipse/features/org.eclipse.jdt/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/eclipse/features/org.eclipse.jdt/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.jdt/feature.properties b/eclipse/features/org.eclipse.jdt/feature.properties
index c94fe82..5472d80 100644
--- a/eclipse/features/org.eclipse.jdt/feature.properties
+++ b/eclipse/features/org.eclipse.jdt/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2010 IBM Corporation and others.
+# Copyright (c) 2000, 2011 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -20,15 +20,12 @@ featureName=Eclipse Java Development Tools
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Project Updates
-
 # "description" property - description of the feature
-description=Eclipse Java development tools. (Binary runtime and user documentation.)
+description=Eclipse Java development tools (binary runtime and user documentation).
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2000, 2010 IBM Corporation and others.\n\
+Copyright (c) 2000, 2011 IBM Corporation and others.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
@@ -36,135 +33,4 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
\ No newline at end of file
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.jdt/feature.xml b/eclipse/features/org.eclipse.jdt/feature.xml
index 3899b9f..8513aed 100644
--- a/eclipse/features/org.eclipse.jdt/feature.xml
+++ b/eclipse/features/org.eclipse.jdt/feature.xml
@@ -2,9 +2,11 @@
 <feature
       id="org.eclipse.jdt"
       label="%featureName"
-      version="3.6.2.qualifier"
+      version="3.7.0.qualifier"
       provider-name="%providerName"
-      image="eclipse_update_120.jpg">
+      image="eclipse_update_120.jpg" 
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
 
    <description>
       %description
@@ -24,7 +26,7 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.platform" version="3.6.2" match="greaterOrEqual"/>
+      <import feature="org.eclipse.platform" version="3.7.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
@@ -151,7 +153,7 @@
          id="org.junit"
          download-size="0"
          install-size="0"
-         version="4.8.1.qualifier"/>
+         version="4.8.2.qualifier"/>
 
    <plugin
          id="org.junit"
diff --git a/eclipse/features/org.eclipse.jdt/license.html b/eclipse/features/org.eclipse.jdt/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/eclipse/features/org.eclipse.jdt/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/eclipse/features/org.eclipse.jdt/rootfiles/notice.html b/eclipse/features/org.eclipse.jdt/rootfiles/notice.html
index c184ca3..dc5aefd 100644
--- a/eclipse/features/org.eclipse.jdt/rootfiles/notice.html
+++ b/eclipse/features/org.eclipse.jdt/rootfiles/notice.html
@@ -1,19 +1,18 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+
+
 
-<body lang="EN-US">
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Eclipse Foundation Software User Agreement</title>
+</head><body lang="EN-US">
 <h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
+<p>February 1, 2011</p>
 
 <h3>Usage Of Content</h3>
 
 <p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
    CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
    OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
    NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
@@ -21,43 +20,73 @@
 
 <h3>Applicable Licenses</h3>
 
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
+<p>Unless otherwise indicated, all Content made available by the Eclipse
+ Foundation is provided to you under the terms and conditions of the 
+Eclipse Public License Version 1.0
+   ("EPL").  A copy of the EPL is provided with this Content and is also
+ available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, "Program" will mean the Content.</p>
 
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
+<p>Content includes, but is not limited to, source code, object code, 
+documentation and other files maintained in the Eclipse Foundation 
+source code
+   repository ("Repository") in software modules ("Modules") and made 
+available as downloadable archives ("Downloads").</p>
 
 <ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+       <li>Content may be structured and packaged into modules to 
+facilitate delivering, extending, and upgrading the Content.  Typical 
+modules may include plug-ins ("Plug-ins"), plug-in fragments 
+("Fragments"), and features ("Features").</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or 
+Fragments and associated material.  Each Feature may be packaged as a 
+sub-directory in a directory named "features".  Within a Feature, files 
+named "feature.xml" may contain a list of the names and version numbers 
+of the Plug-ins
       and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
+       <li>Features may also include other Features ("Included 
+Features"). Within a Feature, files named "feature.xml" may contain a 
+list of the names and version numbers of Included Features.</li>
 </ul>
 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
+<p>The terms and conditions governing Plug-ins and Fragments should be 
+contained in files named "about.html" ("Abouts"). The terms and 
+conditions governing Features and
+Included Features should be contained in files named "license.html" 
+("Feature Licenses").  Abouts and Feature Licenses may be located in any
+ directory of a Download or Module
 including, but not limited to the following locations:</p>
 
 <ul>
        <li>The top-level (root) directory</li>
        <li>Plug-in and Fragment directories</li>
        <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
        <li>Feature directories</li>
 </ul>
 
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+<p>Note: if a Feature made available by the Eclipse Foundation is 
+installed using the Provisioning Technology (as defined below), you must
+ agree to a license ("Feature Update License") during the
+installation process.  If the Feature contains Included Features, the 
+Feature Update License should either provide you with the terms and 
+conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be 
+found in the "license" property of files named "feature.properties" 
+found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the 
+terms and conditions (or references to such terms and conditions) that 
+govern your use of the associated Content in
 that directory.</p>
 
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER 
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.
+  SOME OF THESE
 OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
 
 <ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
        <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
        <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
        <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
@@ -65,43 +94,69 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
        <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
 </ul>
 
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND 
+CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, 
+or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions 
+govern that particular Content.</p>
 
 
 <h3>Use of Provisioning Technology</h3>
 
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+<p>The Eclipse Foundation makes available provisioning software, 
+examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager ("Provisioning Technology") for the purpose of 
+allowing users to install software, documentation, information and/or
+   other materials (collectively "Installable Software"). This 
+capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about 
+packaging Installable Software is available at <a href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   ("Specification").</p>
+
+<p>You may use Provisioning Technology to allow other parties to install
+ Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to
+ be presented to, and accepted by, the users of the Provisioning 
+Technology
+   in accordance with the Specification. By using Provisioning 
+Technology in such a manner and making it available in accordance with 
+the
+   Specification, you further acknowledge your agreement to, and the 
+acquisition of all necessary rights to permit the following:</p>
 
 <ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+       <li>A series of actions may occur ("Provisioning Process") in 
+which a user may execute the Provisioning Technology
+       on a machine ("Target Machine") with the intent of installing, 
+extending or updating the functionality of an Eclipse-based
        product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       <li>During the Provisioning Process, the Provisioning Technology 
+may cause third party Installable Software or a portion thereof to be
        accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+       <li>Pursuant to the Specification, you will provide to the user 
+the terms and conditions that govern the use of the Installable
+       Software ("Installable Software Agreement") and such Installable 
+Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable 
+Software Agreement must inform the user of the terms and conditions that
+ govern
+       the Installable Software and must solicit acceptance by the end 
+user in the manner prescribed in such Installable Software Agreement. 
+Upon such
+       indication of agreement by the user, the provisioning Technology 
+will complete installation of the Installable Software.</li>
 </ol>
 
 <h3>Cryptography</h3>
 
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+<p>Content may contain encryption software. The country in which you are
+ currently may have restrictions on the import, possession, and use, 
+and/or re-export to
+   another country, of encryption software. BEFORE using any encryption 
+software, please check the country's laws, regulations and policies 
+concerning the import,
+   possession, or use, and re-export of encryption software, to see if 
+this is permitted.</p>
 
 <p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
+</body></html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.jdt/sourceTemplateFeature/epl-v10.html b/eclipse/features/org.eclipse.jdt/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/eclipse/features/org.eclipse.jdt/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.jdt/sourceTemplateFeature/feature.properties b/eclipse/features/org.eclipse.jdt/sourceTemplateFeature/feature.properties
index 67ad259..1dd505d 100644
--- a/eclipse/features/org.eclipse.jdt/sourceTemplateFeature/feature.properties
+++ b/eclipse/features/org.eclipse.jdt/sourceTemplateFeature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2010 IBM Corporation and others.
+# Copyright (c) 2000, 2011 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -20,15 +20,12 @@ featureName=Eclipse JDT Plug-in Developer Resources
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Project Updates
-
 # "description" property - description of the feature
 description=API documentation and source code zips for Eclipse Java development tools.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2000, 2010 IBM Corporation and others.\n\
+Copyright (c) 2000, 2011 IBM Corporation and others.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
@@ -36,135 +33,4 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
\ No newline at end of file
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.jdt/sourceTemplateFeature/license.html b/eclipse/features/org.eclipse.jdt/sourceTemplateFeature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/eclipse/features/org.eclipse.jdt/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/eclipse/features/org.eclipse.jdt/sourceTemplatePlugin/about.properties b/eclipse/features/org.eclipse.jdt/sourceTemplatePlugin/about.properties
index 02116f8..7c18b64 100644
--- a/eclipse/features/org.eclipse.jdt/sourceTemplatePlugin/about.properties
+++ b/eclipse/features/org.eclipse.jdt/sourceTemplatePlugin/about.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2010 IBM Corporation and others.
+# Copyright (c) 2000, 2011 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -19,6 +19,6 @@ blurb=Eclipse Java Development Tools SDK\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Eclipse contributors and others 2000, 2010.  All rights reserved.\n\
+(c) Copyright Eclipse contributors and others 2000, 2011.  All rights reserved.\n\
 Visit http://www.eclipse.org/jdt
 
diff --git a/eclipse/features/org.eclipse.license/.project b/eclipse/features/org.eclipse.license/.project
new file mode 100644
index 0000000..6bbbc54
--- /dev/null
+++ b/eclipse/features/org.eclipse.license/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.license</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/eclipse/features/org.eclipse.license/build.properties b/eclipse/features/org.eclipse.license/build.properties
new file mode 100644
index 0000000..2354b7b
--- /dev/null
+++ b/eclipse/features/org.eclipse.license/build.properties
@@ -0,0 +1,11 @@
+###############################################################################
+#  Copyright (c) 2000, 2009 IBM Corporation and others.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+# 
+#  Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+bin.includes=feature.xml,license.html,epl-v10.html,feature.properties,eclipse_update_120.jpg
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.license/epl-v10.html b/eclipse/features/org.eclipse.license/epl-v10.html
new file mode 100644
index 0000000..fd39122
--- /dev/null
+++ b/eclipse/features/org.eclipse.license/epl-v10.html
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>"Contribution" means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>"Contributor" means any person or entity that distributes
+the Program.</p>
+
+<p>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>"Program" means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
diff --git a/eclipse/features/org.eclipse.license/feature.properties b/eclipse/features/org.eclipse.license/feature.properties
new file mode 100644
index 0000000..4d83864
--- /dev/null
+++ b/eclipse/features/org.eclipse.license/feature.properties
@@ -0,0 +1,159 @@
+###############################################################################
+# Copyright (c) 2000, 2010 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+
+# "providerName" property - name of the company that provides the feature
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+
+# "copyright" property - text of the "Feature Update Copyright"
+
+################ end of copyright property ####################################
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+       - Content may be structured and packaged into modules to facilitate delivering,\n\
+         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+         plug-in fragments ("Fragments"), and features ("Features").\n\
+       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+         in a directory named "plugins".\n\
+       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+       - The top-level (root) directory\n\
+       - Plug-in and Fragment directories\n\
+       - Inside Plug-ins and Fragments packaged as JARs\n\
+       - Sub-directories of the directory named "src" of certain Plug-ins\n\
+       - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+          extending or updating the functionality of an Eclipse-based product.\n\
+       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+          with the Specification. Such Installable Software Agreement must inform the user of the\n\
+          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+          indication of agreement by the user, the provisioning Technology will complete installation\n\
+          of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
diff --git a/eclipse/features/org.eclipse.license/feature.xml b/eclipse/features/org.eclipse.license/feature.xml
new file mode 100644
index 0000000..f87780c
--- /dev/null
+++ b/eclipse/features/org.eclipse.license/feature.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.license"
+      version="1.0.0.qualifier"
+      image="eclipse_update_120.jpg">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+</feature>
diff --git a/eclipse/features/org.eclipse.license/license.html b/eclipse/features/org.eclipse.license/license.html
new file mode 100644
index 0000000..f19c483
--- /dev/null
+++ b/eclipse/features/org.eclipse.license/license.html
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   ("Specification").</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/eclipse/features/org.eclipse.pde.api.tools.ee.fragments/build.properties b/eclipse/features/org.eclipse.pde.api.tools.ee.fragments/build.properties
index 9807ee5..1973017 100644
--- a/eclipse/features/org.eclipse.pde.api.tools.ee.fragments/build.properties
+++ b/eclipse/features/org.eclipse.pde.api.tools.ee.fragments/build.properties
@@ -9,6 +9,4 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = feature.xml,\
-               feature.properties,\
-               epl-v10.html,\
-               license.html
+               feature.properties
diff --git a/eclipse/features/org.eclipse.pde.api.tools.ee.fragments/feature.properties b/eclipse/features/org.eclipse.pde.api.tools.ee.fragments/feature.properties
index 24a7500..d0aee3b 100644
--- a/eclipse/features/org.eclipse.pde.api.tools.ee.fragments/feature.properties
+++ b/eclipse/features/org.eclipse.pde.api.tools.ee.fragments/feature.properties
@@ -35,134 +35,3 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
 ################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.pde.api.tools.ee.fragments/feature.xml b/eclipse/features/org.eclipse.pde.api.tools.ee.fragments/feature.xml
index 0d651d5..f1623b4 100644
--- a/eclipse/features/org.eclipse.pde.api.tools.ee.fragments/feature.xml
+++ b/eclipse/features/org.eclipse.pde.api.tools.ee.fragments/feature.xml
@@ -2,8 +2,10 @@
 <feature
       id="org.eclipse.pde.api.tools.ee.fragments"
       label="%featureName"
-      version="1.0.0.qualifier"
-      provider-name="%providerName">
+      version="1.0.100.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
 
    <description>
       %description
diff --git a/eclipse/features/org.eclipse.pde.api.tools.ee.fragments/license.html b/eclipse/features/org.eclipse.pde.api.tools.ee.fragments/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/eclipse/features/org.eclipse.pde.api.tools.ee.fragments/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/eclipse/features/org.eclipse.pde.api.tools.ee.fragments/p2.inf b/eclipse/features/org.eclipse.pde.api.tools.ee.fragments/p2.inf
index 0fc9566..1d2c7b4 100644
--- a/eclipse/features/org.eclipse.pde.api.tools.ee.fragments/p2.inf
+++ b/eclipse/features/org.eclipse.pde.api.tools.ee.fragments/p2.inf
@@ -7,7 +7,192 @@ units.1.properties.1.name=org.eclipse.equinox.p2.name
 units.1.properties.1.value=PDE/API Tools Environment Descriptions
 units.1.properties.2.name=org.eclipse.equinox.p2.type.category
 units.1.properties.2.value=true
+
 units.1.requires.1.namespace=org.eclipse.equinox.p2.iu
-units.1.requires.1.name=org.eclipse.pde.api.tools.ee.fragments
+units.1.requires.1.name=org.eclipse.pde.api.tools.ee.cdcfoundation10.group
 units.1.requires.1.range=[$version$,$version$]
-units.1.requires.1.greedy=true   
\ No newline at end of file
+units.1.requires.1.greedy=true
+units.1.requires.2.namespace=org.eclipse.equinox.p2.iu
+units.1.requires.2.name=org.eclipse.pde.api.tools.ee.cdcfoundation11.group
+units.1.requires.2.range=[$version$,$version$]
+units.1.requires.2.greedy=true
+units.1.requires.3.namespace=org.eclipse.equinox.p2.iu
+units.1.requires.3.name=org.eclipse.pde.api.tools.ee.cdcfoundation11.group
+units.1.requires.3.range=[$version$,$version$]
+units.1.requires.3.greedy=true
+units.1.requires.4.namespace=org.eclipse.equinox.p2.iu
+units.1.requires.4.name=org.eclipse.pde.api.tools.ee.j2se13.group
+units.1.requires.4.range=[$version$,$version$]
+units.1.requires.4.greedy=true
+units.1.requires.5.namespace=org.eclipse.equinox.p2.iu
+units.1.requires.5.name=org.eclipse.pde.api.tools.ee.j2se14.group
+units.1.requires.5.range=[$version$,$version$]
+units.1.requires.5.greedy=true
+units.1.requires.6.namespace=org.eclipse.equinox.p2.iu
+units.1.requires.6.name=org.eclipse.pde.api.tools.ee.j2se15.group
+units.1.requires.6.range=[$version$,$version$]
+units.1.requires.6.greedy=true
+units.1.requires.7.namespace=org.eclipse.equinox.p2.iu
+units.1.requires.7.name=org.eclipse.pde.api.tools.ee.javase16.group
+units.1.requires.7.range=[$version$,$version$]
+units.1.requires.7.greedy=true
+units.1.requires.8.namespace=org.eclipse.equinox.p2.iu
+units.1.requires.8.name=org.eclipse.pde.api.tools.ee.jre11.group
+units.1.requires.8.range=[$version$,$version$]
+units.1.requires.8.greedy=true
+units.1.requires.9.namespace=org.eclipse.equinox.p2.iu
+units.1.requires.9.name=org.eclipse.pde.api.tools.ee.osgiminimum10.group
+units.1.requires.9.range=[$version$,$version$]
+units.1.requires.9.greedy=true
+units.1.requires.10.namespace=org.eclipse.equinox.p2.iu
+units.1.requires.10.name=org.eclipse.pde.api.tools.ee.osgiminimum11.group
+units.1.requires.10.range=[$version$,$version$]
+units.1.requires.10.greedy=true
+units.1.requires.11.namespace=org.eclipse.equinox.p2.iu
+units.1.requires.11.name=org.eclipse.pde.api.tools.ee.osgiminimum12.group
+units.1.requires.11.range=[$version$,$version$]
+units.1.requires.11.greedy=true
+
+units.2.id=org.eclipse.pde.api.tools.ee.cdcfoundation10.group
+units.2.version=$version$
+units.2.provides.1.namespace=org.eclipse.equinox.p2.iu
+units.2.provides.1.name=org.eclipse.pde.api.tools.ee.cdcfoundation10.group
+units.2.provides.1.version=$version$
+units.2.properties.1.name=org.eclipse.equinox.p2.name
+units.2.properties.1.value=PDE/API Tools Environment Descriptions CDC/Foundation 1.0
+units.2.properties.2.name=org.eclipse.equinox.p2.type.group
+units.2.properties.2.value=true
+units.2.requires.1.namespace=org.eclipse.equinox.p2.iu
+units.2.requires.1.name=org.eclipse.pde.api.tools.ee.cdcfoundation10
+units.2.requires.1.greedy=true
+
+units.3.id=org.eclipse.pde.api.tools.ee.cdcfoundation11.group
+units.3.version=$version$
+units.3.provides.1.namespace=org.eclipse.equinox.p2.iu
+units.3.provides.1.name=org.eclipse.pde.api.tools.ee.cdcfoundation11.group
+units.3.provides.1.version=$version$
+units.3.properties.1.name=org.eclipse.equinox.p2.name
+units.3.properties.1.value=PDE/API Tools Environment Descriptions CDC/Foundation 1.1
+units.3.properties.2.name=org.eclipse.equinox.p2.type.group
+units.3.properties.2.value=true
+units.3.requires.1.namespace=org.eclipse.equinox.p2.iu
+units.3.requires.1.name=org.eclipse.pde.api.tools.ee.cdcfoundation11
+units.3.requires.1.greedy=true
+
+units.4.id=org.eclipse.pde.api.tools.ee.j2se12.group
+units.4.version=$version$
+units.4.provides.1.namespace=org.eclipse.equinox.p2.iu
+units.4.provides.1.name=org.eclipse.pde.api.tools.ee.j2se12.group
+units.4.provides.1.version=$version$
+units.4.properties.1.name=org.eclipse.equinox.p2.name
+units.4.properties.1.value=PDE/API Tools Environment Descriptions J2SE 12
+units.4.properties.2.name=org.eclipse.equinox.p2.type.group
+units.4.properties.2.value=true
+units.4.requires.1.namespace=org.eclipse.equinox.p2.iu
+units.4.requires.1.name=org.eclipse.pde.api.tools.ee.j2se12
+units.4.requires.1.greedy=true
+
+units.5.id=org.eclipse.pde.api.tools.ee.j2se13.group
+units.5.version=$version$
+units.5.provides.1.namespace=org.eclipse.equinox.p2.iu
+units.5.provides.1.name=org.eclipse.pde.api.tools.ee.j2se13.group
+units.5.provides.1.version=$version$
+units.5.properties.1.name=org.eclipse.equinox.p2.name
+units.5.properties.1.value=PDE/API Tools Environment Descriptions J2SE 13
+units.5.properties.2.name=org.eclipse.equinox.p2.type.group
+units.5.properties.2.value=true
+units.5.requires.1.namespace=org.eclipse.equinox.p2.iu
+units.5.requires.1.name=org.eclipse.pde.api.tools.ee.j2se13
+units.5.requires.1.greedy=true
+
+units.6.id=org.eclipse.pde.api.tools.ee.j2se14.group
+units.6.version=$version$
+units.6.provides.1.namespace=org.eclipse.equinox.p2.iu
+units.6.provides.1.name=org.eclipse.pde.api.tools.ee.j2se14.group
+units.6.provides.1.version=$version$
+units.6.properties.1.name=org.eclipse.equinox.p2.name
+units.6.properties.1.value=PDE/API Tools Environment Descriptions J2SE 14
+units.6.properties.2.name=org.eclipse.equinox.p2.type.group
+units.6.properties.2.value=true
+units.6.requires.1.namespace=org.eclipse.equinox.p2.iu
+units.6.requires.1.name=org.eclipse.pde.api.tools.ee.j2se14
+units.6.requires.1.greedy=true
+
+units.7.id=org.eclipse.pde.api.tools.ee.j2se15.group
+units.7.version=$version$
+units.7.provides.1.namespace=org.eclipse.equinox.p2.iu
+units.7.provides.1.name=org.eclipse.pde.api.tools.ee.j2se15.group
+units.7.provides.1.version=$version$
+units.7.properties.1.name=org.eclipse.equinox.p2.name
+units.7.properties.1.value=PDE/API Tools Environment Descriptions J2SE 15
+units.7.properties.2.name=org.eclipse.equinox.p2.type.group
+units.7.properties.2.value=true
+units.7.requires.1.namespace=org.eclipse.equinox.p2.iu
+units.7.requires.1.name=org.eclipse.pde.api.tools.ee.j2se15
+units.7.requires.1.greedy=true
+
+units.8.id=org.eclipse.pde.api.tools.ee.javase16.group
+units.8.version=$version$
+units.8.provides.1.namespace=org.eclipse.equinox.p2.iu
+units.8.provides.1.name=org.eclipse.pde.api.tools.ee.javase16.group
+units.8.provides.1.version=$version$
+units.8.properties.1.name=org.eclipse.equinox.p2.name
+units.8.properties.1.value=PDE/API Tools Environment Descriptions J2SE 16
+units.8.properties.2.name=org.eclipse.equinox.p2.type.group
+units.8.properties.2.value=true
+units.8.requires.1.namespace=org.eclipse.equinox.p2.iu
+units.8.requires.1.name=org.eclipse.pde.api.tools.ee.javase16
+units.8.requires.1.greedy=true
+
+units.9.id=org.eclipse.pde.api.tools.ee.jre11.group
+units.9.version=$version$
+units.9.provides.1.namespace=org.eclipse.equinox.p2.iu
+units.9.provides.1.name=org.eclipse.pde.api.tools.ee.jre11.group
+units.9.provides.1.version=$version$
+units.9.properties.1.name=org.eclipse.equinox.p2.name
+units.9.properties.1.value=PDE/API Tools Environment Descriptions JRE 11
+units.9.properties.2.name=org.eclipse.equinox.p2.type.group
+units.9.properties.2.value=true
+units.9.requires.1.namespace=org.eclipse.equinox.p2.iu
+units.9.requires.1.name=org.eclipse.pde.api.tools.ee.jre11
+units.9.requires.1.greedy=true
+
+units.10.id=org.eclipse.pde.api.tools.ee.osgiminimum10.group
+units.10.version=$version$
+units.10.provides.1.namespace=org.eclipse.equinox.p2.iu
+units.10.provides.1.name=org.eclipse.pde.api.tools.ee.osgiminimum10.group
+units.10.provides.1.version=$version$
+units.10.properties.1.name=org.eclipse.equinox.p2.name
+units.10.properties.1.value=PDE/API Tools Environment Descriptions OSGi minimum 10
+units.10.properties.2.name=org.eclipse.equinox.p2.type.group
+units.10.properties.2.value=true
+units.10.requires.1.namespace=org.eclipse.equinox.p2.iu
+units.10.requires.1.name=org.eclipse.pde.api.tools.ee.osgiminimum10
+units.10.requires.1.greedy=true
+
+units.11.id=org.eclipse.pde.api.tools.ee.osgiminimum11.group
+units.11.version=$version$
+units.11.provides.1.namespace=org.eclipse.equinox.p2.iu
+units.11.provides.1.name=org.eclipse.pde.api.tools.ee.osgiminimum11.group
+units.11.provides.1.version=$version$
+units.11.properties.1.name=org.eclipse.equinox.p2.name
+units.11.properties.1.value=PDE/API Tools Environment Descriptions OSGi minimum 11
+units.11.properties.2.name=org.eclipse.equinox.p2.type.group
+units.11.properties.2.value=true
+units.11.requires.1.namespace=org.eclipse.equinox.p2.iu
+units.11.requires.1.name=org.eclipse.pde.api.tools.ee.osgiminimum11
+units.11.requires.1.greedy=true
+
+units.12.id=org.eclipse.pde.api.tools.ee.osgiminimum12.group
+units.12.version=$version$
+units.12.provides.1.namespace=org.eclipse.equinox.p2.iu
+units.12.provides.1.name=org.eclipse.pde.api.tools.ee.osgiminimum12.group
+units.12.provides.1.version=$version$
+units.12.properties.1.name=org.eclipse.equinox.p2.name
+units.12.properties.1.value=PDE/API Tools Environment Descriptions OSGi minimum 12
+units.12.properties.2.name=org.eclipse.equinox.p2.type.group
+units.12.properties.2.value=true
+units.12.requires.1.namespace=org.eclipse.equinox.p2.iu
+units.12.requires.1.name=org.eclipse.pde.api.tools.ee.osgiminimum12
+units.12.requires.1.greedy=true
+
diff --git a/eclipse/features/org.eclipse.pde.build.product.feature/.project b/eclipse/features/org.eclipse.pde.build.product.feature/.project
new file mode 100644
index 0000000..4bb1e9f
--- /dev/null
+++ b/eclipse/features/org.eclipse.pde.build.product.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.pde.build.product.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/eclipse/features/org.eclipse.pde.build.product.feature/build.properties b/eclipse/features/org.eclipse.pde.build.product.feature/build.properties
new file mode 100644
index 0000000..b692f5f
--- /dev/null
+++ b/eclipse/features/org.eclipse.pde.build.product.feature/build.properties
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+               feature.properties
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.pde.build.product.feature/feature.properties b/eclipse/features/org.eclipse.pde.build.product.feature/feature.properties
new file mode 100644
index 0000000..c764da9
--- /dev/null
+++ b/eclipse/features/org.eclipse.pde.build.product.feature/feature.properties
@@ -0,0 +1,33 @@
+###############################################################################
+# Copyright (c) 2010 EclipseSource Inc. and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     EclipseSource - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=PDE Build Base Function
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse PDE Project
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2010 EclipseSource Inc. and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+    EclipseSource - initial API and implementation\n
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.pde.build.product.feature/feature.xml b/eclipse/features/org.eclipse.pde.build.product.feature/feature.xml
new file mode 100644
index 0000000..cf8826c
--- /dev/null
+++ b/eclipse/features/org.eclipse.pde.build.product.feature/feature.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.pde.build.product.feature"
+      label="PDE Build Product Configuration"
+      version="1.0.0.qualifier"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <plugin
+         id="com.ibm.icu.base"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/eclipse/features/org.eclipse.pde.build.product.feature/product/p2.inf b/eclipse/features/org.eclipse.pde.build.product.feature/product/p2.inf
new file mode 100644
index 0000000..8ebf897
--- /dev/null
+++ b/eclipse/features/org.eclipse.pde.build.product.feature/product/p2.inf
@@ -0,0 +1,17 @@
+instructions.configure=
+requires.1.namespace=org.eclipse.equinox.p2.iu
+requires.1.name=toolingorg.eclipse.pde.build.product.macosx
+requires.1.filter=(osgi.os=macosx)
+requires.1.range=[1.0.0,1.0.0]
+requires.1.greedy=true
+
+units.1.id=toolingorg.eclipse.pde.build.product.macosx
+units.1.version=1.0.0
+units.1.provides.1.namespace=org.eclipse.equinox.p2.iu
+units.1.provides.1.name=toolingorg.eclipse.pde.build.product.macosx
+units.1.provides.1.version=1.0.0
+units.1.filter=(osgi.os=macosx)
+units.1.touchpoint.id=org.eclipse.equinox.p2.osgi
+units.1.touchpoint.version=1.0.0
+units.1.instructions.configure=ln(linkTarget:pdebuild.app/Contents/MacOS/pdebuild,targetDir:${installFolder},linkName:pdebuild);
+
diff --git a/eclipse/features/org.eclipse.pde.build.product.feature/product/pdebuild.product b/eclipse/features/org.eclipse.pde.build.product.feature/product/pdebuild.product
new file mode 100644
index 0000000..656d9a0
--- /dev/null
+++ b/eclipse/features/org.eclipse.pde.build.product.feature/product/pdebuild.product
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="Basic Standalone PDE Build System" uid="org.eclipse.pde.build.product" application="org.eclipse.pde.build.Build" version="1.0.0. at qualifier@" useFeatures="true" includeLaunchers="true">
+
+   <configIni use="default">
+   </configIni>
+
+   <launcherArgs>
+      <programArgs>-console -nosplash -consolelog</programArgs>
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+   </launcherArgs>
+
+   <launcher name="pdebuild">
+      <solaris/>
+      <win useIco="false">
+         <bmp/>
+      </win>
+   </launcher>
+
+   <vm>
+   </vm>
+
+   <plugins>
+   </plugins>
+
+   <features>
+      <feature id="org.eclipse.pde.build.feature"/>
+      <feature id="org.eclipse.core.runtime.feature"/>
+      <feature id="org.eclipse.pde.build.configuration"/>
+   </features>
+
+
+</product>
diff --git a/eclipse/features/org.eclipse.pde.junit.runtime.addon/.project b/eclipse/features/org.eclipse.pde.junit.runtime.addon/.project
new file mode 100644
index 0000000..d762c15
--- /dev/null
+++ b/eclipse/features/org.eclipse.pde.junit.runtime.addon/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.pde.junit.runtime.addon</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/eclipse/features/org.eclipse.pde.junit.runtime.addon/build.properties b/eclipse/features/org.eclipse.pde.junit.runtime.addon/build.properties
new file mode 100644
index 0000000..b3a611b
--- /dev/null
+++ b/eclipse/features/org.eclipse.pde.junit.runtime.addon/build.properties
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+               feature.properties
diff --git a/eclipse/features/org.eclipse.pde.junit.runtime.addon/feature.properties b/eclipse/features/org.eclipse.pde.junit.runtime.addon/feature.properties
new file mode 100644
index 0000000..69a57cb
--- /dev/null
+++ b/eclipse/features/org.eclipse.pde.junit.runtime.addon/feature.properties
@@ -0,0 +1,31 @@
+###############################################################################
+# Copyright (c) 2004-2010 Mort Bay Consulting Pty. Ltd. and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     Intalio - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=PDE JUnit Runner Support - Add-on
+
+description=Do not install in your IDE: this feature is meant to provision Target Platforms.\n\
+Support for PDE's JUnit runner for a Target Platform\n\
+Add-on: Does not include org.eclipse.runtime and its dependencies.
+descriptionURL=http://eclipse.org/jetty
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse Jetty Project
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2004-2010 Mort Bay Consulting Pty. Ltd. and others.\n
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.pde.junit.runtime.addon/feature.xml b/eclipse/features/org.eclipse.pde.junit.runtime.addon/feature.xml
new file mode 100644
index 0000000..72692b9
--- /dev/null
+++ b/eclipse/features/org.eclipse.pde.junit.runtime.addon/feature.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.pde.junit.runtime.addon"
+      label="%featureName"
+      version="1.0.100.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
+
+   <description url="%descriptionURL">
+      %description
+   </description>
+
+   <copyright url="%copyrightURL">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <requires>
+       <import plugin="org.eclipse.core.runtime" version="3.6.0"/>
+   </requires>
+     <plugin id="org.eclipse.jdt.junit.runtime" version="0.0.0" unpack="false"/>
+	 <plugin id="org.eclipse.pde.junit.runtime" version="0.0.0" unpack="false"/>
+     <plugin id="org.hamcrest.core" version="0.0.0" unpack="false"/>
+     <plugin id="org.junit" version="4.8.2.qualifier" unpack="true"/> 
+
+</feature>
diff --git a/eclipse/features/org.eclipse.pde.junit.runtime.addon/pom.xml b/eclipse/features/org.eclipse.pde.junit.runtime.addon/pom.xml
new file mode 100644
index 0000000..00d5f2b
--- /dev/null
+++ b/eclipse/features/org.eclipse.pde.junit.runtime.addon/pom.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+// ========================================================================
+// Copyright (c) 2009 Intalio, Inc.
+// 
+// All rights reserved. This program and the accompanying materials
+// are made available under the terms of the Eclipse Public License v1.0
+// and Apache License v2.0 which accompanies this distribution.
+// The Eclipse Public License is available at 
+// http://www.eclipse.org/legal/epl-v10.html
+// The Apache License v2.0 is available at
+// http://www.opensource.org/licenses/apache2.0.php
+// You may elect to redistribute this code under either of these licenses. 
+// Contributors:
+//    Hugues Malphettes - initial API and implementation
+// ========================================================================
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>jetty-osgi</artifactId>
+    <groupId>org.eclipse.jetty.osgi</groupId>
+    <version>7.1.6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
+  </parent>
+  <artifactId>org.eclipse.pde.junit.runtime.addon</artifactId>
+  <version>1.0.0.SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/eclipse/features/org.eclipse.pde.junit.runtime.standalone/.project b/eclipse/features/org.eclipse.pde.junit.runtime.standalone/.project
new file mode 100644
index 0000000..d8f6e1d
--- /dev/null
+++ b/eclipse/features/org.eclipse.pde.junit.runtime.standalone/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.pde.junit.runtime.standalone</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/eclipse/features/org.eclipse.pde.junit.runtime.standalone/build.properties b/eclipse/features/org.eclipse.pde.junit.runtime.standalone/build.properties
new file mode 100644
index 0000000..b692f5f
--- /dev/null
+++ b/eclipse/features/org.eclipse.pde.junit.runtime.standalone/build.properties
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+               feature.properties
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.pde.junit.runtime.standalone/feature.properties b/eclipse/features/org.eclipse.pde.junit.runtime.standalone/feature.properties
new file mode 100644
index 0000000..0907fe7
--- /dev/null
+++ b/eclipse/features/org.eclipse.pde.junit.runtime.standalone/feature.properties
@@ -0,0 +1,31 @@
+###############################################################################
+# Copyright (c) 2004-2010 Mort Bay Consulting Pty. Ltd. and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     Intalio - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=PDE JUnit Runner Support - Standalone
+
+description=Do not install in your IDE: this feature is meant to provision Target Platforms.\n\
+Support for PDE's JUnit runner for a Target Platform\n\
+Standalone: includes all the necessary bundles.
+descriptionURL=http://eclipse.org/jetty
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse Jetty Project
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2004-2010 Mort Bay Consulting Pty. Ltd. and others.\n
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.pde.junit.runtime.standalone/feature.xml b/eclipse/features/org.eclipse.pde.junit.runtime.standalone/feature.xml
new file mode 100644
index 0000000..baf1df1
--- /dev/null
+++ b/eclipse/features/org.eclipse.pde.junit.runtime.standalone/feature.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.pde.junit.runtime.standalone"
+      label="%featureName"
+      version="1.0.100.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
+
+   <description url="%descriptionURL">
+      %description
+   </description>
+
+   <copyright url="%copyrightURL">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+    <plugin id="org.eclipse.osgi" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.eclipse.osgi.services" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.eclipse.core.contenttype" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.eclipse.core.jobs" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.eclipse.core.runtime" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.eclipse.equinox.app" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.eclipse.equinox.common" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.eclipse.equinox.preferences" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.eclipse.equinox.registry" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.eclipse.jdt.junit.runtime" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <!--plugin id="org.eclipse.jdt.junit.runtime" download-size="0" install-size="0" version="3.4.200.r361_v20100714-0800" unpack="false"/-->
+    <plugin id="org.eclipse.pde.junit.runtime" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.hamcrest.core" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.junit" download-size="0" install-size="0" version="4.8.2.qualifier" unpack="true"/>
+
+
+</feature>
diff --git a/eclipse/features/org.eclipse.pde.junit.runtime.standalone/pom.xml b/eclipse/features/org.eclipse.pde.junit.runtime.standalone/pom.xml
new file mode 100644
index 0000000..ef94d24
--- /dev/null
+++ b/eclipse/features/org.eclipse.pde.junit.runtime.standalone/pom.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+// ========================================================================
+// Copyright (c) 2009 Intalio, Inc.
+// 
+// All rights reserved. This program and the accompanying materials
+// are made available under the terms of the Eclipse Public License v1.0
+// and Apache License v2.0 which accompanies this distribution.
+// The Eclipse Public License is available at 
+// http://www.eclipse.org/legal/epl-v10.html
+// The Apache License v2.0 is available at
+// http://www.opensource.org/licenses/apache2.0.php
+// You may elect to redistribute this code under either of these licenses. 
+// Contributors:
+//    Hugues Malphettes - initial API and implementation
+// ========================================================================
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>jetty-osgi</artifactId>
+    <groupId>org.eclipse.jetty.osgi</groupId>
+    <version>7.1.6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
+  </parent>
+  <artifactId>org.eclipse.pde.junit.runtime.standalone</artifactId>
+  <version>1.0.0.SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/eclipse/features/org.eclipse.pde/build.properties b/eclipse/features/org.eclipse.pde/build.properties
index a36998a..be574d9 100644
--- a/eclipse/features/org.eclipse.pde/build.properties
+++ b/eclipse/features/org.eclipse.pde/build.properties
@@ -8,5 +8,5 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-bin.includes=epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html
+bin.includes=eclipse_update_120.jpg,feature.xml,feature.properties
 
diff --git a/eclipse/features/org.eclipse.pde/epl-v10.html b/eclipse/features/org.eclipse.pde/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/eclipse/features/org.eclipse.pde/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.pde/feature.properties b/eclipse/features/org.eclipse.pde/feature.properties
index 48e5445..b28f72f 100644
--- a/eclipse/features/org.eclipse.pde/feature.properties
+++ b/eclipse/features/org.eclipse.pde/feature.properties
@@ -20,9 +20,6 @@ featureName=Eclipse Plug-in Development Environment
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Project Updates
-
 # "description" property - description of the feature
 description=Eclipse plug-in development environment.
 
@@ -36,135 +33,4 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
\ No newline at end of file
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.pde/feature.xml b/eclipse/features/org.eclipse.pde/feature.xml
index 575ef86..2612972 100644
--- a/eclipse/features/org.eclipse.pde/feature.xml
+++ b/eclipse/features/org.eclipse.pde/feature.xml
@@ -2,9 +2,11 @@
 <feature
       id="org.eclipse.pde"
       label="%featureName"
-      version="3.6.2.qualifier"
+      version="3.7.0.qualifier"
       provider-name="%providerName"
-      image="eclipse_update_120.jpg">
+      image="eclipse_update_120.jpg"   
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
 
    <description>
       %description
diff --git a/eclipse/features/org.eclipse.pde/license.html b/eclipse/features/org.eclipse.pde/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/eclipse/features/org.eclipse.pde/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/eclipse/features/org.eclipse.pde/sourceTemplateFeature/build.properties b/eclipse/features/org.eclipse.pde/sourceTemplateFeature/build.properties
deleted file mode 100644
index 6e47058..0000000
--- a/eclipse/features/org.eclipse.pde/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
diff --git a/eclipse/features/org.eclipse.pde/sourceTemplateFeature/epl-v10.html b/eclipse/features/org.eclipse.pde/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/eclipse/features/org.eclipse.pde/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.pde/sourceTemplateFeature/feature.properties b/eclipse/features/org.eclipse.pde/sourceTemplateFeature/feature.properties
index a9fc762..28128a6 100644
--- a/eclipse/features/org.eclipse.pde/sourceTemplateFeature/feature.properties
+++ b/eclipse/features/org.eclipse.pde/sourceTemplateFeature/feature.properties
@@ -20,9 +20,6 @@ featureName=Eclipse PDE Plug-in Developer Resources
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Project Updates
-
 # "description" property - description of the feature
 description=Eclipse plug-in development environment, including documentation and source code zips.
 
@@ -36,139 +33,4 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
\ No newline at end of file
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.pde/sourceTemplateFeature/license.html b/eclipse/features/org.eclipse.pde/sourceTemplateFeature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/eclipse/features/org.eclipse.pde/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc/about.html b/eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc64/about.html
similarity index 100%
rename from eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc/about.html
rename to eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc64/about.html
diff --git a/eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc/about_files/IJG_README b/eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc64/about_files/IJG_README
similarity index 100%
rename from eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc/about_files/IJG_README
rename to eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc64/about_files/IJG_README
diff --git a/eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc/about_files/about_cairo.html b/eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc64/about_files/about_cairo.html
similarity index 100%
rename from eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc/about_files/about_cairo.html
rename to eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc64/about_files/about_cairo.html
diff --git a/eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc/about_files/lgpl-v21.txt b/eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc64/about_files/lgpl-v21.txt
similarity index 100%
rename from eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc/about_files/lgpl-v21.txt
rename to eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc64/about_files/lgpl-v21.txt
diff --git a/eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc/about_files/mpl-v11.txt b/eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc64/about_files/mpl-v11.txt
similarity index 100%
rename from eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc/about_files/mpl-v11.txt
rename to eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc64/about_files/mpl-v11.txt
diff --git a/eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc/about_files/pixman-licenses.txt b/eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc64/about_files/pixman-licenses.txt
similarity index 100%
rename from eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc/about_files/pixman-licenses.txt
rename to eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc64/about_files/pixman-licenses.txt
diff --git a/eclipse/features/org.eclipse.platform/about_files/linux.motif.x86/about.html b/eclipse/features/org.eclipse.platform/about_files/linux.motif.x86/about.html
deleted file mode 100644
index c06208a..0000000
--- a/eclipse/features/org.eclipse.platform/about_files/linux.motif.x86/about.html
+++ /dev/null
@@ -1,265 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>August 17, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-<h3>Third Party Content</h3>
-
-<p>The Content includes items that have been sourced from third parties as set out below. If you 
-did not receive this Content directly from the Eclipse Foundation, the following is provided 
-for informational purposes only, and you should look to the Redistributor’s license for 
-terms and conditions of use.</p>
-
-<h4>Gnome Binding</h4>
-
-<p>The "Gnome Binding" is a binding to the Gnome API.  The Content may include any or all of the following files:</p>
-
-<p>The following files in the plug-in JAR shall be defined as the native code portion of the Gnome Binding:</p>
-<ul>
-	<li>libswt-gnome-motif-xxxx.so (where "xxxx" is the version number)</li>
-</ul>
-
-<p>The following files in both the plug-in JAR and the src.zip shall be defined respectively as the bytecode and source code portions of the Gnome Binding:</p>
-<ul>
-	<li>The contents of the directory org/eclipse/swt/internal/gnome (but not including any sub-directories)</li>
-</ul>
-
-<p>The Gnome Binding contains portions of Gnome ("Library").  Gnome is made available by The Free Software Foundation.  Use of the Library is governed by the terms and
-conditions of the GNU Lesser General Public License Version 2.1 ("LGPL").  Use of the Gnome Binding on a standalone
-basis, is also governed by the terms and conditions of the LGPL.  A copy of the LGPL is provided with the Content (<a href="about_files/lgpl-v21.txt" target="_blank">lgpl-v21.txt</a>) and is also available at
-<a href="http://www.gnu.org/licenses/lgpl.html" target="_blank">http://www.gnu.org/licenses/lgpl.html</a>.</p>
-
-<p>In accordance with Section 6 of the LGPL, you may combine or link a "work that uses the Library" (e.g. the SWT) with the Library to produce a work
-containing portions of the Library (e.g. the Gnome Binding) and distribute that work under the terms of your choice (e.g. the EPL) provided you comply with all
-other terms and conditions of Section 6 as well as other Sections of the LGPL.  Please note, if you modify the Gnome Binding such modifications shall be
-governed by the terms and conditions of the LGPL.  Also note, the terms of the EPL permit you to modify the combined work and the source code of the combined
-work is provided for debugging purposes so there is no need to reverse engineer the combined work.</p>
-
-<h4>GTK+ Binding For Mozilla</h4>
-
-<p>The "GTK+ Binding For Mozilla" is a GTK+ binding to the Mozilla API.  The Content may include any or all of the following files:</p>
-
-<p>The following files in the plug-in JAR shall be defined as the native code portion of the GTK+ Binding For Mozilla:</p>
-<ul>
-	<li>libswt-gtk-motif-xxxx.so (where "xxxx" is the version number)</li>
-</ul>
-
-<p>The following files in both the plug-in JAR and the src.zip shall be defined respectively as the bytecode and source code portions of the GTK+ Binding For Mozilla:</p>
-<ul>
-	<li>The contents of the directory org/eclipse/swt/internal/gtk (but not including any sub-directories)</li>
-</ul>
-
-<p>The GTK+ Binding For Mozilla contains portions of GTK+ ("Library").  GTK+ is made available by The Free Software Foundation.  Use of the Library is governed by the terms and
-conditions of the GNU Lesser General Public License Version 2.1 ("LGPL").  Use of the GTK+ Binding for Mozilla on a standalone
-basis, is also governed by the terms and conditions of the LGPL.  A copy of the LGPL is provided with the Content (<a href="about_files/lgpl-v21.txt" target="_blank">lgpl-v21.txt</a>) and is also available at
-<a href="http://www.gnu.org/licenses/lgpl.html" target="_blank">http://www.gnu.org/licenses/lgpl.html</a>.</p>
-
-<p>In accordance with Section 6 of the LGPL, you may combine or link a "work that uses the Library" (e.g. the SWT) with the Library to produce a work
-containing portions of the Library (e.g. the GTK+ Binding For Mozilla) and distribute that work under the terms of your choice (e.g. the EPL) provided you comply with all
-other terms and conditions of Section 6 as well as other Sections of the LGPL.  Please note, if you modify the GTK+ Binding For Mozilla such modifications shall be
-governed by the terms and conditions of the LGPL.  Also note, the terms of the EPL permit you to modify the combined work and the source code of the combined
-work is provided for debugging purposes so there is no need to reverse engineer the combined work.</p>
-
-<p>Note that the GTK+ Binding For Mozilla contains a subset of the code found in the GTK+ Binding that is available in Linux GTK+ builds.</p>
-
-<h4>Mozilla Binding</h4>
-
-<p>The "Mozilla Binding" is a binding to the Mozilla API.  The Content may include any or all of the following files:</p>
-
-<p>The following files in the plug-in JAR shall be defined as the native code portion of the Mozilla Binding:</p>
-<ul>
-	<li>libswt-mozilla-motif-xxxx.so (where "xxxx" is the version number)</li>
-	<li>libswt-mozilla-gcc3-motif-xxxx.so (where "xxxx" is the version number)</li>
-	<li>libswt-xulrunner-motif-xxxx.so (where "xxxx" is the version number)</li>
-	<li>libswt-xpcominit-motif-xxxx.so (where "xxxx" is the version number)</li>
-</ul>
-
-<p>The following files in both the plug-in JAR and the src.zip shall be defined respectively as the bytecode and source code portions of the Mozilla Binding:</p>
-<ul>
-	<li>The contents of the directory org/eclipse/swt/internal/mozilla (but not including any sub-directories)</li>
-</ul>
-
-<p>The Mozilla Binding contains portions of Mozilla ("Mozilla").  Mozilla is made available by Mozilla.org.  Use of Mozilla is governed by the terms and
-conditions of the Mozilla Public License Version 1.1 ("MPL").  A copy of the MPL is provided with the Content (<a href="about_files/mpl-v11.txt" target="_blank">mpl-v11.txt</a>) and is also available at
-<a href="http://www.mozilla.org/MPL/MPL-1.1.html" target="_blank">http://www.mozilla.org/MPL/MPL-1.1.html</a>.</p>
-
-<h4>XULRunner 1.9 (subset, derivative work)</h4>
-
-The libraries libswt-xulrunner-motif-xxxx.so, libswt-mozilla-motif-xxxx.so, and libswt-mozilla-gcc3-motif-xxxx.so (where "xxxx" is the version number) contain a small portion of XULRunner 1.9 content (header files)
-that have been modified from the Original Code provided by mozilla.org, and whose Initial Developer is Netscape Communications Corporation. Use of this code is governed by
-the terms and conditions of the Mozilla Public License Version 1.1 ("MPL").  A copy of the MPL is provided with the Content (<a href="./about_files/mpl-v11.txt">mpl-v11.txt</a>)
-and is also available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>.
-<p>The changed files are:
-<ul>
-  <li>org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptContext.h</code>
-  <li>org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptGlobalObject.h</code>
-</ul>
-Changes to the original files were made by SWT on April 7, 2009 and are marked with trailing comment <em>"//SWT-20090407"</em>.
-
-<h4>Cairo Binding</h4>
-
-<p>The "Cairo Binding" is a binding to the Cairo API.  The Content may include any or all of the following files:</p>
-
-<p>The following files in the plug-in JAR shall be defined as the native code portion of the Cairo Binding:</p>
-<ul>
-	<li>libswt-cairo-motif-xxxx.so (where "xxxx" is the version number)</li>
-</ul>
-
-<p>The following files in both the plug-in JAR and the src.zip shall be defined respectively as the bytecode and source code portions of the Cairo Binding:</p>
-<ul>
-	<li>The contents of the directory org/eclipse/swt/internal/cairo (where "xxxx" is the version number)</li>
-</ul>
-
-<p>The Cairo Binding contains portions of Cairo ("Cairo").  Cairo is made available by the Cairo project at
-<a href="http://www.cairographics.org" target="_blank">http://www.cairographics.org</a>.  Use of Cairo by the Cairo Binding is governed by the terms and
-conditions of the Mozilla Public License Version 1.1 ("MPL").  A copy of the MPL is
-provided with the Content (<a href="about_files/mpl-v11.txt" target="_blank">mpl-v11.txt</a>) and is also available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>.</p>
-
-<h4>Cairo for Linux</h4>
-
-<p>Refer to the file <a href="about_files/about_cairo.html">about_cairo.html</a> for licensing details about "Cairo for Linux".</p>
-
-<h4>Open Motif for Linux</h4>
-
-<p>Refer to the file <a href="about_files/about_open_motif.html">about_open_motif.html</a> for licensing details about "Open Motif for Linux".</p>
-
-<h4>Independent JPEG Group's JPEG software release 6b</h4>
-
-<p>This software is based in part on the work of the Independent JPEG Group's JPEG software release 6b ("LIBJPEG").
-LIBJPEG was used to implement the decoding of JPEG format files in Java (TM).  The Content does NOT include any portion of the LIBJPEG file ansi2knr.c.</p>
-
-<p>Your use of LIBJPEG is subject to the terms and conditions located in the <a href="about_files/IJG_README">about_files/IJG_README</a> file which is included
-with the Content.</p>
-
-<p>The IJG's website is located at <a href="http://ijg.org/" target="_blank">http://ijg.org</a>.</p>
-
-<p>The class org.eclipse.swt.internal.image.JPEGFileFormat is based on following files from LIBJPEG:</p>
-
-<ul>
-    <li>cderror.h</li>
-    <li>cdjpeg.h</li>
-    <li>jchuff.h</li>
-    <li>jdcolor.c</li>
-    <li>jdct.h</li>
-    <li>jdhuff.h</li>
-    <li>jerror.h</li>
-    <li>jidctint.c</li>
-    <li>jinclude.h</li>
-    <li>jmemsys.h</li>
-    <li>jmorecfg.h</li>
-    <li>jpegint.h</li>
-    <li>jpeglib.h</li>
-    <li>jversion.h</li>
-    <li>transupp.h</li>
-</ul>
-
-<p>The class org.eclipse.swt.internal.image.JPEGDecoder is based on the following files from LIBJPEG:</p>
-
-<ul>
-	<li>jcapimin.c</li>
-	<li>jcapistd.c</li>
-	<li>jccoefct.c</li>
-	<li>jccolor.c</li>
-	<li>jcdctmgr.c</li>
-	<li>jchuff.c</li>
-	<li>jcinit.c</li>
-	<li>jcmainct.c</li>
-	<li>jcmarker.c</li>
-	<li>jcmaster.c</li>
-	<li>jcomapi.c</li>
-	<li>jcparam.c</li>
-	<li>jcphuff.c</li>
-	<li>jcprepct.c</li>
-	<li>jcsample.c</li>
-	<li>jctrans.c</li>
-	<li>jdapimin.c</li>
-	<li>jdapistd.c</li>
-	<li>jdatadst.c</li>
-	<li>jdatasrc.c</li>
-	<li>jdcoefct.c</li>
-	<li>jdcolor.c</li>
-	<li>jddctmgr.c</li>
-	<li>jdhuff.c</li>
-	<li>jdinput.c</li>
-	<li>jdmainct.c</li>
-	<li>jdmarker.c</li>
-	<li>jdmaster.c</li>
-	<li>jdmerge.c</li>
-	<li>jdphuff.c</li>
-	<li>jdpostct.c</li>
-	<li>jdsample.c</li>
-	<li>jdtrans.c</li>
-	<li>jerror.c</li>
-	<li>jfdctflt.c</li>
-	<li>jfdctfst.c</li>
-	<li>jfdctint.c</li>
-	<li>jidctflt.c</li>
-	<li>jidctfst.c</li>
-	<li>jidctint.c</li>
-	<li>jidctred.c</li>
-	<li>jpegtran.c</li>
-	<li>jquant1.c</li>
-	<li>jquant2.c</li>
-	<li>jutils.c</li>
-	<li>cderror.h</li>
-	<li>cdjpeg.h</li>
-	<li>jchuff.h</li>
-	<li>jconfig.h</li>
-	<li>jdct.h</li>
-	<li>jdhuff.h</li>
-	<li>jerror.h</li>
-	<li>jinclude.h</li>
-	<li>jmorecfg.h</li>
-	<li>jpegint.h</li>
-	<li>jpeglib.h</li>
-	<li>jversion.h</li>
-	<li>transupp.h</li>
-</ul>
-	
-<p>The following changes were made to the LIBJPEG code in the Content:</p>
-
-<ol>
-	<li>In Java, pointer math is not allowed so indexing was used instead.</li>
-	<li>Function pointers were replaced with switch statements.</li>
-	<li>The virtual memory, tracing and progress monitoring were removed.</li>
-	<li>The error handling was simplified and now uses Java exceptions.</li>
-</ol>
-
-<h4>PuTTY 0.58 (derivative work)</h4>
-
-<p>Portions of the SWT class org/eclipse/swt/internal/image/PngDeflater are based on PuTTY's sshzlib.c. PuTTY is made available by Mozilla.org.  Use of PuTTY is governed by the terms and
-conditions of the the following MIT-style license:  </p>
-<blockquote>
-  <p><em>PuTTY is copyright 1997-2007 Simon Tatham.</em> </p>
-  <p><em>Portions copyright Robert de Bath, Joris van Rantwijk, Delian  Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,  Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus Kuhn,  and CORE SDI S.A.</em> </p>
-  <p><em>Permission is hereby granted, free of charge, to any person  obtaining a copy of this software and associated documentation files  (the "Software"), to deal in the Software without restriction,  including without limitation the rights to use, copy, modify, merge,  publish, distribute, sublicense, and/or sell copies of the Software,  and to permit persons to whom the Software is furnished to do so,  subject to the following conditions:</em> </p>
-  <p><em>The above copyright notice and this permission notice shall be  included in all copies or substantial portions of the Software.</em> </p>
-  <p><em>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND  NONINFRINGEMENT.  IN NO EVENT SHALL SIMON TATHAM BE LIABLE FOR ANY  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</em> </p>
-</blockquote>
-<p>A copy of the license is also available at <a href="http://www.chiark.greenend.org.uk/~sgtatham/putty/licence.html" target="_blank">http://www.chiark.greenend.org.uk/~sgtatham/putty/licence.html</a>.</p>
-
-<p><small>Java and all Java-based trademarks and logos are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.</small></p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.platform/about_files/linux.motif.x86/about_files/about_open_motif.html b/eclipse/features/org.eclipse.platform/about_files/linux.motif.x86/about_files/about_open_motif.html
deleted file mode 100644
index 2862520..0000000
--- a/eclipse/features/org.eclipse.platform/about_files/linux.motif.x86/about_files/about_open_motif.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 20, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation has included the following package for your convenience:</p> 
-
-<h4>Open Motif for Linux 2.1.30 Release 4</h4>
-
-<p>Open Motif for Linux ("Open Motif") is developed by Metro Link as part of The Open Motif project.  Open Motif is:</p>
-
-<blockquote>
-	Copyright (C) May, 2000 The Open Group, Metro Link, Incorporated and others. All Rights Reserved
-</blockquote>
-
-<p>Open Motif includes the following files:</p>
-<ul>
-    <li>libXm.so.2</li>
-</ul>
-
-<p>Open Motif is not considered part of the content provided by the Eclipse Foundation.  Your use of the Open Motif code in binary form is subject to
-the terms and conditions of Metro Link Public License 1.00 ("MLPL").   A copy of the MLPL is provided (<a href="mlpl-v10.html" target="_blank">mlpl-v10.html</a>)
-and is also available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html" target="_blank">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>.</p>
-
-<p>Source code for Open Motif is available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/" target="_blank">http://www.opengroup.org/openmotif/supporters/metrolink/</a>.</p>
-
-<p>If you did not receive Open Motif directly from the Eclipse Foundation, the package is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply its use.  Check the Redistributor's license that was provided with the content.  If no such license exists, contact the Redistributor.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.platform/about_files/linux.motif.x86/about_files/mlpl-v10.html b/eclipse/features/org.eclipse.platform/about_files/linux.motif.x86/about_files/mlpl-v10.html
deleted file mode 100644
index 5c692a5..0000000
--- a/eclipse/features/org.eclipse.platform/about_files/linux.motif.x86/about_files/mlpl-v10.html
+++ /dev/null
@@ -1,401 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- saved from url=(0068)http://www.opengroup.org/openmotif/supporters/metrolink/license.html -->
-<HTML xmlns="http://www.w3.org/TR/REC-html40" xmlns:o = 
-"urn:schemas-microsoft-com:office:office" xmlns:w = 
-"urn:schemas-microsoft-com:office:word"><HEAD><TITLE>Metro Link Open Motif License</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=windows-1252">
-<META content=Word.Document name=ProgId>
-<META content="MSHTML 6.00.2800.1491" name=GENERATOR>
-<META content="Microsoft Word 9" name=Originator><LINK 
-href="./Open_Motif_License_ver1.00_files/filelist.xml" rel=File-List><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Author>10-06-99 W98</o:Author>
-  <o:LastAuthor>Preferred Customer</o:LastAuthor>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>11</o:TotalTime>
-  <o:LastPrinted>2000-05-10T23:38:00Z</o:LastPrinted>
-  <o:Created>2000-05-11T19:36:00Z</o:Created>
-  <o:LastSaved>2000-05-11T19:36:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1750</o:Words>
-  <o:Characters>9977</o:Characters>
-  <o:Company>Akerman</o:Company>
-  <o:Bytes>35840</o:Bytes>
-  <o:Lines>83</o:Lines>
-  <o:Paragraphs>19</o:Paragraphs>
-  <o:CharactersWithSpaces>12252</o:CharactersWithSpaces>
-  <o:Version>9.2720</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:DisplayHorizontalDrawingGridEvery>0</w:DisplayHorizontalDrawingGridEvery>
-  <w:DisplayVerticalDrawingGridEvery>0</w:DisplayVerticalDrawingGridEvery>
-  <w:UseMarginsForDrawingGridOrigin/>
-  <w:Compatibility>
-   <w:FootnoteLayoutLikeWW8/>
-   <w:ShapeLayoutLikeWW8/>
-   <w:AlignTablesRowByRow/>
-   <w:ForgetLastTabAlignment/>
-   <w:LayoutRawTableWidth/>
-   <w:LayoutTableRowsApart/>
-  </w:Compatibility>
- </w:WordDocument>
-</xml><![endif]-->
-<STYLE>@page Section1 {size: 8.5in 11.0in; margin: 1.0in 1.0in 1.0in 1.0in; mso-header-margin: 1.0in; mso-footer-margin: 1.0in; mso-footer: url("./Open_Motif_License_ver1.00_files/header.htm") f1; mso-paper-source: 0; }
-P.MsoNormal {
-	FONT-SIZE: 10pt; MARGIN: 0in 0in 0pt; FONT-FAMILY: "Times New Roman"; mso-style-parent: ""; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman"
-}
-LI.MsoNormal {
-	FONT-SIZE: 10pt; MARGIN: 0in 0in 0pt; FONT-FAMILY: "Times New Roman"; mso-style-parent: ""; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman"
-}
-DIV.MsoNormal {
-	FONT-SIZE: 10pt; MARGIN: 0in 0in 0pt; FONT-FAMILY: "Times New Roman"; mso-style-parent: ""; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman"
-}
-P.MsoHeader {
-	FONT-SIZE: 10pt; MARGIN: 0in 0in 0pt; FONT-FAMILY: "Times New Roman"; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman"; tab-stops: center 3.0in right 6.0in
-}
-LI.MsoHeader {
-	FONT-SIZE: 10pt; MARGIN: 0in 0in 0pt; FONT-FAMILY: "Times New Roman"; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman"; tab-stops: center 3.0in right 6.0in
-}
-DIV.MsoHeader {
-	FONT-SIZE: 10pt; MARGIN: 0in 0in 0pt; FONT-FAMILY: "Times New Roman"; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman"; tab-stops: center 3.0in right 6.0in
-}
-P.MsoFooter {
-	FONT-SIZE: 10pt; MARGIN: 0in 0in 0pt; FONT-FAMILY: "Times New Roman"; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman"; tab-stops: center 3.0in right 6.0in
-}
-LI.MsoFooter {
-	FONT-SIZE: 10pt; MARGIN: 0in 0in 0pt; FONT-FAMILY: "Times New Roman"; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman"; tab-stops: center 3.0in right 6.0in
-}
-DIV.MsoFooter {
-	FONT-SIZE: 10pt; MARGIN: 0in 0in 0pt; FONT-FAMILY: "Times New Roman"; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman"; tab-stops: center 3.0in right 6.0in
-}
-P.H2 {
-	FONT-WEIGHT: bold; FONT-SIZE: 18pt; MARGIN: 5pt 0in; LAYOUT-GRID-MODE: line; FONT-FAMILY: "Times New Roman"; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman"; mso-style-name: H2; mso-style-next: Normal; mso-outline-level: 3; mso-bidi-font-size: 10.0pt; mso-bidi-font-weight: normal
-}
-LI.H2 {
-	FONT-WEIGHT: bold; FONT-SIZE: 18pt; MARGIN: 5pt 0in; LAYOUT-GRID-MODE: line; FONT-FAMILY: "Times New Roman"; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman"; mso-style-name: H2; mso-style-next: Normal; mso-outline-level: 3; mso-bidi-font-size: 10.0pt; mso-bidi-font-weight: normal
-}
-DIV.H2 {
-	FONT-WEIGHT: bold; FONT-SIZE: 18pt; MARGIN: 5pt 0in; LAYOUT-GRID-MODE: line; FONT-FAMILY: "Times New Roman"; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman"; mso-style-name: H2; mso-style-next: Normal; mso-outline-level: 3; mso-bidi-font-size: 10.0pt; mso-bidi-font-weight: normal
-}
-P.H3 {
-	FONT-WEIGHT: bold; FONT-SIZE: 14pt; MARGIN: 5pt 0in; LAYOUT-GRID-MODE: line; FONT-FAMILY: "Times New Roman"; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman"; mso-style-name: H3; mso-style-next: Normal; mso-outline-level: 4; mso-bidi-font-size: 10.0pt; mso-bidi-font-weight: normal
-}
-LI.H3 {
-	FONT-WEIGHT: bold; FONT-SIZE: 14pt; MARGIN: 5pt 0in; LAYOUT-GRID-MODE: line; FONT-FAMILY: "Times New Roman"; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman"; mso-style-name: H3; mso-style-next: Normal; mso-outline-level: 4; mso-bidi-font-size: 10.0pt; mso-bidi-font-weight: normal
-}
-DIV.H3 {
-	FONT-WEIGHT: bold; FONT-SIZE: 14pt; MARGIN: 5pt 0in; LAYOUT-GRID-MODE: line; FONT-FAMILY: "Times New Roman"; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman"; mso-style-name: H3; mso-style-next: Normal; mso-outline-level: 4; mso-bidi-font-size: 10.0pt; mso-bidi-font-weight: normal
-}
-P.Blockquote {
-	FONT-SIZE: 12pt; MARGIN: 5pt 0.25in; LAYOUT-GRID-MODE: line; FONT-FAMILY: "Times New Roman"; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman"; mso-style-name: Blockquote; mso-bidi-font-size: 10.0pt
-}
-LI.Blockquote {
-	FONT-SIZE: 12pt; MARGIN: 5pt 0.25in; LAYOUT-GRID-MODE: line; FONT-FAMILY: "Times New Roman"; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman"; mso-style-name: Blockquote; mso-bidi-font-size: 10.0pt
-}
-DIV.Blockquote {
-	FONT-SIZE: 12pt; MARGIN: 5pt 0.25in; LAYOUT-GRID-MODE: line; FONT-FAMILY: "Times New Roman"; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman"; mso-style-name: Blockquote; mso-bidi-font-size: 10.0pt
-}
-DIV.Section1 {
-	page: Section1
-}
-OL {
-	MARGIN-BOTTOM: 0in
-}
-UL {
-	MARGIN-BOTTOM: 0in
-}
-</STYLE>
-</HEAD>
-<BODY lang=EN-US style="tab-interval: .5in" bgColor=white>
-<DIV class=Section1>
-<P class=H2 style="TEXT-ALIGN: center" align=center>METRO LINK PUBLIC LICENSE 
-<BR>MOTIF GRAPHICAL USER INTERFACE SOFTWARE<BR>Version 1.00</P>
-<P class=MsoNormal><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<P class=MsoNormal><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<P class=MsoNormal>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS 
-METRO LINK PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION 
-OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. </P>
-<P class=H3>1. DEFINITIONS </P>
-<P class=MsoNormal>"Contribution" means: </P>
-<P class=MsoNormal><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<OL style="MARGIN-TOP: 0in" type=a>
-  <LI class=MsoNormal 
-  style="tab-stops: list .5in; mso-outline-level: 1; mso-list: l6 level1 lfo9">in 
-  the case of METRO LINK, INCORPORATED ("METRO LINK"), the Metro Link Program, 
-  and </LI></OL>
-<P class=MsoNormal style="mso-outline-level: 1"><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<OL style="MARGIN-TOP: 0in" type=a start=2>
-  <LI class=MsoNormal 
-  style="tab-stops: list .5in; mso-outline-level: 1; mso-list: l6 level1 lfo9">in 
-  the case of each Contributor, </LI></OL>
-<P class=MsoNormal style="mso-outline-level: 1"><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<OL style="MARGIN-TOP: 0in" type=1>
-  <OL style="MARGIN-TOP: 0in" type=1>
-    <LI class=MsoNormal 
-    style="tab-stops: list 1.0in; mso-outline-level: 2; mso-list: l0 level2 lfo2">changes 
-    to the Program, and 
-    <LI class=MsoNormal 
-    style="tab-stops: list 1.0in; mso-outline-level: 2; mso-list: l0 level2 lfo2">additions 
-    to the Program; </LI></OL></OL>
-<P class=MsoNormal style="MARGIN-LEFT: 0.75in; mso-outline-level: 2"><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<P class=MsoNormal style="MARGIN-LEFT: 0.5in; mso-outline-level: 1">where such 
-changes and/or additions to the Program originate from and are distributed by 
-that particular Contributor. A Contribution 'originates' from a Contributor if 
-it was added to the Program by such Contributor itself or anyone acting on such 
-Contributor's behalf. Contributions do not include additions to the Program 
-which: (i) are separate modules of software distributed in conjunction with the 
-Program under their own license agreement, and (ii) are not derivative works of 
-the Program. </P>
-<P class=MsoNormal style="MARGIN-LEFT: 0.5in; mso-outline-level: 1"><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<P class=MsoNormal>"Contributor" means The Open Group, METRO LINK and any other 
-entity that distributes the Program. </P>
-<P class=MsoNormal><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<P class=MsoNormal>"Licensed Patents" mean patent claims licensable by a 
-Contributor which are necessarily infringed by the use or sale of its 
-Contribution alone or when combined with the Program.</P>
-<P class=MsoNormal><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<P class=MsoNormal>"Open Source"<SPAN style="mso-spacerun: yes">  
-</SPAN>programs mean software for the source code is available without 
-confidential or trade secret restrictions and for which<SPAN 
-style="mso-spacerun: yes">  </SPAN>the source code and object code are 
-available for distribution without license charges.</P>
-<P class=MsoNormal><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<P class=MsoNormal>"Metro Link Program" means the original version of the 
-software accompanying this Agreement as released by METRO LINK, including source 
-code, object code and documentation, if any. </P>
-<P class=MsoNormal><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<P class=MsoNormal>"Program" means the Metro Link Program and Contributions. 
-</P>
-<P class=MsoNormal><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<P class=MsoNormal>"Recipient" means anyone who receives the Program under this 
-Agreement, including all Contributors. </P>
-<P class=MsoNormal><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<P class=H3 
-style="MARGIN-LEFT: 0.5in; TEXT-INDENT: -0.25in; tab-stops: list .5in; mso-list: l4 level1 lfo8"><![if !supportLists]>2.<SPAN 
-style="FONT: 7pt 'Times New Roman'">     
-</SPAN><![endif]>GRANT OF RIGHTS </P>
-<P class=MsoNormal><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<P class=MsoNormal>The rights granted under this license are limited solely to 
-distribution and sublicensing of the Contribution(s) on, with or<SPAN 
-style="mso-spacerun: yes">  </SPAN>for operating systems which are 
-themselves Open Source programs.</P>
-<P class=MsoNormal><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<OL style="MARGIN-TOP: 0in" type=a>
-  <LI class=MsoNormal 
-  style="tab-stops: list .5in; mso-outline-level: 1; mso-list: l1 level1 lfo3">Subject 
-  to the terms of this Agreement, The Open Group Public License Agreement 
-  attached hereto (“The Open Group Agreement”) and<SPAN 
-  style="mso-spacerun: yes">  </SPAN>the limitations of this Section 2, 
-  each Contributor hereby grants Recipient a non-exclusive, worldwide, 
-  royalty-free copyright license to reproduce, prepare derivative works of, 
-  publicly display, publicly perform, distribute and sublicense the Contribution 
-  of such Contributor, if any, and such derivative works, in source code and 
-  object code form. </LI></OL>
-<P class=MsoNormal style="MARGIN-LEFT: 0.25in; mso-outline-level: 1"><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<OL style="MARGIN-TOP: 0in" type=a start=2>
-  <LI class=MsoNormal 
-  style="tab-stops: list .5in; mso-outline-level: 1; mso-list: l1 level1 lfo3">Subject 
-  to the terms of this Agreement, The Open Group Agreement and this Section 2, 
-  each Contributor hereby grants Recipient a non-exclusive, worldwide, 
-  royalty-free patent license under Licensed Patents to make, use, sell, offer 
-  to sell, import and otherwise transfer the Contribution of such Contributor, 
-  if any, in source code and object code form. This patent license shall apply 
-  to the combination of the Contribution and the Program if, at the time the 
-  Contribution is added by the Contributor, such addition of the Contribution 
-  causes such combination to be covered by the Licensed Patents. The patent 
-  license shall not apply to any other combinations which include the 
-  Contribution. No hardware per se is licensed hereunder. </LI></OL>
-<P class=MsoNormal style="mso-outline-level: 1"><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<P class=MsoNormal style="MARGIN-LEFT: 0.25in; mso-outline-level: 1"><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<OL style="MARGIN-TOP: 0in" type=a start=3>
-  <LI class=MsoNormal 
-  style="tab-stops: list .5in; mso-outline-level: 1; mso-list: l1 level1 lfo3">Recipient 
-  understands that although each Contributor grants the licenses to its 
-  Contributions set forth herein, no assurances are provided by any Contributor 
-  that the Program does not infringe the patent or other intellectual property 
-  rights of any other entity. Each Contributor disclaims any liability to 
-  Recipient for claims brought by any other entity based on infringement of 
-  intellectual property rights or otherwise. As a condition to exercising the 
-  rights and licenses granted hereunder, each Recipient hereby assumes sole 
-  responsibility to secure any other intellectual property rights needed, if 
-  any. For example, if a third party patent license is required to allow 
-  Recipient to distribute the Program, it is Recipient's responsibility to 
-  acquire that license before distributing the Program. </LI></OL>
-<P class=MsoNormal style="MARGIN-LEFT: 0.25in; mso-outline-level: 1"><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<OL style="MARGIN-TOP: 0in" type=a start=4>
-  <LI class=MsoNormal 
-  style="tab-stops: list .5in; mso-outline-level: 1; mso-list: l1 level1 lfo3">Each 
-  Contributor represents that to its knowledge it has sufficient copyright 
-  rights in its Contribution, if any, to grant the copyright license set forth 
-  in this Agreement. </LI></OL>
-<P class=MsoNormal style="mso-outline-level: 1"><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<P class=MsoNormal style="MARGIN-LEFT: 0.25in; mso-outline-level: 1"><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<P class=H3>3. REQUIREMENTS </P>
-<P class=MsoNormal>A Contributor may choose to distribute the Program in object 
-code form under its own license agreement, provided that: </P>
-<OL style="MARGIN-TOP: 0in" type=a>
-  <LI class=MsoNormal 
-  style="tab-stops: list .5in; mso-outline-level: 1; mso-list: l2 level1 lfo4">it 
-  complies with the terms and conditions of this Agreement<B 
-  style="mso-bidi-font-weight: normal"> </B>and The Open Group Agreement; and 
-  </LI></OL>
-<P class=MsoNormal style="MARGIN-LEFT: 0.25in; mso-outline-level: 1"><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<OL style="MARGIN-TOP: 0in" type=a start=2>
-  <LI class=MsoNormal 
-  style="tab-stops: list .5in; mso-outline-level: 1; mso-list: l2 level1 lfo4">its 
-  license agreement: </LI></OL>
-<P class=MsoNormal style="mso-outline-level: 1"><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<P class=MsoNormal style="MARGIN-LEFT: 0.25in; mso-outline-level: 1"><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<OL style="MARGIN-TOP: 0in" type=1 start=2>
-  <OL style="MARGIN-TOP: 0in" type=1>
-    <LI class=MsoNormal 
-    style="tab-stops: list 1.0in; mso-outline-level: 2; mso-list: l2 level2 lfo5">effectively 
-    disclaims on behalf of all Contributors all warranties and conditions, 
-    express and implied, including warranties or conditions of title and 
-    non-infringement, and implied warranties or conditions of merchantability 
-    and fitness for a particular purpose; 
-    <LI class=MsoNormal 
-    style="tab-stops: list 1.0in; mso-outline-level: 2; mso-list: l2 level2 lfo5">effectively 
-    excludes on behalf of all Contributors all liability for damages, including 
-    direct, indirect, special, incidental and consequential damages, such as 
-    lost profits; 
-    <LI class=MsoNormal 
-    style="tab-stops: list 1.0in; mso-outline-level: 2; mso-list: l2 level2 lfo5">states 
-    that any provisions which differ from this Agreement are offered by that 
-    Contributor alone and not by any other party; and 
-    <LI class=MsoNormal 
-    style="tab-stops: list 1.0in; mso-outline-level: 2; mso-list: l2 level2 lfo5">states 
-    that source code for the Program is available from such Contributor, and 
-    informs licensees how to obtain it in a reasonable manner on or through a 
-    medium customarily used for software exchange. </LI></OL></OL>
-<P class=MsoNormal style="MARGIN-LEFT: 0.75in; mso-outline-level: 2"><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<P class=MsoNormal>When the Program is made available in source code form: </P>
-<OL style="MARGIN-TOP: 0in" type=a>
-  <LI class=MsoNormal 
-  style="tab-stops: list .5in; mso-outline-level: 1; mso-list: l3 level1 lfo6">it 
-  must be made available under this Agreement and the Open Group Agreement; and 
-  </LI></OL>
-<P class=MsoNormal style="MARGIN-LEFT: 0.25in; mso-outline-level: 1"><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<OL style="MARGIN-TOP: 0in" type=a start=2>
-  <LI class=MsoNormal 
-  style="tab-stops: list .5in; mso-outline-level: 1; mso-list: l3 level1 lfo6">a 
-  copy of this Agreement must be included with each copy of the Program. 
-</LI></OL>
-<P class=MsoNormal style="mso-outline-level: 1"><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<P class=MsoNormal style="MARGIN-LEFT: 0.25in; mso-outline-level: 1"><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<P class=MsoNormal>Each Contributor must include the following in a conspicuous 
-location in the Program: </P>
-<P class=Blockquote>Copyright (C) May, 2000 The Open Group, Metro Link, 
-Incorporated and others. All Rights Reserved</P>
-<P class=Blockquote><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<P class=MsoNormal>In addition, each Contributor must identify itself as the 
-originator of its Contribution, if any, in a manner that reasonably allows 
-subsequent Recipients to identify the originator of the Contribution. </P>
-<P class=H3>4. COMMERCIAL DISTRIBUTION </P>
-<P class=MsoNormal>Commercial distributors of software may accept certain 
-responsibilities with respect to end users, business partners and the like. 
-While this license is intended to facilitate the commercial use of the Program, 
-the Contributor who includes the Program in a commercial product offering should 
-do so in a manner which does not create potential liability for other 
-Contributors. Therefore, if a Contributor includes the Program in a commercial 
-product offering, such Contributor ("Commercial Contributor") hereby agrees to 
-defend and indemnify every other Contributor ("Indemnified Contributor") against 
-any losses, damages and costs (collectively "Losses") arising from claims, 
-lawsuits and other legal actions brought by a third party against the 
-Indemnified Contributor to the extent caused by the acts or omissions of such 
-Commercial Contributor in connection with its distribution of the Program in a 
-commercial product offering. The obligations in this section do not apply to any 
-claims or Losses relating to any actual or alleged intellectual property 
-infringement. In order to qualify, an Indemnified Contributor must: </P>
-<P class=MsoNormal><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<P class=MsoNormal 
-style="MARGIN-LEFT: 0.25in; TEXT-INDENT: -0.25in; tab-stops: list .25in; mso-list: l5 level1 lfo7"><![if !supportLists]>a)<SPAN 
-style="FONT: 7pt 'Times New Roman'">       </SPAN><![endif]>promptly notify the Commercial Contributor in writing of such 
-claim, and </P>
-<P class=MsoNormal><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<P class=MsoNormal 
-style="MARGIN-LEFT: 0.25in; TEXT-INDENT: -0.25in; tab-stops: list .25in; mso-list: l5 level1 lfo7"><![if !supportLists]>b)<SPAN 
-style="FONT: 7pt 'Times New Roman'">       </SPAN><![endif]>allow the Commercial Contributor to control, and cooperate with 
-the Commercial Contributor in, the defense and any related settlement 
-negotiations. </P>
-<P class=MsoNormal><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<P class=MsoNormal>The Indemnified Contributor may participate in any such claim 
-at its own expense. </P>
-<P class=MsoNormal>For example, a Contributor might include the Program in a 
-commercial product offering, Product X. That Contributor is then a Commercial 
-Contributor. If that Commercial Contributor then makes performance claims, or 
-offers warranties related to Product X, those performance claims and warranties 
-are such Commercial Contributor's responsibility alone. Under this section, the 
-Commercial Contributor would have to defend claims against the other 
-Contributors related to those performance claims and warranties, and if a court 
-requires any other Contributor to pay any damages as a result, the Commercial 
-Contributor must pay those damages. </P>
-<P class=H3>5. NO WARRANTY </P>
-<P class=MsoNormal>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM 
-IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, 
-EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR 
-CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A 
-PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the 
-appropriateness of using and distributing the Program and assumes all risks 
-associated with its exercise of rights under this Agreement, including but not 
-limited to the risks and costs of program errors, compliance with applicable 
-laws, damage to or loss of data, programs or equipment, and unavailability or 
-interruption of operations. </P>
-<P class=H3>6. DISCLAIMER OF LIABILITY </P>
-<P class=MsoNormal>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER 
-RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, 
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING 
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR 
-THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY 
-OF SUCH DAMAGES. </P>
-<P class=H3>7. GENERAL </P>
-<P class=MsoNormal>If any provision of this Agreement is invalid or 
-unenforceable under applicable law, it shall not affect the validity or 
-enforceability of the remainder of the terms of this Agreement, and without 
-further action by the parties hereto, such provision shall be reformed to the 
-minimum extent necessary to make such provision valid and enforceable. </P>
-<P class=MsoNormal><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<P class=MsoNormal>If Recipient institutes patent litigation against a 
-Contributor with respect to a patent applicable to software (including a 
-cross-claim or counterclaim in a lawsuit), then any patent licenses granted by 
-that Contributor to such Recipient under this Agreement shall terminate as of 
-the date such litigation is filed. In addition, if Recipient institutes patent 
-litigation against any entity (including a cross-claim or counterclaim in a 
-lawsuit) alleging that the Program itself (excluding combinations of the Program 
-with other software or hardware) infringes such Recipient's patent(s), then such 
-Recipient's rights granted under Section 2(b) shall terminate as of the date 
-such litigation is filed. </P>
-<P class=MsoNormal><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<P class=MsoNormal>All Recipient's rights under this Agreement shall terminate 
-if it fails to comply with any of the material terms or conditions of this 
-Agreement and does not cure such failure in a reasonable period of time after 
-becoming aware of such noncompliance. If all Recipient's rights under this 
-Agreement terminate, Recipient agrees to cease use and distribution of the 
-Program as soon as reasonably practicable. However, Recipient's obligations 
-under this Agreement and any licenses granted by Recipient relating to the 
-Program shall continue and survive. </P>
-<P class=MsoNormal><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<P class=MsoNormal>METRO LINK may publish new versions (including revisions) of 
-this Agreement from time to time. Each new version of the Agreement will be 
-given a distinguishing version number. The Program (including Contributions) may 
-always be distributed subject to the version of the Agreement under which it was 
-received. In addition, after a new version of the Agreement is published, 
-Contributor may elect to distribute the Program (including its Contributions) 
-under the new version. No one other than METRO LINK has the right to modify this 
-Agreement. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient 
-receives no rights or licenses to the intellectual property of any Contributor 
-under this Agreement, whether expressly, by implication, estoppel or otherwise. 
-All rights in the Program not expressly granted under this Agreement are 
-reserved. </P>
-<P class=MsoNormal><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<P class=MsoNormal>This Agreement is governed by the laws of the State of 
-Florida and the intellectual property laws of the United States of America. </P>
-<P class=MsoNormal><![if !supportEmptyParas]><![endif]> <o:p></o:p></P>
-<P class=MsoNormal>No party to this Agreement will bring a legal action under 
-this Agreement more than one year after the cause of action arose. Each party 
-waives its rights to a jury trial in any resulting litigation.</P>
-<P 
-class=MsoNormal><![if !supportEmptyParas]><![endif]> <o:p></o:p></P></DIV></BODY></HTML>
diff --git a/eclipse/features/org.eclipse.platform/build.properties b/eclipse/features/org.eclipse.platform/build.properties
index 5aaede5..c27f41f 100644
--- a/eclipse/features/org.eclipse.platform/build.properties
+++ b/eclipse/features/org.eclipse.platform/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-#  Copyright (c) 2000, 2009 IBM Corporation and others.
+#  Copyright (c) 2000, 2011 IBM Corporation and others.
 #  All rights reserved. This program and the accompanying materials
 #  are made available under the terms of the Eclipse Public License v1.0
 #  which accompanies this distribution, and is available at
@@ -8,13 +8,10 @@
 #  Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
+bin.includes = feature.xml,\
+			   feature.properties,\
+			   eclipse_update_120.jpg
 
 generatedVersionLength=45
 
-root=rootfiles
\ No newline at end of file
+root=rootfiles
diff --git a/eclipse/features/org.eclipse.platform/epl-v10.html b/eclipse/features/org.eclipse.platform/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/eclipse/features/org.eclipse.platform/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.platform/feature.properties b/eclipse/features/org.eclipse.platform/feature.properties
index beb18c9..44f26f0 100644
--- a/eclipse/features/org.eclipse.platform/feature.properties
+++ b/eclipse/features/org.eclipse.platform/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2010 IBM Corporation and others.
+# Copyright (c) 2000, 2011 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -20,19 +20,12 @@ featureName=Eclipse Platform
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Project Updates
-
-# "secondarySiteName" property - label for the update site
-secondaryUpdateSiteName=Galileo Discovery Site
-
-
 # "description" property - description of the feature
-description=Common OS-independent base of the Eclipse platform. (Binary runtime and user documentation.)
+description=Common OS-independent base of the Eclipse platform (binary runtime and user documentation).
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2000, 2010 IBM Corporation and others.\n\
+Copyright (c) 2000, 2011 IBM Corporation and others.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
@@ -40,135 +33,4 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
\ No newline at end of file
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.platform/feature.xml b/eclipse/features/org.eclipse.platform/feature.xml
index 60babec..caff213 100644
--- a/eclipse/features/org.eclipse.platform/feature.xml
+++ b/eclipse/features/org.eclipse.platform/feature.xml
@@ -2,10 +2,12 @@
 <feature
       id="org.eclipse.platform"
       label="%featureName"
-      version="3.6.2.qualifier"
+      version="3.7.0.qualifier"
       provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
+      image="eclipse_update_120.jpg" 
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
+      
    <description>
       %description
    </description>
@@ -17,13 +19,7 @@
    <license url="%licenseURL">
       %license
    </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/eclipse/updates/3.5"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/eclipse/updates/3.5"/>
-      <discovery label="%secondaryUpdateSiteName" url="http://download.eclipse.org/releases/galileo"/>
-   </url>
-
+  
    <includes
          id="org.eclipse.rcp"
          version="0.0.0"/>
@@ -116,7 +112,7 @@
          version="0.0.0"
          fragment="true"
          unpack="false"/>
-
+         
    <plugin
          id="org.eclipse.core.net.linux.x86_64"
          os="linux"
@@ -126,7 +122,7 @@
          version="0.0.0"
          fragment="true"
          unpack="false"/>
-
+  
    <plugin
          id="org.eclipse.core.net.win32.x86_64"
          os="win32"
@@ -135,8 +131,8 @@
          install-size="0"
          version="0.0.0"
          fragment="true"
-         unpack="false"/>
-
+         unpack="false"/>        
+         
    <plugin
          id="org.eclipse.core.net.linux.x86"
          os="linux"
@@ -152,7 +148,7 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>
+         unpack="false"/> 
 
    <plugin
          id="org.eclipse.core.runtime.compatibility"
@@ -188,7 +184,7 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
+         
    <plugin
          id="org.eclipse.equinox.event"
          download-size="0"
@@ -419,7 +415,7 @@
          install-size="0"
          version="0.0.0"
          fragment="true"/>
-
+         
    <plugin
          id="org.eclipse.core.filesystem.aix.ppc"
          os="aix"
@@ -439,18 +435,8 @@
          version="0.0.0"
          fragment="true"
          unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem.linux.ppc"
-         os="linux"
-         arch="ppc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
+ 
+      <plugin
          id="org.eclipse.core.filesystem.linux.x86"
          os="linux"
          arch="x86"
@@ -582,6 +568,16 @@
          version="0.0.0"
          fragment="true"
          unpack="false"/>
+         
+   <plugin
+         id="org.eclipse.equinox.security.win32.x86_64"
+         os="win32"
+         arch="x86_64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.equinox.security.macosx"
diff --git a/eclipse/features/org.eclipse.platform/license.html b/eclipse/features/org.eclipse.platform/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/eclipse/features/org.eclipse.platform/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/eclipse/features/org.eclipse.platform/rootfiles/.eclipseproduct b/eclipse/features/org.eclipse.platform/rootfiles/.eclipseproduct
index 3ec2cc4..d81df5f 100644
--- a/eclipse/features/org.eclipse.platform/rootfiles/.eclipseproduct
+++ b/eclipse/features/org.eclipse.platform/rootfiles/.eclipseproduct
@@ -1,3 +1,3 @@
 name=Eclipse Platform
 id=org.eclipse.platform
-version=3.6.1
\ No newline at end of file
+version=3.7.0
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.platform/rootfiles/notice.html b/eclipse/features/org.eclipse.platform/rootfiles/notice.html
index c184ca3..dc5aefd 100644
--- a/eclipse/features/org.eclipse.platform/rootfiles/notice.html
+++ b/eclipse/features/org.eclipse.platform/rootfiles/notice.html
@@ -1,19 +1,18 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+
+
 
-<body lang="EN-US">
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Eclipse Foundation Software User Agreement</title>
+</head><body lang="EN-US">
 <h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
+<p>February 1, 2011</p>
 
 <h3>Usage Of Content</h3>
 
 <p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
    CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
    OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
    NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
@@ -21,43 +20,73 @@
 
 <h3>Applicable Licenses</h3>
 
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
+<p>Unless otherwise indicated, all Content made available by the Eclipse
+ Foundation is provided to you under the terms and conditions of the 
+Eclipse Public License Version 1.0
+   ("EPL").  A copy of the EPL is provided with this Content and is also
+ available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, "Program" will mean the Content.</p>
 
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
+<p>Content includes, but is not limited to, source code, object code, 
+documentation and other files maintained in the Eclipse Foundation 
+source code
+   repository ("Repository") in software modules ("Modules") and made 
+available as downloadable archives ("Downloads").</p>
 
 <ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+       <li>Content may be structured and packaged into modules to 
+facilitate delivering, extending, and upgrading the Content.  Typical 
+modules may include plug-ins ("Plug-ins"), plug-in fragments 
+("Fragments"), and features ("Features").</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or 
+Fragments and associated material.  Each Feature may be packaged as a 
+sub-directory in a directory named "features".  Within a Feature, files 
+named "feature.xml" may contain a list of the names and version numbers 
+of the Plug-ins
       and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
+       <li>Features may also include other Features ("Included 
+Features"). Within a Feature, files named "feature.xml" may contain a 
+list of the names and version numbers of Included Features.</li>
 </ul>
 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
+<p>The terms and conditions governing Plug-ins and Fragments should be 
+contained in files named "about.html" ("Abouts"). The terms and 
+conditions governing Features and
+Included Features should be contained in files named "license.html" 
+("Feature Licenses").  Abouts and Feature Licenses may be located in any
+ directory of a Download or Module
 including, but not limited to the following locations:</p>
 
 <ul>
        <li>The top-level (root) directory</li>
        <li>Plug-in and Fragment directories</li>
        <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
        <li>Feature directories</li>
 </ul>
 
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+<p>Note: if a Feature made available by the Eclipse Foundation is 
+installed using the Provisioning Technology (as defined below), you must
+ agree to a license ("Feature Update License") during the
+installation process.  If the Feature contains Included Features, the 
+Feature Update License should either provide you with the terms and 
+conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be 
+found in the "license" property of files named "feature.properties" 
+found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the 
+terms and conditions (or references to such terms and conditions) that 
+govern your use of the associated Content in
 that directory.</p>
 
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER 
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.
+  SOME OF THESE
 OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
 
 <ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
        <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
        <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
        <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
@@ -65,43 +94,69 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
        <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
 </ul>
 
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND 
+CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, 
+or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions 
+govern that particular Content.</p>
 
 
 <h3>Use of Provisioning Technology</h3>
 
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+<p>The Eclipse Foundation makes available provisioning software, 
+examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager ("Provisioning Technology") for the purpose of 
+allowing users to install software, documentation, information and/or
+   other materials (collectively "Installable Software"). This 
+capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about 
+packaging Installable Software is available at <a href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   ("Specification").</p>
+
+<p>You may use Provisioning Technology to allow other parties to install
+ Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to
+ be presented to, and accepted by, the users of the Provisioning 
+Technology
+   in accordance with the Specification. By using Provisioning 
+Technology in such a manner and making it available in accordance with 
+the
+   Specification, you further acknowledge your agreement to, and the 
+acquisition of all necessary rights to permit the following:</p>
 
 <ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+       <li>A series of actions may occur ("Provisioning Process") in 
+which a user may execute the Provisioning Technology
+       on a machine ("Target Machine") with the intent of installing, 
+extending or updating the functionality of an Eclipse-based
        product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       <li>During the Provisioning Process, the Provisioning Technology 
+may cause third party Installable Software or a portion thereof to be
        accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+       <li>Pursuant to the Specification, you will provide to the user 
+the terms and conditions that govern the use of the Installable
+       Software ("Installable Software Agreement") and such Installable 
+Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable 
+Software Agreement must inform the user of the terms and conditions that
+ govern
+       the Installable Software and must solicit acceptance by the end 
+user in the manner prescribed in such Installable Software Agreement. 
+Upon such
+       indication of agreement by the user, the provisioning Technology 
+will complete installation of the Installable Software.</li>
 </ol>
 
 <h3>Cryptography</h3>
 
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+<p>Content may contain encryption software. The country in which you are
+ currently may have restrictions on the import, possession, and use, 
+and/or re-export to
+   another country, of encryption software. BEFORE using any encryption 
+software, please check the country's laws, regulations and policies 
+concerning the import,
+   possession, or use, and re-export of encryption software, to see if 
+this is permitted.</p>
 
 <p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
+</body></html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.platform/rootfiles/readme/readme_eclipse.html b/eclipse/features/org.eclipse.platform/rootfiles/readme/readme_eclipse.html
index 80476fc..d138457 100644
--- a/eclipse/features/org.eclipse.platform/rootfiles/readme/readme_eclipse.html
+++ b/eclipse/features/org.eclipse.platform/rootfiles/readme/readme_eclipse.html
@@ -2,13 +2,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
-<title>Eclipse Project Release Notes 3.6.2</title>
+<title>Eclipse Project Release Notes 3.7</title>
 </head>
 <body>
 
 <h1>Eclipse Project Release Notes</h1>
-<p>Release 3.6.2<br/>
-  Last revised February 10, 2011</p>
+<p>Release 3.7.0<br/>
+  Last revised May 16, 2011</p>
 <p align="left"><strong>This software is OSI Certified Open Source Software.<br/>
 OSI Certified is a certification mark of the Open Source Initiative. </strong></p>
 <blockquote>
@@ -32,10 +32,10 @@ OSI Certified is a certification mark of the Open Source Initiative. </stro
   Java Platform itself. Portions are targeted to specific classes of operating
   environments, requiring their source code to only reference facilities available
   in particular class libraries (e.g. J2ME Foundation 1.1, J2SE 1.4, Java 5, etc).</p>
-<p>In general, the 3.6 release of the Eclipse Project is developed on a mix
-  of Java 1.4, Java 5 and Java 6 VMs. As such, the Eclipse SDK as a whole
+<p>In general, the 3.7 release of the Eclipse Project is developed on a mix
+  of Java SE 5 and Java SE 6 VMs. As such, the Eclipse SDK as a whole
   is targeted at all modern, desktop Java VMs. Most functionality is available for
-  1.4 level development everywhere, and extended development capabilities are made
+  Java SE 5 level development everywhere, and extended development capabilities are made
   available on the VMs that support them.</p>
 <p><a href="#Appendix1">Appendix 1</a> contains a table that indicates the class
   library level required for each bundle.</p>
@@ -47,7 +47,7 @@ OSI Certified is a certification mark of the Open Source Initiative. </stro
   them we cannot vouch for them. Problems encountered when running Eclipse on a
   non-reference platform that cannot be recreated on any reference platform will
   be given lower priority than problems with running Eclipse on a reference platform.</p>
-<p>Eclipse 3.6 is tested and validated on the following reference platforms:</p>
+<p>Eclipse 3.7 is tested and validated on the following reference platforms:</p>
 <style type="text/css">
 	table.platforms {
 		border-width: 1px;
@@ -89,8 +89,8 @@ OSI Certified is a certification mark of the Open Source Initiative. </stro
 			<td rowspan="6">Windows</td>
 			<td rowspan="2">7</td>
 			<td rowspan="1">x86 32-bit</td>
-			<td rowspan="2">Sun Java 5 Update 22<br/>
-				IBM Java 5 SR11
+			<td rowspan="6">Oracle Java 6 Update 17<br/>
+				IBM Java 6 SR8
 			</td>
 			<td rowspan="6">Win32</td>
 		</tr>
@@ -100,62 +100,41 @@ OSI Certified is a certification mark of the Open Source Initiative. </stro
 		<tr>
 			<td rowspan="2">Vista</td>
 			<td rowspan="1">x86 32-bit</td>
-			<td>Sun Java 5 Update 22<br/>
-				IBM Java 5 SR11<br/>
-				Oracle JRockit 27.6.5
-			</td>
 		</tr>
 		<tr class="c0">
 			<td rowspan="1">x86 64-bit</td>
-			<td>Sun Java 5 Update 22<br/>
-				IBM Java 5 SR11
-			</td>
 		</tr>
 		<tr class="c0">
 			<td rowspan="2">XP</td>
 			<td rowspan="1">x86 32-bit</td>
-			<td>Sun Java 6 Update 17<br/>
-				Sun Java 5 Update 22<br/>
-				IBM Java 5 SR11<br/>
-				Oracle JRockit 27.6.5
-			</td>
 		</tr>
 		<tr class="c0">
 			<td rowspan="1">x86 64-bit</td>
-			<td>Sun Java 5 Update 22<br/>
-				IBM Java 5 SR11
-			</td>
 		</tr>
 		<!-- ************ RHEL ************** -->
 		<tr class="c1">
 			<td rowspan="3">Red Hat Enterprise Linux</td>
-			<td rowspan="2">5.0</td>
+			<td rowspan="3">6</td>
 			<td rowspan="1">x86 32-bit</td>
-			<td>Sun Java 6 Update 17<br/>
-				Sun Java 5 Update 22<br/>
-				IBM Java 5 SR11<br/>
-				Oracle JRockit 27.6.5
+			<td rowspan="2">Oracle Java 6 Update 17<br/>
+				IBM Java 6 SR8
 			</td>
 			<td rowspan="3">GTK</td>
 		</tr>
 		<tr class="c1">
-			<td rowspan="1">Power 64-bit</td>
-			<td>IBM Java 5 SR11</td>
+			<td rowspan="1">x86 64-bit</td>
 		</tr>
 		<tr class="c1">
-			<td rowspan="1">4.0</td>
-			<td rowspan="1">x86 64-bit</td>
-			<td>Sun Java 5 Update 22<br/>
-				IBM Java 5 SR11
-			</td>
+			<td rowspan="1">Power 64-bit</td>
+			<td>IBM Java 6 SR8</td>
 		</tr>
 		<!-- ************ SLES ************** -->
 		<tr class="c0">
 			<td rowspan="3">SUSE Linux Enterprise Server</td>
 			<td rowspan="3">11</td>
 			<td rowspan="1">x86 32-bit</td>
-			<td rowspan="2">Sun Java 5 Update 22<br/>
-				IBM Java 5 SR11
+			<td rowspan="2">Oracle Java 6 Update 17<br/>
+				IBM Java 6 SR8
 			</td>
 			<td rowspan="3">GTK</td>
 		</tr>
@@ -164,15 +143,15 @@ OSI Certified is a certification mark of the Open Source Initiative. </stro
 		</tr>
 		<tr class="c0">
 			<td rowspan="1">Power 64-bit</td>
-			<td>IBM Java 5 SR11</td>
+			<td>IBM Java 6 SR8</td>
 		</tr>
 		<!-- ************ Ubuntu ************** -->
 		<tr class="c1">
 			<td rowspan="2">Ubuntu Long Term Support</td>
 			<td rowspan="2">10.04</td>
 			<td rowspan="1">x86 32-bit</td>
-			<td rowspan="2">Sun Java 5 Update 22<br/>
-				IBM Java 5 SR11
+			<td rowspan="2">Oracle Java 6 Update 17<br/>
+				IBM Java 6 SR8
 			</td>
 			<td rowspan="2">GTK</td>
 		</tr>
@@ -181,10 +160,10 @@ OSI Certified is a certification mark of the Open Source Initiative. </stro
 		</tr>
 		<!-- ************ Solaris ************** -->
 		<tr class="c0">
-			<td rowspan="2">Sun Solaris</td>
+			<td rowspan="2">Oracle Solaris</td>
 			<td rowspan="2">10</td>
 			<td rowspan="1">x86 32-bit</td>
-			<td rowspan="2">Sun Java 5 Update 22</td>
+			<td rowspan="2">Oracle Java 6 Update 17</td>
 			<td rowspan="2">GTK</td>
 		</tr>
 		<tr class="c0">
@@ -195,27 +174,23 @@ OSI Certified is a certification mark of the Open Source Initiative. </stro
 			<td rowspan="1">HP-UX</td>
 			<td rowspan="1">11i v2</td>
 			<td rowspan="1">ia64 32-bit</td>
-			<td rowspan="1">HP-UX Java 5 Update 18</td>
-			<td rowspan="1">Motif 2.1</td>
+			<td rowspan="1"> HP-UX Java 6 Update 10</td>
+			<td rowspan="1">GTK</td>
 		</tr>
 		<!-- ************ AIX ************** -->
 		<tr class="c0">
 			<td rowspan="1">IBM AIX</td>
 			<td rowspan="1">5.3</td>
-			<td rowspan="1">Power 32-bit</td>
-			<td rowspan="1">IBM Java 5 SR11</td>
-			<td rowspan="1">Motif 2.1</td>
+			<td rowspan="1">Power 64-bit</td>
+			<td rowspan="1">IBM Java 6 SR8</td>
+			<td rowspan="1">GTK</td>
 		</tr>
 		<!-- ************ Mac ************** -->
 		<tr class="c1">
-			<td rowspan="3">Apple Mac OS X</td>
-			<td rowspan="3">10.5</td>
-			<td rowspan="1">Universal</td>
-			<td rowspan="3">Apple Java 10.5 Update 2</td>
-			<td rowspan="1">Carbon</td>
-		</tr>
-		<tr class="c1">
+			<td rowspan="2">Apple Mac OS X</td>
+			<td rowspan="2">10.6</td>
 			<td rowspan="1">Universal 32-bit</td>
+			<td rowspan="2">Apple Java 10.6 Update 2</td>
 			<td rowspan="2">Cocoa</td>
 		</tr>
 		<tr class="c1">
@@ -232,67 +207,67 @@ OSI Certified is a certification mark of the Open Source Initiative. </stro
   user interface elements provided by the Eclipse SDK components, including dialogs
   and error messages, are externalized. The English strings are provided as the
   default resource bundles.</p>
-<p>Latin-1 and DBCS locales are supported by the Eclipse SDK on all reference platforms;
-  BIDI locales are supported by the Eclipse SDK everywhere but on Motif.</p>
+<p>Latin-1, DBCS, and BIDI locales are supported by the Eclipse SDK on all reference platforms.</p>
 <p>The Eclipse SDK supports GB 18030 (level 1), the Chinese code page standard,
-  on Windows XP and 2000, Linux/GTK and the Macintosh.</p>
+  on Windows, Linux and the Macintosh.</p>
 <p>German and Japanese locales are tested.</p>
 
 <h2>2. <a name="Compatibility"></a>Compatibility with Previous Releases</h2>
-<h3>Compatibility of Release 3.6 with 3.5</h3>
-<p>Eclipse 3.6 is compatible with Eclipse 3.5 (and all earlier 3.x versions).</p>
+<h3>Compatibility of Release 3.7 with 3.6</h3>
+<p>Eclipse 3.7 is compatible with Eclipse 3.6 (and all earlier 3.x versions).</p>
 
-<p><strong>API Contract Compatibility:</strong> Eclipse SDK 3.6 is upwards
-  contract-compatible with Eclipse SDK 3.5 except in those areas noted in the
-  <a href="http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/org.eclipse.platform.doc.isv/porting/eclipse_3_6_porting_guide.html" target="_top">
-    <em>Eclipse 3.6 Plug-in Migration Guide</em>
+<p><strong>API Contract Compatibility:</strong> Eclipse SDK 3.7 is upwards
+  contract-compatible with Eclipse SDK 3.6 except in those areas noted in the
+  <a href="http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/org.eclipse.platform.doc.isv/porting/eclipse_3_7_porting_guide.html" target="_top">
+    <em>Eclipse 3.7 Plug-in Migration Guide</em>
   </a>. Programs that use affected APIs and extension points will need to be ported
-  to Eclipse SDK 3.6 APIs. Downward contract compatibility
-  is not supported. There is no guarantee that compliance with Eclipse SDK 3.6
-  APIs would ensure compliance with Eclipse SDK 3.5 APIs. Refer to
+  to Eclipse SDK 3.7 APIs. Downward contract compatibility
+  is not supported. There is no guarantee that compliance with Eclipse SDK 3.7
+  APIs would ensure compliance with Eclipse SDK 3.6 APIs. Refer to
   <a href="http://wiki.eclipse.org/index.php/Evolving_Java-based_APIs">
     <em>Evolving Java-based APIs</em>
   </a> for a discussion of the kinds of API changes that maintain contract compatibility.</p>
   
-<p><strong>Binary (plug-in) Compatibility:</strong> Eclipse SDK 3.6 is upwards
-  binary-compatible with Eclipse SDK 3.5 except in those areas noted in the
-  <a href="http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/org.eclipse.platform.doc.isv/porting/eclipse_3_6_porting_guide.html" target="_top">
-    <em>Eclipse 3.6 Plug-in Migration Guide</em>
+<p><strong>Binary (plug-in) Compatibility:</strong> Eclipse SDK 3.7 is upwards
+  binary-compatible with Eclipse SDK 3.6 except in those areas noted in the
+  <a href="http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/org.eclipse.platform.doc.isv/porting/eclipse_3_7_porting_guide.html" target="_top">
+    <em>Eclipse 3.7 Plug-in Migration Guide</em>
   </a>. Downward plug-in compatibility is not supported. Plug-ins for Eclipse SDK
-  3.6 will not be usable in Eclipse SDK 3.5. Refer to
+  3.7 will not be usable in Eclipse SDK 3.6. Refer to
   <a href="http://wiki.eclipse.org/index.php/Evolving_Java-based_APIs">
     <em>Evolving Java-based APIs</em>
   </a> for a discussion of the kinds of API changes that maintain binary compatibility.</p>
   
-<p><strong>Source Compatibility:</strong> Eclipse SDK 3.6 is upwards source-compatible
-  with Eclipse SDK 3.5 except in the areas noted in the
-  <a href="http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/org.eclipse.platform.doc.isv/porting/eclipse_3_6_porting_guide.html" target="_top">
-    <em>Eclipse 3.6 Plug-in Migration Guide</em>
+<p><strong>Source Compatibility:</strong> Eclipse SDK 3.7 is upwards source-compatible
+  with Eclipse SDK 3.6 except in the areas noted in the
+  <a href="http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/org.eclipse.platform.doc.isv/porting/eclipse_3_7_porting_guide.html" target="_top">
+    <em>Eclipse 3.7 Plug-in Migration Guide</em>
   </a>. This means that source files written
-  to use Eclipse SDK 3.5 APIs might successfully compile and run against Eclipse
-  SDK 3.6 APIs, although this is not guaranteed. Downward source compatibility
+  to use Eclipse SDK 3.6 APIs might successfully compile and run against Eclipse
+  SDK 3.7 APIs, although this is not guaranteed. Downward source compatibility
   is not supported. If source files use new Eclipse SDK APIs, they will not be
   usable with an earlier version of the Eclipse SDK. </p>
   
-<p><strong>Workspace Compatibility:</strong> Eclipse SDK 3.6 is upwards
+<p><strong>Workspace Compatibility:</strong> Eclipse SDK 3.7 is upwards
   workspace-compatible with earlier 3.x versions of the Eclipse SDK unless noted.
-  This means that workspaces and projects created with Eclipse SDK 3.5 .. 3.0 can be successfully
-  opened by Eclipse SDK 3.6 and upgraded to a 3.6 workspace. This includes both
+  This means that workspaces and projects created with Eclipse SDK 3.6 .. 3.0 can be successfully
+  opened by Eclipse SDK 3.7 and upgraded to a 3.7 workspace. This includes both
   hidden metadata, which is localized to a particular workspace, as well as metadata
   files found within a workspace project (e.g., the .project file), which may
   propagate between workspaces via file copying or team repositories. Individual
-  plug-ins developed for Eclipse SDK 3.6 should provide similar upwards compatibility
+  plug-ins developed for Eclipse SDK 3.7 should provide similar upwards compatibility
   for their hidden and visible workspace metadata created by earlier versions;
-  3.6 plug-in developers are responsible for ensuring that their plug-ins recognize
+  3.7 plug-in developers are responsible for ensuring that their plug-ins recognize
   metadata from earlier versions and process it appropriately. User
   interface session state may be discarded when a workspace is upgraded. Downward
   workspace compatibility is not supported. A workspace created (or opened) by
-  a product based on Eclipse 3.6 will be unusable with a product based on an earlier
+  a product based on Eclipse 3.7 will be unusable with a product based on an earlier
   version of Eclipse. Visible metadata files created (or overwritten) by Eclipse
-  3.6 will generally be unusable with earlier versions of Eclipse. </p>
+  3.7 will generally be unusable with earlier versions of Eclipse. </p>
   
 <p><strong>Non-compliant usage of API's</strong>: All non-API methods and classes,
-  and certainly everything in a package with "internal" in its name,
+  and certainly everything in a package with "internal" in its name or
+  x-internal in the bundle manifest entry,
   are considered implementation details which may vary between operating environment
   and are subject to change without notice. Client plug-ins that directly depend
   on anything other than what is specified in the Eclipse SDK API are inherently
@@ -335,8 +310,8 @@ OSI Certified is a certification mark of the Open Source Initiative. </stro
 <h4>Installation/Configuration issues that can cause Eclipse to fail start</h4>
 <p>Here are some common problems that can cause Eclipse not to start:</p>
 <ul>
-  <li>As shown <a href="#TargetOperatingEnvironments">above</a>, Eclipse 3.6 requires 
-    at least a 1.4.2 VM. Perhaps an older version of the VM is being found in 
+  <li>As shown <a href="#TargetOperatingEnvironments">above</a>, Eclipse 3.7 requires 
+    at least a Java SE 5. Perhaps an older version of the VM is being found in 
     your path. To explicitly specify which VM to run with, use the Eclipse <tt>-vm</tt> 
     command-line argument. (See also the <a href="#RunningEclipse">Running Eclipse</a> 
     section below.)</li>
@@ -420,10 +395,10 @@ Eg: <code>Build id: M20070212-1330 (Ubuntu version: 3.2.2-0ubuntu3)</code>
 
 It is imperative that 64-bit builds are downloaded and used if a 64-bit Java
 runtime environment has been installed. Below are two sample tarball names of
-version 3.6.0 of the Eclipse SDK packaged for 32-bit and 64-bit processors.
+version 3.7.0 of the Eclipse SDK packaged for 32-bit and 64-bit processors.
 
-<pre>eclipse-SDK-3.6-linux-gtk.tar.gz (32-bit)
-eclipse-SDK-3.6-linux-gtk-x86_64.tar.gz (64-bit)</pre>
+<pre>eclipse-SDK-3.7-linux-gtk.tar.gz (32-bit)
+eclipse-SDK-3.7-linux-gtk-x86_64.tar.gz (64-bit)</pre>
 
 <p>To run Eclipse with an alternate Java runtime environment, the path to the Java
 virtual machine's binary must be identified. With an Eclipse installation from
@@ -527,14 +502,6 @@ version of a plug-in that is already installed will have no effect. To change th
 of a plug-in installed in your system, you need to either perform an update, or install
 a feature patch.</p>
 
-<h4>XML files with UTF-8 byte order mark fail to have content type detected</h4>
-<p>Eclipse will fail to detect the proper content type for XML files that have a
-UTF-8 byte order mark if Crimson is the XML parser (as it is on Sun 1.4 JREs,
-but not on Sun 1.5 JREs). This
-problem will prevent actions normally available when files of the affected
-content types are selected from being presented to the user. The workaround is
-to ensure the default XML parser supports UTF-8 BOMs (such as Xerces does). (bug
-<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=67048">67048</a>)</p>
 <h4>No branding with old config.ini</h4>
 <p>If you have an old config.ini file and use it with a new Eclipse build, you
 may not get the correct product branding. This is because the id of the standard
@@ -543,8 +510,7 @@ situation as previous builds of Eclipse automatically generated config.ini files
 in some cases. The work around is either to delete the local config.ini or
 update the eclipse.product line to read eclipse.product=org.eclipse.platform.ide.</p>
 
-<h4>Problems with
-classloaders in created threads</h4>
+<h4>Problems with classloaders in created threads</h4>
 <p>There is a known issue with trying to load classes from a newly-created
 thread using a class loader different from the plug-in class loader. The result
 will be a <code>ClassNotFoundException</code>. As a workaround, do the
@@ -561,8 +527,7 @@ be unpredictable. However, there should be no problem in practice provided you
 reset the context class loader back to its original value when your use in the
 current thread is complete. (bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=8907">8907</a>)</p>
 
-<h4>Deadlock creating executable
-extension in Plugin.startup</h4>
+<h4>Deadlock creating executable extension in Plugin.startup</h4>
 <p>If <code>Plugin.startup</code> code is too complex and performs tasks such
 as creating an executable extension, a deadlock situation can be created. Only
 simple bookkeeping tasks should be performed in <code>Plugin.startup</code>
@@ -650,11 +615,7 @@ void myCallback(void) {
 
 
 <h3>3.2.2 <a name="I-Platform-Ant">Platform - Ant</a></h3>
-<h4>UTF-8 encoded buildfiles with Byte Order Mark</h4>
-<p>UTF-8 encoded buildfiles with byte order marks will fail to be parsed correctly depending on the XML parser being used for the build. Therefore a valid buildfile will fail to build with an error message similar to: "BUILD FAILED: C:\workspace\bom.xml:1: Document root element is missing.". To succeed in building with these files, ensure to include Xerces jars on the Ant runtime classpath so that the Xerces parser is used to parse the XML. As well the context menu for these files in the Navigator or Package Explorer will not have the run shortcuts for Ant builds. (bug
-<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=67048">67048</a>)</p>
-<h4> Custom Ant tasks and Ant
-types must be separate from plug-in library JARs</h4>
+<h4> Custom Ant tasks and Ant types must be separate from plug-in library JARs</h4>
 <p>Including the class files for custom Ant tasks or Ant types in the regular
 code JAR for your plug-in causes problems. These class files must be provided in
 a separate JAR that is contributed to the <code>org.eclipse.ant.core.antTasks</code>
@@ -666,30 +627,15 @@ special Ant class loader and not by a plug-in classloader. (bug <a href="https:/
 <p>Eclipse can run Ant in the same JVM as the rest of Eclipse. Several aspects
 of Ant and its use of global Java resources (such as System.out and System.err),
 make it unsafe to run more than one Ant build concurrently in the same JVM. (bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=24129">24129</a>).</p>
-<h4> Running certain Ant tasks
-cause memory leakage</h4>
-<p>Certain Ant tasks are known to leak memory. Please see the bug report for
-details, patches, and possible workarounds. (bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=24448">24448</a>)</p>
-<h4> Tasks that require input
-lock up workspace</h4>
-
-<p>As with using Ant from the command line, prompts for input from the
-console is not handled. This is not the same as making use of the <input>
-task, which works correctly within Eclipse. (bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=21748">21748</a>)</p>
-<h4>"version" property is always set when running Ant in the same VM as Eclipse</h4>
-<p>The Xalan libraries set system properties including a version property. These get set as properties within the Ant build and therefore the "version" property cannot be set within an Ant buildfile due to the immutable nature of Ant properties. This property will always be set to "2.4.1" for Ant builds in the same VM as Eclipse. (bug
-<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=45717">45717</a>)</p>
-<h4>XDoclet support from within Eclipse</h4>
 
+<h4>XDoclet support from within Eclipse</h4>
 <p>Since there are differences when running Ant from the commandline and within Eclipse, some extra steps may be needed to have XDoclet support function correctly within Eclipse. Problems may occur creating XDoclet subtasks. The workarounds and full discussion can be found in bug report. (bug
 <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=37070">37070</a>)</p>
-<h4>Ant Editor code completion based on Ant 1.6.1</h4>
-<p>Code completion provided by the Ant editor does not respect the user-specified version of org.eclipse.ant.core plug-in or ANT_HOME. Code completion proposals are mostly based on Ant 1.6.1 with some updates to Ant 1.6.5 (bug
-<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=30886">30886</a>)</p>
-<h4> Eclipse can hang due to implementation of the Ant <property> task (Windows 9X
-only)</h4>
-<p>On Windows 9X, using:<property environment="env"/> will cause Eclipse to hang if the build occurs in the same VM as Eclipse. Running the build in a separate VM will hang the build but not Eclipse.
-(bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=44196">44196</a>)</p>
+
+<h4>Ant Editor code completion based on Ant 1.6.x</h4>
+<p>Code completion provided by the Ant editor does not respect the user-specified version of org.eclipse.ant.core plug-in or ANT_HOME. 
+Code completion proposals are mostly based on Ant 1.6.x with some updates to Ant 1.6.5 (bug
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=193046">bug 193046</a>)</p>
 
 <h4> Setting build loggers not supported when debugging Ant builds</h4>
 <p>When debugging Ant builds within Eclipse, setting -logger as a program argument will be ignored.</p>
@@ -705,13 +651,29 @@ The workaround is to first disable the builder for auto-builds and then rename t
 
 <h4>Slow typing/saving of the Ant editor with imports that define numerous macrodefs</h4>
 <p>The Ant editor is slow on saving with buildfiles that have <import> declarations of buildfiles that have numerous <macrodef>s.
-See bugs <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=92640">92640</a> and <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=125117">125117</a> for possible workarounds</p>
+See bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=125117">125117</a> for a possible workaround</p>
 
 <h4>Failure to run Ant builds on non-Windows platforms if Eclipse installed in location with spaces in the path</h4>
 <p>Due to a bug in Ant 1.7.0, Ant builds will fail with an IllegalArgumentException if the Eclipse installation is in a location with spaces in the path.
 Embedded usage of Ant builds, such as plug-in export will also fail.
 See bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=187993">187993</a> for possible workarounds</p>
 
+<h4>Ant 1.8.x reports missing libraries as build failures</h4>
+<p>
+In Ant 1.8.x, if you try to use a task that requires additional libraries and you do not have the libraries on the Ant classpath, the build will now properly report is failed. 
+In previous versions of Ant, the build would still report that it had suceeded even though it actually failed to run any of the tasks from additional bundles. See <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=344518">bug 344518</a>.
+</p>
+<p>
+For more information on tasks that require additional bundles please refer to the <a href="http://www.apache.org/dist/ant/RELEASE-NOTES-apache-ant-1.8.2.html">Ant 1.8.2 release notes</a>
+and the <a href="http://ant.apache.org/manual/install.html#optionalTasks">Optional Tasks</a> section in the At manual. 
+</p>
+
+<h4>Ant 1.8.x extension-point feature is not supported in the Ant editor</h4>
+<p>
+The extension-point feature added in Ant 1.8.x is not supported in the Ant editor, meaning there is no content assist or help support for it.
+See <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=324625">bug 324625</a> for more details. 
+</p>
+
 <h3>3.2.3 <a name="I-Platform-User-Assistance">Platform - User Assistance</a></h3>
 <h4>Welcome page not displayed properly (Linux/Unix)</h4>
 <p>The default Welcome implementation is HTML-based and requires a supported browser
@@ -778,54 +740,12 @@ Color Scheme drop down. (bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi
 XP High Contrast mode. You can select this mode by selecting Accessibility
 Options > Display > Use High Contrast from the Windows XP Control Panel
 menu.</p>
-<h4>Default text file encoding
-may be detected incorrectly (Windows XP/2000 only)</h4>
-
-<p><strong>Note</strong>: the bug report associated with this problem has been fixed. 
-If you run Eclipse with JDK 1.5 or greater you should not have to use the workaround 
-stated below any longer. However, the problem still exists when running Eclipse with 
-JDK 1.4.x or lower, so in this case  the workaround is still required . </p>
-<p>The "Text file encoding" value displayed in the Preferences
-  dialog under "Editors" may be wrong on platforms running Windows XP
-(or 2000) when the user locale and system locale differ. </p>
-<p>Example of the manifestation of the bug: A Japanese user using Japanese
-Windows 2000 works in New York, United States. The user has selected English
-(United States) as the user locale. The "Text file encoding" value
-displayed by Eclipse is incorrect: "Cp1252" (English). It should
-display the system locale "MS932" (Japanese).</p>
-<p>Workaround: The user can modify the user locale so that user locale and
-system locale are identical. In the example above, this means the user should
-set Japanese as the user locale. Then restart Eclipse. The "Text file
-encoding" value will then be correct: "MS932" (Japanese).</p>
-
-<p>For Windows XP:</p>
-<ul>
-  <li>To check the system locale: Open the Control Panel. Go to Regional and
-    Language Options. Switch to the Advanced tab. The system locale is specified
-    in "Language for non-Unicode programs".</li>
-  <li>To change the user locale: Open the Control Panel. Go to Regional and
-    Language Options. The user locale can be modified by changing the language
-    in "Standards and formats".</li>
-</ul>
-<p>For Windows 2000:</p>
-<ul>
-  <li>To check the system locale: Open the Control Panel. Go to Regional
-    Options. Look up the items in the General tab, inside the "Language
-    settings for the system" group. The system locale is the item marked as
-    (Default).</li>
-  <li>To change the user locale: Open the Control Panel. Go to Regional
-    Options. The user locale can be modified by changing the location in
-    "Settings for the current user".</li>
 
-</ul>
-<p>(bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=20641">20641</a>)</p>
-<h4> Dirty state not tracked
-properly for OLE documents (Windows only)</h4>
+<h4> Dirty state not tracked properly for OLE documents (Windows only)</h4>
 <p>The dirty state for an OLE document is not updated properly. This causes
 Eclipse to prompt to save the contents of the editor when the document is
 closed, even if the contents have already been saved. (bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=2564">2564</a>)</p>
-<h4> OLE document crashes can
-cause Eclipse to also crash (Windows only)</h4>
+<h4> OLE document crashes can cause Eclipse to also crash (Windows only)</h4>
 <p>If an OLE document crashes, Eclipse can crash, or the workbench menus can
 become inconsistent.</p>
 <h4>2.1 Presentation based workspaces incorrectly get new Min/Max behavior</h4>
@@ -872,40 +792,12 @@ of Windows\System32\USP10.DLL in the Eclipse startup directory or uninstall
 Service Pack 2.
 (bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=56390">56390</a>)</p>
 
-<h4>Input Method broken (Motif only)</h4>
-<p>Some versions of RedHat Linux such as Fedora Core 3 and Enterprise Linux WS 
-release 4 use a new technology called IIIM (Intranet/Internet Input Method
-Framework) to replace the old XIM (X input method).   When running on these 
-new systems, Eclipse will crash if you attempt to enter any DBCS character.  The 
-workaround is to use a XIM based input method such as chinput.  This problem 
-may be fixed in newer releases of RedHat.
-(bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=89722">89722</a>)</p>
-
-<h4>Eclipse does not start on Linux-Motif with Xinerama and a UTF-8 locale</h4>
-<p>The Linux-motif build of Eclipse does not launch properly when run on a 
-computer with Xinerama (provides support for dual head monitors) and a UTF-8 
-locale.  The workaround for this problem is to change the locale to a non-UTF-8 
-value, or to disable Xinerama.
-(bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=38843">38843</a>)
-</p>
-
 <h4>Eclipse hangs when pasting from an unresponsive application (GTK only)</h4>
 <p>If the application that is supplying the clipboard material is unresponsive,
 the paste operation hangs Eclipse for several minutes. This situation can be
 encountered when copying from an Eclipse target workbench, suspending the target
 workbench at a breakpoint and pasting into the hosting Eclipse workbench. (bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=44915">44915</a>)</p>
 
-<h4>Unable to drag data between applications in simplified Chinese locale (Motif only)</h4>
-<p>When configured for the simplified Chinese locale, it is not possible to
-drag data between applications running on the Motif window system. This is a
-known limitation of the Open Motif library. (bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=29777">29777</a>)</p>
-
-<h4>Crash when attempting to launch file browser (AIX Motif only)</h4>
-<p>There is a known AIX graphics bug affecting certain levels of AIX
-releases. Ensure that the AIX install includes the necessary service updates as
-described in the "Install notes/requirements for Eclipse on AIX"
-attachment to Eclipse bug report number <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=34524">34524</a>.</p>
-
 <h4>Available colors on 8-bit Linux (Linux only)</h4>
 <p>Typically, in Gnome Linux installs running with 8-bit visuals (i.e. 256
 color mode), before the Eclipse application is started there are no free colors.
@@ -913,27 +805,10 @@ This may mean that Eclipse is unable to allocate the default widget background
 color, causing it to display a white background. The functionality, however, is
 otherwise unaffected.</p>
 
-<h4>IME-related crash (Linux Motif only)</h4>
-<p>When using Linux Motif and GB18030 IME "chinput", Eclipse can
-crash if the IME client window is left open when the parent window is disposed.
-(bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=32045">32045</a>)</p>
-
 <h4>IME conversion problem (Solaris GTK only)</h4>
 <p>When typing Japanese text, the conversion to Kanji must be done one ideogram at
 a time. (bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=226636">226636</a>)</p>
 
-<h4> gtk_init_check and X11 socket failure when using the IBM 1.4.2 JRE (GTK only)</h4>
-<p>Under RHEL 3.1 with the IBM 1.4.2 JRE and a large number
-of plugins, Eclipse may fail to launch with an exception from
-<tt>gtk_init_check</tt> along with this error:</p>
-<pre>
-_X11TransSocketOpen: socket() failed for local
-_X11TransSocketOpenCOTSClient: Unable to open socket for local
-</pre>
-<p>A workaround is to set the environment variable <tt>JAVA_HIGH_ZIPFDS</tt> to
-a value of 500 before starting Eclipse. (bug
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=106396">106396</a>)</p>
-
 <h4>Key bindings can stop working on Debian (GTK+ only)</h4>
 <p>On some versions of Debian, Eclipse key bindings may stop working.  In this context
 the only way to make the key bindings work again is to restart Eclipse.
@@ -991,7 +866,7 @@ differ from the visual representation of the selection. (bug <a href="https://bu
 <h4>Older versions of some Windows screen readers no longer work with Eclipse</h4>
 <p>JAWS versions 8 and 9 and Window-Eyes version 6 no longer work well with Eclipse and other SWT applications.
 Window-Eyes 6 will cause Eclipse to crash, and JAWS 8 and 9 can cause SWT applications to crash.
-This happens because IAccessible2 support was added to SWT for Eclipse 3.6, but these older screen reader versions contain
+This happens because IAccessible2 support was added to SWT for Eclipse 3.7, but these older screen reader versions contain
 partial implementations of IAccessible2 that do not follow the current IAccessible2 specification.</p>
 <p>
 The workaround for these cases is to specify Java property <code>org.eclipse.swt.accessibility.UseIA2</code> with value <code>false</code>,
@@ -999,6 +874,16 @@ which will instruct SWT to not attempt to use IA2 interfaces.  An easy way to se
 <code>-Dorg.eclipse.swt.accessibility.UseIA2=false</code> when launching Eclipse or your SWT application. (bug
 <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=313182">313182</a>)</p>
 
+<h4>Drawing problems when using non-advanced graphics on recent GTK versions</h4>
+<p>On modern Linux distributions with a GTK version greater than 2.18, clipping problems and pixel corruption
+can occur if the SWT client uses non-advanced GC calls. These problems seem to be caused by low-level bugs
+in the interactions between GDK and X.</p>
+<p>
+The workaround for this problem is to specify Java property <code>org.eclipse.swt.internal.gtk.useCairo</code> with value <code>true</code>,
+which instructs SWT to always use Cairo for all GC calls (advanced graphics).  An easy way to set this property is to specify VM argument
+<code>-Dorg.eclipse.swt.internal.gtk.useCairo=true</code> when launching Eclipse or your SWT application.
+(bugs <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=345650">345650</a> and <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=333965">333965</a>)</p>
+
 
 <h3>3.2.7 <a name="I-Platform-Team-CVS">Platform - Team - CVS</a></h3>
 <p>The following are known problems with the CVS repository provider only, and
@@ -1134,20 +1019,6 @@ not always suspend execution). The problem occurs on Windows and Linux
 platforms. This is an issue with the VM and not with Eclipse.
 The workaround is to use the <code>-XX:+UseParallelGC</code> VM option. (bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=279137">279137</a>).
 
-<h4>Side effects of Step into Selection and Run to Line</h4>
-<p>The actions "Step into Selection" and "Run to Line"
-optimistically set breakpoints on the line the user has chosen to step into or
-run to. However, the debugger can not determine if or when execution will ever
-reach the chosen line. The breakpoints set by the underlying implementation are
-not visible to the user and can cause execution to suspend unexpectedly at a
-later time, when the associated line is actually executed. (bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=51507">51507</a>)</p>
-
-<h4>Default locale initialization incorrect</h4>
-<p>The default locale is generally initialized from the settings in the
-operating system when a target VM is launched. However, when using javaw.exe on
-JDK1.4.2, Windows XP, the default locale is incorrectly initialized to en_US, no
-matter what the operating system settings are. (bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=65945">65945</a>)</p>
-
 <h4>Some refactoring script operations fail with Sun 6.0 JREs</h4>
 <p>Creating and applying refactoring scripts sometimes fails with Sun 6.0 JREs
 due to a bug in the XML parser that is shipped with those VMs.
@@ -1277,11 +1148,6 @@ pop-up menu (or use the shortcut "delete" key). Associated system
 processes in the OS may not be properly cleaned up. If a debug target has no
 suspended threads, termination works properly. (bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=1631">1631</a>)
 
-
-<h4> Memory View (Linux only)</h4>
-The feature to automatically load segments of memory while scrolling in the Memory
-view does not work on Linux. Instead the user must use the "Next Page" and "Previous Page" actions
-to manually load memory segments (bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=74559">74559</a>)
 <h4>Java 6 and MacOS</h4>
 Apple JavaSE-1.6 VMs only execute on 64-bit architectures but JDT will detect 1.6 VMs installed on 32-bit
 architectures when a new workspace is started or when the user presses the "Search..." button
@@ -1336,12 +1202,7 @@ org.eclipse.swt as binary with source attached. (bug <a href="https://bugs.eclip
 work in manifest editor fields</h4>
 <p>Non-default key bindings currently do not work in fields on non-source
 pages of the PDE manifest editors. (bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=19482">19482</a>)</p>
-<h4>Plug-in import wizard does
-not allow plug-ins of different versions to be imported</h4>
-<p>The Eclipse platform allows two plug-ins with the same ID but different
-versions to coexist if the only thing they contribute is run-time libraries.
-However, PDE cannot handle these plug-ins because it creates project names using
-plug-in Ids during binary project import. (bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=18500">18500</a>)</p>
+
 <h4>Export of plug-in may silently drop classes</h4>
 <p>When exporting a plug-in using the plug-in, feature or product wizards, some classes
 might be dropped from the resulting archive if their fully qualified name is too long.
@@ -1376,32 +1237,12 @@ This is because a target's runtime configuration only contains plug-ins specific
 (bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=230146">230146</a>)
 </p>
 
-<h4>The org.osgi.util.tracker package is exported at wrong version</h4>
-<p>The Equinox OSGI Framework (org.eclipse.osgi) exports the org.osgi.util.tracker package
-at the incorrect version of 1.4.2.  The correct org.osgi.util.tracker package version for 
-the OSGi Release 4 Version 4.2 specification is version 1.4.0.  Bundles that 
-wish to run on other vendor frameworks should import the org.osgi.util.tracker package at
-version 1.4.0.  By default PDE will suggest the version 1.4.2 to be used when a bundle imports 
-the org.osgi.util.tracker package (using Import-Package manifest header).  Developers can 
-manually change the import to use 1.4.0 version of the package to be able to run on both
-Equinox and other vendor frameworks.
-(bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=279622">279622</a>)
-</p>
-
-<h4>Importing plug-ins as source misses resources</h4>
-<p>When importing plug-ins as source (from associated binary plug-ins and source bundles), resources
-such as property files and images will not be imported into the workspace. The workaround is to retrieve
-projects from their associated CVS repository or import binary plug-ins with attached source (if the ability
-to edit the imported plug-ins is not required).
-(bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=280259">280259</a>)
-</p>
-
 <h2>4. <a name="RunningEclipse">Running Eclipse</a></h2>
 <p>After installing the Eclipse SDK in a directory, you can start the Workbench
-by running the Eclipse executable included with the release (you also need a 1.4.2
+by running the Eclipse executable included with the release (you also need a Java SE 5
 JRE, not included with the Eclipse SDK). On Windows, the executable file is called <samp>eclipse.exe</samp>,
 and is located in the <code>eclipse</code> sub-directory of the install. If
-installed at <code>c:\eclipse-SDK-3.6-win32</code>, the executable is <code>c:\eclipse-SDK-3.6-win32\eclipse\eclipse.exe</code>.
+installed at <code>c:\eclipse-SDK-3.7-win32</code>, the executable is <code>c:\eclipse-SDK-3.7-win32\eclipse\eclipse.exe</code>.
 
 <b>Note:</b> Set-up on most other operating environments is analogous. Special
 instructions for Mac OS X are listed <a href="#macosx">below</a>.</p>
@@ -1452,7 +1293,7 @@ dialog (or via the "<code>-data</code>" command line argument).</p>
 <p>Here is a typical Eclipse command line: </p>
 
 <blockquote>
-  <p><code>eclipse -vm c:\jdk1.4.2\jre\bin\javaw</code></p>
+  <p><code>eclipse -vm c:\jdk6u22\jre\bin\javaw</code></p>
 </blockquote>
 <p><i>Tip:</i> It's generally a good idea to explicitly specify which Java VM to
 use when running Eclipse. This is achieved with the "<code>-vm</code>"
@@ -1553,8 +1394,8 @@ list on start-up, or</li>
 </p>
 <h2>6. <a name="InteroperabilityWithPreviousReleases">Interoperability with
 Previous Releases</a></h2>
-<h3>6.1 Interoperability of Release 3.6 with previous releases</h3>
-<h4>Sharing projects between heterogeneous Eclipse 3.6 and 3.5</h4>
+<h3>6.1 Interoperability of Release 3.7 with previous releases</h3>
+<h4>Sharing projects between heterogeneous Eclipse 3.7 and 3.6</h4>
 <p>Special care is required when a project in a team repository is being loaded
 and operated on by developers using Eclipse-based products based on different
 feature or plug-in versions. The general problem is that the existence,
@@ -1562,2154 +1403,145 @@ contents, and interpretation of metadata files in the workspaces may be specific
 to a particular feature or plug-in version, and differ between versions. The
 workspace compatibility guarantees only cover cases where all developers upgrade
 their Eclipse workspaces in lock step. In those cases there should be no problem
-with shared metadata. However, when some developers are working in Eclipse 3.6
-while others are working in Eclipse 3.5, there are no such guarantees.
+with shared metadata. However, when some developers are working in Eclipse 3.7
+while others are working in Eclipse 3.6, there are no such guarantees.
 This section provides advice for what to do and not to do. It addresses the
 specific issues with the Eclipse SDK.</p>
 
-<p>The typical failure mode is noticed by the 3.6 user. 3.6 metadata is lost
-when a 3.5 user saves changes and then commits the updated metadata files to the
+<p>The typical failure mode is noticed by the 3.7 user. 3.7 metadata is lost
+when a 3.6 user saves changes and then commits the updated metadata files to the
 repository. Here's how things typically go awry:</p>
 <ul>
-  <li>A user working in Eclipse 3.6 creates or modifies a project in a way that
-    results in changes to a shared metadata file that rely on 3.6-specific
+  <li>A user working in Eclipse 3.7 creates or modifies a project in a way that
+    results in changes to a shared metadata file that rely on 3.7-specific
     information. The user then commits the updated project files, including the
     shared metadata file, to the shared repository.</li>
-  <li>Another user working in Eclipse 3.5 shares this project from the same
-    repository. The 3.6-specific information in the shared metadata file is not
-    understood by Eclipse 3.5, and is generally discarded or ignored without
+  <li>Another user working in Eclipse 3.6 shares this project from the same
+    repository. The 3.7-specific information in the shared metadata file is not
+    understood by Eclipse 3.6, and is generally discarded or ignored without
     warning. The user modifies the project in a way that results in changes to
     the shared metadata file, causing the shared metadata file to be rewritten
-    without any of the 3.6-specific information. The user commits the updated
+    without any of the 3.7-specific information. The user commits the updated
     project files, including the shared metadata file, to the shared repository.
     The user is generally unaware that shared information has just been lost as
     a result of their actions.</li>
-  <li>A user working in Eclipse 3.6 picks up the changes to a project from the
+  <li>A user working in Eclipse 3.7 picks up the changes to a project from the
     shared repository, including the updated shared metadata file. The user may
     be unaware that they have just taken a retrograde step until later when
     things start to malfunction.</li>
 </ul>
 <p>Here are some things to watch out for when sharing projects between
-Eclipse 3.6 and earlier 3.x releases:</p>
+Eclipse 3.7 and earlier 3.x releases:</p>
 <ul>
   <li><b>Virtual folders</b> - 
-  Eclipse 3.6 supports a notion of <i>virtual folders</i> that did not exist
-  in Eclipse 3.5 or earlier. If such virtual folders are created in 3.6, and the project
+  Eclipse 3.7 supports a notion of <i>virtual folders</i> that did not exist
+  in Eclipse 3.5 or earlier. If such virtual folders are created in 3.7, and the project
   is subsequently loaded into an Eclipse 3.5 or earlier workspace, these folders
   will not be recognized. Recommendation: avoid creating virtual folders where project
   compatibility with Eclipse 3.5 or earlier is required.</li>
   <li><b>Resource filters</b> - 
-  Eclipse 3.6 supports a notion of <i>resource filters</i> that did not exist
-  in Eclipse 3.5 or earlier. If such filters are added to resources in 3.6, and the project
+  Eclipse 3.7 supports a notion of <i>resource filters</i> that did not exist
+  in Eclipse 3.5 or earlier. If such filters are added to resources in 3.7, and the project
   is subsequently loaded into an Eclipse 3.5 or earlier workspace, these filters
   will not be recognized. Recommendation: avoid creating resource filters where project
   compatibility with Eclipse 3.5 or earlier is required.</li>
   <li><b>Predefined path variables</b> - 
-  Eclipse 3.6 supports a set of built in path variables that can be used as the basis
+  Eclipse 3.7 supports a set of built in path variables that can be used as the basis
   for linked resource locations. Such variables will not be defined automatically in 
   Eclipse 3.5 or earlier. If compatibility with 3.5 or earlier workspace is required,
   users on 3.5 or earlier workspaces will need to define such path variables manually.
   </li>
 </ul>
-<h4>Using Eclipse 3.6 to develop plug-ins that work in Eclipse 3.5</h4>
-<p>It is also possible (and reasonable) to use Eclipse 3.6 to develop a plug-in 
-  intended to work in Eclipse 3.5 or earlier. Use the <b>Plug-in Development > 
+<h4>Using Eclipse 3.7 to develop plug-ins that work in Eclipse 3.6</h4>
+<p>It is also possible (and reasonable) to use Eclipse 3.7 to develop a plug-in 
+  intended to work in Eclipse 3.6 or earlier. Use the <b>Plug-in Development > 
   Target Platform </b>preference page to locate non-workspace plug-ins in an Eclipse 
-  3.5 install. This ensures that the code for your plug-in is being compiled and 
-  tested against Eclipse 3.5 APIs, extension points, and plug-ins. (The above 
+  3.6 install. This ensures that the code for your plug-in is being compiled and 
+  tested against Eclipse 3.6 APIs, extension points, and plug-ins. (The above 
   list of concerns do not apply since they affect the layout and interpretation 
   of files in the plug-in <i>project</i> but none affect the actual deployed form 
   of the plug-in.)</p>
-  
-  
-  
-  <h2>7. <a name="DefectsFixed"></a>Defects Fixed in Maintenance Releases</h2>
 
-<h3>7.1 Defects fixed in release 3.6.2 since 3.6.1</h3>
-<p>Release 3.6.2 is a maintenance release to fix serious defects present in
-release 3.6.1 These changes only affect some plug-ins and
-features.</p>
-
-<p>Maintenance release 3.6.2 contains fixes for the following defects and others:</p>
-
-<p>
-Note: Bug fixes since the 3.6.1 release can be obtained by the following the Bugzilla query: </p> 
-<p>
-
-<a href="https://bugs.eclipse.org/bugs/buglist.cgi?bug_file_loc_type=allwordssubstr;bug_status=RESOLVED;bug_status=VERIFIED;bug_status=CLOSED;classification=Eclipse;classification=RT;field-1-0-0=bug_status;field-1-1-0=classification;field-1-2-0=product;field-1-3-0=resolution;field-1-4-0=target_milestone;field0-0-0=noop;keywords_type=allwords;long_desc_type=allwordssubstr;product=Equinox;product=JDT;product=PDE;product=Platform;query_format=advanced;remaction=;resolution=FIXED;short_desc=;short_desc_type=allwordssubstr;status_whiteboard=;status_whiteboard_type=allwordssubstr;target_milestone=3.6.2;type-1-0-0=anyexact;type-1-1-0=anyexact;type-1-2-0=anyexact;type-1-3-0=anyexact;type-1-4-0=anyexact;type0-0-0=noop;value-1-0-0=RESOLVED%2CVERIFIED%2CCLOSED;value-1-1-0=Eclipse%2CRT;value-1-2-0=Equinox%2CJDT%2CPDE%2CPlatform;value-1-3-0=FIXED;value-1-4-0=3.6.1;value0-0-0=|;query_based_on=">Bugs fixed in the 3.6.2 release</a>
-
-</p>
-
-
-
-
-
-<table class="bz_buglist" cellspacing="0" cellpadding="4" width="100%">
-    <tr class="bz_buglist_header bz_first_buglist_header">
-      <th colspan="1" class="first-child">
-        <a href="buglist.cgi?bug_file_loc_type=allwordssubstr&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&classification=Eclipse&classification=RT&columnlist=short_desc&field0-0-0=noop&keywords_type=allwords&long_desc_type=allwordssubstr&product=Equinox&product=JDT&product=PDE&product=Platform&query_format=advanced&remaction=&resolution=FIXED&short_desc=&short_desc_type=allwordssubstr&status_whiteboard=&status_whiteboard_type=allwordssubstr&target_milestone=3.6.2&type0-0-0=noop&value0-0-0=%7C&order=bug_id%20DESC&query_based_on=">ID</a>
-      </th>
+<hr/>
+<p>Sun, Solaris, Java and all Java-based trademarks are trademarks of Oracle Corporation.
+in the United States, other countries, or both.</p>
+<p>IBM is a trademark of International Business Machines Corporation in the
+United States, other countries, or both.</p>
+<p>Microsoft, Windows, Windows NT, Vista, and the Windows logo are trademarks of
+Microsoft Corporation in the United States, other countries, or both.</p>
+<p>Apple and Mac OS are trademarks of Apple Computer, Inc., registered in the
+U.S. and other countries.</p>
+<p>QNX, Neutrino, and Photon are trademarks or registered trademarks of QNX
+Software Systems Ltd.</p>
+<p>Other company, product, and service names may be trademarks or service marks
+of others.</p>
+<p>(c) Copyright IBM Corp. and others 2009, 2011</p>
 
-<th colspan="1">
-    <a href="buglist.cgi?bug_file_loc_type=allwordssubstr&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&classification=Eclipse&classification=RT&columnlist=short_desc&field0-0-0=noop&keywords_type=allwords&long_desc_type=allwordssubstr&product=Equinox&product=JDT&product=PDE&product=Platform&query_format=advanced&remaction=&resolution=FIXED&short_desc=&short_desc_type=allwordssubstr&status_whiteboard=&status_whiteboard_type=allwordssubstr&target_milestone=3.6.2&type0-0-0=noop&value0-0-0=%7C&order=short_desc%2Cbug_id&query_based_on=">Summary</a>
-  </th>
+<h2><a name="Appendix1">Appendix 1: Execution Environment by Bundle</a></h2>
 
+<p>In the table below, the "3.7 minimum execution environment"
+  column indicates the minimum Java class library requirements of each bundle
+  for the 3.7 release, where the value is one of:</p>
+<table border="0" width="90%">
+  <tbody>
+    <tr>
 
+      <td align="center"><b>Entry</b></td>
+      <td align="left"><b>Meaning</b></td>
     </tr>
+    <tr>
+      <td><div align="center"><strong>F1.0</strong></div></td>
+      <td>J2ME Foundation 1.0 - indicates that the bundle can only be run on
+        Foundation 1.0 or greater. Note that with the exception of some MicroEdition
+        IO classes, Foundation 1.0 is a subset of J2SE 1.3.</td>
+    </tr>
+    <tr>
+      <td><div align="center"><strong>F1.1</strong></div></td>
+      <td>J2ME Foundation 1.1 - indicates that the bundle can only be run on
+        Foundation 1.1 or greater. Note that with the exception of some MicroEdition
+        IO classes, Foundation 1.1 is a subset of J2SE 1.4.</td>
+    </tr>
+    <tr>
+      <td><div align="center"><strong>1.3</strong></div></td>
+      <td>J2SE 1.3 - indicates that the bundle can only be run on JSE 1.3 or
+        greater.</td>
+    </tr>
+    <tr>
+      <td><div align="center"><strong>1.4</strong></div></td>
+      <td>J2SE 1.4 - indicates that the bundle can only be run on JSE 1.4 or
+        greater.</td>
+    </tr>
+    <tr>
+      <td><div align="center"><strong>1.5</strong></div></td>
+      <td>Java SE 5 - indicates that the bundle can only be run on Java SE 5 or
+        greater.</td>
 
+    </tr>
+    <tr>
+      <td><div align="center"><strong>1.6</strong></div></td>
+      <td>Java SE 6 - indicates that the bundle can only be run on Java SE 6 or
+        greater.</td>
+    </tr>
+    <tr>
+      <td align="center"><b>n/a</b></td>
+      <td>Unknown at the time of this revision.</td>
+    </tr>
+  </tbody>
+</table>
 
-  <tr class="bz_bugitem
-             bz_major             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b210027"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=210027">210027</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">TreeModelLabelProvider does not cancel stale updates.
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b283320"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=283320">283320</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[SWT] Widgets flashing when moving mouse while holding Alt button
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P2             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b301894"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=301894">301894</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">OutOfMemory error when building a large project with annotations
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b302184"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=302184">302184</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[About] About dialog text - needs to not cache system property values
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b307345"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=307345">307345</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[Browser][Mozilla][Mac]Can't use ctrl+f2 to move focus to the menu bar in Mozilla browser
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b312189"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=312189">312189</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[quick assist] BadLocationException when applying proposal while preview is computed
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b317771"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=317771">317771</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">FUP of 315978: Add performance tracking test for scenario fixed by bug# 315978
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_critical             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b319123"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=319123">319123</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[launcher] Application becomes unresponsive when code completion tooltip shows
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b319337"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=319337">319337</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[Win32] WindowXP command "Close Group" can not close all the Eclipse window that in one group
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b321155"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=321155">321155</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[DynamicGUI] UIExtensionTracker calling Display.syncExec() on disposed Display
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_major             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b323514"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=323514">323514</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[indexing] The Java Indexer is taking longer to run in eclipse 3.6 when opening projects
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_critical             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b323763"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=323763">323763</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">Eclipse 3.7 M1 crashes as it is starting up - detected by Java Runtime Environment
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_critical             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b324102"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=324102">324102</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">Backspace key, delete key and tab stop working when my application is minimized
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_major             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b324236"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=324236">324236</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[Browser-Mozilla] Links and JS actions opening a new window do not work
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b324596"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=324596">324596</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[releng][p2] consume ECF build for 3.6.1 maintenance
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b324801"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=324801">324801</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">enable WebKitGTK on Linux-PPC
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b324892"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=324892">324892</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">Wrong constant values for some IA2 events
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_critical             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b325028"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=325028">325028</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[a11y] Frequent crashes in editor resulting from atk_object_get_attributes()
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_major             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b325161"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=325161">325161</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">NPE in Java breakpoint properties page with JavaStratumLineBreakpoint
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_critical             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b325227"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=325227">325227</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[Backport] NatureManager is NOT threadsafe causing incorrect responses to isNatureEnabled() (and others)
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED             bz_secure             bz_secure_mode_manual             bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b325294"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=325294">325294</a>
-      <span style="display: none">[SEC]</span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[launcher] DLL hijacking exploit
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b325557"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=325557">325557</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">Associating a Launch with Perspective "None" is not persisted
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_major             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b325797"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=325797">325797</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">views automatically opened based on debug context are hidden/closed on perspective switch
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_major             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b325885"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=325885">325885</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">Dynamic import resolver bug
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED             bz_secure             bz_secure_mode_manual             bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b325902"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=325902">325902</a>
-      <span style="display: none">[SEC]</span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[launcher] Windows LoadLibrary search cwd DLL exploit
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b325946"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=325946">325946</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[backport] Provide a way to disable capping in the comparison algorithm
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b326152"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=326152">326152</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[Memory View] new monitors added while Memory view is hidden or closed are not shown in the tree
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b326263"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=326263">326263</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">Windows File Locks are obtained on bundles exporting extension points and not released.
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b326351"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=326351">326351</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">remove p2.selfhosting bundle from org.eclipse.releng/maps/p2.map
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_major             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b326354"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=326354">326354</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[3.6][compiler][regression] Compiler in 3.6 and 3.6.1 generates bad code
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b326395"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=326395">326395</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[Backport] Cannot compare word documents
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_major             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b326434"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=326434">326434</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">New issues with NPE refreshing external folders with 3.6.1
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b326453"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=326453">326453</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">releng compare tool and pde api tooling should compare against 3.6.1 in 3.6.2 maintenance stream
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b326516"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=326516">326516</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">3.6.2 feature versions need to be incremented
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b326532"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=326532">326532</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">run compare tool against p2 repos instead of sdk (backport to 3.6.2)
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b326541"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=326541">326541</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">Plan Verifier results not checked in reconciler
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b326673"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=326673">326673</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[WorkingSets] FileNotFoundException in WorkingSetManager
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_major             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b326958"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=326958">326958</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">default ANT home directory lower than the Ant plugin version
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_trivial             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b327138"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=327138">327138</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[Import/Export] WizardExportResourcesPage's Finish button isn't sensitive to Select/Deselect All
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b327233"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=327233">327233</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">p2 and equinox feature versions need to be incremented in 3.6.2 stream
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b327234"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=327234">327234</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">version of org.eclipse.core.resources needs to be incremented in 3.6.x stream
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b327362"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=327362">327362</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">setUrl() call navigates to about:blank prior to real url breaks IEWebHistory
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b327425"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=327425">327425</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[backport] New option to not use capped algorithm misses documentation
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b327446"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=327446">327446</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">Launch's wait for build logic does not check for autobuild correctly
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_major             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b327560"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=327560">327560</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">Failed to create Citrix Client v12
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b327654"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=327654">327654</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">FUP of bug 317264: Refactoring is not possible if the commons-lang.jar is in the path
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_major             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b327706"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=327706">327706</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">Headless build failure with Eclipse 3.6.1
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b327772"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=327772">327772</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">equinox.serverside.sdk version needs to be incremented to 3.6.1 in R3_6_maintenance stream
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b327790"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=327790">327790</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[Widgets] Controls with null background inside Group or TabFolder do not display correctly in Cocoa
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_critical             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b327827"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=327827">327827</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[Webapp] Fix for Eclipse 3.6.2 - Eclipse help system content panel tree component is unusable by people using screen readers
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_major             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b328145"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=328145">328145</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[cocoa, gef] Guide markers not fully visible on Cocoa
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b328151"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=328151">328151</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[launcher] 3.6.2: Remember to compile for S390(x)
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b328177"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=328177">328177</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">Project ant builder cannot run in headless context as it attempts to load a UI AntInputHandler (even when not in use)
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b328295"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=328295">328295</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">Launch button disabled after failed launch
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b328345"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=328345">328345</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">version of org.eclipse.equinox.supplement needs to be incremented in 3.6.2 stream
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b328350"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=328350">328350</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">update location of platform zips used in p2 tests
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_major             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b328400"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=328400">328400</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">TextEdit computed incorrectly for inserting annotation before package declaration
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b328826"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=328826">328826</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">content.xml is too big (20 MB+)
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_major             bz_P3             bz_RESOLVED             bz_FIXED             bz_secure             bz_secure_mode_manual             bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b328975"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=328975">328975</a>
-      <span style="display: none">[SEC]</span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[Webapp] Possible security issue with JSP code exposure.
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b329129"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329129">329129</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[Mac] Unhandled event loop exception when closing Error Log Event Details
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_major             bz_P3             bz_RESOLVED             bz_FIXED             bz_secure             bz_secure_mode_manual             bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b329193"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329193">329193</a>
-      <span style="display: none">[SEC]</span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[Webapp] Possible security issue with JSP code exposure.
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_major             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b329212"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329212">329212</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">OSGI app binaries do not inherit Java 2 security
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_enhancement             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b329222"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329222">329222</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">Request for AIX 64-bit gtk build in 3.6.2
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b329223"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329223">329223</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">Need 3.6.2 launcher for AIX 64 GTK
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b329267"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329267">329267</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">3.6.1 download page should contain link to 3.6 new & noteworthy
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_major             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b329288"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329288">329288</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">Fetching parameter names literally hangs on a class with a lot of methods
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b329303"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329303">329303</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">Port AIX GTK 64 back to 3.6.2
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b329333"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329333">329333</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[Backport] Concurrent access to file while decorating
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_major             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b329485"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329485">329485</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[Help] Fix for 3.6.2 On WinXP bookmarks added from help view get name "N/A"
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b329494"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329494">329494</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[Help] Fix in Eclipse 3.6.2 - Jaws does not give enough context info when in Help pane
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b329713"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329713">329713</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[Webapp] Fix in 3.6.2 Wrong topic was selected in the TOC tree
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b329838"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329838">329838</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[KeyBindings] Exporting key preferences to CSV does not allow context being null
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_major             bz_P3             bz_RESOLVED             bz_FIXED             bz_secure             bz_secure_mode_manual             bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b330026"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330026">330026</a>
-      <span style="display: none">[SEC]</span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[Webapp][Security] Fix for Eclipse 3.6.2 Eclipse Help Server XSS
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_major             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b330030"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330030">330030</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">P2 Nullpointer Exception at RepositoryTransport.download
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b330047"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330047">330047</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">PluginRegistry.findModel* throws IllegalArgumentExceptions
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_major             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b330081"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330081">330081</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[compiler] ArrayIndexOutOfBoundsException when Switched from C/C++ Perspective to Java Perspective
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_major             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b330122"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330122">330122</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[3.6 maint] HTMLTransfer broken from Firefox --> SWT [Carbon]
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_major             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b330285"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330285">330285</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[Commands] Stackoverflow in BindingSystem
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b330310"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330310">330310</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[webapp] Regression: Capability filtering and "Show All" are missing in Eclipse 3.6
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b330438"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330438">330438</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[ltk] NPE in UndoDocumentChange
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b330460"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330460">330460</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[planner] p2 director does not install source bundles from optional features
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b330463"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330463">330463</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">Optimize manifest TouchPointData memory footprint for MetadataRepositories
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_critical             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b330515"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330515">330515</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[Help] Fix in 3.6.2 Remote Help HTTPS support is setting java.protocol.handler.pkgs=javax.net.ssl
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b330549"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330549">330549</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[Wizards] cancelable parameter does not disable Wizard progress bar cancel button
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b330584"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330584">330584</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">org.eclipse.equinox.core.sdk needed to be tagged in 3.6.2 stream
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b330605"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330605">330605</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">test 3.6.2 build with bundles from M20101117-1123 to fix p2 source generation problem
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b330611"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330611">330611</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[launcher] Add mechanism for ignoring user specified config.ini values
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b330815"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330815">330815</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">perf_35x baselines failing due to relocated archives
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b330824"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330824">330824</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[Graphics] Splash screen for SR2 should be updated to use Oracle's copyrights
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_major             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b330927"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330927">330927</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[backport] Default external web browser not found when running 32-bit Eclipse on 64-bit Ubuntu 9.04
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b331303"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=331303">331303</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[backport] Regression: Convert line delimiter action enablement is broken
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b331563"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=331563">331563</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">Backport: [Import/Export]  Import file system doesn't include the top folder you select
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_major             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b331758"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=331758">331758</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[backport] performance regression caused by fix in 298835
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b331762"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=331762">331762</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[repository] Share StringPool for Composite Repositories
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b332041"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=332041">332041</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">Backport bug 162079: [PropertiesView] Properties view should be a post selection listener
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b332095"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=332095">332095</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[query] Repository query takes a long time when deleting a lot of IUs (from dropins)
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b332098"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=332098">332098</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">Metadata generator should not create mkdir/rmdir actions for reconciler bundle
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b332148"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=332148">332148</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[native] Don't fail install when rmdir cannot delete empty directory
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_major             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b332637"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=332637">332637</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">Dead Code detection removing code that isn't dead
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b332639"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=332639">332639</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[backport] There are no changes for models  showing in the Synchronize view with Team > Merge operation.
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b332640"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=332640">332640</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[backport] Team > Merge operation for project contains logical model always show no changes between two branches
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b332686"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=332686">332686</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[backport][Browser] Search for external browser in Preferences finds > 40 instances of firefox on Ubuntu 64bit, if started in /usr/bin
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b332709"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=332709">332709</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">Use JNI add an  window callback function to Shell, function can not be called.
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b333416"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=333416">333416</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[backport] Call to IResource.setEncoding() persists derived file's encoding setting in .settings\org.eclipse.core.resources.prefs
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b333493"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=333493">333493</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">disposed widget exception when closing editor with Browser with Ctrl+F4
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_major             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b333576"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=333576">333576</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[jre] "JRE System Library" default not used properly after Java update
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b333898"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=333898">333898</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[Preferences] [accessibility] Preferences Dialog menu button needs a tooltip
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b334048"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=334048">334048</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[3.6.2] Clicking on a checkbox in a CheckboxTreeViewer selects the row.
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_enhancement             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b334160"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=334160">334160</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[reconciler] Provide mechanism for specifying multiple non-default drop-ins folders
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_major             bz_P3             bz_VERIFIED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b334161"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=334161">334161</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">Eclipse crashes if link to PDF with anchor is clicked twice from Browser Widget
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_CLOSED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b334707"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=334707">334707</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">[discovery] Cache jars downloaded by RemoteBundleDiscoveryStrategy
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b334725"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=334725">334725</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">Something whacky with the build ids
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b334916"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=334916">334916</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">About text needs to be updated to 2011
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_even             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b334919"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=334919">334919</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">org.eclipse.equinox.p2.sdk feature version needs to be incremented in 3.6.2 stream
-    </td>
-
-  </tr>
-
-
-
-  <tr class="bz_bugitem
-             bz_normal             bz_P3             bz_RESOLVED             bz_FIXED                                       bz_row_odd             ">
-
-    <td class="first-child bz_id_column">
-      <a name="b334947"
-         href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=334947">334947</a>
-      <span style="display: none"></span>
-    </td>
-
-    <td 
-        class="bz_short_desc_column">swt bundles still have version 3.6.1 in 3.6.2 stream
-    </td>
-
-  </tr>
-
-
-
-</table>
-
-
-
-
-
-<span class="bz_result_count">115 bugs found.
-</span>
-
-
-
-
-
-<hr/>
-<p>Sun, Solaris, Java and all Java-based trademarks are trademarks of Oracle Corporation.
-in the United States, other countries, or both.</p>
-<p>IBM is a trademark of International Business Machines Corporation in the
-United States, other countries, or both.</p>
-<p>Microsoft, Windows, Windows NT, Vista, and the Windows logo are trademarks of
-Microsoft Corporation in the United States, other countries, or both.</p>
-<p>Apple and Mac OS are trademarks of Apple Computer, Inc., registered in the
-U.S. and other countries.</p>
-<p>QNX, Neutrino, and Photon are trademarks or registered trademarks of QNX
-Software Systems Ltd.</p>
-<p>Other company, product, and service names may be trademarks or service marks
-of others.</p>
-<p>(c) Copyright IBM Corp. and others 2009, 2010</p>
-
-<h2><a name="Appendix1">Appendix 1: Execution Environment by Bundle</a></h2>
-
-<p>In the table below, the "3.6 minimum execution environment"
-  column indicates the minimum Java class library requirements of each bundle
-  for the 3.6 release, where the value is one of:</p>
-<table border="0" width="90%">
-  <tbody>
-    <tr>
-
-      <td align="center"><b>Entry</b></td>
-      <td align="left"><b>Meaning</b></td>
-    </tr>
-    <tr>
-      <td><div align="center"><strong>F1.0</strong></div></td>
-      <td>J2ME Foundation 1.0 - indicates that the bundle can only be run on
-        Foundation 1.0 or greater. Note that with the exception of some MicroEdition
-        IO classes, Foundation 1.0 is a subset of J2SE 1.3.</td>
-    </tr>
-    <tr>
-      <td><div align="center"><strong>F1.1</strong></div></td>
-      <td>J2ME Foundation 1.1 - indicates that the bundle can only be run on
-        Foundation 1.1 or greater. Note that with the exception of some MicroEdition
-        IO classes, Foundation 1.1 is a subset of J2SE 1.4.</td>
-    </tr>
-    <tr>
-      <td><div align="center"><strong>1.3</strong></div></td>
-      <td>J2SE 1.3 - indicates that the bundle can only be run on JSE 1.3 or
-        greater.</td>
-    </tr>
-    <tr>
-      <td><div align="center"><strong>1.4</strong></div></td>
-      <td>J2SE 1.4 - indicates that the bundle can only be run on JSE 1.4 or
-        greater.</td>
-    </tr>
-    <tr>
-      <td><div align="center"><strong>1.5</strong></div></td>
-      <td>Java SE 5 - indicates that the bundle can only be run on Java SE 5 or
-        greater.</td>
-
-    </tr>
-    <tr>
-      <td><div align="center"><strong>1.6</strong></div></td>
-      <td>Java SE 6 - indicates that the bundle can only be run on Java SE 6 or
-        greater.</td>
-    </tr>
-    <tr>
-      <td align="center"><b>n/a</b></td>
-      <td>Unknown at the time of this revision.</td>
-    </tr>
-  </tbody>
-</table>
-
-<p><b>Table of minimum execution environments by bundle.</b> (See also the
-  <a href="http://www.eclipse.org/projects/project-plan.php?projectid=rt.equinox#appendix">Equinox Project plan</a>
-  for the execution environment requirements of bundles contributed via that project.)</p>
+<p><b>Table of minimum execution environments by bundle.</b> (See also the
+  <a href="http://www.eclipse.org/projects/project-plan.php?projectid=rt.equinox#appendix">Equinox Project plan</a>
+  for the execution environment requirements of bundles contributed via that project.)</p>
 
 <table border="1">
   <tbody>
     <tr>
       <td width="290"><strong>Bundle</strong></td>
-      <td width="60"><div align="center"><p align="center"><b>3.6<br/>minimum<br/>execution<br/>environment</b></p></div></td>
-    </tr>
-    <tr>
-      <td>aa.compute.bundle.ee</td>
-      <td><div align="center">1.5</div></td>
+      <td width="60"><div align="center"><p align="center"><b>3.7<br/>minimum<br/>execution<br/>environment</b></p></div></td>
     </tr>
     <tr>
       <td>com.ibm.icu</td>
-      <td><div align="center">F1.0</div></td>
+      <td><div align="center">1.5</div></td>
     </tr>
     <tr>
       <td>com.jcraft.jsch</td>
@@ -3749,11 +1581,15 @@ of others.</p>
     </tr>
     <tr>
       <td>org.apache.lucene</td>
-      <td><div align="center">not specified</div></td>
+      <td><div align="center">1.4</div></td>
     </tr>
     <tr>
       <td>org.apache.lucene.analysis</td>
-      <td><div align="center">not specified</div></td>
+      <td><div align="center">1.4</div></td>
+    </tr>
+    <tr>
+      <td>org.apache.lucene.core</td>
+      <td><div align="center">1.4</div></td>
     </tr>
     <tr>
       <td>org.eclipse.ant.core</td>
@@ -3824,28 +1660,16 @@ of others.</p>
       <td><div align="center">1.4</div></td>
     </tr>
     <tr>
-      <td>org.eclipse.core.filesystem.win32.x86</td>
-      <td><div align="center">not specified</div></td>
-    </tr>
-    <tr>
       <td>org.eclipse.core.jobs</td>
-      <td><div align="center">F1.0</div></td>
+      <td><div align="center">F1.1</div></td>
     </tr>
     <tr>
       <td>org.eclipse.core.net</td>
       <td><div align="center">F1.1</div></td>
     </tr>
     <tr>
-      <td>org.eclipse.core.net.win32.x86</td>
-      <td><div align="center">1.4</div></td>
-    </tr>
-    <tr>
       <td>org.eclipse.core.resources</td>
-      <td><div align="center">1.4</div></td>
-    </tr>
-    <tr>
-      <td>org.eclipse.core.resources.win32.x86</td>
-      <td><div align="center">not specified</div></td>
+      <td><div align="center">1.5</div></td>
     </tr>
     <tr>
       <td>org.eclipse.core.runtime</td>
@@ -3885,7 +1709,7 @@ of others.</p>
     </tr>
     <tr>
       <td>org.eclipse.ecf.filetransfer</td>
-      <td><div align="center">F1.0</div></td>
+      <td><div align="center">F1.1</div></td>
     </tr>
     <tr>
       <td>org.eclipse.ecf.identity</td>
@@ -3961,11 +1785,7 @@ of others.</p>
     </tr>
     <tr>
       <td>org.eclipse.equinox.launcher</td>
-      <td><div align="center">M1.2</div></td>
-    </tr>
-    <tr>
-      <td>org.eclipse.equinox.launcher.win32.win32.x86</td>
-      <td><div align="center">not specified</div></td>
+      <td><div align="center">OSGi/Minimum-1.2</div></td>
     </tr>
     <tr>
       <td>org.eclipse.equinox.p2.artifact.repository</td>
@@ -4012,10 +1832,6 @@ of others.</p>
       <td><div align="center">F1.1</div></td>
     </tr>
     <tr>
-      <td>org.eclipse.equinox.p2.metadata.generator</td>
-      <td><div align="center">1.4</div></td>
-    </tr>
-    <tr>
       <td>org.eclipse.equinox.p2.metadata.repository</td>
       <td><div align="center">F1.1</div></td>
     </tr>
@@ -4028,6 +1844,10 @@ of others.</p>
       <td><div align="center">F1.1</div></td>
     </tr>
     <tr>
+      <td>org.eclipse.equinox.p2.publisher.eclipse</td>
+      <td><div align="center">1.5</div></td>
+    </tr>
+    <tr>
       <td>org.eclipse.equinox.p2.ql</td>
       <td><div align="center">F1.1</div></td>
     </tr>
@@ -4052,10 +1872,18 @@ of others.</p>
       <td><div align="center">F1.1</div></td>
     </tr>
     <tr>
+      <td>org.eclipse.equinox.p2.transport.ecf</td>
+      <td><div align="center">1.4</div></td>
+    </tr>
+    <tr>
       <td>org.eclipse.equinox.p2.ui</td>
       <td><div align="center">F1.1</div></td>
     </tr>
     <tr>
+      <td>org.eclipse.equinox.p2.ui.importexport</td>
+      <td><div align="center">F1.1</div></td>
+    </tr>
+    <tr>
       <td>org.eclipse.equinox.p2.ui.sdk</td>
       <td><div align="center">F1.1</div></td>
     </tr>
@@ -4088,7 +1916,7 @@ of others.</p>
       <td><div align="center">1.4</div></td>
     </tr>
     <tr>
-      <td>org.eclipse.equinox.security.win32.x86</td>
+      <td>org.eclipse.equinox.security.win32.x86_64</td>
       <td><div align="center">1.4</div></td>
     </tr>
     <tr>
@@ -4101,7 +1929,7 @@ of others.</p>
     </tr>
     <tr>
       <td>org.eclipse.equinox.util</td>
-      <td><div align="center">M1.1</div></td>
+      <td><div align="center">OSGi/Minimum-1.1</div></td>
     </tr>
     <tr>
       <td>org.eclipse.help</td>
@@ -4173,7 +2001,7 @@ of others.</p>
     </tr>
     <tr>
       <td>org.eclipse.jdt.junit</td>
-      <td><div align="center">1.4</div></td>
+      <td><div align="center">1.5</div></td>
     </tr>
     <tr>
       <td>org.eclipse.jdt.junit.core</td>
@@ -4193,7 +2021,7 @@ of others.</p>
     </tr>
     <tr>
       <td>org.eclipse.jdt.ui</td>
-      <td><div align="center">1.4</div></td>
+      <td><div align="center">1.5</div></td>
     </tr>
     <tr>
       <td>org.eclipse.jface</td>
@@ -4324,10 +2152,6 @@ of others.</p>
       <td><div align="center">F1.0</div></td>
     </tr>
     <tr>
-      <td>org.eclipse.swt.win32.win32.x86</td>
-      <td><div align="center">F1.0</div></td>
-    </tr>
-    <tr>
       <td>org.eclipse.team.core</td>
       <td><div align="center">1.4</div></td>
     </tr>
@@ -4445,7 +2269,7 @@ of others.</p>
     </tr>
     <tr>
       <td>org.eclipse.update.core</td>
-      <td><div align="center">F1.0</div></td>
+      <td><div align="center">F1.1</div></td>
     </tr>
     <tr>
       <td>org.eclipse.update.core.win32</td>
@@ -4491,7 +2315,7 @@ of others.</p>
       <td>org.sat4j.pb</td>
       <td><div align="center">1.4</div></td>
     </tr>
-    </tbody>
+  </tbody>
 </table>
 
 </body>
diff --git a/eclipse/features/org.eclipse.platform/sourceTemplateFeature/build.properties b/eclipse/features/org.eclipse.platform/sourceTemplateFeature/build.properties
index fc2a706..a510593 100644
--- a/eclipse/features/org.eclipse.platform/sourceTemplateFeature/build.properties
+++ b/eclipse/features/org.eclipse.platform/sourceTemplateFeature/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-#  Copyright (c) 2000, 2009 IBM Corporation and others.
+#  Copyright (c) 2000, 2011 IBM Corporation and others.
 #  All rights reserved. This program and the accompanying materials
 #  are made available under the terms of the Eclipse Public License v1.0
 #  which accompanies this distribution, and is available at
@@ -9,28 +9,26 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes =\
-epl-v10.html,\
 eclipse_update_120.jpg,\
 feature.xml,\
-feature.properties,\
-license.html
+feature.properties
 
-generate.feature at org.eclipse.rcp.source=org.eclipse.rcp,plugin at com.ibm.icu.source;version=4.2.1.qualifier;unpack="false"
+generate.feature at org.eclipse.rcp.source=org.eclipse.rcp,plugin at com.ibm.icu.source;version=4.4.2.qualifier;unpack="false"
 generate.feature at org.eclipse.equinox.p2.user.ui.source=org.eclipse.equinox.p2.user.ui,\
-	   plugin at org.eclipse.ecf.source;version=3.0.0.qualifier;unpack="false",\
+	   feature at org.eclipse.equinox.p2.core.feature.source,\
+	   feature at org.eclipse.equinox.p2.extras.feature.source,\
+	   feature at org.eclipse.equinox.p2.rcp.feature.source,\
+	   plugin at org.eclipse.ecf.source;version=3.1.300.qualifier;unpack="false",\
 	   plugin at org.eclipse.ecf.ssl.source;version=1.0.100.qualifier;unpack="false",\
-	   plugin at org.eclipse.ecf.identity.source;version=3.0.0.qualifier;unpack="false",\
-	   plugin at org.eclipse.ecf.filetransfer.source;version=3.0.0.qualifier;unpack="false",\
-	   plugin at org.eclipse.ecf.provider.filetransfer.source;version=3.0.0.qualifier;unpack="false",\
+	   plugin at org.eclipse.ecf.identity.source;version=3.1.100.qualifier;unpack="false",\
+	   plugin at org.eclipse.ecf.filetransfer.source;version=5.0.0.qualifier;unpack="false",\
+	   plugin at org.eclipse.ecf.provider.filetransfer.source;version=3.2.0.qualifier;unpack="false",\
 	   plugin at org.eclipse.ecf.provider.filetransfer.ssl.source;version=1.0.0.qualifier;unpack="false",\
-	   plugin at org.eclipse.ecf.provider.filetransfer.httpclient.source;version=3.0.0.qualifier;unpack="false",\
+	   plugin at org.eclipse.ecf.provider.filetransfer.httpclient.source;version=4.0.0.qualifier;unpack="false",\
 	   plugin at org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source;version=1.0.0.qualifier;unpack="false",\
 	   plugin at org.apache.commons.codec.source;version=1.3.0.qualifier;unpack="false,\
 	   plugin at org.apache.commons.httpclient.source;version=3.1.0.qualifier;unpack="false"   
-   
-
-
-
+    
 
 
 
diff --git a/eclipse/features/org.eclipse.platform/sourceTemplateFeature/epl-v10.html b/eclipse/features/org.eclipse.platform/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/eclipse/features/org.eclipse.platform/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.platform/sourceTemplateFeature/feature.properties b/eclipse/features/org.eclipse.platform/sourceTemplateFeature/feature.properties
index 8a1eab2..1feb7fa 100644
--- a/eclipse/features/org.eclipse.platform/sourceTemplateFeature/feature.properties
+++ b/eclipse/features/org.eclipse.platform/sourceTemplateFeature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2010 IBM Corporation and others.
+# Copyright (c) 2000, 2011 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -20,12 +20,6 @@ featureName=Eclipse Platform Plug-in Developer Resources
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Project Updates
-
-# "secondarySiteName" property - label for the update site
-secondaryUpdateSiteName=Helios Discovery Site
-
 # "description" property - description of the feature
 description=Common OS-independent API documentation and source code zips for the Eclipse Platform.
 
@@ -39,135 +33,4 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
\ No newline at end of file
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.platform/sourceTemplateFeature/license.html b/eclipse/features/org.eclipse.platform/sourceTemplateFeature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/eclipse/features/org.eclipse.platform/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/eclipse/features/org.eclipse.platform/sourceTemplatePlugin/about.properties b/eclipse/features/org.eclipse.platform/sourceTemplatePlugin/about.properties
index 7e7d3a3..f7e2395 100644
--- a/eclipse/features/org.eclipse.platform/sourceTemplatePlugin/about.properties
+++ b/eclipse/features/org.eclipse.platform/sourceTemplatePlugin/about.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2010 IBM Corporation and others.
+# Copyright (c) 2000, 2011 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -21,6 +21,6 @@ blurb=Eclipse Platform Plug-in Developer Resources\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Eclipse contributors and others 2000, 2010.  All rights reserved.\n\
+(c) Copyright Eclipse contributors and others 2000, 2011.  All rights reserved.\n\
 Visit http://www.eclipse.org/platform
 
diff --git a/eclipse/features/org.eclipse.rcp/build.properties b/eclipse/features/org.eclipse.rcp/build.properties
index a7c7a0a..5095a23 100644
--- a/eclipse/features/org.eclipse.rcp/build.properties
+++ b/eclipse/features/org.eclipse.rcp/build.properties
@@ -8,7 +8,7 @@
 #  Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-bin.includes=feature.xml,license.html,epl-v10.html,feature.properties,eclipse_update_120.jpg
+bin.includes=feature.xml,feature.properties,eclipse_update_120.jpg
 root=../org.eclipse.platform/rootfiles
 
 
diff --git a/eclipse/features/org.eclipse.rcp/epl-v10.html b/eclipse/features/org.eclipse.rcp/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/eclipse/features/org.eclipse.rcp/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.rcp/feature.properties b/eclipse/features/org.eclipse.rcp/feature.properties
index ddf35f4..11812c0 100644
--- a/eclipse/features/org.eclipse.rcp/feature.properties
+++ b/eclipse/features/org.eclipse.rcp/feature.properties
@@ -36,135 +36,4 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
\ No newline at end of file
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.rcp/feature.xml b/eclipse/features/org.eclipse.rcp/feature.xml
index 9c30767..1b0f07f 100644
--- a/eclipse/features/org.eclipse.rcp/feature.xml
+++ b/eclipse/features/org.eclipse.rcp/feature.xml
@@ -1,10 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
<feature
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
       id="org.eclipse.rcp"
       label="%featureName"
-      version="3.6.2.qualifier"
+      version="3.7.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rcp"
-      image="eclipse_update_120.jpg">
+      image="eclipse_update_120.jpg"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
 
    <description>
       %description
@@ -20,8 +23,8 @@
 
    <url>
       <update label="%updateSiteName" url="http://download.eclipse.org/eclipse/updates/3.5"/>
-   </url>
-
+   </url>  
+    
    <plugin
          id="com.ibm.icu"
          download-size="0"
@@ -34,23 +37,23 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>      
-        
-    <plugin
+         unpack="false"/>
+
+   <plugin
          id="org.eclipse.core.databinding"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>         
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.core.databinding.observable"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>       
-             
-  <plugin
+         unpack="false"/>
+
+   <plugin
          id="org.eclipse.core.databinding.property"
          download-size="0"
          install-size="0"
@@ -98,7 +101,7 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
+
    <plugin
          id="org.eclipse.osgi.services"
          download-size="0"
@@ -157,17 +160,17 @@
          version="0.0.0"
          fragment="true"
          unpack="false"/>
-         
-    <plugin
+
+   <plugin
          id="org.eclipse.ui.cocoa"
          os="macosx"
-         ws="cocoa"    
+         ws="cocoa"
          download-size="0"
          install-size="0"
          version="0.0.0"
          fragment="true"
-         unpack="false"/> 
-                                  
+         unpack="false"/>
+
    <plugin
          id="org.eclipse.update.configurator"
          download-size="0"
@@ -214,8 +217,8 @@
          version="0.0.0"
          fragment="true"
          unpack="false"/>
-         
-    <plugin
+
+   <plugin
          id="org.eclipse.swt.gtk.linux.s390x"
          os="linux"
          ws="gtk"
@@ -225,8 +228,8 @@
          version="0.0.0"
          fragment="true"
          unpack="false"/>
-         
-    <plugin
+
+   <plugin
          id="org.eclipse.swt.gtk.linux.s390"
          os="linux"
          ws="gtk"
@@ -247,7 +250,7 @@
          version="0.0.0"
          fragment="true"
          unpack="false"/>
-         
+
    <plugin
          id="org.eclipse.swt.gtk.solaris.x86"
          os="solaris"
@@ -260,17 +263,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.swt.gtk.linux.ppc"
-         os="linux"
-         ws="gtk"
-         arch="ppc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-         
-   <plugin
          id="org.eclipse.swt.gtk.linux.ppc64"
          os="linux"
          ws="gtk"
@@ -302,8 +294,8 @@
          version="0.0.0"
          fragment="true"
          unpack="false"/>
-         
-    <plugin
+
+   <plugin
          id="org.eclipse.swt.carbon.macosx"
          os="macosx"
          ws="carbon"
@@ -313,8 +305,8 @@
          version="0.0.0"
          fragment="true"
          unpack="false"/>
-         
-    <plugin
+
+   <plugin
          id="org.eclipse.swt.cocoa.macosx"
          os="macosx"
          ws="cocoa"
@@ -324,8 +316,8 @@
          version="0.0.0"
          fragment="true"
          unpack="false"/>
-         
-    <plugin
+
+   <plugin
          id="org.eclipse.swt.cocoa.macosx"
          os="macosx"
          ws="cocoa"
@@ -335,8 +327,8 @@
          version="0.0.0"
          fragment="true"
          unpack="false"/>
-         
-    <plugin
+
+   <plugin
          id="org.eclipse.swt.cocoa.macosx.x86_64"
          os="macosx"
          ws="cocoa"
@@ -345,46 +337,24 @@
          install-size="0"
          version="0.0.0"
          fragment="true"
-         unpack="false"/>           
+         unpack="false"/>
 
    <plugin
-         id="org.eclipse.swt.motif.aix.ppc"
+         id="org.eclipse.swt.gtk.aix.ppc"
          os="aix"
-         ws="motif"
+         ws="gtk"
          arch="ppc"
          download-size="0"
          install-size="0"
          version="0.0.0"
          fragment="true"
-         unpack="false"/>
         
    <plugin
         id="org.eclipse.swt.gtk.aix.ppc64"
         os="aix"
         ws="gtk"
         arch="ppc64"
         download-size="0"
         install-size="0"
         version="0.0.0"
         fragment="true"
         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.swt.motif.hpux.ia64_32"
-         os="hpux"
-         ws="motif"
-         arch="ia64_32"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.swt.motif.linux.x86"
-         os="linux"
-         ws="motif"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>   
-
-   <plugin
-         id="org.eclipse.swt.motif.solaris.sparc"
-         os="solaris"
-         ws="motif"
-         arch="sparc"
+         id="org.eclipse.swt.gtk.aix.ppc64"
+         os="aix"
+         ws="gtk"
+         arch="ppc64"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -392,10 +362,10 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.swt.photon.qnx.x86"
-         os="qnx"
-         ws="photon"
-         arch="x86"
+         id="org.eclipse.swt.gtk.hpux.ia64_32"
+         os="hpux"
+         ws="gtk"
+         arch="ia64_32"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -428,22 +398,22 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>         
-         
-    <plugin
+         unpack="false"/>
+
+   <plugin
          id="org.eclipse.equinox.ds"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>       
-        
-    <plugin
+         unpack="false"/>
+
+   <plugin
          id="org.eclipse.equinox.util"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
- 
+
    <plugin
          id="org.eclipse.equinox.preferences"
          download-size="0"
@@ -474,8 +444,8 @@
          install-size="0"
          version="0.0.0"
          fragment="true"/>
-         
-    <plugin
+
+   <plugin
          id="org.eclipse.equinox.launcher.gtk.solaris.x86"
          os="solaris"
          ws="gtk"
@@ -494,8 +464,8 @@
          install-size="0"
          version="0.0.0"
          fragment="true"/>
-         
-    <plugin
+
+   <plugin
          id="org.eclipse.equinox.launcher.carbon.macosx"
          os="macosx"
          ws="carbon"
@@ -504,8 +474,8 @@
          install-size="0"
          version="0.0.0"
          fragment="true"/>
-    
-    <plugin
+
+   <plugin
          id="org.eclipse.equinox.launcher.cocoa.macosx"
          os="macosx"
          ws="cocoa"
@@ -514,8 +484,8 @@
          install-size="0"
          version="0.0.0"
          fragment="true"/>
-         
-    <plugin
+
+   <plugin
          id="org.eclipse.equinox.launcher.cocoa.macosx"
          os="macosx"
          ws="cocoa"
@@ -523,8 +493,8 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         fragment="true"/>       
-            
+         fragment="true"/>
+
    <plugin
          id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64"
          os="macosx"
@@ -533,19 +503,9 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         fragment="true"/>
+         fragment="true"/>  
 
    <plugin
-         id="org.eclipse.equinox.launcher.gtk.linux.ppc"
-         os="linux"
-         ws="gtk"
-         arch="ppc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-         
-   <plugin
          id="org.eclipse.equinox.launcher.gtk.linux.ppc64"
          os="linux"
          ws="gtk"
@@ -554,7 +514,6 @@
          install-size="0"
          version="0.0.0"
          fragment="true"/>
-         
 
    <plugin
          id="org.eclipse.equinox.launcher.gtk.linux.x86"
@@ -575,7 +534,7 @@
          install-size="0"
          version="0.0.0"
          fragment="true"/>
-         
+
    <plugin
          id="org.eclipse.equinox.launcher.gtk.linux.s390"
          os="linux"
@@ -587,16 +546,6 @@
          fragment="true"/>
 
    <plugin
-         id="org.eclipse.equinox.launcher.motif.linux.x86"
-         os="linux"
-         ws="motif"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
          id="org.eclipse.equinox.launcher.gtk.linux.x86_64"
          os="linux"
          ws="gtk"
@@ -607,26 +556,26 @@
          fragment="true"/>
 
    <plugin
-         id="org.eclipse.equinox.launcher.motif.aix.ppc"
+         id="org.eclipse.equinox.launcher.gtk.aix.ppc"
          os="aix"
-         ws="motif"
+         ws="gtk"
          arch="ppc"
          download-size="0"
          install-size="0"
          version="0.0.0"
          fragment="true"/>
-
 <plugin
         id="org.eclipse.equinox.launcher.gtk.aix.ppc64"
         os="aix"
         ws="gtk"
         arch="ppc64"
         download-size="0"
         install-size="0"
         version="0.0.0"
         fragment="true"/>
+
    <plugin
-         id="org.eclipse.equinox.launcher.motif.hpux.ia64_32"
-         os="hpux"
-         ws="motif"
-         arch="ia64_32"
+         id="org.eclipse.equinox.launcher.gtk.aix.ppc64"
+         os="aix"
+         ws="gtk"
+         arch="ppc64"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         fragment="true"/>  
- 
-   <plugin
+         fragment="true"/>
+
+     <plugin
          id="org.eclipse.equinox.launcher.win32.win32.x86"
          os="win32"
          ws="win32"
@@ -646,5 +595,4 @@
          version="0.0.0"
          fragment="true"/>
 
-
 </feature>
diff --git a/eclipse/features/org.eclipse.rcp/license.html b/eclipse/features/org.eclipse.rcp/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/eclipse/features/org.eclipse.rcp/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/eclipse/features/org.eclipse.rcp/sourceTemplateFeature/build.properties b/eclipse/features/org.eclipse.rcp/sourceTemplateFeature/build.properties
index 787aab1..ef23cda 100644
--- a/eclipse/features/org.eclipse.rcp/sourceTemplateFeature/build.properties
+++ b/eclipse/features/org.eclipse.rcp/sourceTemplateFeature/build.properties
@@ -9,10 +9,9 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes =\
-epl-v10.html,\
 eclipse_update_120.jpg,\
 feature.xml,\
-feature.properties,\
-license.html
+feature.properties
+
 
 
diff --git a/eclipse/features/org.eclipse.rcp/sourceTemplateFeature/epl-v10.html b/eclipse/features/org.eclipse.rcp/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/eclipse/features/org.eclipse.rcp/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.rcp/sourceTemplateFeature/feature.properties b/eclipse/features/org.eclipse.rcp/sourceTemplateFeature/feature.properties
index 3e2d556..ae04e6a 100644
--- a/eclipse/features/org.eclipse.rcp/sourceTemplateFeature/feature.properties
+++ b/eclipse/features/org.eclipse.rcp/sourceTemplateFeature/feature.properties
@@ -20,15 +20,12 @@ featureName=Eclipse RCP Plug-in Developer Resources
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Project Updates
-
 # "description" property - description of the feature
 description=Source code zips for the Eclipse RCP.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2000, 2009 IBM Corporation and others.\n\
+Copyright (c) 2000, 2010 IBM Corporation and others.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
@@ -36,135 +33,4 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
\ No newline at end of file
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.rcp/sourceTemplateFeature/license.html b/eclipse/features/org.eclipse.rcp/sourceTemplateFeature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/eclipse/features/org.eclipse.rcp/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/eclipse/features/org.eclipse.rcp/sourceTemplateFragment/about.html b/eclipse/features/org.eclipse.rcp/sourceTemplateFragment/about.html
deleted file mode 100644
index c207d05..0000000
--- a/eclipse/features/org.eclipse.rcp/sourceTemplateFragment/about.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 10, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.rcp/sourceTemplatePlugin/about.properties b/eclipse/features/org.eclipse.rcp/sourceTemplatePlugin/about.properties
index 3553c5d..7a5cd91 100644
--- a/eclipse/features/org.eclipse.rcp/sourceTemplatePlugin/about.properties
+++ b/eclipse/features/org.eclipse.rcp/sourceTemplatePlugin/about.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-#  Copyright (c) 2000, 2009 IBM Corporation and others.
+#  Copyright (c) 2000, 2010 IBM Corporation and others.
 #  All rights reserved. This program and the accompanying materials
 #  are made available under the terms of the Eclipse Public License v1.0
 #  which accompanies this distribution, and is available at
@@ -21,6 +21,6 @@ blurb=Eclipse RCP Plug-in Developer Resources\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Eclipse contributors and others 2000, 2009.  All rights reserved.\n\
+(c) Copyright Eclipse contributors and others 2000, 2010.  All rights reserved.\n\
 Visit http://www.eclipse.org/rcp
 
diff --git a/eclipse/features/org.eclipse.releng.tools/feature.properties b/eclipse/features/org.eclipse.releng.tools/feature.properties
index 642b24c..09fe6ca 100644
--- a/eclipse/features/org.eclipse.releng.tools/feature.properties
+++ b/eclipse/features/org.eclipse.releng.tools/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2010 IBM Corporation and others.
+# Copyright (c) 2000, 2011 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -20,9 +20,6 @@ featureName=Eclipse Releng Tools
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Project Updates
-
 # "description" property - description of the feature
 description=Eclipse Releng Tools
 
@@ -36,135 +33,4 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
\ No newline at end of file
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.releng.tools/feature.xml b/eclipse/features/org.eclipse.releng.tools/feature.xml
index 5134072..b88e1fd 100644
--- a/eclipse/features/org.eclipse.releng.tools/feature.xml
+++ b/eclipse/features/org.eclipse.releng.tools/feature.xml
@@ -2,10 +2,12 @@
 <feature
       id="org.eclipse.releng.tools"
       label="%featureName"
-      version="3.3.0.qualifier"
+      version="3.4.100.qualifier"
       provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
+      image="eclipse_update_120.jpg"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
+      
    <description>
       %description
    </description>
@@ -13,17 +15,11 @@
    <copyright>
       %copyright
    </copyright>
-   
+
    <license url="%licenseURL">
       %license
    </license>
 
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/eclipse/updates/3.5"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/eclipse/updates/3.5"/>
-      <discovery label="%secondaryUpdateSiteName" url="http://download.eclipse.org/releases/galileo"/>
-   </url>
-   
    <plugin
          id="org.eclipse.releng.tools"
          download-size="0"
diff --git a/eclipse/features/org.eclipse.sdk/build.properties b/eclipse/features/org.eclipse.sdk/build.properties
index 910df08..a265b27 100644
--- a/eclipse/features/org.eclipse.sdk/build.properties
+++ b/eclipse/features/org.eclipse.sdk/build.properties
@@ -8,20 +8,19 @@
 #  Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-bin.includes=epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html
+bin.includes=eclipse_update_120.jpg,feature.xml,feature.properties
 
 generate.feature at org.eclipse.platform.source=org.eclipse.platform,feature at org.eclipse.rcp.source,feature at org.eclipse.equinox.p2.user.ui.source;optional="true",plugin at org.eclipse.platform.doc.isv;unpack="false",\
-  plugin at org.apache.ant.source;version=1.7.1.qualifier;unpack="false",\
+  plugin at org.apache.ant.source;version=1.8.2.qualifier;unpack="false",\
   plugin at com.jcraft.jsch.source;version=0.1.41.qualifier;unpack="false",\
   exclude at org.eclipse.platform.doc.user
    
 generate.feature at org.eclipse.jdt.source=org.eclipse.jdt, plugin at org.eclipse.jdt.doc.isv;unpack="false",\
 plugin at org.junit.source;version=3.8.2.qualifier;unpack="false",\
-plugin at org.junit.source;version=4.8.1.qualifier;unpack="false",\
+plugin at org.junit.source;version=4.8.2.qualifier;unpack="false",\
 plugin at org.hamcrest.core.source;version=1.1.0.qualifier;unpack="false",\
 exclude at org.eclipse.jdt.doc.user
-generate.feature at org.eclipse.pde.source=org.eclipse.pde,plugin at org.objectweb.asm.source;version=3.2.0.qualifier;unpack="false",\exclude at org.eclipse.pde.doc.user
-generate.feature at org.eclipse.pde.p2.source=org.eclipse.pde.p2
+generate.feature at org.eclipse.pde.source=org.eclipse.pde,plugin at org.objectweb.asm.source;version=3.3.1.qualifier;unpack="false",\exclude at org.eclipse.pde.doc.user
 generate.feature at org.eclipse.cvs.source=org.eclipse.cvs
 generate.feature at org.eclipse.help.source=org.eclipse.help,\
   plugin at javax.servlet.source;version=2.5.0.qualifier;unpack="false",\
@@ -29,9 +28,10 @@ generate.feature at org.eclipse.help.source=org.eclipse.help,\
   plugin at org.apache.jasper.source;version=5.5.17.qualifier;unpack="false",\
   plugin at org.apache.commons.el.source;version=1.0.0.qualifier;unpack="false",\
   plugin at org.apache.commons.logging.source;version=1.0.4.qualifier;unpack="false",\
-  plugin at org.apache.lucene.source;version=1.9.1.qualifier;unpack="false",\
-  plugin at org.apache.lucene.analysis.source;version=1.9.1.qualifier;unpack="false",\
+  plugin at org.apache.lucene.source;version=2.9.1.qualifier;unpack="false",\
+  plugin at org.apache.lucene.analysis.source;version=2.9.1.qualifier;unpack="false",\
+  plugin at org.apache.lucene.core.source;version=2.9.1.qualifier;unpack="false",\
   plugin at org.mortbay.jetty.util.source;version=6.1.23.qualifier;unpack="false",\
   plugin at org.mortbay.jetty.server.source;version=6.1.23.qualifier;unpack="false"
 
-generatedVersionLength=45
\ No newline at end of file
+generatedVersionLength=45
diff --git a/eclipse/features/org.eclipse.sdk/epl-v10.html b/eclipse/features/org.eclipse.sdk/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/eclipse/features/org.eclipse.sdk/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.sdk/feature.properties b/eclipse/features/org.eclipse.sdk/feature.properties
index 84d8533..3d9b8dd 100644
--- a/eclipse/features/org.eclipse.sdk/feature.properties
+++ b/eclipse/features/org.eclipse.sdk/feature.properties
@@ -20,12 +20,6 @@ featureName=Eclipse Project SDK
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Project Updates
-
-# "secondarySiteName" property - label for the secondary update site
-secondaryUpdateSiteName=Helios Discovery Site
-
 # "description" property - description of the feature
 description=SDK for Eclipse.
 
@@ -39,135 +33,4 @@ http://www.eclipse.org/legal/epl-v10.html\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
\ No newline at end of file
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.sdk/feature.xml b/eclipse/features/org.eclipse.sdk/feature.xml
index f954c4a..0c232d5 100644
--- a/eclipse/features/org.eclipse.sdk/feature.xml
+++ b/eclipse/features/org.eclipse.sdk/feature.xml
@@ -2,9 +2,11 @@
 <feature
       id="org.eclipse.sdk"
       label="%featureName"
-      version="3.6.2.qualifier"
+      version="3.7.0.qualifier"
       provider-name="%providerName"
-      image="eclipse_update_120.jpg">
+      image="eclipse_update_120.jpg"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
 
    <description>
       %description
@@ -18,12 +20,6 @@
       %license
    </license>
 
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/eclipse/updates/3.6"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/eclipse/updates/3.6"/>
-      <discovery label="%secondaryUpdateSiteName" url="http://download.eclipse.org/releases/helios"/>
-   </url>
-
    <includes
          id="org.eclipse.platform"
          version="0.0.0"/>
@@ -54,16 +50,16 @@
 
    <includes
          id="org.eclipse.pde.source"
-         version="0.0.0"/> 
- 
+         version="0.0.0"/>
+
    <includes
          id="org.eclipse.help"
          version="0.0.0"/>
-         
+
    <includes
          id="org.eclipse.help.source"
          version="0.0.0"/>
- 
+
    <plugin
          id="org.eclipse.sdk"
          download-size="0"
diff --git a/eclipse/features/org.eclipse.sdk/license.html b/eclipse/features/org.eclipse.sdk/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/eclipse/features/org.eclipse.sdk/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/eclipse/label.properties b/eclipse/label.properties
index 7b78f16..6531971 100644
--- a/eclipse/label.properties
+++ b/eclipse/label.properties
@@ -1,6 +1,6 @@
 
-			timestamp=20110308-1405
+			timestamp=20110627-1014
 			buildType=I
-			buildId=I20110308-1405
-			buildLabel=I20110308-1405
+			buildId=I20110627-1014
+			buildLabel=I20110627-1014
 		
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/ant.map b/eclipse/maps/org.eclipse.releng/maps/ant.map
index 4e55039..ef89400 100644
--- a/eclipse/maps/org.eclipse.releng/maps/ant.map
+++ b/eclipse/maps/org.eclipse.releng/maps/ant.map
@@ -1,13 +1,13 @@
 !***************  ANT CONTRIBUTION  ******************************************************** 
 
 #plugin at org.apache.ant=v20070416,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ant.core=v20110203_r362,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ant.launching=v20101020_r362,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ant.core=v20110511,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ant.launching=v20110506,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.ant.ui=v20100427,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ant.ui=v20110510,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.ui.externaltools=v20100427,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.externaltools=v20100831_r361,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.externaltools=v20110506,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.externaltools=v20110506,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.ant.tests.core=v20091214,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ant.tests.ui=v20100602-1000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+plugin at org.eclipse.ant.tests.core=v20110506,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ant.tests.ui=v20110506,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/compare.map b/eclipse/maps/org.eclipse.releng/maps/compare.map
index 3257354..b5706db 100644
--- a/eclipse/maps/org.eclipse.releng/maps/compare.map
+++ b/eclipse/maps/org.eclipse.releng/maps/compare.map
@@ -1,10 +1,10 @@
 !***************  COMPARE CONTRIBUTION  ******************************************************** 
 
-plugin at org.eclipse.compare=R36x_v20100929-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare
-plugin at org.eclipse.compare.core=R36x_v20100929-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare.core
-plugin at org.eclipse.compare.win32=R36x_v20101103-0618,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare.win32
+plugin at org.eclipse.compare=I20110525-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare
+plugin at org.eclipse.compare.core=I20110208-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare.core
+plugin at org.eclipse.compare.win32=I20110510-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare.win32
 
-plugin at org.eclipse.compare.examples=I20100505-1245,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.compare.examples.xml=I20100505-1245,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.compare.examples=I20110510-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.compare.examples.xml=I20110510-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.compare.tests=I20100505-1245,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+plugin at org.eclipse.compare.tests=I20110510-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/core-hpux.map b/eclipse/maps/org.eclipse.releng/maps/core-hpux.map
index b077860..2533a6e 100644
--- a/eclipse/maps/org.eclipse.releng/maps/core-hpux.map
+++ b/eclipse/maps/org.eclipse.releng/maps/core-hpux.map
@@ -1,3 +1,3 @@
 !***************  CORE (HP-UX) CONTRIBUTION  ************************************************ 
 
-fragment at org.eclipse.core.filesystem.hpux.ia64_32=v20100505,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+fragment at org.eclipse.core.filesystem.hpux.ia64_32=v20110423-0524,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/core-macosx.map b/eclipse/maps/org.eclipse.releng/maps/core-macosx.map
index 2c24c98..0e40bad 100644
--- a/eclipse/maps/org.eclipse.releng/maps/core-macosx.map
+++ b/eclipse/maps/org.eclipse.releng/maps/core-macosx.map
@@ -1,3 +1,3 @@
 !***************  CORE (MacOSX) CONTRIBUTION  ************************************************ 
 
-fragment at org.eclipse.core.filesystem.macosx=v20100505,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+fragment at org.eclipse.core.filesystem.macosx=v20110423-0524,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/core-variables.map b/eclipse/maps/org.eclipse.releng/maps/core-variables.map
index a4a4aff..3d761f9 100644
--- a/eclipse/maps/org.eclipse.releng/maps/core-variables.map
+++ b/eclipse/maps/org.eclipse.releng/maps/core-variables.map
@@ -1,3 +1,3 @@
 !***************  CORE VARIABLES CONTRIBUTION  ******************************************************** 
 
-plugin at org.eclipse.core.variables=v20100505,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+plugin at org.eclipse.core.variables=v20110511,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/core.map b/eclipse/maps/org.eclipse.releng/maps/core.map
index d7ddfa4..10cd6ca 100644
--- a/eclipse/maps/org.eclipse.releng/maps/core.map
+++ b/eclipse/maps/org.eclipse.releng/maps/core.map
@@ -1,126 +1,147 @@
-!***************  CORE CONTRIBUTION  ******************************************************** 
+!***************  CORE CONTRIBUTION  ********************************************************* 
 
 !**** OSGi
-plugin at org.eclipse.osgi=R36x_v20110210,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi
-plugin at org.eclipse.osgi.services=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.osgi.services
-plugin at org.eclipse.osgi.util=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.osgi.util
+plugin at org.eclipse.osgi=v20110613,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi
+plugin at org.eclipse.osgi.services=v20110513,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.osgi.services
+plugin at org.eclipse.osgi.util=v20110110,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.osgi.util
 
 !**** Equinox
-plugin at org.eclipse.equinox.common=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.common
-plugin at org.eclipse.equinox.preferences=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.preferences
-plugin at org.eclipse.equinox.registry=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.registry
-plugin at org.eclipse.equinox.supplement=R36x_v20101021,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi/supplement
-plugin at org.eclipse.equinox.app=R36x_v20100803,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.app
-plugin at org.eclipse.equinox.device=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.device
-plugin at org.eclipse.equinox.event=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.event
-plugin at org.eclipse.equinox.http=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http
-plugin at org.eclipse.equinox.log=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.log
-plugin at org.eclipse.equinox.metatype=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.metatype
-plugin at org.eclipse.equinox.useradmin=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.useradmin
-plugin at org.eclipse.equinox.http.jetty,2.0.0=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.jetty6
-plugin at org.eclipse.equinox.http.jetty,1.1.100=v20100519,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.jetty5
-plugin at org.eclipse.equinox.http.servlet=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.servlet
+plugin at org.eclipse.equinox.common=v20110523,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.common
+plugin at org.eclipse.equinox.preferences=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.preferences
+plugin at org.eclipse.equinox.registry=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.registry
+plugin at org.eclipse.equinox.supplement=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi/supplement
+plugin at org.eclipse.equinox.app=v20110321,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.app
+plugin at org.eclipse.equinox.device=v20101217,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.device
+plugin at org.eclipse.equinox.event=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.event
+plugin at org.eclipse.equinox.http=v20110413,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http
+plugin at org.eclipse.equinox.log=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.log
+plugin at org.eclipse.equinox.metatype=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.metatype
+plugin at org.eclipse.equinox.useradmin=v20110413,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.useradmin
+plugin at org.eclipse.equinox.http.jetty,2.0.0=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.jetty6
+plugin at org.eclipse.equinox.http.jetty,1.1.100=v20110418,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.jetty5
+plugin at org.eclipse.equinox.http.servlet=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.servlet
 plugin at org.eclipse.equinox.http.servletbridge=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.http.servletbridge
-plugin at org.eclipse.equinox.http.registry=R36x_v20101103,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.http.registry
-plugin at org.eclipse.equinox.servletbridge=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.servletbridge
+plugin at org.eclipse.equinox.http.registry=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.http.registry
+plugin at org.eclipse.equinox.servletbridge=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.servletbridge
 fragment at org.eclipse.equinox.servletbridge.extensionbundle=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.servletbridge.extensionbundle
-bundle at org.eclipse.equinox.jsp.jasper=R36x_v20101103,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.jsp.jasper
+bundle at org.eclipse.equinox.jsp.jasper=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.jsp.jasper
 bundle at org.eclipse.equinox.jsp.jasper.registry=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.jsp.jasper.registry
-plugin at org.eclipse.equinox.cm=v20100520,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.cm
-plugin at org.eclipse.equinox.concurrent=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.concurrent
+plugin at org.eclipse.equinox.cm=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.cm
+plugin at org.eclipse.equinox.concurrent=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.concurrent
+plugin at org.eclipse.equinox.coordinator=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.coordinator
 
 !**** Prosyst Contributions
-plugin at org.eclipse.equinox.ds=R36x_v20100803,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.ds
-plugin at org.eclipse.equinox.io=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.io
-plugin at org.eclipse.equinox.ip=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.ip
-plugin at org.eclipse.equinox.util=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.util
-plugin at org.eclipse.equinox.wireadmin=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.wireadmin
+plugin at org.eclipse.equinox.ds=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.ds
+plugin at org.eclipse.equinox.io=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.io
+plugin at org.eclipse.equinox.ip=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.ip
+plugin at org.eclipse.equinox.util=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.util
+plugin at org.eclipse.equinox.wireadmin=v20110601,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.wireadmin
 
 !**** Security Contributions
-plugin at org.eclipse.equinox.security=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security
-plugin at org.eclipse.equinox.security.tests=v20080722-0430,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.tests
-plugin at org.eclipse.equinox.security.ui=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.ui
+plugin at org.eclipse.equinox.security=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security
+plugin at org.eclipse.equinox.security.tests=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.tests
+plugin at org.eclipse.equinox.security.ui=v20101004,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.ui
 fragment at org.eclipse.equinox.security.win32.x86=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.win32.x86
+fragment at org.eclipse.equinox.security.win32.x86_64=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.win32.x86_64
 fragment at org.eclipse.equinox.security.macosx=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.macosx
 
 !**** Transforms
 plugin at org.eclipse.equinox.transforms.xslt=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.transforms.xslt
-fragment at org.eclipse.equinox.transforms.hook=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.transforms.hook
+fragment at org.eclipse.equinox.transforms.hook=v20100719,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.transforms.hook
 
 !**** Weaving
-plugin at org.eclipse.equinox.weaving.aspectj=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/weaving/bundles/org.eclipse.equinox.weaving.aspectj
-plugin at org.eclipse.equinox.weaving.caching=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/weaving/bundles/org.eclipse.equinox.weaving.caching
-plugin at org.eclipse.equinox.weaving.caching.j9=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/weaving/bundles/org.eclipse.equinox.weaving.caching.j9
-fragment at org.eclipse.equinox.weaving.hook=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/weaving/bundles/org.eclipse.equinox.weaving.hook
+plugin at org.eclipse.equinox.weaving.aspectj=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/weaving/bundles/org.eclipse.equinox.weaving.aspectj
+plugin at org.eclipse.equinox.weaving.caching=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/weaving/bundles/org.eclipse.equinox.weaving.caching
+plugin at org.eclipse.equinox.weaving.caching.j9=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/weaving/bundles/org.eclipse.equinox.weaving.caching.j9
+fragment at org.eclipse.equinox.weaving.hook=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/weaving/bundles/org.eclipse.equinox.weaving.hook
 
 !****launcher, startup.jar
-plugin at org.eclipse.equinox.launcher=R36x_v20101122_1400,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher
-fragment at org.eclipse.equinox.launcher.win32.win32.x86=R36x_v20101222,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86
-fragment at org.eclipse.equinox.launcher.win32.win32.x86_64=R36x_v20101222,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86_64
-fragment at org.eclipse.equinox.launcher.win32.win32.ia64=R36x_v20101222,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.ia64
-fragment at org.eclipse.equinox.launcher.wpf.win32.x86=R36x_v20101222,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.wpf.win32.x86
-fragment at org.eclipse.equinox.launcher.carbon.macosx=R36x_v20101019_1345,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.carbon.macosx
-fragment at org.eclipse.equinox.launcher.cocoa.macosx=R36x_v20101019_1345,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx
-fragment at org.eclipse.equinox.launcher.cocoa.macosx.x86_64=R36x_v20101019_1345,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx.x86_64
-fragment at org.eclipse.equinox.launcher.gtk.linux.x86=R36x_v20101019_1345,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86
-fragment at org.eclipse.equinox.launcher.gtk.linux.x86_64=R36x_v20101019_1345,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86_64
-fragment at org.eclipse.equinox.launcher.gtk.linux.ppc=R36x_v20101019_1345,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc
-fragment at org.eclipse.equinox.launcher.gtk.linux.ppc64=R36x_v20101019_1345,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc64
-fragment at org.eclipse.equinox.launcher.gtk.aix.ppc64=R36x_v20101102,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc64
-fragment at org.eclipse.equinox.launcher.motif.hpux.ia64_32=R36x_v20101019_1345,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.hpux.ia64_32
-fragment at org.eclipse.equinox.launcher.motif.aix.ppc=R36x_v20101019_1345,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.aix.ppc
-fragment at org.eclipse.equinox.launcher.motif.linux.x86=R36x_v20101019_1345,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86
-fragment at org.eclipse.equinox.launcher.gtk.solaris.sparc=R36x_v20101019_1345,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.solaris.sparc
-plugin at org.eclipse.equinox.launcher.releng=R36x_v20101019,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/releng/org.eclipse.equinox.launcher.releng
+plugin at org.eclipse.equinox.launcher=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher
+fragment at org.eclipse.equinox.launcher.win32.win32.x86=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86
+fragment at org.eclipse.equinox.launcher.win32.win32.x86_64=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86_64
+fragment at org.eclipse.equinox.launcher.win32.win32.ia64=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.ia64
+fragment at org.eclipse.equinox.launcher.wpf.win32.x86=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.wpf.win32.x86
+fragment at org.eclipse.equinox.launcher.carbon.macosx=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.carbon.macosx
+fragment at org.eclipse.equinox.launcher.cocoa.macosx=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx
+fragment at org.eclipse.equinox.launcher.cocoa.macosx.x86_64=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx.x86_64
+fragment at org.eclipse.equinox.launcher.gtk.linux.x86=v20110505,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86
+fragment at org.eclipse.equinox.launcher.gtk.linux.x86_64=v20110505,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86_64
+fragment at org.eclipse.equinox.launcher.gtk.linux.ppc=v20110505,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc
+fragment at org.eclipse.equinox.launcher.gtk.linux.ppc64=v20110505,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc64
+fragment at org.eclipse.equinox.launcher.gtk.aix.ppc64=v20110530,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc64
+fragment at org.eclipse.equinox.launcher.gtk.aix.ppc=v20110530,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc
+fragment at org.eclipse.equinox.launcher.gtk.hpux.ia64_32=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.hpux.ia64_32
+fragment at org.eclipse.equinox.launcher.motif.hpux.ia64_32=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.hpux.ia64_32
+fragment at org.eclipse.equinox.launcher.motif.aix.ppc=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.aix.ppc
+fragment at org.eclipse.equinox.launcher.motif.linux.x86=v20110505,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86
+fragment at org.eclipse.equinox.launcher.gtk.solaris.sparc=v20110505,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.solaris.sparc
+plugin at org.eclipse.equinox.launcher.releng=v20101129,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/releng/org.eclipse.equinox.launcher.releng
 
 !****contributed fragments
-fragment at org.eclipse.equinox.launcher.gtk.linux.s390=R36x_v20110125,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390
-fragment at org.eclipse.equinox.launcher.gtk.linux.s390x=R36x_v20110125,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390x
-fragment at org.eclipse.equinox.launcher.gtk.solaris.x86=R36x_v20101019_1345,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.solaris.x86
-fragment at org.eclipse.equinox.launcher.motif.solaris.sparc=R36x_v20101019_1345,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.solaris.sparc
+fragment at org.eclipse.equinox.launcher.gtk.linux.s390=v20110505,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390
+fragment at org.eclipse.equinox.launcher.gtk.linux.s390x=v20110505,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390x
+fragment at org.eclipse.equinox.launcher.gtk.solaris.x86=v20110505,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.solaris.x86
+fragment at org.eclipse.equinox.launcher.motif.solaris.sparc=v20110505,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.solaris.sparc
 
-feature at org.eclipse.equinox.executable=R36x_v20110125,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.executable
+feature at org.eclipse.equinox.executable=v20110530,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.executable
 
 !**** Runtime
-plugin at org.eclipse.core.runtime=v20100505,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.contenttype=v20100505-1235,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.jobs=R36x_v20100824,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.runtime=v20110110,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.contenttype=v20110423-0524,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.jobs=v20110404,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
 !**** Expressions
-plugin at org.eclipse.core.expressions=v20100505,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.expressions=v20110228,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 plugin at org.eclipse.core.expressions.tests=v20091203,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
 !**** Resources
-plugin at org.eclipse.core.resources=R36x_v20110131-1630,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.resources=v20110510-0712,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 fragment at org.eclipse.core.resources.win32=v20100505-1235,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.resources.win32.x86=v20100505-1345,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.resources.win32.ia64=v20081020,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.resources.compatibility=v20100505-1235,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.resources.win32.x86=v20110423-0524,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.resources.win32.ia64=v20110423-0524,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.resources.compatibility=v20101108,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
 !**** File System
-plugin at org.eclipse.core.filesystem=R36x_v20100727-0745,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.filesystem.win32.x86=R36x_v20100727-0745,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.filesystem.win32.x86_64=R36x_v20100727-0745,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.filesystem.win32.ia64=R36x_v20100727-0745,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.filesystem.linux.x86=v20100505-1235,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.filesystem.linux.x86_64=v20100505-1235,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.filesystem.linux.ppc=v20100505-1235,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.filesystem.solaris.sparc=v20100505-1235,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.filesystem.aix.ppc=v20100505-1235,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc
+plugin at org.eclipse.core.filesystem=v20110423-0524,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.win32.x86=v20110423-0524,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.win32.x86_64=v20110423-0524,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.win32.ia64=v20110423-0524,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.linux.x86=v20110423-0524,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.linux.x86_64=v20110423-0524,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.solaris.sparc=v20110423-0524,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.aix.ppc=v20110423-0524,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc
 
 !**** Legacy Runtime
 plugin at org.eclipse.core.boot=v20100505,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 plugin at org.eclipse.core.runtime.compatibility=v20100505,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.runtime.compatibility.auth=v20100517,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.runtime.compatibility.registry=v20100520,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.runtime.compatibility.auth=v20110110,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.runtime.compatibility.registry=v20110505,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
 !**** Other Core Code
-plugin at org.eclipse.pde.build=R36x_20110203,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build
-plugin at org.eclipse.pde.build.tests=R36x_v20110111,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build.tests
+plugin at org.eclipse.pde.build=v20110512-1320,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build
+plugin at org.eclipse.pde.build.tests=v20110512-1320,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build.tests
 feature at org.eclipse.pde.builder=v20040624a,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build/feature
+feature at org.eclipse.pde.build.feature=v20110123,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build.feature
+feature at org.eclipse.pde.build.product.feature=v20110123,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build.product.feature
+
+!**** Features and Products
+feature at org.eclipse.core.runtime.feature=v20110124,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+feature at org.eclipse.equinox.compendium.sdk=CVS,tag=v20110502,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/compendium/features/org.eclipse.equinox.compendium.sdk
+feature at org.eclipse.equinox.core.feature=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/features/org.eclipse.equinox.core.feature
+feature at org.eclipse.equinox.core.sdk=CVS,tag=v20110506-0800,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/framework/features/org.eclipse.equinox.core.sdk
+feature at org.eclipse.equinox.sdk=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/features/org.eclipse.equinox.sdk
+feature at org.eclipse.equinox.starterkit.product.feature=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/features/org.eclipse.equinox.starterkit.product.feature
+feature at org.eclipse.equinox.server.core=CVS,tag=v20110502,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.core
+feature at org.eclipse.equinox.server.jetty=CVS,tag=v20110502,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.jetty
+feature at org.eclipse.equinox.server.p2=CVS,tag=v20110502,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.p2
+feature at org.eclipse.equinox.server.servletbridge=CVS,tag=v20110502,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.servletbridge
+feature at org.eclipse.equinox.server.simple=CVS,tag=v20110502,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.simple
+feature at org.eclipse.equinox.serverside.sdk=CVS,tag=v20110502,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.serverside.sdk
+feature at org.eclipse.equinox.weaving.sdk=CVS,tag=v20110502,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/weaving/features/org.eclipse.equinox.weaving.sdk
 
 !**** Test Suites
-plugin at org.eclipse.core.tests.harness=v20100505-1235,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.tests.resources=R36x_v20110131-1630,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.tests.runtime=R36x_v20101213,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.osgi.tests=R36x_v20101103,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi.tests
\ No newline at end of file
+plugin at org.eclipse.core.tests.harness=v20110505,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.tests.resources=v20110511-0607,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.tests.runtime=v20110506,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.osgi.tests=v20110513,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi.tests
+plugin at org.eclipse.equinox.ds.tests=v20110502,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.ds.tests
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/doc.map b/eclipse/maps/org.eclipse.releng/maps/doc.map
index 3919351..3cc8299 100644
--- a/eclipse/maps/org.eclipse.releng/maps/doc.map
+++ b/eclipse/maps/org.eclipse.releng/maps/doc.map
@@ -1,9 +1,9 @@
 !***************  DOC CONTRIBUTION  ******************************************************** 
 
-plugin at org.eclipse.platform.doc.user=r362_v20101117-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.platform.doc.isv=r362_v20110111,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.platform.doc.user=v20110601-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.platform.doc.isv=v20110602-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.jdt.doc.user=r361_v20100721-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.doc.isv=r362_v20101117-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.doc.user=v20110601-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.doc.isv=v20110531-1242,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.pde.doc.user=v20101118_r362,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/doc/org.eclipse.pde.doc.user
\ No newline at end of file
+plugin at org.eclipse.pde.doc.user=v20110601-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/doc/org.eclipse.pde.doc.user
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/equinox-incubator.map b/eclipse/maps/org.eclipse.releng/maps/equinox-incubator.map
index 35aaecc..d041eb7 100644
--- a/eclipse/maps/org.eclipse.releng/maps/equinox-incubator.map
+++ b/eclipse/maps/org.eclipse.releng/maps/equinox-incubator.map
@@ -9,20 +9,30 @@ bundle at org.eclipse.equinox.initializer=v20100503,kmoir at dev.eclipse.org:/cvsroot/
 plugin at org.eclipse.equinox.jmx.client=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.client
 plugin at org.eclipse.equinox.jmx.client.rmi=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi
 plugin at org.eclipse.equinox.jmx.client.xmlrpc=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc
-feature at org.eclipse.equinox.jmx.client.feature=v20081124,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.client.feature
+feature at org.eclipse.equinox.jmx.client.feature=v20110511,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.client.feature
 
 !** Common **
 plugin at org.eclipse.equinox.jmx.common=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.common
-feature at org.eclipse.equinox.jmx.common.feature=v20070507,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.common.feature
+feature at org.eclipse.equinox.jmx.common.feature=v20110511,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.common.feature
 
 !** Server **
 plugin at org.eclipse.equinox.jmx.server=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.server
 plugin at org.eclipse.equinox.jmx.server.rmi=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi
-plugin at org.eclipse.equinox.jmx.server.xmlrpc=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc
+plugin at org.eclipse.equinox.jmx.server.xmlrpc=v20110413,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc
 plugin at org.eclipse.equinox.jmx.vm=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.vm
 plugin at org.eclipse.equinox.preferences.jmx=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.preferences.jmx
 plugin at org.eclipse.equinox.registry.jmx=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.registry.jmx
-plugin at org.eclipse.osgi.jmx=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.osgi.jmx
+plugin at org.eclipse.osgi.jmx=v20110414,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.osgi.jmx
 plugin at org.eclipse.swt.jmx=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.swt.jmx
 plugin at org.eclipse.core.resources.jmx=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.core.resources.jmx
-feature at org.eclipse.equinox.jmx.server.feature=v20081124,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.server.feature
\ No newline at end of file
+feature at org.eclipse.equinox.jmx.server.feature=v20110511,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.server.feature
+
+!** Console **
+plugin at org.eclipse.equinox.console.supportability=v20110207,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/console/org.eclipse.equinox.console.supportability
+
+!** Region **
+plugin at org.eclipse.equinox.region=v20110524,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.region
+plugin at org.eclipse.equinox.region.tests=v20110523,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.region.tests
+
+!** Feature for all equinox incubatorbundles **
+feature at org.eclipse.equinox.incubator.feature=v20110511,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.incubator.feature
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/feature.map b/eclipse/maps/org.eclipse.releng/maps/feature.map
index 61fd2e9..8b6f29e 100644
--- a/eclipse/maps/org.eclipse.releng/maps/feature.map
+++ b/eclipse/maps/org.eclipse.releng/maps/feature.map
@@ -1,10 +1,10 @@
 !***************  FEATURE CONTRIBUTION  ******************************************************
-feature at org.eclipse.sdk=r362_v20100929,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.sdk
-plugin at org.eclipse.sdk=r362_v20110202,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+feature at org.eclipse.sdk=v20110426,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.sdk
+plugin at org.eclipse.sdk=v20110504-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-feature at org.eclipse.jdt=r362_v20101117-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.jdt-feature
+feature at org.eclipse.jdt=v20110520-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.jdt-feature
 
-feature at org.eclipse.pde=r362_v20110203,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.pde-feature
+feature at org.eclipse.pde=v20110504-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.pde-feature
 feature at org.eclipse.pde.api.tools.ee.cdcfoundation10_feature=v20091027-1300,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature
 feature at org.eclipse.pde.api.tools.ee.cdcfoundation11_feature=v20091027-1300,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature
 feature at org.eclipse.pde.api.tools.ee.j2se12_feature=v20091027-1300,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se12-feature
@@ -17,36 +17,22 @@ feature at org.eclipse.pde.api.tools.ee.osgiminimum10_feature=v20091027-1300,kmoir@
 feature at org.eclipse.pde.api.tools.ee.osgiminimum11_feature=v20091027-1300,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature
 feature at org.eclipse.pde.api.tools.ee.osgiminimum12_feature=v20091027-1300,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature
 
-feature at org.eclipse.platform=r362_v20110210,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.platform-feature
-plugin at org.eclipse.platform=r362_v20110120,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+feature at org.eclipse.platform=v20110530,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.platform-feature
+plugin at org.eclipse.platform=v20110520,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-feature at org.eclipse.sdk.examples=r362_v20101014,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk.examples-feature
-plugin at org.eclipse.sdk.examples=v20100527,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+feature at org.eclipse.sdk.examples=v20110503,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk.examples-feature
+plugin at org.eclipse.sdk.examples=v20110503,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-feature at org.eclipse.sdk.tests=r361_v20100714-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk.tests-feature/features/org.eclipse.sdk.tests
-plugin at org.eclipse.sdk.tests=v20060605,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+feature at org.eclipse.sdk.tests=v20110503,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk.tests-feature/features/org.eclipse.sdk.tests
+plugin at org.eclipse.sdk.tests=v20100907,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-feature at org.eclipse.equinox.sdk=r362_v20110210b,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.equinox.sdk
+feature at org.eclipse.cvs=v20110520-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.cvs-feature
+plugin at org.eclipse.cvs=v20110505-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/org.eclipse.cvs
 
-feature at org.eclipse.cvs=r362_v20101111,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.cvs-feature
-plugin at org.eclipse.cvs=v20100414,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/org.eclipse.cvs
+feature at org.eclipse.help=v20110327,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.help-feature
 
-feature at org.eclipse.help=r362_v20101111,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.help-feature
+feature at org.eclipse.pde.api.tools.ee.fragments=v20110123,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.pde.api.tools.ee.fragments
 
-feature at org.eclipse.equinox.p2.user.ui=r361_v20100903,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/p2/org.eclipse.equinox.p2.releng/buildtime-features/org.eclipse.equinox.p2.user.ui
-
-feature at org.eclipse.equinox.p2.sdk=CVS,tag=R36x_v20110120,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.sdk
-feature at org.eclipse.equinox.p2.discovery.feature=CVS,tag=R36x_v20110210,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.discovery.feature
-feature at org.eclipse.equinox.core.sdk=CVS,tag=r36x_v20110210,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/framework/features/org.eclipse.equinox.core.sdk
-feature at org.eclipse.equinox.compendium.sdk=CVS,tag=R36x_v20101014,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/compendium/features/org.eclipse.equinox.compendium.sdk
-
-feature at org.eclipse.equinox.serverside.sdk=CVS,tag=R36x_v20101014,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.serverside.sdk
-feature at org.eclipse.equinox.server.core=CVS,tag=R36x_v20101007,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.core
-feature at org.eclipse.equinox.server.jetty=CVS,tag=v20100510,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.jetty
-feature at org.eclipse.equinox.server.p2=CVS,tag=R36x_v20101007,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.p2
-feature at org.eclipse.equinox.server.servletbridge=CVS,tag=v20100510,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.servletbridge
-feature at org.eclipse.equinox.server.simple=CVS,tag=v20100510,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.simple
-
-feature at org.eclipse.equinox.weaving.sdk=CVS,tag=v20100421,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/weaving/features/org.eclipse.equinox.weaving.sdk
-
-feature at org.eclipse.pde.api.tools.ee.fragments=v20100427,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.pde.api.tools.ee.fragments
\ No newline at end of file
+feature at org.eclipse.pde.junit.runtime.addon=v20110331,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.pde.junit.runtime.addon
+feature at org.eclipse.pde.junit.runtime.standalone=v20110331,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.pde.junit.runtime.standalone
+feature at org.eclipse.license=v20110208,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.license
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/jdtapt.map b/eclipse/maps/org.eclipse.releng/maps/jdtapt.map
index 390c22f..d667dcb 100644
--- a/eclipse/maps/org.eclipse.releng/maps/jdtapt.map
+++ b/eclipse/maps/org.eclipse.releng/maps/jdtapt.map
@@ -1,10 +1,10 @@
 
 !***************  JDT APT CONTRIBUTION *******************************************
 
-plugin at org.eclipse.jdt.apt.core=R36_v20110120-1000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.apt.ui=v20100513-0845,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.apt.tests=R36x_v20100707-0100,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.jdt.compiler.apt=v20100513-0845,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.compiler.apt.tests=v20100513-0845,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.apt.pluggable.core=R36_v20100727-0110,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.apt.pluggable.tests=v20100513-0845,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+plugin at org.eclipse.jdt.apt.core=v20110420-1015,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.apt.ui=v20110305-1450,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.apt.tests=v20110305-1450,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.jdt.compiler.apt=v0110509-1300,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.compiler.apt.tests=v0110509-1300,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.apt.pluggable.core=v20110305-1450,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.apt.pluggable.tests=v20110305-1450,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/jdtcore.map b/eclipse/maps/org.eclipse.releng/maps/jdtcore.map
index 7408718..aaace43 100644
--- a/eclipse/maps/org.eclipse.releng/maps/jdtcore.map
+++ b/eclipse/maps/org.eclipse.releng/maps/jdtcore.map
@@ -1,11 +1,11 @@
 
-!*********************************** JDT CORE CONTRIBUTION ******************************************* 
+!*******************************  JDT CORE CONTRIBUTION ******************************************* 
 
-plugin at org.eclipse.jdt.core=v_A76_R36x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.jdt.compiler.tool=v_A76_R36x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core=v_B61,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.jdt.compiler.tool=v_B61,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.jdt.core.tests.builder=v_A76_R36x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.core.tests.compiler=v_A76_R36x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.core.tests.model=v_A76_R36x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.core.tests.performance=v_A76_R36x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.compiler.tool.tests=v_A76_R36x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+plugin at org.eclipse.jdt.core.tests.builder=v_B61,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core.tests.compiler=v_B61,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core.tests.model=v_B61,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core.tests.performance=v_B61,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.compiler.tool.tests=v_B61,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/jdtdebug.map b/eclipse/maps/org.eclipse.releng/maps/jdtdebug.map
index 3835400..63d4670 100644
--- a/eclipse/maps/org.eclipse.releng/maps/jdtdebug.map
+++ b/eclipse/maps/org.eclipse.releng/maps/jdtdebug.map
@@ -1,17 +1,17 @@
 !***************  DEBUG CONTRIBUTION  ******************************************************** 
 
-plugin at org.eclipse.debug.core=v20100519,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.debug.ui=v20101201_r362,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.debug=v20100715_r361,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.debug.ui=v20100928a_r362,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.launching=v20110105_r362,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.launching.macosx=v20100505,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.launching.ui.macosx=v20100505,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.debug.core=v20110518,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.debug.ui=v20110518,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.debug=v20110509,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.debug.ui=v20110512,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.launching=v20110509,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.launching.macosx=v20110509,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.launching.ui.macosx=v20110509,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.ui.console=v20100526,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.console=v20110511,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.jdt.debug.tests=v20100526,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.debug.tests=v20100624_r361,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.debug.tests=v20110509,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.debug.tests=v20110511,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.debug.examples.core=v20100505,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.debug.examples.ui=v20100526,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+plugin at org.eclipse.debug.examples.core=v20110511,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.debug.examples.ui=v20110511,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/jdtui.map b/eclipse/maps/org.eclipse.releng/maps/jdtui.map
index 24c5e66..2abd041 100644
--- a/eclipse/maps/org.eclipse.releng/maps/jdtui.map
+++ b/eclipse/maps/org.eclipse.releng/maps/jdtui.map
@@ -1,23 +1,23 @@
 !***************  JDT UI CONTRIBUTION  ******************************************************** 
-plugin at org.eclipse.search=v20100520-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.search.tests=v20100520-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.search=v20110505-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.search.tests=v20110505-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.ltk.core.refactoring=r362_v20101117-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ltk.core.refactoring.tests=v20100520-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ltk.ui.refactoring=v20100526-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ltk.ui.refactoring.tests=v20100520-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ltk.core.refactoring=v20110505-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ltk.core.refactoring.tests=v20110505-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ltk.ui.refactoring=v20110505-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ltk.ui.refactoring.tests=v20110505-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.jdt=r361_v20100714-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt=v20110505-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.jdt.core.manipulation=v20100520-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core.manipulation=v20110505-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.jdt.ui=r362_v20110203,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.ui.tests=r361_v20100818-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.ui.tests.refactoring=v20100526-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.ui=v20110531-1200,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.ui.tests=v20110518-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.ui.tests.refactoring=v20110511-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.jdt.junit=r361_v20100825-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.junit.core=r361_v20100825-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.junit.runtime=v20100526-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.junit4.runtime=v20100526-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.junit=v20110505-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.junit.core=v20110518-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.junit.runtime=v20110505-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.junit4.runtime=v20110505-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
 plugin at org.junit4=v20100525,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/orbit.map b/eclipse/maps/org.eclipse.releng/maps/orbit.map
index be3de03..017b67a 100644
--- a/eclipse/maps/org.eclipse.releng/maps/orbit.map
+++ b/eclipse/maps/org.eclipse.releng/maps/orbit.map
@@ -1,63 +1,69 @@
 !***************  ORBIT CONTRIBUTION  ********************************************************
-plugin at com.ibm.icu,4.2.1=p2IU,id=com.ibm.icu,version=4.2.1.v20100412,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at com.ibm.icu.base,4.2.1=p2IU,id=com.ibm.icu.base,version=4.2.1.v20100412,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at com.ibm.icu.base.source,4.2.1=p2IU,id=com.ibm.icu.base.source,version=4.2.1.v20100412,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at com.ibm.icu.source,4.2.1=p2IU,id=com.ibm.icu.source,version=4.2.1.v20100412,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at com.jcraft.jsch,0.1.41=p2IU,id=com.jcraft.jsch,version=0.1.41.v200903070017,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at com.jcraft.jsch.source,0.1.41=p2IU,id=com.jcraft.jsch.source,version=0.1.41.v200903070017,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at javax.management,1.2.0=p2IU,id=javax.management,version=1.2.0.v20100427-1100,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at javax.management.remote,1.0.0=p2IU,id=javax.management.remote,version=1.0.0.v20100427-1100,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at javax.servlet,2.4.0=p2IU,id=javax.servlet,version=2.4.0.v200806031604,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at javax.servlet,2.5.0=p2IU,id=javax.servlet,version=2.5.0.v200910301333,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at javax.servlet.source,2.4.0=p2IU,id=javax.servlet.source,version=2.4.0.v200806031604,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at javax.servlet.source,2.5.0=p2IU,id=javax.servlet.source,version=2.5.0.v200910301333,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at javax.servlet.jsp,2.0.0=p2IU,id=javax.servlet.jsp,version=2.0.0.v200806031607,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at javax.servlet.jsp.source,2.0.0=p2IU,id=javax.servlet.jsp.source,version=2.0.0.v200806031607,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at net.sourceforge.mx4j,3.0.1=p2IU,id=net.sourceforge.mx4j,version=3.0.1.v20100427-1100,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at net.sourceforge.mx4j.remote,3.0.1=p2IU,id=net.sourceforge.mx4j.remote,version=3.0.1.v20100427-1100,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.ant,1.7.1=p2IU,id=org.apache.ant,version=1.7.1.v20100518-1145,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.ant.source,1.7.1=p2IU,id=org.apache.ant.source,version=1.7.1.v20100518-1145,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.commons.codec,1.3.0=p2IU,id=org.apache.commons.codec,version=1.3.0.v20100518-1140,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.commons.codec.source,1.3.0=p2IU,id=org.apache.commons.codec.source,version=1.3.0.v20100518-1140,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.commons.el,1.0.0=p2IU,id=org.apache.commons.el,version=1.0.0.v201004212143,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.commons.el.source,1.0.0=p2IU,id=org.apache.commons.el.source,version=1.0.0.v201004212143,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.commons.httpclient,3.1.0=p2IU,id=org.apache.commons.httpclient,version=3.1.0.v201005080502,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.commons.httpclient.source,3.1.0=p2IU,id=org.apache.commons.httpclient.source,version=3.1.0.v201005080502,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.commons.logging,1.0.4=p2IU,id=org.apache.commons.logging,version=1.0.4.v201005080501,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.commons.logging.source,1.0.4=p2IU,id=org.apache.commons.logging.source,version=1.0.4.v201005080501,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.jasper,5.5.17=p2IU,id=org.apache.jasper,version=5.5.17.v201004212143,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.jasper.source,5.5.17=p2IU,id=org.apache.jasper.source,version=5.5.17.v201004212143,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.lucene,1.9.1=p2IU,id=org.apache.lucene,version=1.9.1.v20100518-1140,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.lucene.analysis,1.9.1=p2IU,id=org.apache.lucene.analysis,version=1.9.1.v20100518-1140,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.lucene.analysis.source,1.9.1=p2IU,id=org.apache.lucene.analysis.source,version=1.9.1.v20100518-1140,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.ws.commons.util,1.0.0=p2IU,id=org.apache.ws.commons.util,version=1.0.0.v20100518-1135,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.ws.jaxme,0.5.1=p2IU,id=org.apache.ws.jaxme,version=0.5.1.v20100427-1100,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.xmlrpc,3.0.0=p2IU,id=org.apache.xmlrpc,version=3.0.0.v20100427-1100,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.easymock,2.4.0=p2IU,id=org.easymock,version=2.4.0.v20090202-0900,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.easymock.source,2.4.0=p2IU,id=org.easymock.source,version=2.4.0.v20090202-0900,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.hamcrest.core,1.1.0=p2IU,id=org.hamcrest.core,version=1.1.0.v20090501071000,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.hamcrest.core.source,1.1.0=p2IU,id=org.hamcrest.core.source,version=1.1.0.v20090501071000,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.junit,3.8.2=p2IU,id=org.junit,version=3.8.2.v3_8_2_v20100427-1100,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.junit.source,3.8.2=p2IU,id=org.junit.source,version=3.8.2.v3_8_2_v20100427-1100,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.junit,4.8.1=p2IU,id=org.junit,version=4.8.1.v4_8_1_v20100427-1100,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.junit.source,4.8.1=p2IU,id=org.junit.source,version=4.8.1.v4_8_1_v20100427-1100,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.mortbay.jetty,5.1.14=p2IU,id=org.mortbay.jetty,version=5.1.14.v200806031611,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.mortbay.jetty.source,5.1.14=p2IU,id=org.mortbay.jetty.source,version=5.1.14.v200806031611,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.mortbay.jetty.server,6.1.23=p2IU,id=org.mortbay.jetty.server,version=6.1.23.v201004211559,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.mortbay.jetty.server.source,6.1.23=p2IU,id=org.mortbay.jetty.server.source,version=6.1.23.v201004211559,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.mortbay.jetty.util,6.1.23=p2IU,id=org.mortbay.jetty.util,version=6.1.23.v201004211559,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.mortbay.jetty.util.source,6.1.23=p2IU,id=org.mortbay.jetty.util.source,version=6.1.23.v201004211559,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
+plugin at com.ibm.icu,4.4.2=p2IU,id=com.ibm.icu,version=4.4.2.v20110208,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at com.ibm.icu.base,4.4.2=p2IU,id=com.ibm.icu.base,version=4.4.2.v20110208,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at com.ibm.icu.base.source,4.4.2=p2IU,id=com.ibm.icu.base.source,version=4.4.2.v20110208,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at com.ibm.icu.source,4.4.2=p2IU,id=com.ibm.icu.source,version=4.4.2.v20110208,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at com.jcraft.jsch,0.1.41=p2IU,id=com.jcraft.jsch,version=0.1.41.v201101211617,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at com.jcraft.jsch.source,0.1.41=p2IU,id=com.jcraft.jsch.source,version=0.1.41.v201101211617,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at javax.management,1.2.0=p2IU,id=javax.management,version=1.2.0.v20100427-1100,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at javax.management.remote,1.0.0=p2IU,id=javax.management.remote,version=1.0.0.v20100427-1100,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at javax.servlet,2.4.0=p2IU,id=javax.servlet,version=2.4.0.v200806031604,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at javax.servlet,2.5.0=p2IU,id=javax.servlet,version=2.5.0.v201103041518,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at javax.servlet.source,2.4.0=p2IU,id=javax.servlet.source,version=2.4.0.v200806031604,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at javax.servlet.source,2.5.0=p2IU,id=javax.servlet.source,version=2.5.0.v201103041518,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at javax.servlet.jsp,2.0.0=p2IU,id=javax.servlet.jsp,version=2.0.0.v201101211617,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at javax.servlet.jsp.source,2.0.0=p2IU,id=javax.servlet.jsp.source,version=2.0.0.v201101211617,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at net.sourceforge.mx4j,3.0.1=p2IU,id=net.sourceforge.mx4j,version=3.0.1.v20100427-1100,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at net.sourceforge.mx4j.remote,3.0.1=p2IU,id=net.sourceforge.mx4j.remote,version=3.0.1.v20100427-1100,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.ant,1.8.2=p2IU,id=org.apache.ant,version=1.8.2.v20110505-1300,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.ant.source,1.8.2=p2IU,id=org.apache.ant.source,version=1.8.2.v20110505-1300,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.commons.codec,1.3.0=p2IU,id=org.apache.commons.codec,version=1.3.0.v201101211617,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.commons.codec.source,1.3.0=p2IU,id=org.apache.commons.codec.source,version=1.3.0.v201101211617,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.commons.el,1.0.0=p2IU,id=org.apache.commons.el,version=1.0.0.v201101211617,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.commons.el.source,1.0.0=p2IU,id=org.apache.commons.el.source,version=1.0.0.v201101211617,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.commons.httpclient,3.1.0=p2IU,id=org.apache.commons.httpclient,version=3.1.0.v201012070820,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.commons.httpclient.source,3.1.0=p2IU,id=org.apache.commons.httpclient.source,version=3.1.0.v201012070820,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.commons.logging,1.0.4=p2IU,id=org.apache.commons.logging,version=1.0.4.v201101211617,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.commons.logging.source,1.0.4=p2IU,id=org.apache.commons.logging.source,version=1.0.4.v201101211617,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.jasper,5.5.17=p2IU,id=org.apache.jasper,version=5.5.17.v201101211617,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.jasper.source,5.5.17=p2IU,id=org.apache.jasper.source,version=5.5.17.v201101211617,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.lucene,2.9.1=p2IU,id=org.apache.lucene,version=2.9.1.v201101211721,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.lucene.source,2.9.1=p2IU,id=org.apache.lucene.source,version=2.9.1.v201101211721,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.lucene.analysis,2.9.1=p2IU,id=org.apache.lucene.analysis,version=2.9.1.v201101211721,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.lucene.analysis.source,2.9.1=p2IU,id=org.apache.lucene.analysis.source,version=2.9.1.v201101211721,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.lucene.core,2.9.1=p2IU,id=org.apache.lucene.core,version=2.9.1.v201101211721,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.lucene.core.source,2.9.1=p2IU,id=org.apache.lucene.core.source,version=2.9.1.v201101211721,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.ws.commons.util,1.0.0=p2IU,id=org.apache.ws.commons.util,version=1.0.0.v20100518-1135,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.ws.jaxme,0.5.1=p2IU,id=org.apache.ws.jaxme,version=0.5.1.v20100427-1100,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.xmlrpc,3.0.0=p2IU,id=org.apache.xmlrpc,version=3.0.0.v20100427-1100,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.easymock,2.4.0=p2IU,id=org.easymock,version=2.4.0.v20090202-0900,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.easymock.source,2.4.0=p2IU,id=org.easymock.source,version=2.4.0.v20090202-0900,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.hamcrest.core,1.1.0=p2IU,id=org.hamcrest.core,version=1.1.0.v20090501071000,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.hamcrest.core.source,1.1.0=p2IU,id=org.hamcrest.core.source,version=1.1.0.v20090501071000,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.junit,3.8.2=p2IU,id=org.junit,version=3.8.2.v3_8_2_v20100427-1100,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.junit.source,3.8.2=p2IU,id=org.junit.source,version=3.8.2.v3_8_2_v20100427-1100,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.junit,4.8.2=p2IU,id=org.junit,version=4.8.2.v4_8_2_v20110321-1705,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.junit.source,4.8.2=p2IU,id=org.junit.source,version=4.8.2.v4_8_2_v20110321-1705,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.mortbay.jetty,5.1.14=p2IU,id=org.mortbay.jetty,version=5.1.14.v200806031611,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.mortbay.jetty.source,5.1.14=p2IU,id=org.mortbay.jetty.source,version=5.1.14.v200806031611,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.mortbay.jetty.server,6.1.23=p2IU,id=org.mortbay.jetty.server,version=6.1.23.v201012071420,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.mortbay.jetty.server.source,6.1.23=p2IU,id=org.mortbay.jetty.server.source,version=6.1.23.v201012071420,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.mortbay.jetty.util,6.1.23=p2IU,id=org.mortbay.jetty.util,version=6.1.23.v201012071420,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.mortbay.jetty.util.source,6.1.23=p2IU,id=org.mortbay.jetty.util.source,version=6.1.23.v201012071420,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
 
 # Bundles from Orbit for p2
-plugin at org.apache.xml.resolver,1.2.0=p2IU,id=org.apache.xml.resolver,version=1.2.0.v201005080400,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.apache.xerces,2.8.0=p2IU,id=org.apache.xerces,version=2.8.0.v200803070308,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.sat4j.core,2.2.0=p2IU,id=org.sat4j.core,version=2.2.0.v20100429,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.sat4j.pb,2.2.0=p2IU,id=org.sat4j.pb,version=2.2.0.v20100429,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
+plugin at org.apache.xml.resolver,1.2.0=p2IU,id=org.apache.xml.resolver,version=1.2.0.v201005080400,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.apache.xerces,2.8.0=p2IU,id=org.apache.xerces,version=2.8.0.v200803070308,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.sat4j.core,2.3.0=p2IU,id=org.sat4j.core,version=2.3.0.v20110329,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.sat4j.pb,2.3.0=p2IU,id=org.sat4j.pb,version=2.3.0.v20110329,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
 
 # Orbit bundles for API tooling
-plugin at org.objectweb.asm,3.2.0=p2IU,id=org.objectweb.asm,version=3.2.0.v200909071300,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
-plugin at org.objectweb.asm.source,3.2.0=p2IU,id=org.objectweb.asm.source,version=3.2.0.v200909071300,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
+plugin at org.objectweb.asm,3.3.1=p2IU,id=org.objectweb.asm,version=3.3.1.v201105211655,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
+plugin at org.objectweb.asm.source,3.3.1=p2IU,id=org.objectweb.asm.source,version=3.3.1.v201105211655,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
 
 #aspectj plugins for equinox weaving plugins
 plugin at org.aspectj.weaver,1.6.7=p2IU,id=org.aspectj.weaver,version=1.6.7.20091231194938,repository=http://fullmoon.ottawa.ibm.com/tools/ajdt/aspectj/update																   
 plugin at org.aspectj.runtime,1.6.7=p2IU,id=org.aspectj.runtime,version=1.6.7.20091231194938,repository=http://fullmoon.ottawa.ibm.com/tools/ajdt/aspectj/update
+
+# gogo needed for equinox incubator console
+plugin at org.apache.felix.gogo.runtime,0.6.1=p2IU,id=org.apache.felix.gogo.runtime,version=0.6.1.v20110414-1850,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20110523182458/repository
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/p2.map b/eclipse/maps/org.eclipse.releng/maps/p2.map
index 4a6abff..f8d7505 100644
--- a/eclipse/maps/org.eclipse.releng/maps/p2.map
+++ b/eclipse/maps/org.eclipse.releng/maps/p2.map
@@ -1,44 +1,54 @@
-plugin at org.eclipse.equinox.frameworkadmin=CVS,tag=v20100503,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin
-plugin at org.eclipse.equinox.frameworkadmin.equinox=CVS,tag=v20100505,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin.equinox
-plugin at org.eclipse.equinox.frameworkadmin.test=CVS,tag=v20100503,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin.test
-plugin at org.eclipse.equinox.p2.artifact.repository=CVS,tag=R36x_v20100901,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.repository
-plugin at org.eclipse.equinox.p2.console=CVS,tag=v20100601,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.console
-plugin at org.eclipse.equinox.p2.core=CVS,tag=R36x_v20110111,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.core
-plugin at org.eclipse.equinox.p2.director=CVS,tag=R36x_v20101117-1018,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director
-plugin at org.eclipse.equinox.p2.director.app=CVS,tag=R36x_v20100823,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director.app
-plugin at org.eclipse.equinox.p2.directorywatcher=CVS,tag=R36x_v20101220,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.directorywatcher
-plugin at org.eclipse.equinox.p2.discovery=CVS,tag=v20100503,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.discovery
-plugin at org.eclipse.equinox.p2.discovery.compatibility=CVS,tag=v20110204-1323,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.discovery.compatibility
-plugin at org.eclipse.equinox.p2.engine=CVS,tag=R36x_v20110201,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine
-plugin at org.eclipse.equinox.p2.extensionlocation=CVS,tag=v20100518,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.extensionlocation
-plugin at org.eclipse.equinox.p2.garbagecollector=CVS,tag=v20100503,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.garbagecollector
-plugin at org.eclipse.equinox.p2.installer=CVS,tag=v20100503a,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.installer
-plugin at org.eclipse.equinox.p2.jarprocessor=CVS,tag=v20100503a,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.jarprocessor
-plugin at org.eclipse.equinox.p2.metadata=CVS,tag=R36x_v20101202,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata
-plugin at org.eclipse.equinox.p2.metadata.generator=CVS,tag=R36x_v20101208-1400,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.generator
-plugin at org.eclipse.equinox.p2.metadata.repository=CVS,tag=v20100513,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.repository
-plugin at org.eclipse.equinox.p2.operations=CVS,tag=v20100510,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.operations
-plugin at org.eclipse.equinox.p2.publisher=CVS,tag=v20100824-2220,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.publisher
-plugin at org.eclipse.equinox.p2.reconciler.dropins=CVS,tag=R36x_v20110114,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.reconciler.dropins
-plugin at org.eclipse.equinox.p2.repository=CVS,tag=R36x_v20110111-1500,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository
-plugin at org.eclipse.equinox.p2.repository.tools=CVS,tag=R36x_v20100823,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository.tools
-plugin at org.eclipse.equinox.p2.touchpoint.eclipse=CVS,tag=R36x_v20101202,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.eclipse
-plugin at org.eclipse.equinox.p2.touchpoint.natives=CVS,tag=R36x_v20110111,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.natives
-plugin at org.eclipse.equinox.p2.ui=CVS,tag=v20100518,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui
-plugin at org.eclipse.equinox.p2.ui.admin=CVS,tag=v20100503,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.admin
-plugin at org.eclipse.equinox.p2.ui.discovery=CVS,tag=v20100519,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.discovery
-plugin at org.eclipse.equinox.p2.ui.sdk=CVS,tag=v20100513,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.sdk
-plugin at org.eclipse.equinox.p2.ui.sdk.scheduler=CVS,tag=v20100507-1815,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler
-plugin at org.eclipse.equinox.p2.ui.admin.rcp=CVS,tag=R36x_v20100823,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.admin.rcp
-plugin at org.eclipse.equinox.p2.updatechecker=CVS,tag=R36x_v20100823,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatechecker
-plugin at org.eclipse.equinox.p2.updatesite=CVS,tag=R36x_v20100823,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatesite
-plugin at org.eclipse.equinox.simpleconfigurator=CVS,tag=v20100503,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.simpleconfigurator
-plugin at org.eclipse.equinox.simpleconfigurator.manipulator=CVS,tag=v20100503,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.simpleconfigurator.manipulator
-plugin at org.eclipse.equinox.p2.tests=CVS,tag=R36x_v20101202,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests
-plugin at org.eclipse.equinox.p2.tests.discovery=CVS,tag=v20100503,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.discovery
-plugin at org.eclipse.equinox.p2.tests.ui=CVS,tag=v20100513,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.ui
-plugin at org.eclipse.equinox.p2.tests.verifier=CVS,tag=v20100503,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.verifier
-plugin at org.eclipse.equinox.p2.ql=CVS,tag=v20100503a,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ql
+plugin at org.eclipse.equinox.frameworkadmin=CVS,tag=v20110502-1955,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin
+plugin at org.eclipse.equinox.frameworkadmin.equinox=CVS,tag=v20110506,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin.equinox
+plugin at org.eclipse.equinox.frameworkadmin.test=CVS,tag=v20110502-1955,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin.test
+plugin at org.eclipse.equinox.p2.artifact.repository=CVS,tag=v20110519,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.repository
+plugin at org.eclipse.equinox.p2.console=CVS,tag=v20110502-1955,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.console
+plugin at org.eclipse.equinox.p2.core=CVS,tag=v20110502-1955,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.core
+plugin at org.eclipse.equinox.p2.director=CVS,tag=v20110504-1715,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director
+plugin at org.eclipse.equinox.p2.director.app=CVS,tag=v20110505,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director.app
+plugin at org.eclipse.equinox.p2.directorywatcher=CVS,tag=v20110502-1955,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.directorywatcher
+plugin at org.eclipse.equinox.p2.discovery=CVS,tag=v20110502-1955,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.discovery
+plugin at org.eclipse.equinox.p2.discovery.compatibility=CVS,tag=v20110502-1955,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.discovery.compatibility
+plugin at org.eclipse.equinox.p2.engine=CVS,tag=v20110511,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine
+plugin at org.eclipse.equinox.p2.extensionlocation=CVS,tag=v20110510,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.extensionlocation
+plugin at org.eclipse.equinox.p2.garbagecollector=CVS,tag=v20110510,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.garbagecollector
+plugin at org.eclipse.equinox.p2.installer=CVS,tag=v20110502-1955,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.installer
+plugin at org.eclipse.equinox.p2.jarprocessor=CVS,tag=v20110502-1955,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.jarprocessor
+plugin at org.eclipse.equinox.p2.metadata=CVS,tag=v20110510,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata
+plugin at org.eclipse.equinox.p2.metadata.repository=CVS,tag=v20110511-1359,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.repository
+plugin at org.eclipse.equinox.p2.operations=CVS,tag=v20110511-1821,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.operations
+plugin at org.eclipse.equinox.p2.publisher=CVS,tag=v20110511,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.publisher
+plugin at org.eclipse.equinox.p2.publisher.eclipse=CVS,tag=v20110511,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.publisher.eclipse
+plugin at org.eclipse.equinox.p2.reconciler.dropins=CVS,tag=v20110510,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.reconciler.dropins
+plugin at org.eclipse.equinox.p2.repository=CVS,tag=v20110601,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository
+plugin at org.eclipse.equinox.p2.repository.tools=CVS,tag=v20110512-1320,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository.tools
+plugin at org.eclipse.equinox.p2.touchpoint.eclipse=CVS,tag=v20110511,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.eclipse
+plugin at org.eclipse.equinox.p2.transport.ecf=CVS,tag=v20110510,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.transport.ecf
+plugin at org.eclipse.equinox.p2.touchpoint.natives=CVS,tag=v20110502-1955,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.natives
+plugin at org.eclipse.equinox.p2.ui=CVS,tag=v20110601,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui
+plugin at org.eclipse.equinox.p2.ui.admin=CVS,tag=v20110502-1955,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.admin
+plugin at org.eclipse.equinox.p2.ui.discovery=CVS,tag=v20110502-1955,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.discovery
+plugin at org.eclipse.equinox.p2.ui.importexport=CVS,tag=v20110511,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.importexport
+plugin at org.eclipse.equinox.p2.ui.sdk=CVS,tag=v20110502-1955,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.sdk
+plugin at org.eclipse.equinox.p2.ui.sdk.scheduler=CVS,tag=v20110502-1955,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler
+plugin at org.eclipse.equinox.p2.ui.admin.rcp=CVS,tag=v20110502-1955,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.admin.rcp
+plugin at org.eclipse.equinox.p2.updatechecker=CVS,tag=v20110502-1955,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatechecker
+plugin at org.eclipse.equinox.p2.updatesite=CVS,tag=v20110510,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatesite
+plugin at org.eclipse.equinox.simpleconfigurator=CVS,tag=v20110502-1955,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.simpleconfigurator
+plugin at org.eclipse.equinox.simpleconfigurator.manipulator=CVS,tag=v20110502-1955,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.simpleconfigurator.manipulator
+plugin at org.eclipse.equinox.p2.tests=CVS,tag=v20110519,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests
+plugin at org.eclipse.equinox.p2.tests.discovery=CVS,tag=v20110502-1955,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.discovery
+plugin at org.eclipse.equinox.p2.tests.ui=CVS,tag=v20110511,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.ui
+plugin at org.eclipse.equinox.p2.tests.verifier=CVS,tag=v20110222-0044,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.verifier
+plugin at org.eclipse.equinox.p2.ql=CVS,tag=v20110510,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ql
+
+!# p2 features
+feature at org.eclipse.equinox.p2.core.feature=v20110519,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.core.feature
+feature at org.eclipse.equinox.p2.discovery.feature=CVS,tag=v20110519,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.discovery.feature
+feature at org.eclipse.equinox.p2.extras.feature=v20110519,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.extras.feature
+feature at org.eclipse.equinox.p2.rcp.feature=v20110519,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.rcp.feature
+feature at org.eclipse.equinox.p2.sdk=CVS,tag=v20110519,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.sdk
+feature at org.eclipse.equinox.p2.user.ui=CVS,tag=v20110526,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.user.ui
 
 !# p2 examples
 plugin at org.eclipse.equinox.p2.examples.rcp.cloud=CVS,tag=v20100604,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/examples/org.eclipse.equinox.p2.examples.rcp.cloud
@@ -49,22 +59,30 @@ plugin at org.eclipse.equinox.p2.examples.rcp.prestartupdate=CVS,tag=v20100604,cvsR
 plugin at org.eclipse.equinox.p2.examples.rcp.prestartupdate.releng=CVS,tag=v20100604,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/examples/org.eclipse.equinox.p2.examples.rcp.prestartupdate.releng
 plugin at org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility=CVS,tag=v20100604,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility
 plugin at org.eclipse.equinox.p2.examples.rcp.sdknoautoupdates=CVS,tag=v20100604,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/examples/org.eclipse.equinox.p2.examples.rcp.sdknoautoupdates
-plugin at org.eclipse.equinox.p2.examples.rcp.sdkui=CVS,tag=v20100604,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/examples/org.eclipse.equinox.p2.examples.rcp.sdkui
+plugin at org.eclipse.equinox.p2.examples.rcp.sdkui=CVS,tag=v20100927-1600,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/examples/org.eclipse.equinox.p2.examples.rcp.sdkui
 
 !# Bundles from ECF
-plugin at org.eclipse.ecf,3.1.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf_3.1.0.v20100906-1425.jar,usetimestamp=true
-plugin at org.eclipse.ecf.source,3.1.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.source_3.1.0.v20100906-1425.jar,usetimestamp=true
-fragment at org.eclipse.ecf.ssl,1.0.100=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.ssl_1.0.100.v20100906-1425.jar,usetimestamp=true
-fragment at org.eclipse.ecf.ssl.source,1.0.100=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.ssl.source_1.0.100.v20100906-1425.jar,usetimestamp=true
-plugin at org.eclipse.ecf.identity,3.1.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.identity_3.1.0.v20100906-1425.jar,usetimestamp=true
-plugin at org.eclipse.ecf.identity.source,3.1.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.identity.source_3.1.0.v20100906-1425.jar,usetimestamp=true
-plugin at org.eclipse.ecf.filetransfer,4.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.filetransfer_4.0.0.v20100906-1425.jar,usetimestamp=true
-plugin at org.eclipse.ecf.filetransfer.source,4.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.filetransfer.source_4.0.0.v20100906-1425.jar,usetimestamp=true
-plugin at org.eclipse.ecf.provider.filetransfer,3.1.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer_3.1.0.v20100906-1425.jar,usetimestamp=true
-plugin at org.eclipse.ecf.provider.filetransfer.source,3.1.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer.source_3.1.0.v20100906-1425.jar,usetimestamp=true
-fragment at org.eclipse.ecf.provider.filetransfer.ssl,1.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20100906-1425.jar,usetimestamp=true
-fragment at org.eclipse.ecf.provider.filetransfer.ssl.source,1.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer.ssl.source_1.0.0.v20100906-1425.jar,usetimestamp=true
-plugin at org.eclipse.ecf.provider.filetransfer.httpclient,4.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.v20100906-1425.jar,usetimestamp=true
-plugin at org.eclipse.ecf.provider.filetransfer.httpclient.source,4.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.source_4.0.0.v20100906-1425.jar,usetimestamp=true
-fragment at org.eclipse.ecf.provider.filetransfer.httpclient.ssl,1.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20100906-1425.jar,usetimestamp=true
-fragment at org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source,1.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source_1.0.0.v20100906-1425.jar,usetimestamp=true
\ No newline at end of file
+plugin at org.eclipse.ecf,3.1.300=p2IU,id=org.eclipse.ecf,version=3.1.300.v20110531-2218,repository=http://fullmoon.ottawa.ibm.com/rt/ecf/3.5.1/site.p2
+plugin at org.eclipse.ecf.source,3.1.300=p2IU,id=org.eclipse.ecf.source,version=3.1.300.v20110531-2218,repository=http://fullmoon.ottawa.ibm.com/rt/ecf/3.5.1/site.p2
+fragment at org.eclipse.ecf.ssl,1.0.100=p2IU,id=org.eclipse.ecf.ssl,version=1.0.100.v20110531-2218,repository=http://fullmoon.ottawa.ibm.com/rt/ecf/3.5.1/site.p2
+fragment at org.eclipse.ecf.ssl.source,1.0.100=p2IU,id=org.eclipse.ecf.ssl.source,version=1.0.100.v20110531-2218,repository=http://fullmoon.ottawa.ibm.com/rt/ecf/3.5.1/site.p2
+plugin at org.eclipse.ecf.identity,3.1.100=p2IU,id=org.eclipse.ecf.identity,version=3.1.100.v20110531-2218,repository=http://fullmoon.ottawa.ibm.com/rt/ecf/3.5.1/site.p2
+plugin at org.eclipse.ecf.identity.source,3.1.100=p2IU,id=org.eclipse.ecf.identity.source,version=3.1.100.v20110531-2218,repository=http://fullmoon.ottawa.ibm.com/rt/ecf/3.5.1/site.p2
+plugin at org.eclipse.ecf.filetransfer,5.0.0=p2IU,id=org.eclipse.ecf.filetransfer,version=5.0.0.v20110531-2218,repository=http://fullmoon.ottawa.ibm.com/rt/ecf/3.5.1/site.p2
+plugin at org.eclipse.ecf.filetransfer.source,5.0.0=p2IU,id=org.eclipse.ecf.filetransfer.source,version=5.0.0.v20110531-2218,repository=http://fullmoon.ottawa.ibm.com/rt/ecf/3.5.1/site.p2
+plugin at org.eclipse.ecf.provider.filetransfer,3.2.0=p2IU,id=org.eclipse.ecf.provider.filetransfer,version=3.2.0.v20110531-2218,repository=http://fullmoon.ottawa.ibm.com/rt/ecf/3.5.1/site.p2
+plugin at org.eclipse.ecf.provider.filetransfer.source,3.2.0=p2IU,id=org.eclipse.ecf.provider.filetransfer.source,version=3.2.0.v20110531-2218,repository=http://fullmoon.ottawa.ibm.com/rt/ecf/3.5.1/site.p2
+fragment at org.eclipse.ecf.provider.filetransfer.ssl,1.0.0=p2IU,id=org.eclipse.ecf.provider.filetransfer.ssl,version=1.0.0.v20110531-2218,repository=http://fullmoon.ottawa.ibm.com/rt/ecf/3.5.1/site.p2
+fragment at org.eclipse.ecf.provider.filetransfer.ssl.source,1.0.0=p2IU,id=org.eclipse.ecf.provider.filetransfer.ssl.source,version=1.0.0.v20110531-2218,repository=http://fullmoon.ottawa.ibm.com/rt/ecf/3.5.1/site.p2
+plugin at org.eclipse.ecf.provider.filetransfer.httpclient,4.0.0=p2IU,id=org.eclipse.ecf.provider.filetransfer.httpclient,version=4.0.0.v20110531-2218,repository=http://fullmoon.ottawa.ibm.com/rt/ecf/3.5.1/site.p2
+plugin at org.eclipse.ecf.provider.filetransfer.httpclient.source,4.0.0=p2IU,id=org.eclipse.ecf.provider.filetransfer.httpclient.source,version=4.0.0.v20110531-2218,repository=http://fullmoon.ottawa.ibm.com/rt/ecf/3.5.1/site.p2
+fragment at org.eclipse.ecf.provider.filetransfer.httpclient.ssl,1.0.0=p2IU,id=org.eclipse.ecf.provider.filetransfer.httpclient.ssl,version=1.0.0.v20110531-2218,repository=http://fullmoon.ottawa.ibm.com/rt/ecf/3.5.1/site.p2
+fragment at org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source,1.0.0=p2IU,id=org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source,version=1.0.0.v20110531-2218,repository=http://fullmoon.ottawa.ibm.com/rt/ecf/3.5.1/site.p2
+
+!# The following apache bundes are obtained from the orbit.map
+!#plugin at org.apache.commons.codec,1.3.0=GET,http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/S20090426201227/bundles/org.apache.commons.codec_1.3.0.v20080530-1600.jar
+!#plugin at org.apache.commons.codec.source,1.3.0=GET,http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/S20090426201227/bundles/org.apache.commons.codec.source_1.3.0.v20080530-1600.jar
+!#plugin at org.apache.commons.httpclient,3.1.0=GET,http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/S20090426201227/bundles/org.apache.commons.httpclient_3.1.0.v20080605-1935.jar
+!#plugin at org.apache.commons.httpclient.source,3.1.0=GET,http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/S20090426201227/bundles/org.apache.commons.httpclient.source_3.1.0.v20080605-1935.jar
+!#plugin at org.apache.commons.logging,1.0.4=GET,http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/S20090426201227/bundles/org.apache.commons.logging_1.0.4.v200904062259.jar
+!#plugin at org.apache.commons.logging.source,1.0.4=GET,http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/S20090426201227/bundles/org.apache.commons.logging.source_1.0.4.v200904062259.jar
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/pde.map b/eclipse/maps/org.eclipse.releng/maps/pde.map
index 5c15895..c1ce5a8 100644
--- a/eclipse/maps/org.eclipse.releng/maps/pde.map
+++ b/eclipse/maps/org.eclipse.releng/maps/pde.map
@@ -1,34 +1,34 @@
 !***************  PDE CONTRIBUTION  ******************************************************** 
 
 
-plugin at org.eclipse.pde=v20100625_r361,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde
-plugin at org.eclipse.pde.core=v20110210_r362,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.core
-plugin at org.eclipse.pde.junit.runtime=v20100601,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.junit.runtime
-plugin at org.eclipse.pde.runtime=v20100601,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.runtime
-plugin at org.eclipse.pde.launching=v20100601,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.launching
-plugin at org.eclipse.pde.ui=v20110210_r362,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui
-plugin at org.eclipse.pde.ui.templates=v20100601,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui.templates
-plugin at org.eclipse.pde.ui.tests=v20101210_r362,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui.tests
+plugin at org.eclipse.pde=v20110504-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde
+plugin at org.eclipse.pde.core=v20110603,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.core
+plugin at org.eclipse.pde.junit.runtime=v20110406,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.junit.runtime
+plugin at org.eclipse.pde.runtime=v20110508,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.runtime
+plugin at org.eclipse.pde.launching=v20110506,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.launching
+plugin at org.eclipse.pde.ui=v20110603,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui
+plugin at org.eclipse.pde.ui.templates=v20110516,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui.templates
+plugin at org.eclipse.pde.ui.tests=v20110509,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui.tests
 
-plugin at org.eclipse.ui.views.log=v20110210_r362,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.ui.views.log
-plugin at org.eclipse.pde.api.tools=v20100820_r361,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools
-plugin at org.eclipse.pde.api.tools.ui=v20100820_r361,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ui
-plugin at org.eclipse.pde.api.tools.tests=v20100820_r361,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.tests
-fragment at org.eclipse.pde.api.tools.ee.cdcfoundation10=v20100506-0900,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10
-fragment at org.eclipse.pde.api.tools.ee.cdcfoundation11=v20100506-0900,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11
-fragment at org.eclipse.pde.api.tools.ee.j2se12=v20100506-0900,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se12
-fragment at org.eclipse.pde.api.tools.ee.j2se13=v20100506-0900,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se13
-fragment at org.eclipse.pde.api.tools.ee.j2se14=v20100506-0900,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se14
-fragment at org.eclipse.pde.api.tools.ee.j2se15=v20100506-0900,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se15
-fragment at org.eclipse.pde.api.tools.ee.javase16=v20100506-0900,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.javase16
-fragment at org.eclipse.pde.api.tools.ee.jre11=v20100506-0900,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.jre11
-fragment at org.eclipse.pde.api.tools.ee.osgiminimum10=v20100506-0900,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10
-fragment at org.eclipse.pde.api.tools.ee.osgiminimum11=v20100506-0900,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11
-fragment at org.eclipse.pde.api.tools.ee.osgiminimum12=v20100506-0900,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12
+plugin at org.eclipse.ui.views.log=v20110404,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.ui.views.log
+plugin at org.eclipse.pde.api.tools=v20110523-1600,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools
+plugin at org.eclipse.pde.api.tools.ui=v20110523-1600,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ui
+plugin at org.eclipse.pde.api.tools.tests=v20110523-1600,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.tests
+fragment at org.eclipse.pde.api.tools.ee.cdcfoundation10=v20110401-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10
+fragment at org.eclipse.pde.api.tools.ee.cdcfoundation11=v20110401-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11
+fragment at org.eclipse.pde.api.tools.ee.j2se12=v20110401-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se12
+fragment at org.eclipse.pde.api.tools.ee.j2se13=v20110401-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se13
+fragment at org.eclipse.pde.api.tools.ee.j2se14=v20110401-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se14
+fragment at org.eclipse.pde.api.tools.ee.j2se15=v20110401-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se15
+fragment at org.eclipse.pde.api.tools.ee.javase16=v20110401-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.javase16
+fragment at org.eclipse.pde.api.tools.ee.jre11=v20110401-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.jre11
+fragment at org.eclipse.pde.api.tools.ee.osgiminimum10=v20110401-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10
+fragment at org.eclipse.pde.api.tools.ee.osgiminimum11=v20110401-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11
+fragment at org.eclipse.pde.api.tools.ee.osgiminimum12=v20110401-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12
 
 plugin at org.eclipse.pde.ds.core=v20100601,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ds/org.eclipse.pde.ds.core
-plugin at org.eclipse.pde.ds.ui=v20100601,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ds/org.eclipse.pde.ds.ui
+plugin at org.eclipse.pde.ds.ui=v20110516,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ds/org.eclipse.pde.ds.ui
 plugin at org.eclipse.pde.ds.tests=v20100601,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ds/org.eclipse.pde.ds.tests
 
-plugin at org.eclipse.pde.ua.core=v20100504,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ua/org.eclipse.pde.ua.core
-plugin at org.eclipse.pde.ua.ui=v20100504,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ua/org.eclipse.pde.ua.ui
\ No newline at end of file
+plugin at org.eclipse.pde.ua.core=v20110516,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ua/org.eclipse.pde.ua.core
+plugin at org.eclipse.pde.ua.ui=v20110516,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ua/org.eclipse.pde.ua.ui
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/rcp.map b/eclipse/maps/org.eclipse.releng/maps/rcp.map
index 17fdae2..b00a3d6 100644
--- a/eclipse/maps/org.eclipse.releng/maps/rcp.map
+++ b/eclipse/maps/org.eclipse.releng/maps/rcp.map
@@ -1,3 +1,3 @@
-feature at org.eclipse.rcp=r362_v20101104,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.rcp
+feature at org.eclipse.rcp=v20110216,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.rcp
 feature at org.eclipse.rcp.sdk=v20080507,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.rcp.sdk
-plugin at org.eclipse.rcp=v20100527-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/org.eclipse.rcp
\ No newline at end of file
+plugin at org.eclipse.rcp=v20110504-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/org.eclipse.rcp
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/releng.map b/eclipse/maps/org.eclipse.releng/maps/releng.map
index 62baa04..8d69b56 100644
--- a/eclipse/maps/org.eclipse.releng/maps/releng.map
+++ b/eclipse/maps/org.eclipse.releng/maps/releng.map
@@ -1,17 +1,17 @@
 !****************  RELENG CONTRIBUTION  ******************************************************** 
-feature at master=v20091019,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master
-feature at master-equinox=r362_v20101118,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-equinox
-feature at master-equinox-p2=v20091106,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-equinox-p2
-feature at master-equinox-weaving=v20090817,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-equinox-weaving
-feature at master-jetty=r362_v20101014,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-jetty
-feature at master-ecf=v20090316,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-ecf
+feature at master=v20110426,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master
+feature at master-equinox=v20110511,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-equinox
+feature at master-equinox-p2=v20110503,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-equinox-p2
+feature at master-equinox-weaving=v20110505,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-equinox-weaving
+feature at master-jetty=v20110326,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-jetty
+feature at master-ecf=v20110503,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-ecf
 
-feature at com.ibm.icu.base=v20090119,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/com.ibm.icu.base
+feature at com.ibm.icu.base=v20110302,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/com.ibm.icu.base
 
-feature at org.eclipse.releng.tools=v20100427,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.releng.tools
+feature at org.eclipse.releng.tools=v20110503,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.releng.tools
 
-plugin at org.eclipse.releng.tools=v20100531,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.releng.tests=r362_v20110203,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.releng.tools=v20110523,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.releng.tests=v20110520,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
 plugin at org.eclipse.pde.tools.versioning=r20080922,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk.tests-feature/plugins/org.eclipse.pde.tools.versioning
 
diff --git a/eclipse/maps/org.eclipse.releng/maps/swt.map b/eclipse/maps/org.eclipse.releng/maps/swt.map
index c59eae3..ba64441 100644
--- a/eclipse/maps/org.eclipse.releng/maps/swt.map
+++ b/eclipse/maps/org.eclipse.releng/maps/swt.map
@@ -1,42 +1,38 @@
 !***************  SWT CONTRIBUTION  ******************************************************** 
 
 !*** SWT Plugin
-plugin at org.eclipse.swt=v3659c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt=v3735b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
 !*** SWT Platform Fragments
-fragment at org.eclipse.swt.carbon.macosx=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.cocoa.macosx=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.cocoa.macosx.x86_64=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.ppc=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.ppc64=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.x86=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.x86_64=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.solaris.sparc=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.solaris.x86=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.aix.ppc64=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.motif.aix.ppc=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.motif.hpux.ia64_32=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.motif.linux.x86=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.motif.solaris.sparc=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.photon.qnx.x86=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.win32.wce_ppc.arm=v3659c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.win32.win32.x86=v3659c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.win32.win32.x86_64=v3659c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.win32.win32.ia64=v3659c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.carbon.macosx=v3735b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.cocoa.macosx=v3735b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.cocoa.macosx.x86_64=v3735b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.ppc64=v3735b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.x86=v3735b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.x86_64=v3735b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.solaris.sparc=v3735b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.solaris.x86=v3735b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.aix.ppc=v3735b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.aix.ppc64=v3735b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.hpux.ia64_32=v3735b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.win32.wce_ppc.arm=v3735b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.win32.win32.x86=v3735b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.win32.win32.x86_64=v3735b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.win32.win32.ia64=v3735b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-fragment at org.eclipse.swt.gtk.linux.s390=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.s390x=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.s390=v3735b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.s390x=v3735b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
 !*** SWT Examples
-plugin at org.eclipse.swt.examples=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.browser=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.browser.demos=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.controls=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.launcher=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.layouts=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.ole.win32=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.paint=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples=v3735b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.browser=v3735b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.browser.demos=v3735b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.controls=v3735b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.launcher=v3735b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.layouts=v3735b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.ole.win32=v3735b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.paint=v3735b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
 !*** SWT Tests and Tools
-plugin at org.eclipse.swt.tests=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.tools=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+plugin at org.eclipse.swt.tests=v3735b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.tools=v3735b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/team.map b/eclipse/maps/org.eclipse.releng/maps/team.map
index 169cce4..eaaff7f 100644
--- a/eclipse/maps/org.eclipse.releng/maps/team.map
+++ b/eclipse/maps/org.eclipse.releng/maps/team.map
@@ -1,24 +1,24 @@
 !***************  TEAM CONTRIBUTION  ******************************************************** 
 
-plugin at org.eclipse.team.core=R36x_v20110203-1036,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.cvs.core=R36x_v20110119-0815,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.cvs.ssh=I20100526-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.cvs.ssh2=I20100526-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.ui=R36x_v20110203-1036,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.cvs.ui=R36x_v20110203-1036,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.core=I20110525-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.cvs.core=I20110510-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.cvs.ssh=I20110208-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.cvs.ssh2=I20110511-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.ui=I20110525-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.cvs.ui=I20110510-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.core.net=I20100511-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.net=I20100505-1245,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.tests.net=I20100505-1245,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jsch.core=I20100505-1245,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jsch.ui=I20100505-1245,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jsch.tests=I20100505-1245,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.net=I20110511-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.net=I20110511-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.tests.net=I20110208-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jsch.core=I20110514-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jsch.ui=I20110511-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jsch.tests=I20100912-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.team.examples.filesystem=I20100526-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.examples.filesystem=I20110510-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.team.tests.core=I20100511-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.tests.cvs.core=R36x_v20110119-0815,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.net.win32.x86=I20100511-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86
-fragment at org.eclipse.core.net.linux.x86=R36x_v20100825-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86
-fragment at org.eclipse.core.net.linux.x86_64=I20100505-1245,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64
-fragment at org.eclipse.core.net.win32.x86_64=I20100505-1245,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64
\ No newline at end of file
+plugin at org.eclipse.team.tests.core=I20110510-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.tests.cvs.core=I20110525-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.net.win32.x86=I20110331-0827,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86
+fragment at org.eclipse.core.net.linux.x86=I20110419-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86
+fragment at org.eclipse.core.net.linux.x86_64=I20110331-0827,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64
+fragment at org.eclipse.core.net.win32.x86_64=I20110331-0827,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/testframework.map b/eclipse/maps/org.eclipse.releng/maps/testframework.map
index dc3ef74..c2ec89d 100644
--- a/eclipse/maps/org.eclipse.releng/maps/testframework.map
+++ b/eclipse/maps/org.eclipse.releng/maps/testframework.map
@@ -1,10 +1,10 @@
 !***************  Test Framework CONTRIBUTION  ******************************************************** 
-feature at org.eclipse.test=v20100427,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.test-feature
+feature at org.eclipse.test=v20110503,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.test-feature
 
-plugin at org.eclipse.test=v20100118,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.ant.optional.junit=v20080717,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.test=v20110511,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.ant.optional.junit=v20110503,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.test.performance=v20100122,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.test.performance=v20101027,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 fragment at org.eclipse.test.performance.win32=v20070530,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
 plugin at org.eclipse.test.performance.data=v20050415,kmoir at dev.eclipse.org:/cvsroot/eclipse,
diff --git a/eclipse/maps/org.eclipse.releng/maps/text.map b/eclipse/maps/org.eclipse.releng/maps/text.map
index 3d881f0..3e53d6b 100644
--- a/eclipse/maps/org.eclipse.releng/maps/text.map
+++ b/eclipse/maps/org.eclipse.releng/maps/text.map
@@ -1,16 +1,16 @@
 !***************  TEXT CONTRIBUTION  ******************************************************** 
 
-plugin at org.eclipse.text=v20100601-1300,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jface.text=r361_v20100825-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.workbench.texteditor=r361_v20100714-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.editors=r361_v20100825-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.filebuffers=v20100520-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.text=v20110505-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jface.text=v20110505-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.workbench.texteditor=v20110505-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.editors=v20110517-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.filebuffers=v20110505-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.ui.examples.javaeditor=v20100520-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.examples.javaeditor=v20110524-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.text.tests=v20100520-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jface.text.tests=v20100520-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.filebuffers.tests=v20100520-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.workbench.texteditor.tests=v20100520-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.editors.tests=v20100520-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.text.tests=v20100526-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+plugin at org.eclipse.text.tests=v20110505-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jface.text.tests=v20110505-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.filebuffers.tests=v20110505-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.workbench.texteditor.tests=v20110505-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.editors.tests=v20110505-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.text.tests=v20110524-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/ui.map b/eclipse/maps/org.eclipse.releng/maps/ui.map
index 4aa5db9..a7718d9 100644
--- a/eclipse/maps/org.eclipse.releng/maps/ui.map
+++ b/eclipse/maps/org.eclipse.releng/maps/ui.map
@@ -1,43 +1,43 @@
 !***************  UI CONTRIBUTION  ********************************************************* 
 
-plugin at org.eclipse.core.commands=I20100512-1500,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jface=M20110210-1200,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.databinding=I20100601-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.databinding.observable=I20100601-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.databinding.property=I20100601-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.databinding.beans=I20100601-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jface.databinding=I20100601-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui=M20110203-1100,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.ide=M20101201-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.ide.application=M20100707-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.commands=I20110111-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jface=I20110522-1430,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.databinding=I20110111-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.databinding.observable=I20110222-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.databinding.property=I20110222-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.databinding.beans=I20100824-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jface.databinding=I20100907-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui=I20110602-0100,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.ide=I20110519-0100,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.ide.application=I20110306-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 plugin at org.eclipse.ui.presentations.r21=I20100517-1500,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.views=M20110202-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.workbench=M20110210-1200,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.ui.workbench.compatibility=I20100511-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.views=I20110412-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.workbench=I20110519-0100,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.ui.workbench.compatibility=I20110413-1600,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 fragment at org.eclipse.ui.win32=I20100509-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.ui.carbon=M20101124-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.ui.cocoa=M20101124-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.ui.carbon=I20101109-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.ui.cocoa=I20101109-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
 
 plugin at org.eclipse.jface.examples.databinding=I20100601-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.examples.multipageeditor=I20100509-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.examples.propertysheet=I20100509-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.examples.readmetool=I20100509-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.examples.undo=I20100509-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.examples.multipageeditor=I20110413-1600,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.examples.propertysheet=I20110413-1600,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.examples.readmetool=I20110413-1600,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.examples.undo=I20110413-1600,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 plugin at org.eclipse.ui.examples.views.properties.tabbed.article=I20100517-1500,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
 plugin at org.eclipse.ui.examples.fieldassist=I20100601-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 plugin at org.eclipse.ui.examples.contributions=I20100509-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.ui.navigator=I20100601-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.navigator.resources=M20101124-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.navigator=I20110524-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.navigator.resources=I20110421-1800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.ui.views.properties.tabbed=I20100509-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.views.properties.tabbed=I20110201-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
-plugin at org.eclipse.jface.tests.databinding=I20100601-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jface.tests.databinding.conformance=I20090818-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.tests=M20100825-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.tests.rcp=I20090525-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.tests.navigator=M20101201-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.tests.views.properties.tabbed=M20110202-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.tests.performance=I20100601-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.tests.harness=I20100601-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+plugin at org.eclipse.jface.tests.databinding=I20110405-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jface.tests.databinding.conformance=I20100914-0100,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.tests=I20110602-0100,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.tests.rcp=I20110425-1800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.tests.navigator=I20110425-1800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.tests.views.properties.tabbed=I20110405-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.tests.performance=I20110421-1800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.tests.harness=I20110425-1800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/update.map b/eclipse/maps/org.eclipse.releng/maps/update.map
index ed207b1..0676988 100644
--- a/eclipse/maps/org.eclipse.releng/maps/update.map
+++ b/eclipse/maps/org.eclipse.releng/maps/update.map
@@ -1,11 +1,11 @@
 !***************  UPDATE CONTRIBUTION  ******************************************************** 
 
 plugin at org.eclipse.update.configurator=v20100512,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.update.core=R36x_v20100629,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.update.core=v20110330,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 plugin at org.eclipse.update.scheduler=v20100512,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 plugin at org.eclipse.update.ui=v20100512,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
 fragment at org.eclipse.update.core.win32=v20100512,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 fragment at org.eclipse.update.core.linux=v20100512,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-
+#
 plugin at org.eclipse.update.tests.core=v20100512,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/userassist.map b/eclipse/maps/org.eclipse.releng/maps/userassist.map
index 1ca80e4..20e919a 100644
--- a/eclipse/maps/org.eclipse.releng/maps/userassist.map
+++ b/eclipse/maps/org.eclipse.releng/maps/userassist.map
@@ -1,26 +1,26 @@
 !***************  UA CONTRIBUTION  *********************************************
 
 !**** Help
-plugin at org.eclipse.help=v20100524,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.help.appserver=v20100427,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.help.base=r36_20101123,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.help.ui=r36_20101116,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.help.webapp=r36_20101130,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.help=v20110426,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.help.appserver=v20110425,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.help.base=v20110517,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.help.ui=v20110425,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.help.webapp=v20110518,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
 !**** Welcome
-plugin at org.eclipse.ui.intro=v20100427,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.intro.universal=r36_v20100702,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.intro=v20110425,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.intro.universal=v20110510,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
 !**** Cheat sheets
-plugin at org.eclipse.ui.cheatsheets=v20100427,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.cheatsheets=v20110425,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
 !**** Browser
-plugin at org.eclipse.ui.browser=r36_20101216,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.browser=v20110426,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
 !**** Forms
-plugin at org.eclipse.ui.forms=r36_v20100702,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.forms=v20110425,kmoir at dev.eclipse.org:/cvsroot/eclipse,
 
 !**** Tests
-plugin at org.eclipse.ua.tests=r36_r20100816,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ua.tests.doc=v20100427,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.tests.forms=v20100517,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+plugin at org.eclipse.ua.tests=v20110505,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ua.tests.doc=v20110425,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.tests.forms=v20110425,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/pluginVersions.properties b/eclipse/pluginVersions.properties
index bcf7f7a..92bd86f 100644
--- a/eclipse/pluginVersions.properties
+++ b/eclipse/pluginVersions.properties
@@ -1,301 +1,303 @@
-#Tue Mar 08 14:12:31 EST 2011
-org.eclipse.help.appserver,0.0.0=v20100427
-org.eclipse.ui.forms,0.0.0=r36_v20100702
-org.eclipse.swt.gtk.linux.s390x,0.0.0=v3659b
-org.eclipse.jdt.debug.ui,0.0.0=v20100928a_r362
-org.eclipse.jdt.launching.macosx,0.0.0=v20100505
-org.eclipse.equinox.jmx.server.xmlrpc,0.0.0=v20100503
-org.eclipse.equinox.launcher.motif.solaris.sparc,0.0.0=R36x_v20101019_1345
-org.eclipse.equinox.launcher.gtk.aix.ppc64,0.0.0=R36x_v20101102
+#Mon Jun 27 11:22:02 EDT 2011
+org.eclipse.help.appserver,0.0.0=v20110425
+org.eclipse.ui.forms,0.0.0=v20110425
+org.eclipse.swt.gtk.linux.s390x,0.0.0=v3735b
+org.eclipse.jdt.debug.ui,0.0.0=v20110512
+org.eclipse.jdt.launching.macosx,0.0.0=v20110509
+org.eclipse.equinox.jmx.server.xmlrpc,0.0.0=v20110413
+org.eclipse.equinox.launcher.motif.solaris.sparc,0.0.0=v20110505
+org.eclipse.equinox.launcher.gtk.aix.ppc64,0.0.0=v20110530
 org.eclipse.core.boot,0.0.0=v20100505
-org.eclipse.ui.net,0.0.0=I20100505-1245
-org.eclipse.equinox.launcher.gtk.solaris.x86,0.0.0=R36x_v20101019_1345
-org.eclipse.jdt.apt.pluggable.core,0.0.0=R36_v20100727-0110
-org.eclipse.swt.examples.paint,0.0.0=v3659b
-org.eclipse.core.net.win32.x86,0.0.0=I20100511-0800
-org.eclipse.core.filesystem.macosx,0.0.0=v20100505
-org.eclipse.equinox.launcher.motif.linux.x86,0.0.0=R36x_v20101019_1345
-org.eclipse.ui.navigator.resources,0.0.0=M20101124-0800
-org.eclipse.equinox.p2.metadata.repository,0.0.0=v20100513
-org.eclipse.swt,0.0.0=v3659c
-org.eclipse.swt.win32.win32.x86,0.0.0=v3659c
+org.eclipse.ui.net,0.0.0=I20110511-0800
+org.eclipse.equinox.launcher.gtk.solaris.x86,0.0.0=v20110505
+org.eclipse.jdt.apt.pluggable.core,0.0.0=v20110305-1450
+org.eclipse.swt.examples.paint,0.0.0=v3735b
+org.eclipse.core.net.win32.x86,0.0.0=I20110331-0827
+org.eclipse.core.filesystem.macosx,0.0.0=v20110423-0524
+org.eclipse.equinox.launcher.motif.linux.x86,0.0.0=v20110505
+org.eclipse.ui.navigator.resources,0.0.0=I20110421-1800
+org.eclipse.equinox.p2.metadata.repository,0.0.0=v20110511-1359
+org.eclipse.swt,0.0.0=v3735b
+org.eclipse.swt.win32.win32.x86,0.0.0=v3735b
 org.eclipse.update.ui,0.0.0=v20100512
-org.eclipse.core.filesystem,0.0.0=R36x_v20100727-0745
-org.eclipse.core.externaltools,0.0.0=v20100831_r361
+org.eclipse.core.filesystem,0.0.0=v20110423-0524
+org.eclipse.core.externaltools,0.0.0=v20110506
 org.eclipse.equinox.registry.jmx,0.0.0=v20100503
-org.eclipse.equinox.io,0.0.0=v20100503
-org.eclipse.equinox.simpleconfigurator.manipulator,0.0.0=v20100503
-org.eclipse.pde.api.tools.ui,0.0.0=v20100820_r361
-org.eclipse.jdt.debug,0.0.0=v20100715_r361
-org.eclipse.sdk.examples,0.0.0=v20100527
-org.eclipse.pde,0.0.0=v20100625_r361
-org.eclipse.compare.core,0.0.0=R36x_v20100929-0800
-org.eclipse.equinox.p2.engine,0.0.0=R36x_v20110201
-org.eclipse.equinox.launcher.motif.hpux.ia64_32,0.0.0=R36x_v20101019_1345
-org.eclipse.equinox.http,0.0.0=v20100503
-org.eclipse.swt.gtk.linux.x86_64,0.0.0=v3659b
-org.eclipse.swt.photon.qnx.x86,0.0.0=v3659b
-org.eclipse.equinox.p2.ui.admin,0.0.0=v20100503
-org.eclipse.equinox.weaving.caching.j9,0.0.0=v20100503
+org.eclipse.equinox.io,0.0.0=v20110502
+org.eclipse.equinox.simpleconfigurator.manipulator,0.0.0=v20110502-1955
+org.eclipse.pde.api.tools.ui,0.0.0=v20110523-1600
+org.eclipse.jdt.debug,0.0.0=v20110509
+org.eclipse.sdk.examples,0.0.0=v20110503
+org.eclipse.pde,0.0.0=v20110504-0800
+org.eclipse.compare.core,0.0.0=I20110208-0800
+org.eclipse.equinox.p2.engine,0.0.0=v20110511
+org.eclipse.equinox.launcher.motif.hpux.ia64_32,0.0.0=v20110502
+org.eclipse.equinox.http,0.0.0=v20110413
+org.eclipse.swt.gtk.linux.x86_64,0.0.0=v3735b
+org.eclipse.equinox.p2.ui.admin,0.0.0=v20110502-1955
+org.eclipse.equinox.p2.publisher.eclipse,0.0.0=v20110511
+org.eclipse.equinox.weaving.caching.j9,0.0.0=v20110502
+org.eclipse.equinox.launcher.gtk.hpux.ia64_32,0.0.0=v20110502
 org.eclipse.equinox.transforms.xslt,0.0.0=v20100503
-org.eclipse.jface.databinding,0.0.0=I20100601-0800
-org.eclipse.equinox.p2.touchpoint.eclipse,0.0.0=R36x_v20101202
-org.eclipse.help.base,0.0.0=r36_20101123
+org.eclipse.jface.databinding,0.0.0=I20100907-0800
+org.eclipse.equinox.p2.touchpoint.eclipse,0.0.0=v20110511
+org.eclipse.help.base,0.0.0=v20110517
 org.eclipse.ui.presentations.r21,0.0.0=I20100517-1500
-org.eclipse.equinox.frameworkadmin,0.0.0=v20100503
-org.eclipse.pde.launching,0.0.0=v20100601
-org.eclipse.ui.intro,0.0.0=v20100427
-org.eclipse.ltk.ui.refactoring,0.0.0=v20100526-0800
-org.eclipse.swt.examples.ole.win32,0.0.0=v3659b
-org.eclipse.ui.workbench.texteditor,0.0.0=r361_v20100714-0800
-org.eclipse.ui.examples.multipageeditor,0.0.0=I20100509-0800
-org.eclipse.core.filesystem.linux.x86,0.0.0=v20100505-1235
-org.eclipse.equinox.p2.ui.discovery,0.0.0=v20100519
-org.eclipse.ui.examples.javaeditor,0.0.0=v20100520-0800
-org.eclipse.ant.core,0.0.0=v20110203_r362
-org.eclipse.equinox.p2.ui.admin.rcp,0.0.0=R36x_v20100823
-org.eclipse.equinox.p2.updatechecker,0.0.0=R36x_v20100823
-org.eclipse.debug.core,0.0.0=v20100519
+org.eclipse.equinox.frameworkadmin,0.0.0=v20110502-1955
+org.eclipse.pde.launching,0.0.0=v20110506
+org.eclipse.ui.intro,0.0.0=v20110425
+org.eclipse.ltk.ui.refactoring,0.0.0=v20110505-0800
+org.eclipse.swt.examples.ole.win32,0.0.0=v3735b
+org.eclipse.ui.workbench.texteditor,0.0.0=v20110505-0800
+org.eclipse.ui.examples.multipageeditor,0.0.0=I20110413-1600
+org.eclipse.core.filesystem.linux.x86,0.0.0=v20110423-0524
+org.eclipse.equinox.p2.ui.discovery,0.0.0=v20110502-1955
+org.eclipse.ui.examples.javaeditor,0.0.0=v20110524-0800
+org.eclipse.ant.core,0.0.0=v20110511
+org.eclipse.equinox.p2.ui.admin.rcp,0.0.0=v20110502-1955
+org.eclipse.equinox.p2.updatechecker,0.0.0=v20110502-1955
+org.eclipse.debug.core,0.0.0=v20110518
 org.eclipse.ui.examples.views.properties.tabbed.article,0.0.0=I20100517-1500
-org.eclipse.core.databinding,0.0.0=I20100601-0800
-org.eclipse.equinox.transforms.hook,0.0.0=v20100503
-org.eclipse.ui.carbon,0.0.0=M20101124-0800
-org.eclipse.core.contenttype,0.0.0=v20100505-1235
-org.eclipse.text,0.0.0=v20100601-1300
-org.eclipse.help.ui,0.0.0=r36_20101116
-org.eclipse.equinox.servletbridge,0.0.0=v20100503
-org.eclipse.jdt.apt.core,0.0.0=R36_v20110120-1000
-org.eclipse.swt.win32.win32.x86_64,0.0.0=v3659c
-org.eclipse.equinox.metatype,0.0.0=v20100503
-org.eclipse.pde.ua.ui,0.0.0=v20100504
+org.eclipse.core.databinding,0.0.0=I20110111-0800
+org.eclipse.equinox.transforms.hook,0.0.0=v20100719
+org.eclipse.ui.carbon,0.0.0=I20101109-0800
+org.eclipse.core.contenttype,0.0.0=v20110423-0524
+org.eclipse.text,0.0.0=v20110505-0800
+org.eclipse.help.ui,0.0.0=v20110425
+org.eclipse.equinox.servletbridge,0.0.0=v20110502
+org.eclipse.jdt.apt.core,0.0.0=v20110420-1015
+org.eclipse.swt.win32.win32.x86_64,0.0.0=v3735b
+org.eclipse.equinox.p2.transport.ecf,0.0.0=v20110510
+org.eclipse.equinox.metatype,0.0.0=v20110502
+org.eclipse.pde.ua.ui,0.0.0=v20110516
 org.eclipse.equinox.initializer,0.0.0=v20100503
-org.eclipse.jsch.core,0.0.0=I20100505-1245
-org.eclipse.equinox.frameworkadmin.equinox,0.0.0=v20100505
-org.eclipse.osgi.util,0.0.0=v20100503
-org.eclipse.search,0.0.0=v20100520-0800
-org.eclipse.ui.views,0.0.0=M20110202-0800
-org.eclipse.equinox.simpleconfigurator,0.0.0=v20100503
-org.eclipse.team.ui,0.0.0=R36x_v20110203-1036
-org.eclipse.equinox.p2.metadata,0.0.0=R36x_v20101202
-org.eclipse.swt.cocoa.macosx.x86_64,0.0.0=v3659b
-org.eclipse.swt.gtk.linux.ppc64,0.0.0=v3659b
-org.eclipse.jdt.compiler.tool,0.0.0=v_A76_R36x
-org.eclipse.platform,0.0.0=r362_v20110120
-org.eclipse.core.databinding.observable,0.0.0=I20100601-0800
-org.eclipse.equinox.weaving.aspectj,0.0.0=v20100503
-org.eclipse.team.examples.filesystem,0.0.0=I20100526-0800
-org.eclipse.pde.core,0.0.0=v20110210_r362
-org.eclipse.ui.workbench,0.0.0=M20110210-1200
-org.eclipse.core.runtime,0.0.0=v20100505
-org.eclipse.core.resources.win32.x86,0.0.0=v20100505-1345
-org.eclipse.equinox.launcher.gtk.linux.x86_64,0.0.0=R36x_v20101019_1345
-org.eclipse.help,0.0.0=v20100524
-org.eclipse.pde.api.tools.ee.j2se15,0.0.0=v20100506-0900
+org.eclipse.jsch.core,0.0.0=I20110514-0800
+org.eclipse.equinox.frameworkadmin.equinox,0.0.0=v20110506
+org.eclipse.osgi.util,0.0.0=v20110110
+org.eclipse.search,0.0.0=v20110505-0800
+org.eclipse.ui.views,0.0.0=I20110412-0800
+org.eclipse.equinox.simpleconfigurator,0.0.0=v20110502-1955
+org.eclipse.team.ui,0.0.0=I20110525-0800
+org.eclipse.equinox.p2.metadata,0.0.0=v20110510
+org.eclipse.swt.cocoa.macosx.x86_64,0.0.0=v3735b
+org.eclipse.swt.gtk.linux.ppc64,0.0.0=v3735b
+org.eclipse.jdt.compiler.tool,0.0.0=v_B61
+org.eclipse.platform,0.0.0=v20110520
+org.eclipse.core.databinding.observable,0.0.0=I20110222-0800
+org.eclipse.equinox.weaving.aspectj,0.0.0=v20110502
+org.eclipse.team.examples.filesystem,0.0.0=I20110510-0800
+org.eclipse.pde.core,0.0.0=v20110603
+org.eclipse.ui.workbench,0.0.0=I20110519-0100
+org.eclipse.core.runtime,0.0.0=v20110110
+org.eclipse.core.resources.win32.x86,0.0.0=v20110423-0524
+org.eclipse.equinox.launcher.gtk.linux.x86_64,0.0.0=v20110505
+org.eclipse.help,0.0.0=v20110426
+org.eclipse.pde.api.tools.ee.j2se15,0.0.0=v20110401-1030
 org.junit4,0.0.0=v20100525
 org.eclipse.update.scheduler,0.0.0=v20100512
-org.eclipse.equinox.launcher.gtk.linux.s390,0.0.0=R36x_v20110125
-org.eclipse.pde.junit.runtime,0.0.0=v20100601
-org.eclipse.osgi.services,0.0.0=v20100503
-org.eclipse.swt.examples.layouts,0.0.0=v3659b
-org.eclipse.jface,0.0.0=M20110210-1200
-org.eclipse.equinox.p2.discovery,0.0.0=v20100503
-org.eclipse.pde.api.tools.ee.osgiminimum10,0.0.0=v20100506-0900
+org.eclipse.equinox.launcher.gtk.linux.s390,0.0.0=v20110505
+org.eclipse.pde.junit.runtime,0.0.0=v20110406
+org.eclipse.osgi.services,0.0.0=v20110513
+org.eclipse.swt.examples.layouts,0.0.0=v3735b
+org.eclipse.jface,0.0.0=I20110522-1430
+org.eclipse.equinox.p2.discovery,0.0.0=v20110502-1955
+org.eclipse.pde.api.tools.ee.osgiminimum10,0.0.0=v20110401-1030
 org.eclipse.equinox.jmx.server,0.0.0=v20100503
 org.eclipse.equinox.jmx.server.rmi,0.0.0=v20100503
-org.eclipse.jdt.ui,0.0.0=r362_v20110203
-org.eclipse.equinox.security,0.0.0=v20100503
-org.eclipse.equinox.launcher,0.0.0=R36x_v20101122_1400
-org.eclipse.core.runtime.compatibility.registry,0.0.0=v20100520
-org.eclipse.jdt.junit.core,0.0.0=r361_v20100825-0800
-org.eclipse.equinox.http.jetty,2.0.0=v20100503
-org.eclipse.jdt.launching,0.0.0=v20110105_r362
-org.eclipse.equinox.p2.ql,0.0.0=v20100503a
-org.eclipse.ui.console,0.0.0=v20100526
-org.eclipse.equinox.weaving.caching,0.0.0=v20100503
-org.eclipse.swt.gtk.linux.s390,0.0.0=v3659b
-org.eclipse.jdt.apt.ui,0.0.0=v20100513-0845
-org.eclipse.equinox.p2.discovery.compatibility,0.0.0=v20110204-1323
+org.eclipse.jdt.ui,0.0.0=v20110531-1200
+org.eclipse.equinox.security,0.0.0=v20110502
+org.eclipse.equinox.launcher,0.0.0=v20110502
+org.eclipse.core.runtime.compatibility.registry,0.0.0=v20110505
+org.eclipse.jdt.junit.core,0.0.0=v20110518-0800
+org.eclipse.jdt.launching,0.0.0=v20110509
+org.eclipse.equinox.p2.ql,0.0.0=v20110510
+org.eclipse.ui.console,0.0.0=v20110511
+org.eclipse.equinox.weaving.caching,0.0.0=v20110502
+org.eclipse.swt.gtk.linux.s390,0.0.0=v3735b
+org.eclipse.jdt.apt.ui,0.0.0=v20110305-1450
+org.eclipse.equinox.p2.discovery.compatibility,0.0.0=v20110502-1955
 org.eclipse.ui.examples.fieldassist,0.0.0=I20100601-0800
-org.eclipse.ui.ide.application,0.0.0=M20100707-0800
-org.eclipse.equinox.launcher.gtk.linux.ppc,0.0.0=R36x_v20101019_1345
-org.eclipse.equinox.launcher.carbon.macosx,0.0.0=R36x_v20101019_1345
-org.eclipse.jdt.junit,0.0.0=r361_v20100825-0800
-org.eclipse.pde.api.tools,0.0.0=v20100820_r361
+org.eclipse.ui.ide.application,0.0.0=I20110306-2000
+org.eclipse.equinox.launcher.gtk.linux.ppc,0.0.0=v20110505
+org.eclipse.equinox.launcher.carbon.macosx,0.0.0=v20110502
+org.eclipse.jdt.junit,0.0.0=v20110505-0800
+org.eclipse.pde.api.tools,0.0.0=v20110523-1600
+org.eclipse.equinox.security.win32.x86_64,0.0.0=v20110502
 org.eclipse.core.runtime.compatibility,0.0.0=v20100505
-org.eclipse.equinox.p2.directorywatcher,0.0.0=R36x_v20101220
-org.eclipse.equinox.launcher.gtk.solaris.sparc,0.0.0=R36x_v20101019_1345
-org.eclipse.core.filesystem.hpux.ia64_32,0.0.0=v20100505
-org.eclipse.swt.motif.aix.ppc,0.0.0=v3659b
-org.eclipse.ui.examples.undo,0.0.0=I20100509-0800
-org.eclipse.ui.cocoa,0.0.0=M20101124-0800
-org.eclipse.equinox.http.registry,0.0.0=R36x_v20101103
-org.eclipse.pde.api.tools.ee.jre11,0.0.0=v20100506-0900
-org.eclipse.core.net.linux.x86_64,0.0.0=I20100505-1245
-org.eclipse.equinox.jsp.jasper,0.0.0=R36x_v20101103
-org.eclipse.pde.api.tools.ee.j2se14,0.0.0=v20100506-0900
-org.eclipse.equinox.p2.ui,0.0.0=v20100518
-org.eclipse.jdt.launching.ui.macosx,0.0.0=v20100505
-org.eclipse.equinox.p2.ui.sdk,0.0.0=v20100513
-org.eclipse.compare.examples,0.0.0=I20100505-1245
-org.eclipse.pde.ua.core,0.0.0=v20100504
-org.eclipse.platform.doc.isv,0.0.0=r362_v20110111
-org.eclipse.ant.launching,0.0.0=v20101020_r362
-org.eclipse.equinox.p2.operations,0.0.0=v20100510
-org.eclipse.compare,0.0.0=R36x_v20100929-0800
+org.eclipse.equinox.p2.directorywatcher,0.0.0=v20110502-1955
+org.eclipse.equinox.launcher.gtk.solaris.sparc,0.0.0=v20110505
+org.eclipse.core.filesystem.hpux.ia64_32,0.0.0=v20110423-0524
+org.eclipse.ui.examples.undo,0.0.0=I20110413-1600
+org.eclipse.ui.cocoa,0.0.0=I20101109-0800
+org.eclipse.equinox.http.registry,0.0.0=v20110502
+org.eclipse.equinox.p2.ui.importexport,0.0.0=v20110511
+org.eclipse.pde.api.tools.ee.jre11,0.0.0=v20110401-1030
+org.eclipse.core.net.linux.x86_64,0.0.0=I20110331-0827
+org.eclipse.equinox.jsp.jasper,0.0.0=v20110502
+org.eclipse.pde.api.tools.ee.j2se14,0.0.0=v20110401-1030
+org.eclipse.equinox.p2.ui,0.0.0=v20110601
+org.eclipse.jdt.launching.ui.macosx,0.0.0=v20110509
+org.eclipse.equinox.p2.ui.sdk,0.0.0=v20110502-1955
+org.eclipse.compare.examples,0.0.0=I20110510-0800
+org.eclipse.pde.ua.core,0.0.0=v20110516
+org.eclipse.platform.doc.isv,0.0.0=v20110602-0800
+org.eclipse.ant.launching,0.0.0=v20110506
+org.eclipse.equinox.p2.operations,0.0.0=v20110511-1821
+org.eclipse.compare,0.0.0=I20110525-0800
 org.eclipse.equinox.http.servletbridge,0.0.0=v20100503
-org.eclipse.jdt.compiler.apt,0.0.0=v20100513-0845
-org.eclipse.help.webapp,0.0.0=r36_20101130
-org.eclipse.pde.ui.templates,0.0.0=v20100601
-org.eclipse.equinox.p2.repository,0.0.0=R36x_v20110111-1500
-org.eclipse.equinox.p2.metadata.generator,0.0.0=R36x_v20101208-1400
-org.eclipse.equinox.p2.director.app,0.0.0=R36x_v20100823
-org.eclipse.equinox.launcher.motif.aix.ppc,0.0.0=R36x_v20101019_1345
-org.eclipse.equinox.app,0.0.0=R36x_v20100803
-org.eclipse.swt.motif.hpux.ia64_32,0.0.0=v3659b
-org.eclipse.swt.gtk.solaris.x86,0.0.0=v3659b
-org.eclipse.pde.ds.ui,0.0.0=v20100601
-org.eclipse.core.net.linux.x86,0.0.0=R36x_v20100825-0800
-org.eclipse.equinox.p2.console,0.0.0=v20100601
-org.eclipse.equinox.http.jetty,0.0.0=v20100503
-org.eclipse.swt.examples.browser.demos,0.0.0=v3659b
-org.eclipse.equinox.launcher.cocoa.macosx.x86_64,0.0.0=R36x_v20101019_1345
-org.eclipse.releng.tools,0.0.0=v20100531
-org.eclipse.pde.doc.user,0.0.0=v20101118_r362
-org.eclipse.swt.motif.linux.x86,0.0.0=v3659b
+org.eclipse.jdt.compiler.apt,0.0.0=v0110509-1300
+org.eclipse.help.webapp,0.0.0=v20110518
+org.eclipse.pde.ui.templates,0.0.0=v20110516
+org.eclipse.equinox.p2.repository,0.0.0=v20110601
+org.eclipse.equinox.p2.director.app,0.0.0=v20110505
+org.eclipse.equinox.launcher.motif.aix.ppc,0.0.0=v20110502
+org.eclipse.swt.gtk.aix.ppc,0.0.0=v3735b
+org.eclipse.equinox.app,0.0.0=v20110321
+org.eclipse.swt.gtk.solaris.x86,0.0.0=v3735b
+org.eclipse.pde.ds.ui,0.0.0=v20110516
+org.eclipse.core.net.linux.x86,0.0.0=I20110419-0800
+org.eclipse.equinox.p2.console,0.0.0=v20110502-1955
+org.eclipse.equinox.http.jetty,0.0.0=v20110502
+org.eclipse.swt.examples.browser.demos,0.0.0=v3735b
+org.eclipse.equinox.launcher.cocoa.macosx.x86_64,0.0.0=v20110502
+org.eclipse.releng.tools,0.0.0=v20110523
+org.eclipse.pde.doc.user,0.0.0=v20110601-0800
 org.eclipse.jface.examples.databinding,0.0.0=I20100601-0800
 org.eclipse.equinox.jmx.client.rmi,0.0.0=v20100503
-org.eclipse.equinox.weaving.hook,0.0.0=v20100503
-org.eclipse.debug.ui,0.0.0=v20101201_r362
-org.eclipse.core.net,0.0.0=I20100511-0800
-org.eclipse.core.filesystem.solaris.sparc,0.0.0=v20100505-1235
-org.eclipse.equinox.p2.touchpoint.natives,0.0.0=R36x_v20110111
-org.eclipse.pde.api.tools.ee.cdcfoundation11,0.0.0=v20100506-0900
-org.eclipse.equinox.launcher.win32.win32.ia64,0.0.0=R36x_v20101222
-org.eclipse.swt.examples.browser,0.0.0=v3659b
-org.eclipse.core.filesystem.linux.x86_64,0.0.0=v20100505-1235
-org.eclipse.equinox.event,0.0.0=v20100503
-org.eclipse.ui.ide,0.0.0=M20101201-0800
-org.eclipse.ui.views.log,0.0.0=v20110210_r362
-org.eclipse.equinox.p2.jarprocessor,0.0.0=v20100503a
-org.eclipse.ui.browser,0.0.0=r36_20101216
-org.eclipse.core.expressions,0.0.0=v20100505
-org.eclipse.core.databinding.beans,0.0.0=I20100601-0800
-org.eclipse.equinox.ds,0.0.0=R36x_v20100803
-org.eclipse.equinox.launcher.win32.win32.x86_64,0.0.0=R36x_v20101222
-org.eclipse.equinox.launcher.gtk.linux.x86,0.0.0=R36x_v20101019_1345
+org.eclipse.equinox.weaving.hook,0.0.0=v20110502
+org.eclipse.debug.ui,0.0.0=v20110518
+org.eclipse.core.net,0.0.0=I20110511-0800
+org.eclipse.core.filesystem.solaris.sparc,0.0.0=v20110423-0524
+org.eclipse.equinox.p2.touchpoint.natives,0.0.0=v20110502-1955
+org.eclipse.pde.api.tools.ee.cdcfoundation11,0.0.0=v20110401-1030
+org.eclipse.equinox.launcher.win32.win32.ia64,0.0.0=v20110502
+org.eclipse.swt.examples.browser,0.0.0=v3735b
+org.eclipse.core.filesystem.linux.x86_64,0.0.0=v20110423-0524
+org.eclipse.equinox.event,0.0.0=v20110502
+org.eclipse.ui.ide,0.0.0=I20110519-0100
+org.eclipse.ui.views.log,0.0.0=v20110404
+org.eclipse.equinox.p2.jarprocessor,0.0.0=v20110502-1955
+org.eclipse.ui.browser,0.0.0=v20110426
+org.eclipse.core.expressions,0.0.0=v20110228
+org.eclipse.core.databinding.beans,0.0.0=I20100824-0800
+org.eclipse.equinox.ds,0.0.0=v20110502
+org.eclipse.equinox.launcher.win32.win32.x86_64,0.0.0=v20110502
+org.eclipse.equinox.launcher.gtk.linux.x86,0.0.0=v20110505
 org.eclipse.update.core.linux,0.0.0=v20100512
-org.eclipse.core.databinding.property,0.0.0=I20100601-0800
-org.eclipse.ui.examples.propertysheet,0.0.0=I20100509-0800
-org.eclipse.core.jobs,0.0.0=R36x_v20100824
-org.eclipse.swt.gtk.linux.ppc,0.0.0=v3659b
-org.eclipse.swt.carbon.macosx,0.0.0=v3659b
-org.eclipse.pde.runtime,0.0.0=v20100601
-org.eclipse.pde.build,0.0.0=R36x_20110203
-org.eclipse.equinox.p2.reconciler.dropins,0.0.0=R36x_v20110114
-org.eclipse.equinox.device,0.0.0=v20100503
-org.eclipse.core.commands,0.0.0=I20100512-1500
-org.eclipse.equinox.p2.repository.tools,0.0.0=R36x_v20100823
-org.eclipse.equinox.launcher.gtk.linux.s390x,0.0.0=R36x_v20110125
-org.eclipse.update.core,0.0.0=R36x_v20100629
-org.eclipse.team.core,0.0.0=R36x_v20110203-1036
-org.eclipse.debug.examples.ui,0.0.0=v20100526
-org.eclipse.pde.api.tools.ee.javase16,0.0.0=v20100506-0900
-org.eclipse.compare.win32,0.0.0=R36x_v20101103-0618
-org.eclipse.equinox.p2.installer,0.0.0=v20100503a
-org.eclipse.debug.examples.core,0.0.0=v20100505
-org.eclipse.rcp,0.0.0=v20100527-0800
+org.eclipse.core.databinding.property,0.0.0=I20110222-0800
+org.eclipse.ui.examples.propertysheet,0.0.0=I20110413-1600
+org.eclipse.core.jobs,0.0.0=v20110404
+org.eclipse.swt.carbon.macosx,0.0.0=v3735b
+org.eclipse.pde.runtime,0.0.0=v20110508
+org.eclipse.pde.build,0.0.0=v20110512-1320
+org.eclipse.equinox.p2.reconciler.dropins,0.0.0=v20110510
+org.eclipse.equinox.device,0.0.0=v20101217
+org.eclipse.core.commands,0.0.0=I20110111-0800
+org.eclipse.equinox.p2.repository.tools,0.0.0=v20110512-1320
+org.eclipse.equinox.launcher.gtk.linux.s390x,0.0.0=v20110505
+org.eclipse.update.core,0.0.0=v20110330
+org.eclipse.team.core,0.0.0=I20110525-0800
+org.eclipse.debug.examples.ui,0.0.0=v20110511
+org.eclipse.pde.api.tools.ee.javase16,0.0.0=v20110401-1030
+org.eclipse.compare.win32,0.0.0=I20110510-0800
+org.eclipse.equinox.p2.installer,0.0.0=v20110502-1955
+org.eclipse.debug.examples.core,0.0.0=v20110511
+org.eclipse.rcp,0.0.0=v20110504-0800
 org.eclipse.pde.ds.core,0.0.0=v20100601
-org.eclipse.equinox.registry,0.0.0=v20100503
-org.eclipse.ui.examples.readmetool,0.0.0=I20100509-0800
-org.eclipse.jdt.core.manipulation,0.0.0=v20100520-0800
-org.eclipse.equinox.http.servlet,0.0.0=v20100503
-org.eclipse.equinox.launcher.win32.win32.x86,0.0.0=R36x_v20101222
-org.eclipse.jdt.junit.runtime,0.0.0=v20100526-0800
-org.eclipse.swt.examples.controls,0.0.0=v3659b
-org.eclipse.core.filesystem.linux.ppc,0.0.0=v20100505-1235
-org.eclipse.osgi.jmx,0.0.0=v20100503
-org.eclipse.ui.workbench.compatibility,0.0.0=I20100511-0800
-org.eclipse.core.filesystem.aix.ppc,0.0.0=v20100505-1235
-org.eclipse.swt.cocoa.macosx,0.0.0=v3659b
-org.eclipse.ui,0.0.0=M20110203-1100
+org.eclipse.equinox.registry,0.0.0=v20110502
+org.eclipse.ui.examples.readmetool,0.0.0=I20110413-1600
+org.eclipse.jdt.core.manipulation,0.0.0=v20110505-0800
+org.eclipse.equinox.http.servlet,0.0.0=v20110502
+org.eclipse.equinox.launcher.win32.win32.x86,0.0.0=v20110502
+org.eclipse.jdt.junit.runtime,0.0.0=v20110505-0800
+org.eclipse.swt.examples.controls,0.0.0=v3735b
+org.eclipse.osgi.jmx,0.0.0=v20110414
+org.eclipse.ui.workbench.compatibility,0.0.0=I20110413-1600
+org.eclipse.core.filesystem.aix.ppc,0.0.0=v20110423-0524
+org.eclipse.swt.cocoa.macosx,0.0.0=v3735b
+org.eclipse.ui,0.0.0=I20110602-0100
 org.eclipse.equinox.jmx.client.xmlrpc,0.0.0=v20100503
-org.eclipse.swt.win32.wce_ppc.arm,0.0.0=v3659c
-org.eclipse.compare.examples.xml,0.0.0=I20100505-1245
+org.eclipse.swt.win32.wce_ppc.arm,0.0.0=v3735b
+org.eclipse.compare.examples.xml,0.0.0=I20110510-0800
 org.eclipse.equinox.jsp.jasper.registry,0.0.0=v20100503
-org.eclipse.core.resources,0.0.0=R36x_v20110131-1630
-org.eclipse.team.cvs.ssh2,0.0.0=I20100526-0800
-org.eclipse.equinox.wireadmin,0.0.0=v20100503
-org.eclipse.ant.ui,0.0.0=v20100427
-org.eclipse.swt.gtk.solaris.sparc,0.0.0=v3659b
-org.eclipse.core.net.win32.x86_64,0.0.0=I20100505-1245
-org.eclipse.swt.examples.launcher,0.0.0=v3659b
+org.eclipse.core.resources,0.0.0=v20110510-0712
+org.eclipse.team.cvs.ssh2,0.0.0=I20110511-0800
+org.eclipse.equinox.wireadmin,0.0.0=v20110601
+org.eclipse.ant.ui,0.0.0=v20110510
+org.eclipse.swt.gtk.solaris.sparc,0.0.0=v3735b
+org.eclipse.equinox.region,0.0.0=v20110524
+org.eclipse.core.net.win32.x86_64,0.0.0=I20110331-0827
+org.eclipse.swt.examples.launcher,0.0.0=v3735b
 org.eclipse.equinox.preferences.jmx,0.0.0=v20100503
-org.eclipse.equinox.p2.garbagecollector,0.0.0=v20100503
-org.eclipse.equinox.cm,0.0.0=v20100520
-org.eclipse.equinox.common,0.0.0=v20100503
-org.eclipse.equinox.p2.director,0.0.0=R36x_v20101117-1018
-org.eclipse.equinox.p2.publisher,0.0.0=v20100824-2220
-org.eclipse.jdt.doc.isv,0.0.0=r362_v20101117-0800
-org.eclipse.ltk.core.refactoring,0.0.0=r362_v20101117-0800
-org.eclipse.jdt.core,0.0.0=v_A76_R36x
-org.eclipse.equinox.p2.updatesite,0.0.0=R36x_v20100823
+org.eclipse.equinox.p2.garbagecollector,0.0.0=v20110510
+org.eclipse.equinox.cm,0.0.0=v20110502
+org.eclipse.equinox.common,0.0.0=v20110523
+org.eclipse.equinox.p2.director,0.0.0=v20110504-1715
+org.eclipse.equinox.p2.publisher,0.0.0=v20110511
+org.eclipse.jdt.doc.isv,0.0.0=v20110531-1242
+org.eclipse.ltk.core.refactoring,0.0.0=v20110505-0800
+org.eclipse.jdt.core,0.0.0=v_B61
+org.eclipse.equinox.p2.updatesite,0.0.0=v20110510
 org.eclipse.update.configurator,0.0.0=v20100512
-org.eclipse.core.filesystem.win32.x86,0.0.0=R36x_v20100727-0745
-org.eclipse.equinox.p2.core,0.0.0=R36x_v20110111
-org.eclipse.swt.examples,0.0.0=v3659b
-org.eclipse.cvs,0.0.0=v20100414
-org.eclipse.swt.gtk.linux.x86,0.0.0=v3659b
-org.eclipse.equinox.log,0.0.0=v20100503
+org.eclipse.core.filesystem.win32.x86,0.0.0=v20110423-0524
+org.eclipse.equinox.launcher.gtk.aix.ppc,0.0.0=v20110530
+org.eclipse.equinox.p2.core,0.0.0=v20110502-1955
+org.eclipse.swt.examples,0.0.0=v3735b
+org.eclipse.cvs,0.0.0=v20110505-0800
+org.eclipse.swt.gtk.linux.x86,0.0.0=v3735b
+org.eclipse.equinox.log,0.0.0=v20110502
 org.eclipse.equinox.jmx.client,0.0.0=v20100503
 org.eclipse.ui.win32,0.0.0=I20100509-0800
-org.eclipse.ui.views.properties.tabbed,0.0.0=I20100509-0800
-org.eclipse.equinox.security.ui,0.0.0=v20100503
-org.eclipse.pde.api.tools.ee.j2se13,0.0.0=v20100506-0900
-org.eclipse.swt.motif.solaris.sparc,0.0.0=v3659b
-org.eclipse.equinox.util,0.0.0=v20100503
-org.eclipse.equinox.p2.extensionlocation,0.0.0=v20100518
-org.eclipse.pde.api.tools.ee.osgiminimum12,0.0.0=v20100506-0900
-org.eclipse.equinox.concurrent,0.0.0=v20100503
-org.eclipse.platform.doc.user,0.0.0=r362_v20101117-0800
+org.eclipse.ui.views.properties.tabbed,0.0.0=I20110201-0800
+org.eclipse.equinox.security.ui,0.0.0=v20101004
+org.eclipse.pde.api.tools.ee.j2se13,0.0.0=v20110401-1030
+org.eclipse.equinox.util,0.0.0=v20110502
+org.eclipse.equinox.p2.extensionlocation,0.0.0=v20110510
+org.eclipse.pde.api.tools.ee.osgiminimum12,0.0.0=v20110401-1030
+org.eclipse.equinox.concurrent,0.0.0=v20110502
+org.eclipse.platform.doc.user,0.0.0=v20110601-0800
 org.eclipse.equinox.security.macosx,0.0.0=v20100503
-org.eclipse.equinox.supplement,0.0.0=R36x_v20101021
-org.eclipse.sdk,0.0.0=r362_v20110202
-org.eclipse.equinox.launcher.gtk.linux.ppc64,0.0.0=R36x_v20101019_1345
-org.eclipse.jsch.ui,0.0.0=I20100505-1245
-org.eclipse.core.filesystem.win32.x86_64,0.0.0=R36x_v20100727-0745
+org.eclipse.equinox.supplement,0.0.0=v20110502
+org.eclipse.sdk,0.0.0=v20110504-0800
+org.eclipse.equinox.launcher.gtk.linux.ppc64,0.0.0=v20110505
+org.eclipse.jsch.ui,0.0.0=I20110511-0800
+org.eclipse.core.filesystem.win32.x86_64,0.0.0=v20110423-0524
 org.eclipse.equinox.security.win32.x86,0.0.0=v20100503
-org.eclipse.core.variables,0.0.0=v20100505
-org.eclipse.pde.ui,0.0.0=v20110210_r362
-org.eclipse.equinox.p2.artifact.repository,0.0.0=R36x_v20100901
-org.eclipse.core.runtime.compatibility.auth,0.0.0=v20100517
-org.eclipse.osgi,0.0.0=R36x_v20110210
-org.eclipse.ui.intro.universal,0.0.0=r36_v20100702
+org.eclipse.core.variables,0.0.0=v20110511
+org.eclipse.pde.ui,0.0.0=v20110603
+org.eclipse.equinox.p2.artifact.repository,0.0.0=v20110519
+org.eclipse.core.runtime.compatibility.auth,0.0.0=v20110110
+org.eclipse.osgi,0.0.0=v20110613
+org.eclipse.ui.intro.universal,0.0.0=v20110510
 org.eclipse.swt.jmx,0.0.0=v20100503
-org.eclipse.equinox.launcher.cocoa.macosx,0.0.0=R36x_v20101019_1345
+org.eclipse.equinox.coordinator,0.0.0=v20110502
+org.eclipse.equinox.launcher.cocoa.macosx,0.0.0=v20110502
 org.eclipse.ui.examples.contributions,0.0.0=I20100509-0800
-org.eclipse.team.cvs.ui,0.0.0=R36x_v20110203-1036
-org.eclipse.ui.cheatsheets,0.0.0=v20100427
-org.eclipse.jdt.doc.user,0.0.0=r361_v20100721-0800
-org.eclipse.equinox.useradmin,0.0.0=v20100503
-org.eclipse.jface.text,0.0.0=r361_v20100825-0800
+org.eclipse.team.cvs.ui,0.0.0=I20110510-0800
+org.eclipse.ui.cheatsheets,0.0.0=v20110425
+org.eclipse.jdt.doc.user,0.0.0=v20110601-0800
+org.eclipse.equinox.useradmin,0.0.0=v20110413
+org.eclipse.jface.text,0.0.0=v20110505-0800
 org.eclipse.core.resources.jmx,0.0.0=v20100503
 org.eclipse.update.core.win32,0.0.0=v20100512
-org.eclipse.ui.externaltools,0.0.0=v20100427
-org.eclipse.jdt.junit4.runtime,0.0.0=v20100526-0800
-org.eclipse.pde.api.tools.ee.j2se12,0.0.0=v20100506-0900
-org.eclipse.equinox.http.jetty,1.1.100=v20100519
-org.eclipse.pde.api.tools.ee.osgiminimum11,0.0.0=v20100506-0900
-org.eclipse.ui.navigator,0.0.0=I20100601-0800
-org.eclipse.team.cvs.core,0.0.0=R36x_v20110119-0815
-org.eclipse.pde.api.tools.ee.cdcfoundation10,0.0.0=v20100506-0900
-org.eclipse.equinox.launcher.wpf.win32.x86,0.0.0=R36x_v20101222
-org.eclipse.equinox.preferences,0.0.0=v20100503
+org.eclipse.ui.externaltools,0.0.0=v20110506
+org.eclipse.jdt.junit4.runtime,0.0.0=v20110505-0800
+org.eclipse.pde.api.tools.ee.j2se12,0.0.0=v20110401-1030
+org.eclipse.equinox.http.jetty,1.1.100=v20110418
+org.eclipse.pde.api.tools.ee.osgiminimum11,0.0.0=v20110401-1030
+org.eclipse.ui.navigator,0.0.0=I20110524-0800
+org.eclipse.equinox.console.supportability,0.0.0=v20110207
+org.eclipse.team.cvs.core,0.0.0=I20110510-0800
+org.eclipse.pde.api.tools.ee.cdcfoundation10,0.0.0=v20110401-1030
+org.eclipse.equinox.launcher.wpf.win32.x86,0.0.0=v20110502
+org.eclipse.equinox.preferences,0.0.0=v20110502
 org.eclipse.equinox.jmx.common,0.0.0=v20100503
-org.eclipse.equinox.p2.ui.sdk.scheduler,0.0.0=v20100507-1815
+org.eclipse.equinox.p2.ui.sdk.scheduler,0.0.0=v20110502-1955
 org.eclipse.equinox.jmx.vm,0.0.0=v20100503
-org.eclipse.swt.gtk.aix.ppc64,0.0.0=v3659b
-org.eclipse.ui.editors,0.0.0=r361_v20100825-0800
+org.eclipse.swt.gtk.aix.ppc64,0.0.0=v3735b
+org.eclipse.swt.gtk.hpux.ia64_32,0.0.0=v3735b
+org.eclipse.ui.editors,0.0.0=v20110517-0800
 org.eclipse.equinox.servletbridge.extensionbundle,0.0.0=v20100503
-org.eclipse.core.filebuffers,0.0.0=v20100520-0800
-org.eclipse.equinox.ip,0.0.0=v20100503
-org.eclipse.jdt,0.0.0=r361_v20100714-0800
+org.eclipse.core.filebuffers,0.0.0=v20110505-0800
+org.eclipse.equinox.ip,0.0.0=v20110502
+org.eclipse.jdt,0.0.0=v20110505-0800
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/META-INF/ECLIPSEF.RSA b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/META-INF/ECLIPSEF.RSA
deleted file mode 100644
index 47fe778..0000000
Binary files a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/META-INF/ECLIPSEF.RSA and /dev/null differ
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/META-INF/ECLIPSEF.SF b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/META-INF/ECLIPSEF.SF
deleted file mode 100644
index 3422047..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/META-INF/ECLIPSEF.SF
+++ /dev/null
@@ -1,179 +0,0 @@
-Signature-Version: 1.0
-SHA1-Digest-Manifest: DnymqoTvSz4gbC12HMrSKUQk34w=
-Created-By: 1.6.0 (IBM Corporation)
-SHA1-Digest-Manifest-Main-Attributes: T473SZ5WWmQktg3oaHggnJO/FTM=
-
-Name: lib/ant-apache-bcel.jar
-SHA1-Digest: LOl+pgdc9a4HwZywWL7CEqCEvZs=
-
-Name: etc/mmetrics-frames.xsl
-SHA1-Digest: APiAPtADgoYGSwEquxQdQx5NN0A=
-
-Name: bin/ant.bat
-SHA1-Digest: VRSA9YOPmicxeIZD8LdYkqdUmEA=
-
-Name: etc/tagdiff.xsl
-SHA1-Digest: oQK6F+rUwsdxfJl58vbKAmtTs3Y=
-
-Name: lib/ant.jar
-SHA1-Digest: lQ3OziQI4mYf42vhZl5qK05euHQ=
-
-Name: lib/ant-apache-oro.jar
-SHA1-Digest: 08O0J8DpA2CUYHKRuRY8E6d2FS0=
-
-Name: lib/ant-jsch.jar
-SHA1-Digest: 9REV6G1dh3UOS8ueh6rJVnXaBBE=
-
-Name: about_files/LICENSE.dom.html
-SHA1-Digest: xK0He1PkoQXdHC48ROEqZRNXTL4=
-
-Name: etc/coverage-frames.xsl
-SHA1-Digest: Lk7Vo06ABrH7brbJkP1hKRxLkMg=
-
-Name: lib/ant-jdepend.jar
-SHA1-Digest: 0jLeaOQiRnL1dq7dYpmBw3NIEPk=
-
-Name: about_files/asl-v20.txt
-SHA1-Digest: pJO0L/tUizs1vz2W9gV2VmGJsDs=
-
-Name: lib/ant-nodeps.jar
-SHA1-Digest: b3zl9yIdDVX5up8caMNncYIhOZk=
-
-Name: META-INF/eclipse.inf
-SHA1-Digest: Z+e4UrhAmTCBR1UpP/RqMf9OX00=
-
-Name: lib/ant-apache-regexp.jar
-SHA1-Digest: bCJf89W6L5gZfecnoaC3GY5i9j0=
-
-Name: bin/runant.pl
-SHA1-Digest: 4EKNYCEcyO/SMqxm79fnts8/Q1c=
-
-Name: lib/ant-weblogic.jar
-SHA1-Digest: 1zEByTGSxJzTfSdx+joviPFLPgI=
-
-Name: bin/envset.cmd
-SHA1-Digest: anGgepI9TTUvD6W73h+kGQrc2d0=
-
-Name: etc/checkstyle/checkstyle-text.xsl
-SHA1-Digest: Jzub6NSrWxS9hYda+Wy/SP49SeI=
-
-Name: lib/ant-junit.jar
-SHA1-Digest: Asegl5TsYIaKAuGWD3RQGmYG9iw=
-
-Name: bin/ant.cmd
-SHA1-Digest: fKm5e7CiWr2UH61jbx6Yol3cQZo=
-
-Name: etc/log.xsl
-SHA1-Digest: 0HD61tw+M8q33hpPVPkjJJe4SDo=
-
-Name: bin/antRun
-SHA1-Digest: 3xz5zLVIT2QJnPskzZCOuX0LVnw=
-
-Name: bin/runant.py
-SHA1-Digest: uMviIJaN6y/k6xUbjXhmUd6TN8E=
-
-Name: lib/ant-commons-logging.jar
-SHA1-Digest: gPBkcASbXXb7sM6WCSbP3OnU0qw=
-
-Name: lib/ant-swing.jar
-SHA1-Digest: KeZdzozW8mPvLnnzlpJbnLFHC/k=
-
-Name: etc/jdepend-frames.xsl
-SHA1-Digest: OEsPHq3PIr185ocUtm81ULkmobs=
-
-Name: etc/checkstyle/checkstyle-xdoc.xsl
-SHA1-Digest: mfVMgdE+9JoC0hKc0Vc5f7pbe/c=
-
-Name: etc/changelog.xsl
-SHA1-Digest: 9ZFS8fHSvz42GLs2NDnqzLFo5G8=
-
-Name: lib/ant-launcher.jar
-SHA1-Digest: T5al3RPPs+cl2svqvzwRQyPua1M=
-
-Name: etc/jdepend.xsl
-SHA1-Digest: M6boZHWa9+JeDhCjXtq5Z9Y61dY=
-
-Name: bin/runrc.cmd
-SHA1-Digest: aq6+dBb+jdiXyrvDNmLIOzj21N8=
-
-Name: lib/ant-jmf.jar
-SHA1-Digest: rEt5vCSeiJhrDXhToAlqBYJUlpY=
-
-Name: lib/ant-starteam.jar
-SHA1-Digest: CC7k+9amtUmgE+nMSJswFn0gmdc=
-
-Name: lib/ant-netrexx.jar
-SHA1-Digest: 4MHr/zw5Cad5RNbITo3KEhTVU/g=
-
-Name: plugin.properties
-SHA1-Digest: g7K94ZyjaSU4QSVkjoTpYtl1vqE=
-
-Name: lib/ant-jai.jar
-SHA1-Digest: Hgz5UmlpuD4hOHTE+BQc7wzmHz0=
-
-Name: lib/ant-trax.jar
-SHA1-Digest: w6uurfjcZy7fOSYUPT2jG8svYVo=
-
-Name: bin/antRun.bat
-SHA1-Digest: KX8SW+sZ8gtQYr3boWRpl2DkWrE=
-
-Name: lib/ant-apache-bsf.jar
-SHA1-Digest: usSlJG0vxeeqtxI/5lH/UPeH2fg=
-
-Name: about_files/LICENSE.sax.txt
-SHA1-Digest: CnKqzCUI0E0NUSlVIAfUd8gctxU=
-
-Name: lib/ant-stylebook.jar
-SHA1-Digest: FwmSqxPzrBPJXJ0X4oKHndncTnY=
-
-Name: lib/ant-apache-log4j.jar
-SHA1-Digest: zcg372So4PVCkltPKzEiAFN3rA4=
-
-Name: bin/ant
-SHA1-Digest: bnS5vQF5wYnqXs8zr+3LORKIA0U=
-
-Name: etc/checkstyle/checkstyle-frames.xsl
-SHA1-Digest: cQKamOMX7Att9wW45aAohAWp3K0=
-
-Name: bin/complete-ant-cmd.pl
-SHA1-Digest: wXOPsOb8rPKKwt6rAb3XoXCwFgQ=
-
-Name: about_files/NOTICE
-SHA1-Digest: g5R8FDyNNir6o/tFVnDNSlcP+z0=
-
-Name: lib/ant-apache-resolver.jar
-SHA1-Digest: NNj7gb1Enc2M8v/lMP9D4XO+8W0=
-
-Name: etc/junit-frames.xsl
-SHA1-Digest: 2hTCiaPp95X9ZjX8ZDwjvqwfT6U=
-
-Name: etc/junit-noframes.xsl
-SHA1-Digest: M4u7091ckN+zoCaRvjal1SDwJQE=
-
-Name: lib/ant-antlr.jar
-SHA1-Digest: pYDgw2hfdxjUG5938M9pyip9zoA=
-
-Name: about.html
-SHA1-Digest: tujWEJAt+/IKSC26IMuUh48ercA=
-
-Name: etc/maudit-frames.xsl
-SHA1-Digest: U8xxI3AoPSoVepSv0ZbfrARsTZY=
-
-Name: etc/junit-frames-xalan1.xsl
-SHA1-Digest: Bvmst1NiMllcc+sricG/3Eyszc0=
-
-Name: lib/ant-commons-net.jar
-SHA1-Digest: 054oC0sq2Zt1GCWm8zv3DATb8nQ=
-
-Name: lib/ant-javamail.jar
-SHA1-Digest: eJJcJGmsmr4JB5KfiZJRZcv6xLs=
-
-Name: bin/lcp.bat
-SHA1-Digest: EA5m2+HfGFLhb6ForQdjnlvl3cU=
-
-Name: bin/antenv.cmd
-SHA1-Digest: as5/uc6NFrw5Zqzjc5vZEWg6MsM=
-
-Name: bin/antRun.pl
-SHA1-Digest: Cw3hkFZ/7NbP7kPUGL/WM1n8EKk=
-
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/META-INF/MANIFEST.MF b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/META-INF/MANIFEST.MF
deleted file mode 100644
index 56d762b..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,234 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ClassPath: lib/ant.jar,lib/ant-antlr.jar,lib/ant-apache-bcel.ja
- r,lib/ant-apache-bsf.jar,lib/ant-apache-log4j.jar,lib/ant-apache-oro.
- jar,lib/ant-apache-regexp.jar,lib/ant-apache-resolver.jar,lib/ant-com
- mons-logging.jar,lib/ant-commons-net.jar,lib/ant-jai.jar,lib/ant-java
- mail.jar,lib/ant-jdepend.jar,lib/ant-jmf.jar,lib/ant-jsch.jar,lib/ant
- -junit.jar,lib/ant-launcher.jar,lib/ant-netrexx.jar,lib/ant-nodeps.ja
- r,lib/ant-starteam.jar,lib/ant-stylebook.jar,lib/ant-swing.jar,lib/an
- t-trax.jar,lib/ant-weblogic.jar
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.apache.ant
-Require-Bundle: org.eclipse.osgi
-Export-Package: images,org.apache.tools.ant,org.apache.tools.ant.dispa
- tch,org.apache.tools.ant.filters,org.apache.tools.ant.filters.util,or
- g.apache.tools.ant.helper,org.apache.tools.ant.input,org.apache.tools
- .ant.launch,org.apache.tools.ant.listener,org.apache.tools.ant.loader
- ,org.apache.tools.ant.taskdefs,org.apache.tools.ant.taskdefs.compiler
- s,org.apache.tools.ant.taskdefs.condition,org.apache.tools.ant.taskde
- fs.cvslib,org.apache.tools.ant.taskdefs.email,org.apache.tools.ant.ta
- skdefs.optional,org.apache.tools.ant.taskdefs.optional.ccm,org.apache
- .tools.ant.taskdefs.optional.clearcase,org.apache.tools.ant.taskdefs.
- optional.depend,org.apache.tools.ant.taskdefs.optional.depend.constan
- tpool,org.apache.tools.ant.taskdefs.optional.dotnet,org.apache.tools.
- ant.taskdefs.optional.ejb,org.apache.tools.ant.taskdefs.optional.exte
- nsion,org.apache.tools.ant.taskdefs.optional.extension.resolvers,org.
- apache.tools.ant.taskdefs.optional.i18n,org.apache.tools.ant.taskdefs
- .optional.image,org.apache.tools.ant.taskdefs.optional.j2ee,org.apach
- e.tools.ant.taskdefs.optional.javacc,org.apache.tools.ant.taskdefs.op
- tional.javah,org.apache.tools.ant.taskdefs.optional.jdepend,org.apach
- e.tools.ant.taskdefs.optional.jlink,org.apache.tools.ant.taskdefs.opt
- ional.jsp,org.apache.tools.ant.taskdefs.optional.jsp.compilers,org.ap
- ache.tools.ant.taskdefs.optional.junit,org.apache.tools.ant.taskdefs.
- optional.junit.xsl,org.apache.tools.ant.taskdefs.optional.native2asci
- i,org.apache.tools.ant.taskdefs.optional.net,org.apache.tools.ant.tas
- kdefs.optional.perforce,org.apache.tools.ant.taskdefs.optional.pvcs,o
- rg.apache.tools.ant.taskdefs.optional.scm,org.apache.tools.ant.taskde
- fs.optional.script,org.apache.tools.ant.taskdefs.optional.sos,org.apa
- che.tools.ant.taskdefs.optional.sound,org.apache.tools.ant.taskdefs.o
- ptional.splash,org.apache.tools.ant.taskdefs.optional.ssh,org.apache.
- tools.ant.taskdefs.optional.starteam,org.apache.tools.ant.taskdefs.op
- tional.unix,org.apache.tools.ant.taskdefs.optional.vss,org.apache.too
- ls.ant.taskdefs.optional.windows,org.apache.tools.ant.taskdefs.rmic,o
- rg.apache.tools.ant.types,org.apache.tools.ant.types.conditions,org.a
- pache.tools.ant.types.mappers,org.apache.tools.ant.types.optional,org
- .apache.tools.ant.types.optional.depend,org.apache.tools.ant.types.op
- tional.image,org.apache.tools.ant.types.resolver,org.apache.tools.ant
- .types.resources,org.apache.tools.ant.types.resources.comparators,org
- .apache.tools.ant.types.resources.selectors,org.apache.tools.ant.type
- s.selectors,org.apache.tools.ant.types.selectors.modifiedselector,org
- .apache.tools.ant.types.spi,org.apache.tools.ant.util,org.apache.tool
- s.ant.util.depend,org.apache.tools.ant.util.depend.bcel,org.apache.to
- ols.ant.util.facade,org.apache.tools.ant.util.java15,org.apache.tools
- .ant.util.optional,org.apache.tools.ant.util.regexp,org.apache.tools.
- bzip2,org.apache.tools.mail,org.apache.tools.tar,org.apache.tools.zip
-Bundle-Version: 1.7.1.v20100518-1145
-Bundle-ManifestVersion: 2
-
-Name: lib/ant-apache-bcel.jar
-SHA1-Digest: mL7ypH+XtKGLayV/7EGF6kwoYwI=
-
-Name: etc/mmetrics-frames.xsl
-SHA1-Digest: cQnziGYZC2FrO0zwFE92P1bP2v8=
-
-Name: bin/ant.bat
-SHA1-Digest: Rc2etgn1RATkrEL3NCa3Fs75Ov8=
-
-Name: etc/tagdiff.xsl
-SHA1-Digest: ddaegkBkww5CoIlRpSR8RDUI1bQ=
-
-Name: lib/ant.jar
-SHA1-Digest: QmGGhQi4COYG3u+KHGHVjvZA9hM=
-
-Name: lib/ant-apache-oro.jar
-SHA1-Digest: 3mVzpEG3xmdgVi2+lwuMPKHKZfM=
-
-Name: lib/ant-jsch.jar
-SHA1-Digest: FmNWUeOpmyXmyH5K7WvBCfyprsE=
-
-Name: about_files/LICENSE.dom.html
-SHA1-Digest: 9F8cZaCgriCte0T6Mt5hAFumadk=
-
-Name: etc/coverage-frames.xsl
-SHA1-Digest: 5SE/NhPWEbqzGDGL58dwEbkhwRs=
-
-Name: lib/ant-jdepend.jar
-SHA1-Digest: juZ5ScBk7RdbT9kx1nq/TB1qix8=
-
-Name: about_files/asl-v20.txt
-SHA1-Digest: K4uBUimqimHkg/tLoFiLi2xJGJA=
-
-Name: lib/ant-nodeps.jar
-SHA1-Digest: stuzByOvnFqXXfMR1DOHMbURR4Y=
-
-Name: META-INF/eclipse.inf
-SHA1-Digest: u+F8j/GAE8tzrDry9+wT3Cvg81Y=
-
-Name: lib/ant-apache-regexp.jar
-SHA1-Digest: bCOUGaWl76Yhuy0KPpq3Cl/w55g=
-
-Name: bin/runant.pl
-SHA1-Digest: tynYaGh8+BtWDsZ6PljZdoi+egU=
-
-Name: lib/ant-weblogic.jar
-SHA1-Digest: q/YjU1rB8u/dxjXcENxmEQ3pgXQ=
-
-Name: etc/checkstyle/checkstyle-text.xsl
-SHA1-Digest: CqSzAXEeeV20DtFpeujwjL9FEW8=
-
-Name: bin/envset.cmd
-SHA1-Digest: EJ+ljL5sbUQ8mWVn8V49XPBuAz0=
-
-Name: bin/ant.cmd
-SHA1-Digest: 4jPJI7nJO+v3oPpbi5GbrT7x9qk=
-
-Name: lib/ant-junit.jar
-SHA1-Digest: VPSxi0uuALZXXpJF4QFhkpUOpUI=
-
-Name: bin/antRun
-SHA1-Digest: S63QT5F5EI1BCpIj59nosT3lVTw=
-
-Name: etc/log.xsl
-SHA1-Digest: juv2H0VplMm4ri1rzgdOW0yCroc=
-
-Name: bin/runant.py
-SHA1-Digest: Kg3iFzRnZW6PVIFmbj7Eyuo72cM=
-
-Name: lib/ant-commons-logging.jar
-SHA1-Digest: NjlZah2crXobTrvv4OGCIMjO+8A=
-
-Name: lib/ant-swing.jar
-SHA1-Digest: XynrDWbhmRUIf9PM4gVJqgCaA5s=
-
-Name: etc/jdepend-frames.xsl
-SHA1-Digest: U2Bb6aMxgbEYqXkCm2sujeLP7Zo=
-
-Name: etc/checkstyle/checkstyle-xdoc.xsl
-SHA1-Digest: yL3TqCA4pc0daZXtXwAiCN6xHxI=
-
-Name: etc/changelog.xsl
-SHA1-Digest: 2EZZ+jSTt1TTlBYPN4vGUAX7cTQ=
-
-Name: lib/ant-launcher.jar
-SHA1-Digest: GHtlGif/wHyc2Emb1oDygUu5sOU=
-
-Name: etc/jdepend.xsl
-SHA1-Digest: 0rf14aLzhLsun24uUsXVVvkHM6I=
-
-Name: bin/runrc.cmd
-SHA1-Digest: eNo+cuYQicndcc56FVkRScD5w30=
-
-Name: lib/ant-jmf.jar
-SHA1-Digest: LkMJEvWekiNff2+40hzqUtHWv5Y=
-
-Name: lib/ant-starteam.jar
-SHA1-Digest: phxps48pSlCZmpwiyZY2cbk6yaw=
-
-Name: lib/ant-netrexx.jar
-SHA1-Digest: QWTo/YKGFWwaSuanXxbeyc3U2yQ=
-
-Name: plugin.properties
-SHA1-Digest: EM3JUl9D3jv9MhxxbdTWTUt6kbI=
-
-Name: lib/ant-jai.jar
-SHA1-Digest: EJ+iUjul2mZKti+TEgmuQ3kIh/o=
-
-Name: lib/ant-trax.jar
-SHA1-Digest: HZ8Fu0t4n4XH3pf7VeSW1i3ymAw=
-
-Name: bin/antRun.bat
-SHA1-Digest: zB9JbFFhlXTVgwaJlw61wNELj6k=
-
-Name: lib/ant-apache-bsf.jar
-SHA1-Digest: 3m9VogNJMXiCF1ZkaeMRPdtM9OA=
-
-Name: about_files/LICENSE.sax.txt
-SHA1-Digest: uLnQn2qwT77aJ6MThuLeWz1I5ek=
-
-Name: lib/ant-stylebook.jar
-SHA1-Digest: E+Uxq8GjVBkGmc4TZ3JQh4MZeRw=
-
-Name: lib/ant-apache-log4j.jar
-SHA1-Digest: 35KkJkHQuFhTpd0mbJemrVVJCQI=
-
-Name: bin/ant
-SHA1-Digest: jK7w10Hy+BIiSimUAhjgizdaBuY=
-
-Name: etc/checkstyle/checkstyle-frames.xsl
-SHA1-Digest: 5KYg/jQq+iuWKS5gF1qX37F+UX0=
-
-Name: bin/complete-ant-cmd.pl
-SHA1-Digest: F1mrSua1xk98goAA1YvtOoJNiuw=
-
-Name: about_files/NOTICE
-SHA1-Digest: v3XrGNGv2sQGqBe+ObJZnq9915g=
-
-Name: lib/ant-apache-resolver.jar
-SHA1-Digest: fzM5Jwsbw+H2XUPO5uxQGgO9mRA=
-
-Name: etc/junit-frames.xsl
-SHA1-Digest: XIcHcYoM8I5hzTkhdiy5iskupIM=
-
-Name: etc/junit-noframes.xsl
-SHA1-Digest: zmgmTYDnXS0QZvMd3wUarjPR7aE=
-
-Name: lib/ant-antlr.jar
-SHA1-Digest: Kagxm9lkBtXTXWMRKDWn52KZeTE=
-
-Name: about.html
-SHA1-Digest: cPPs9diR9VPNDzWrCs1FLNOdJEo=
-
-Name: etc/maudit-frames.xsl
-SHA1-Digest: 1oML7OYqWjV+hPKu/ItdzrAFGcA=
-
-Name: etc/junit-frames-xalan1.xsl
-SHA1-Digest: ME/2vW22HRXG87EwVJ9LFfkfyEI=
-
-Name: lib/ant-commons-net.jar
-SHA1-Digest: Rg+mKr8hSVibDLdQwjnhGg+oMuA=
-
-Name: lib/ant-javamail.jar
-SHA1-Digest: 2b0KzqoBPtuNEHHwW3KXqLGLby8=
-
-Name: bin/lcp.bat
-SHA1-Digest: eX7ICcBsanATsaEDkn5+oTA4QaQ=
-
-Name: bin/antenv.cmd
-SHA1-Digest: s2zvcJEs2E2x6ckfXZoGxx1OF1Y=
-
-Name: bin/antRun.pl
-SHA1-Digest: mynp1agPByxojQUKZqlVZkXZSHY=
-
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/about.html b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/about.html
deleted file mode 100644
index 08d5781..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/about.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>July 14, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-<h3>Third Party Content</h3>
-
-<p>The Content includes items that have been sourced from third parties as set out below. If you 
-did not receive this Content directly from the Eclipse Foundation, the following is provided 
-for informational purposes only, and you should look to the Redistributor’s license for 
-terms and conditions of use.</p>
-
-<h4>Ant 1.7.1</h4>
-<p>The plug-in includes software developed by The Apache Software Foundation as part of the Ant project.</p>
-
-<p>The Ant binary code in ant.jar and the scripts ant, ant.bat, ant.cmd, antenv.cmd, antRun, antRun.bat, antRun.pl, complete-ant-cmd.pl, envset.cmd, lcp.bat, runant.pl, runant.py and runrc.cmd are included with the plug-in with no modifications.
-The Ant source code is located in the zip files named ant-*src.zip.</p>
-
-<p>Your use of the Ant code and the scripts is subject to the terms and conditions of the Apache License, Version 2.0.  A copy of the license is contained
-in the file <a href="about_files/asl-v20.txt" target="_blank">asl-v20.txt</a> and is also available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html" target="_blank">http://www.apache.org/licenses/LICENSE-2.0.html</a>.
-
-<p>The names "Ant" and "Apache Software Foundation" must not be used to endorse or promote products derived from this 
-software without prior written permission.  For written permission, please contact <a href="mailto:apache at apache.org">apache at apache.org</a>.</p>
-
-<p>The Apache attribution <a href="about_files/NOTICE" target="_blank">NOTICE</a> file is included with the Content in accordance with 4d of the Apache License, Version 2.0.</p>
-
-<p>Ant includes the following software:</p>
-
-<blockquote>
-	<h4>DOM</h4>
-	<p>DOM is developed by the World Wide Web Consortium.  Your use of DOM is subject to the terms and conditions of the license found in the
-	file <a href="about_files/LICENSE.dom.html" target="_blank">LICENSE.dom.html</a> which is included with this plug-in and can also be found at
-	<a href="http://www.w3.org/Consortium/Legal/copyright-software-19980720" target="_blank">http://www.w3.org/Consortium/Legal/copyright-software-19980720</a>.</p>
-	
-	<h4>SAX</h4>
-	
-	<p>SAX is developed by the SAX project (<a href="http://www.saxproject.org" target="_blank">http://www.saxproject.org</a>).  Your use of SAX is subject to the
-	terms and conditions of the license found in the file <a href="about_files/LICENSE.sax.txt" target="_blank">LICENSE.sax.txt</a> which is included with this plug-in.</p>
-</blockquote>
-</body>
-</html>
\ No newline at end of file
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/about_files/LICENSE.dom.html b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/about_files/LICENSE.dom.html
deleted file mode 100644
index 97e7898..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/about_files/LICENSE.dom.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>License</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<p>This license came from:<br>
-<a href="http://www.w3.org/Consortium/Legal/copyright-software-19980720">http://www.w3.org/Consortium/Legal/copyright-software-19980720</a></p>
-
-<p>
-W3C® SOFTWARE NOTICE AND LICENSE<br>
-Copyright © 1994-2001 <a href="http://www.w3.org/">World Wide Web Consortium</a>, (<a href="http://www.lcs.mit.edu/">Massachusetts Institute of Technology</a>, 
-<a href="http://www.inria.fr/">Institut National de Recherche en Informatique et en Automatique</a>, <a href="http://www.keio.ac.jp/">Keio University</a>). All Rights Reserved.<br>
-<a href="http://www.w3.org/Consortium/Legal/">http://www.w3.org/Consortium/Legal/</a></p>
-
-<p>
-This W3C work (including software, documents, or other related<br>
-items) is being provided by the copyright holders under the<br>
-following license. By obtaining, using and/or copying this work,<br>
-you (the licensee) agree that you have read, understood, and will<br>
-comply with the following terms and conditions:<br>
-Permission to use, copy, modify, and distribute this software<br>
-and its documentation, with or without modification, for any<br>
-purpose and without fee or royalty is hereby granted, provided that<br>
-you include the following on ALL copies of the software and<br>
-documentation or portions thereof, including modifications, that<br>
-you make:</p>
-
-<p>
-The full text of this NOTICE in a location viewable to users of<br>
-the redistributed or derivative work.</p>
-
-<p>
-Any pre-existing intellectual property disclaimers, notices, or<br>
-terms and conditions. If none exist, a short notice of the<br>
-following form (hypertext is preferred, text is permitted) should<br>
-be used within the body of any redistributed or derivative code:<br>
-"Copyright © [$date-of-software] World Wide Web Consortium, (Massachusetts Institute of<br>
-Technology, Institut National de<br>
-Recherche en Informatique et en Automatique, Keio University). All Rights Reserved.<br>
-http://www.w3.org/Consortium/Legal/"</p>
-
-<p>
-Notice of any changes or modifications to the W3C files,<br>
-including the date changes were made. (We recommend you provide <br>
-URIs to the location from which the code is derived.)</p>
-
-<p>
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND<br>
-COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR<br>
-IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF<br>
-MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE<br>
-USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD<br>
-PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.<br>
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,<br>
-SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE<br>
-SOFTWARE OR DOCUMENTATION.</p>
-
-<p>
-The name and trademarks of copyright holders may NOT be used in<br>
-advertising or publicity pertaining to the software without<br>
-specific, written prior permission. Title to copyright in this<br>
-software and any associated documentation will at all times remain<br>
-with copyright holders.</p>
-
-<p>
-____________________________________<br>
-This formulation of W3C's notice and license became active on<br>
-August 14 1998 so as to improve compatibility with GPL. This<br>
-version ensures that W3C software licensing terms are no more<br>
-restrictive than GPL and consequently W3C software may be<br>
-distributed in GPL packages. See the older formulation for the<br>
-policy prior to this date. Please see our Copyright FAQ for common <br>
-questions about using materials from<br>
-our site, including specific terms and conditions for packages like<br>
-libwww, Amaya, and Jigsaw. <br>
-Other questions about this notice can be<br>
-directed to site-policy at w3.org.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/about_files/LICENSE.sax.txt b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/about_files/LICENSE.sax.txt
deleted file mode 100644
index d46b3dc..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/about_files/LICENSE.sax.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-This license came from: http://www.megginson.com/SAX/copying.html
-  However please note future versions of SAX may be covered 
-  under http://saxproject.org/?selected=pd
-
-
-This page is now out of date -- see the new SAX site at 
-http://www.saxproject.org/ for more up-to-date
-releases and other information. Please change your bookmarks.
-
-
-SAX2 is Free!
-
-I hereby abandon any property rights to SAX 2.0 (the Simple API for
-XML), and release all of the SAX 2.0 source code, compiled code, and
-documentation contained in this distribution into the Public Domain.
-SAX comes with NO WARRANTY or guarantee of fitness for any
-purpose.
-
-David Megginson, david at megginson.com
-2000-05-05
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/about_files/NOTICE b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/about_files/NOTICE
deleted file mode 100644
index 4c88cc6..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/about_files/NOTICE
+++ /dev/null
@@ -1,26 +0,0 @@
-   =========================================================================
-   ==  NOTICE file corresponding to the section 4 d of                    ==
-   ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache Ant distribution.                      ==
-   =========================================================================
-
-   Apache Ant
-   Copyright 1999-2008 The Apache Software Foundation
-
-   This product includes software developed by
-   The Apache Software Foundation (http://www.apache.org/).
-
-   This product includes also software developed by :
-     - the W3C consortium (http://www.w3c.org) ,
-     - the SAX project (http://www.saxproject.org)
-
-   The <sync> task is based on code Copyright (c) 2002, Landmark
-   Graphics Corp that has been kindly donated to the Apache Software
-   Foundation.
-
-   Portions of this software were originally based on the following:
-     - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
-     - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
-     - voluntary contributions made by Paul Eng on behalf of the 
-       Apache Software Foundation that were originally developed at iClick, Inc.,
-       software copyright (c) 1999.
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/ant b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/ant
deleted file mode 100644
index 2e60839..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/ant
+++ /dev/null
@@ -1,326 +0,0 @@
-#! /bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Extract launch and ant arguments, (see details below).
-ant_exec_args=
-no_config=false
-use_jikes_default=false
-ant_exec_debug=false
-show_help=false
-for arg in "$@" ; do
-  if [ "$arg" = "--noconfig" ] ; then
-    no_config=true
-  elif [ "$arg" = "--usejikes" ] ; then
-    use_jikes_default=true
-  elif [ "$arg" = "--execdebug" ] ; then
-    ant_exec_debug=true
-  elif [ my"$arg" = my"--h"  -o my"$arg" = my"--help"  ] ; then
-    show_help=true
-    ant_exec_args="$ant_exec_args -h"
-  else
-    if [  my"$arg" = my"-h"  -o  my"$arg" = my"-help" ] ; then
-      show_help=true
-    fi
-    ant_exec_args="$ant_exec_args \"$arg\""
-  fi
-done
-
-# Source/default ant configuration
-if $no_config ; then
-  rpm_mode=false
-  usejikes=$use_jikes_default
-else
-  # load system-wide ant configuration (ONLY if ANT_HOME has NOT been set)
-  if [ -z "$ANT_HOME" -o "$ANT_HOME" = "/usr/share/ant" ]; then
-      if [ -f "/etc/ant.conf" ] ; then
-          . /etc/ant.conf
-      fi
-  fi
-
-  # load user ant configuration
-  if [ -f "$HOME/.ant/ant.conf" ] ; then
-    . $HOME/.ant/ant.conf
-  fi
-  if [ -f "$HOME/.antrc" ] ; then
-    . "$HOME/.antrc"
-  fi
-
-  # provide default configuration values
-  if [ -z "$rpm_mode" ] ; then
-    rpm_mode=false
-  fi
-  if [ -z "$usejikes" ] ; then
-    usejikes=$use_jikes_default
-  fi
-fi
-
-# Setup Java environment in rpm mode
-if $rpm_mode ; then
-  if [ -f /usr/share/java-utils/java-functions ] ; then
-    . /usr/share/java-utils/java-functions
-    set_jvm
-    set_javacmd
-  fi
-fi
-
-# OS specific support.  $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
-case "`uname`" in
-  CYGWIN*) cygwin=true ;;
-  Darwin*) darwin=true
-           if [ -z "$JAVA_HOME" ] ; then
-             JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
-           fi
-           ;;
-esac
-
-if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then
-  ## resolve links - $0 may be a link to ant's home
-  PRG="$0"
-  progname=`basename "$0"`
-
-  # need this for relative symlinks
-  while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-    PRG="$link"
-    else
-    PRG=`dirname "$PRG"`"/$link"
-    fi
-  done
-
-  ANT_HOME=`dirname "$PRG"`/..
-
-  # make it fully qualified
-  ANT_HOME=`cd "$ANT_HOME" > /dev/null && pwd`
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-  [ -n "$ANT_HOME" ] &&
-    ANT_HOME=`cygpath --unix "$ANT_HOME"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# set ANT_LIB location
-ANT_LIB="${ANT_HOME}/lib"
-
-if [ -z "$JAVACMD" ] ; then
-  if [ -n "$JAVA_HOME"  ] ; then
-    # IBM's JDK on AIX uses strange locations for the executables
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-      JAVACMD="$JAVA_HOME/jre/sh/java"
-    elif [ -x "$JAVA_HOME/jre/bin/java" ] ; then
-      JAVACMD="$JAVA_HOME/jre/bin/java"
-    else
-      JAVACMD="$JAVA_HOME/bin/java"
-    fi
-  else
-    JAVACMD=`which java 2> /dev/null `
-    if [ -z "$JAVACMD" ] ; then
-        JAVACMD=java
-    fi
-  fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly."
-  echo "  We cannot execute $JAVACMD"
-  exit 1
-fi
-
-# Build local classpath using just the launcher in non-rpm mode or
-# use the Jpackage helper in rpm mode with basic and default jars
-# specified in the ant.conf configuration. Because the launcher is
-# used, libraries linked in ANT_HOME/lib will also be included, but this
-# is discouraged as it is not java-version safe. A user should
-# request optional jars and their dependencies via the OPT_JAR_LIST
-# variable
-if $rpm_mode && [ -x /usr/bin/build-classpath ] ; then
-  LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher jaxp_parser_impl xml-commons-apis)"
-
-  # If no optional jars have been specified then build the default list
-  if [ -z "$OPT_JAR_LIST" ] ; then
-    for file in /etc/ant.d/*; do
-      if [ -f "$file" ]; then
-        case "$file" in
-        *~) ;;
-        *#*) ;;
-        *.rpmsave) ;;
-        *.rpmnew) ;;
-        *)
-          for dep in `cat "$file"`; do
-            case "$OPT_JAR_LIST" in
-            *"$dep"*) ;;
-            *) OPT_JAR_LIST="$OPT_JAR_LIST${OPT_JAR_LIST:+ }$dep"
-            esac
-          done
-        esac
-      fi
-    done
-  fi
-
-  # If the user requested to try to add some other jars to the classpath
-  if [ -n "$OPT_JAR_LIST" ] ; then
-    _OPTCLASSPATH="$(/usr/bin/build-classpath $OPT_JAR_LIST 2> /dev/null)"
-    if [ -n "$_OPTCLASSPATH" ] ; then 
-      LOCALCLASSPATH="$LOCALCLASSPATH:$_OPTCLASSPATH"
-    fi
-  fi
-
-  # Explicitly add javac path to classpath, assume JAVA_HOME set
-  # properly in rpm mode
-  if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
-    LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar"
-  fi
-  if [ -f "$JAVA_HOME/lib/classes.zip" ] ; then
-    LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip"
-  fi
-
-  # if CLASSPATH_OVERRIDE env var is set, LOCALCLASSPATH will be
-  # user CLASSPATH first and ant-found jars after.
-  # In that case, the user CLASSPATH will override ant-found jars
-  #
-  # if CLASSPATH_OVERRIDE is not set, we'll have the normal behaviour
-  # with ant-found jars first and user CLASSPATH after
-  if [ -n "$CLASSPATH" ] ; then
-    # merge local and specified classpath 
-    if [ -z "$LOCALCLASSPATH" ] ; then 
-      LOCALCLASSPATH="$CLASSPATH"
-    elif [ -n "$CLASSPATH_OVERRIDE" ] ; then
-      LOCALCLASSPATH="$CLASSPATH:$LOCALCLASSPATH"
-    else
-      LOCALCLASSPATH="$LOCALCLASSPATH:$CLASSPATH"
-    fi
-
-    # remove class path from launcher -cp option
-    CLASSPATH=""
-  fi
-else
-  # not using rpm_mode; use launcher to determine classpaths
-  if [ -z "$LOCALCLASSPATH" ] ; then
-      LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar
-  else
-      LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar:$LOCALCLASSPATH
-  fi
-fi
-
-if [ -n "$JAVA_HOME" ] ; then
-  # OSX hack to make Ant work with jikes
-  if $darwin ; then
-    OSXHACK="${JAVA_HOME}/../Classes"
-    if [ -d "${OSXHACK}" ] ; then
-      for i in "${OSXHACK}"/*.jar
-      do
-        JIKESPATH="$JIKESPATH:$i"
-      done
-    fi
-  fi
-fi
-
-# Allow Jikes support (off by default)
-if $usejikes; then
-  ANT_OPTS="$ANT_OPTS -Dbuild.compiler=jikes"
-fi
-
-# For Cygwin, switch paths to appropriate format before running java
-# For PATHs convert to unix format first, then to windows format to ensure
-# both formats are supported. Probably this will fail on directories with ;
-# in the name in the path. Let's assume that paths containing ; are more
-# rare than windows style paths on cygwin.
-if $cygwin; then
-  if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null ; then
-    format=mixed
-  else
-    format=windows
-  fi
-  ANT_HOME=`cygpath --$format "$ANT_HOME"`
-  ANT_LIB=`cygpath --$format "$ANT_LIB"`
-  JAVA_HOME=`cygpath --$format "$JAVA_HOME"`
-  LCP_TEMP=`cygpath --path --unix "$LOCALCLASSPATH"`
-  LOCALCLASSPATH=`cygpath --path --$format "$LCP_TEMP"`
-  if [ -n "$CLASSPATH" ] ; then
-    CP_TEMP=`cygpath --path --unix "$CLASSPATH"`
-    CLASSPATH=`cygpath --path --$format "$CP_TEMP"`
-  fi
-  CYGHOME=`cygpath --$format "$HOME"`
-fi
-
-# Show script help if requested
-if $show_help ; then
-  echo $0 '[script options] [options] [target [target2 [target3] ..]]'
-  echo 'Script Options:'
-  echo '  --help, --h            print this message and ant help'
-  echo '  --noconfig             suppress sourcing of /etc/ant.conf,'
-  echo '                         $HOME/.ant/ant.conf, and $HOME/.antrc'
-  echo '                         configuration files'
-  echo '  --usejikes             enable use of jikes by default, unless'
-  echo '                         set explicitly in configuration files'
-  echo '  --execdebug            print ant exec line generated by this'
-  echo '                         launch script'
-  echo '  '
-fi
-# add a second backslash to variables terminated by a backslash under cygwin
-if $cygwin; then
-  case "$ANT_HOME" in
-    *\\ )
-    ANT_HOME="$ANT_HOME\\"
-    ;;
-  esac
-  case "$CYGHOME" in
-    *\\ )
-    CYGHOME="$CYGHOME\\"
-    ;;
-  esac
-  case "$JIKESPATH" in
-    *\\ )
-    JIKESPATH="$JIKESPATH\\"
-    ;;
-  esac
-  case "$LOCALCLASSPATH" in
-    *\\ )
-    LOCALCLASSPATH="$LOCALCLASSPATH\\"
-    ;;
-  esac
-  case "$CLASSPATH" in
-    *\\ )
-    CLASSPATH="$CLASSPATH\\"
-    ;;
-  esac
-fi
-# Execute ant using eval/exec to preserve spaces in paths,
-# java options, and ant args
-ant_sys_opts=
-if [ -n "$CYGHOME" ]; then
-  if [ -n "$JIKESPATH" ]; then
-    ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\" -Dcygwin.user.home=\"$CYGHOME\""
-  else
-    ant_sys_opts="-Dcygwin.user.home=\"$CYGHOME\""
-  fi
-else
-  if [ -n "$JIKESPATH" ]; then
-    ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\""
-  fi
-fi
-ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"$CLASSPATH\" $ant_exec_args"
-if $ant_exec_debug ; then
-    echo $ant_exec_command
-fi
-eval $ant_exec_command
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/ant.bat b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/ant.bat
deleted file mode 100644
index 6d57c81..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/ant.bat
+++ /dev/null
@@ -1,226 +0,0 @@
- at echo off
-
-REM  Licensed to the Apache Software Foundation (ASF) under one or more
-REM  contributor license agreements.  See the NOTICE file distributed with
-REM  this work for additional information regarding copyright ownership.
-REM  The ASF licenses this file to You under the Apache License, Version 2.0
-REM  (the "License"); you may not use this file except in compliance with
-REM  the License.  You may obtain a copy of the License at
-REM 
-REM      http://www.apache.org/licenses/LICENSE-2.0
-REM 
-REM  Unless required by applicable law or agreed to in writing, software
-REM  distributed under the License is distributed on an "AS IS" BASIS,
-REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM  See the License for the specific language governing permissions and
-REM  limitations under the License.
-
-REM This is an inordinately troublesome piece of code, particularly because it
-REM tries to work on both Win9x and WinNT-based systems. If we could abandon '9x
-REM support, things would be much easier, but sadly, it is not yet time.
-REM Be cautious about editing this, and only add WinNT specific stuff in code that
-REM only runs on WinNT.
-
-if "%HOME%"=="" goto homeDrivePathPre
-if exist "%HOME%\antrc_pre.bat" call "%HOME%\antrc_pre.bat"
-
-:homeDrivePathPre
-if "%HOMEDRIVE%%HOMEPATH%"=="" goto userProfilePre
-if "%HOMEDRIVE%%HOMEPATH%"=="%HOME%" goto userProfilePre
-if exist "%HOMEDRIVE%%HOMEPATH%\antrc_pre.bat" call "%HOMEDRIVE%%HOMEPATH%\antrc_pre.bat"
-
-:userProfilePre
-if "%USERPROFILE%"=="" goto alpha
-if "%USERPROFILE%"=="%HOME%" goto alpha
-if "%USERPROFILE%"=="%HOMEDRIVE%%HOMEPATH%" goto alpha
-if exist "%USERPROFILE%\antrc_pre.bat" call "%USERPROFILE%\antrc_pre.bat"
-
-:alpha
-
-if "%OS%"=="Windows_NT" @setlocal
-if "%OS%"=="WINNT" @setlocal
-
-if "%ANT_HOME%"=="" goto setDefaultAntHome
-
-:stripAntHome
-if not _%ANT_HOME:~-1%==_\ goto checkClasspath
-set ANT_HOME=%ANT_HOME:~0,-1%
-goto stripAntHome
-
-:setDefaultAntHome
-rem %~dp0 is expanded pathname of the current script under NT
-set ANT_HOME=%~dp0..
-
-:checkClasspath
-set _USE_CLASSPATH=yes
-rem CLASSPATH must not be used if it is equal to ""
-if "%CLASSPATH%"=="""" set _USE_CLASSPATH=no
-if "%CLASSPATH%"=="" set _USE_CLASSPATH=no
-
-rem Slurp the command line arguments. This loop allows for an unlimited number
-rem of arguments (up to the command line limit, anyway).
-set ANT_CMD_LINE_ARGS=%1
-if ""%1""=="""" goto doneStart
-shift
-:setupArgs
-if ""%1""=="""" goto doneStart
-if ""%1""==""-noclasspath"" goto clearclasspath
-set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1
-shift
-goto setupArgs
-
-rem here is there is a -noclasspath in the options
-:clearclasspath
-set _USE_CLASSPATH=no
-shift
-goto setupArgs
-
-rem This label provides a place for the argument list loop to break out
-rem and for NT handling to skip to.
-
-:doneStart
-
-if _USE_CLASSPATH==no goto findAntHome
-
-:stripClasspath
-if not _%CLASSPATH:~-1%==_\ goto findAntHome
-set CLASSPATH=%CLASSPATH:~0,-1%
-goto stripClasspath
-
-:findAntHome
-rem find ANT_HOME if it does not exist due to either an invalid value passed
-rem by the user or the %0 problem on Windows 9x
-if exist "%ANT_HOME%\lib\ant.jar" goto checkJava
-
-rem check for ant in Program Files
-if not exist "%ProgramFiles%\ant" goto checkSystemDrive
-set ANT_HOME=%ProgramFiles%\ant
-goto checkJava
-
-:checkSystemDrive
-rem check for ant in root directory of system drive
-if not exist %SystemDrive%\ant\lib\ant.jar goto checkCDrive
-set ANT_HOME=%SystemDrive%\ant
-goto checkJava
-
-:checkCDrive
-rem check for ant in C:\ant for Win9X users
-if not exist C:\ant\lib\ant.jar goto noAntHome
-set ANT_HOME=C:\ant
-goto checkJava
-
-:noAntHome
-echo ANT_HOME is set incorrectly or ant could not be located. Please set ANT_HOME.
-goto end
-
-:checkJava
-set _JAVACMD=%JAVACMD%
-
-if "%JAVA_HOME%" == "" goto noJavaHome
-if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
-if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe
-goto checkJikes
-
-:noJavaHome
-if "%_JAVACMD%" == "" set _JAVACMD=java.exe
-
-:checkJikes
-if not "%JIKESPATH%"=="" goto runAntWithJikes
-
-:runAnt
-if "%_USE_CLASSPATH%"=="no" goto runAntNoClasspath
-:runAntWithClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -cp "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
-rem Check the error code of the Ant build
-if not "%OS%"=="Windows_NT" goto onError
-set ANT_ERROR=%ERRORLEVEL%
-goto end
-
-:runAntNoClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
-rem Check the error code of the Ant build
-if not "%OS%"=="Windows_NT" goto onError
-set ANT_ERROR=%ERRORLEVEL%
-goto end
-
-:runAntWithJikes
-
-if not _%JIKESPATH:~-1%==_\ goto checkJikesAndClasspath
-set JIKESPATH=%JIKESPATH:~0,-1%
-goto runAntWithJikes
-
-:checkJikesAndClasspath
-
-if "%_USE_CLASSPATH%"=="no" goto runAntWithJikesNoClasspath
-
-:runAntWithJikesAndClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS%  -cp "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
-rem Check the error code of the Ant build
-if not "%OS%"=="Windows_NT" goto onError
-set ANT_ERROR=%ERRORLEVEL%
-goto end
-
-:runAntWithJikesNoClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
-rem Check the error code of the Ant build
-if not "%OS%"=="Windows_NT" goto onError
-set ANT_ERROR=%ERRORLEVEL%
-goto end
-
-:onError
-rem Windows 9x way of checking the error code.  It matches via brute force.
-for %%i in (1 10 100) do set err%%i=
-for %%i in (0 1 2) do if errorlevel %%i00 set err100=%%i
-if %err100%==2 goto onError200
-if %err100%==0 set err100=
-for %%i in (0 1 2 3 4 5 6 7 8 9) do if errorlevel %err100%%%i0 set err10=%%i
-if "%err100%"=="" if %err10%==0 set err10=
-:onError1
-for %%i in (0 1 2 3 4 5 6 7 8 9) do if errorlevel %err100%%err10%%%i set err1=%%i
-goto onErrorEnd
-:onError200
-for %%i in (0 1 2 3 4 5) do if errorlevel 2%%i0 set err10=%%i
-if err10==5 for %%i in (0 1 2 3 4 5) do if errorlevel 25%%i set err1=%%i
-if not err10==5 goto onError1
-:onErrorEnd
-set ANT_ERROR=%err100%%err10%%err1%
-for %%i in (1 10 100) do set err%%i=
-
-:end
-rem bug ID 32069: resetting an undefined env variable changes the errorlevel.
-if not "%_JAVACMD%"=="" set _JAVACMD=
-if not "%_ANT_CMD_LINE_ARGS%"=="" set ANT_CMD_LINE_ARGS=
-
-if "%ANT_ERROR%"=="0" goto mainEnd
-
-rem Set the return code if we are not in NT.  We can only set
-rem a value of 1, but it's better than nothing.
-if not "%OS%"=="Windows_NT" echo 1 > nul | choice /n /c:1
-
-rem Set the ERRORLEVEL if we are running NT.
-if "%OS%"=="Windows_NT" color 00
-
-goto omega
-
-:mainEnd
-
-rem If there were no errors, we run the post script.
-if "%OS%"=="Windows_NT" @endlocal
-if "%OS%"=="WINNT" @endlocal
-
-if "%HOME%"=="" goto homeDrivePathPost
-if exist "%HOME%\antrc_post.bat" call "%HOME%\antrc_post.bat"
-
-:homeDrivePathPost
-if "%HOMEDRIVE%%HOMEPATH%"=="" goto userProfilePost
-if "%HOMEDRIVE%%HOMEPATH%"=="%HOME%" goto userProfilePost
-if exist "%HOMEDRIVE%%HOMEPATH%\antrc_post.bat" call "%HOMEDRIVE%%HOMEPATH%\antrc_post.bat"
-
-:userProfilePost
-if "%USERPROFILE%"=="" goto omega
-if "%USERPROFILE%"=="%HOME%" goto omega
-if "%USERPROFILE%"=="%HOMEDRIVE%%HOMEPATH%" goto omega
-if exist "%USERPROFILE%\antrc_post.bat" call "%USERPROFILE%\antrc_post.bat"
-
-:omega
-
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/ant.cmd b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/ant.cmd
deleted file mode 100644
index d221a40..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/ant.cmd
+++ /dev/null
@@ -1,93 +0,0 @@
-/* 
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- 
-    Run ant
-*/
-
-'@echo off'
-parse arg mode envarg '::' antarg
-
-if mode\='.' & mode\='..' & mode\='/' then do
-  envarg = mode envarg
-  mode = ''
-end
-
-if antarg = '' then do
-  antarg = envarg
-  envarg = ''
-end
-
-x = setlocal()
-
-env="OS2ENVIRONMENT"
-antenv = _getenv_('antenv')
-if _testenv_() = 0 then interpret 'call "' || antenv || '"' '"' || envarg || '"'
-
-if mode = '' then mode = _getenv_('ANT_MODE' '..')
-if mode \= '/' then do
-  runrc = _getenv_('runrc')
-  antrc = _getenv_('antrc' 'antrc.cmd')
-  if mode = '..' then mode = '-r'
-  else mode = ''
-  interpret 'call "' || runrc || '"' antrc '"' || mode || '"'
-end
-
-if _testenv_() = 0 then do
-  say 'Ant environment is not set properly'
-  x = endlocal()
-  exit 16
-end
-
-settings = '-Dant.home=' || ANT_HOME '-Djava.home=' || JAVA_HOME
-
-java = _getenv_('javacmd' 'java')
-opts = value('ANT_OPTS',,env)
-args = value('ANT_ARGS',,env)
-lcp = value('LOCALCLASSPATH',,env)
-cp = value('CLASSPATH',,env)
-if value('ANT_USE_CP',,env) \= '' then do
-  if lcp \= '' & right(lcp, 1) \= ';' then lcp = lcp || ';'
-  lcp = lcp || cp
-  'SET CLASSPATH='
-end
-if lcp\='' then lcp = '-classpath' lcp
-
-cmd = java opts lcp '-jar' ANT_HOME ||'\lib\ant-launcher.jar' settings args antarg
-launcher = stream(ANT_HOME ||'\lib\ant-launcher.jar', 'C', 'query exists')
-if launcher = '' then entry = 'org.apache.tools.ant.Main'
-else entry = 'org.apache.tools.ant.launch.Launcher'
-java opts lcp entry settings args antarg
-
-x = endlocal()
-
-return rc
-
-_testenv_: procedure expose env ANT_HOME JAVA_HOME
-ANT_HOME = value('ANT_HOME',,env)
-if ANT_HOME = '' then return 0
-JAVA_HOME = value('JAVA_HOME',,env)
-if JAVA_HOME = '' then return 0
-cp = translate(value('CLASSPATH',,env))
-if pos(translate(ANT_HOME), cp) = 0 then return 0
-if pos(translate(JAVA_HOME), cp) = 0 then return 0
-return 1
-
-_getenv_: procedure expose env
-parse arg envar default
-if default = '' then default = envar
-var = value(translate(envar),,env)
-if var = '' then var = default
-return var
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/antRun b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/antRun
deleted file mode 100644
index 8110f86..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/antRun
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Args: DIR command
-cd "$1"
-CMD="$2"
-shift
-shift
-
-exec "$CMD" "$@"
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/antRun.bat b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/antRun.bat
deleted file mode 100644
index 10d2bbc..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/antRun.bat
+++ /dev/null
@@ -1,50 +0,0 @@
- at echo off
-
-REM  Licensed to the Apache Software Foundation (ASF) under one or more
-REM  contributor license agreements.  See the NOTICE file distributed with
-REM  this work for additional information regarding copyright ownership.
-REM  The ASF licenses this file to You under the Apache License, Version 2.0
-REM  (the "License"); you may not use this file except in compliance with
-REM  the License.  You may obtain a copy of the License at
-REM 
-REM      http://www.apache.org/licenses/LICENSE-2.0
-REM 
-REM  Unless required by applicable law or agreed to in writing, software
-REM  distributed under the License is distributed on an "AS IS" BASIS,
-REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM  See the License for the specific language governing permissions and
-REM  limitations under the License.
-
-if "%OS%"=="Windows_NT" @setlocal
-if "%OS%"=="WINNT" @setlocal
-
-if ""%1""=="""" goto runCommand
-
-rem Change drive and directory to %1
-if "%OS%"=="Windows_NT" goto nt_cd
-if "%OS%"=="WINNT" goto nt_cd
-cd ""%1""
-goto end_cd
-:nt_cd
-cd /d ""%1""
-:end_cd
-shift
-
-rem Slurp the command line arguments. This loop allows for an unlimited number
-rem of arguments (up to the command line limit, anyway).
-set ANT_RUN_CMD=%1
-if ""%1""=="""" goto runCommand
-shift
-:loop
-if ""%1""=="""" goto runCommand
-set ANT_RUN_CMD=%ANT_RUN_CMD% %1
-shift
-goto loop
-
-:runCommand
-rem echo %ANT_RUN_CMD%
-%ANT_RUN_CMD%
-
-if "%OS%"=="Windows_NT" @endlocal
-if "%OS%"=="WINNT" @endlocal
-
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/antRun.pl b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/antRun.pl
deleted file mode 100644
index dbea10f..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/antRun.pl
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/perl
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  See the NOTICE file distributed with
-#  this work for additional information regarding copyright ownership.
-#  The ASF licenses this file to You under the Apache License, Version 2.0
-#  (the "License"); you may not use this file except in compliance with
-#  the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-#######################################################################
-#
-# antRun.pl
-#
-# wrapper script for invoking commands on a platform with Perl installed
-# this is akin to antRun.bat, and antRun the SH script 
-#
-# created:         2001-10-18
-# author:          Jeff Tulley jtulley at novell.com 
-#######################################################################
-#be fussy about variables
-use strict;
-
-#turn warnings on during dev; generates a few spurious uninitialised var access warnings
-#use warnings;
-
-#and set $debug to 1 to turn on trace info (currently unused)
-my $debug=1;
-
-#######################################################################
-# change drive and directory to "%1"
-my $ANT_RUN_CMD = @ARGV[0];
-
-# assign current run command to "%2"
-chdir (@ARGV[0]) || die "Can't cd to $ARGV[0]: $!\n";
-if ($^O eq "NetWare") {
-    # There is a bug in Perl 5 on NetWare, where chdir does not
-    # do anything.  On NetWare, the following path-prefixed form should 
-    # always work. (afaict)
-    $ANT_RUN_CMD .= "/". at ARGV[1];
-}
-else {
-    $ANT_RUN_CMD = @ARGV[1];
-}
-
-# dispose of the first two arguments, leaving only the command's args.
-shift;
-shift;
-
-# run the command
-my $returnValue = system $ANT_RUN_CMD, @ARGV;
-if ($returnValue eq 0) {
-    exit 0;
-}
-else {
-    # only 0 and 1 are widely recognized as exit values
-    # so change the exit value to 1
-    exit 1;
-}
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/antenv.cmd b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/antenv.cmd
deleted file mode 100644
index 170d89f..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/antenv.cmd
+++ /dev/null
@@ -1,98 +0,0 @@
-/* 
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-
-'@echo off'
-call RxFuncAdd "SysLoadFuncs", "RexxUtil", "SysLoadFuncs"
-call SysLoadFuncs
-
-/* Prepare the parameters for later use */
-parse arg argv
-mode = ''
-args = ''
-opts = ''
-cp = ''
-lcp = ''
-
-do i = 1 to words(argv)
-  param = word(argv, i)
-  select
-    when param='-lcp' then mode = 'l'
-    when param='-cp' | param='-classpath' then mode = 'c'
-    when abbrev('-opts', param, 4) then mode = 'o'
-    when abbrev('-args', param, 4) then mode = 'a'
-  otherwise
-    select
-      when mode = 'a' then args = space(args param, 1)
-      when mode = 'c' then cp = space(cp param, 1)
-      when mode = 'l' then lcp = space(lcp param, 1)
-      when mode = 'o' then opts = space(opts param, 1)
-    otherwise
-      say 'Option' param 'ignored'
-    end
-  end
-end
-
-env="OS2ENVIRONMENT"
-antconf = _getenv_('antconf' 'antconf.cmd')
-runrc = _getenv_('runrc')
-interpret 'call "' || runrc || '"' '"' || antconf || '"' 'ETC'
-ANT_HOME = value('ANT_HOME',,env)
-JAVA_HOME = value('JAVA_HOME',,env)
-classpath = value('CLASSPATH',,env)
-classes = stream(JAVA_HOME || "\lib\classes.zip", "C", "QUERY EXISTS")
-if classes \= '' then classpath = prepend(classpath classes)
-classes = stream(JAVA_HOME || "\lib\tools.jar", "C", "QUERY EXISTS")
-if classes \= '' then classpath = prepend(classpath classes)
-
-classpath = prepend(classpath ANT_HOME || '\lib\ant-launcher.jar')
-'SET CLASSPATH=' || classpath
-
-/* Setting classpathes, options and arguments */
-envset = _getenv_('envset')
-if cp\=''   then interpret 'call "' || envset || '"' '"; CLASSPATH"' '"' || cp || '"'
-if lcp\=''  then interpret 'call "' || envset || '"' '"; LOCALCLASSPATH"' '"' || lcp || '"'
-if opts\='' then interpret 'call "' || envset || '"' '"-D ANT_OPTS"' '"' || opts || '"'
-if args\='' then interpret 'call "' || envset || '"' '"ANT_ARGS"' '"' || args || '"'
-
-exit 0
-
-addpath: procedure
-parse arg path elem
-if elem = '' then do
-  if path\='' & right(path, 1)\=';' then path = path || ';'
-  return path
-end
-if substr(path, length(path)) = ';' then glue = ''
-else glue = ';'
-if pos(translate(elem), translate(path)) = 0 then path = path || glue || elem || ';'
-return path
-
-prepend: procedure
-parse arg path elem
-if elem = '' then do
-  if path\='' & right(path, 1)\=';' then path = path || ';'
-  return path
-end
-if pos(translate(elem), translate(path)) = 0 then path = elem || ';' || path
-return path
-
-_getenv_: procedure expose env
-parse arg envar default
-if default = '' then default = envar
-var = value(translate(envar),,env)
-if var = '' then var = default
-return var
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/complete-ant-cmd.pl b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/complete-ant-cmd.pl
deleted file mode 100644
index b58c26e..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/complete-ant-cmd.pl
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/usr/bin/perl
-#
-#  Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  See the NOTICE file distributed with
-#  this work for additional information regarding copyright ownership.
-#  The ASF licenses this file to You under the Apache License, Version 2.0
-#  (the "License"); you may not use this file except in compliance with
-#  the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-# A script to allow Bash or Z-Shell to complete an Ant command-line.  
-#
-# To install for Bash 2.0 or better, add the following to ~/.bashrc:
-# 
-#     $ complete -C complete-ant-cmd ant build.sh
-#
-# To install for Z-Shell 2.5 or better, add the following to ~/.zshrc:
-#
-#     function ant_complete () {
-#         local args_line args
-#         read -l args_line
-#         set -A args $args_line
-#         set -A reply $(COMP_LINE=$args_line complete-ant-cmd ${args[1]} $1)
-#     }
-#     compctl -K ant_complete ant build.sh
-#     
-# @author Mike Williams <mikew at cortexebusiness.com.au>
-
-my $cmdLine = $ENV{'COMP_LINE'};
-my $antCmd = $ARGV[0];
-my $word = $ARGV[1];
-
-my @completions;
-if ($word =~ /^-/) {
-    list( restrict( $word, getArguments() ));
-} elsif ($cmdLine =~ /-(f|buildfile)\s+\S*$/) {
-    list( getBuildFiles($word) );
-} else {
-    list( restrict( $word, getTargets() ));
-}
-
-exit(0);
-
-sub list {
-    for (@_) {
-        print "$_\n";
-    }
-}
-
-sub restrict {
-    my ($word, @completions) = @_;
-    grep( /^\Q$word\E/, @completions );
-}
-
-sub getArguments {
-    qw(-buildfile -debug -emacs -f -find -help -listener -logfile 
-       -logger -projecthelp -quiet -verbose -version); 
-}
-
-
-sub getBuildFiles {
-    my ($word) = @_;
-    grep( /\.xml$/, glob( "$word*" ));
-}
-
-sub getTargets {
-
-    # Look for build-file
-    my $buildFile = 'build.xml';
-    if ($cmdLine =~ /-(f|buildfile)\s+(\S+)/) {
-        $buildFile = $2;
-    }
-    return () unless (-f $buildFile);
-
-    # Run "ant -projecthelp" to list targets.  Keep a cache of results in a
-    # cache-file.
-    my $cacheFile = $buildFile;
-    $cacheFile =~ s|(.*/)?(.*)|${1}.ant-targets-${2}|;
-    if ((!-e $cacheFile) || (-M $buildFile) < (-M $cacheFile)) {
-        open( CACHE, '>'.$cacheFile ) || die "can\'t write $cacheFile: $!\n";
-        open( HELP, "$antCmd -projecthelp -f '$buildFile'|" ) || return(); 
-        my %targets;
-        while( <HELP> ) {
-            if (/^\s+(\S+)/) {
-                $targets{$1}++;
-            }
-        }
-        my @targets = sort keys %targets;
-        for (@targets) { print CACHE "$_\n"; }
-        return @targets;
-    }
-    
-    # Read the target-cache
-    open( CACHE, $cacheFile ) || die "can\'t read $cacheFile: $!\n";
-    my @targets;
-    while (<CACHE>) {
-        chop;
-        s/\r$//;  # for Cygwin
-        push( @targets, $_ );
-    }
-    close( CACHE );
-    @targets;
-
-}
-
-
-
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/envset.cmd b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/envset.cmd
deleted file mode 100644
index 3b07419..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/envset.cmd
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-SET environment variables
-First optional parameter:
-   ;     parameters are considered parts of a path variable, semicolons are
-         appended to each element if not already present
-   -D    parameters are properties for Java or Makefile etc., -D will be
-         prepended and the parameters will be separated by a space
-   =D    the same as above but equal sign is not required
-   ,     parameters should be comma separated in the environment variable
-   -     parameters should be separated by the next parameter
-   Other values mean that the first parameter is missing and the environment
-   variable will be set to the space separated parameters
-
-Second parameter: name of the environment variable
-
-Next parameters: values
-; implies that the equal sign is considered a part of the parameter and is
-not interpreted
-
--D requires parameters in the form name=value. If the equal sign is not found,
-the parameters are changed to name=expanded_name
-
-Other options have optional equal sign. If it is found, only the part after
-the equal sign will be oprionally expanded.
-
-If the parameter is the minus sign, the next parameter will not be expanded.
-If the parameter is a single dot, it will be replaced with the value of the
-environment variable as it existed before envset was invoked.
-
-For other parameters the batch looks for the environment variable with the
-same name (in uppercase). If it is found, it forms the expanded_name. If
-the environment variable with such a name does not exist, the expanded_name
-will hold the parameter name without case conversion.
-*/
-
-parse arg mode envar args
-
-equal = 0
-sep = ' '
-
-/* Parse command line parameters */
-select
-  when mode='-' then do
-    sep = envar
-    parse var args envar args
-  end
-  when mode=';' then do
-    sep = ''
-    equal = -1
-  end
-  when mode='-D' then equal = 1
-  when mode='=D' then mode = '-D'
-  when mode=',' then sep = ','
-otherwise
-  args = envar args
-  envar = mode
-  mode = ''
-end
-
-env = 'OS2ENVIRONMENT'
-envar = translate(envar)
-orig = value(envar,,env)
-newval = ''
-expand = 1
-
-/* for each parameter... */
-do i = 1 to words(args)
-  if expand > 0 & word(args, i) = '-' then expand = 0
-  else call addval word(args, i)
-end
-
-/* Optionally enclose path variable by quotes */
-if mode = ';' & pos(' ', newval) > 0 then newval = '"' || newval || '"'
-
-/* Set the new value, 'SET' cannot be used since it does not allow '=' */
-x = value(envar, newval, env)
-exit 0
-
-addval: procedure expose sep equal orig expand newval mode env
-parse arg var
-
-if var = '.' then expvar = orig
-else do
-  if equal >= 0 then do
-    parse var var name '=' val
-    if val = '' then var = name
-    else var = val
-  end
-  if expand = 0 then expvar = var
-  else expvar = value(translate(var),,env)
-  if expvar = '' then expvar = var
-  if equal >= 0 then do
-    if val = '' then do
-      parse var expvar key '=' val
-      if val <> '' then name = key
-      else do
-        if equal > 0 then val = key
-        else name = key
-      end
-    end
-    else val = expvar
-    if pos(' ', val) > 0 | pos('=', val) > 0 then val = '"' || val || '"'
-    if val = '' then expvar = name
-    else expvar = name || '=' || val
-  end
-  if mode = '-D' then expvar = '-D' || expvar
-  if mode = ';' then do
-    if right(expvar, 1) <> ';' then expvar = expvar || ';'
-  end
-end
-
-if newval = '' then newval = expvar
-else newval = newval || sep || expvar
-expand = 1
-return
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/lcp.bat b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/lcp.bat
deleted file mode 100644
index 4bf2e7c..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/lcp.bat
+++ /dev/null
@@ -1,31 +0,0 @@
-REM
-REM  Licensed to the Apache Software Foundation (ASF) under one or more
-REM  contributor license agreements.  See the NOTICE file distributed with
-REM  this work for additional information regarding copyright ownership.
-REM  The ASF licenses this file to You under the Apache License, Version 2.0
-REM  (the "License"); you may not use this file except in compliance with
-REM  the License.  You may obtain a copy of the License at
-REM 
-REM      http://www.apache.org/licenses/LICENSE-2.0
-REM 
-REM  Unless required by applicable law or agreed to in writing, software
-REM  distributed under the License is distributed on an "AS IS" BASIS,
-REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM  See the License for the specific language governing permissions and
-REM  limitations under the License.
-REM
-REM
-
-set _CLASSPATHCOMPONENT=%1
-if ""%1""=="""" goto gotAllArgs
-shift
-
-:argCheck
-if ""%1""=="""" goto gotAllArgs
-set _CLASSPATHCOMPONENT=%_CLASSPATHCOMPONENT% %1
-shift
-goto argCheck
-
-:gotAllArgs
-set LOCALCLASSPATH=%LOCALCLASSPATH%;%_CLASSPATHCOMPONENT%
-
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/runant.pl b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/runant.pl
deleted file mode 100644
index 5f8307a..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/runant.pl
+++ /dev/null
@@ -1,153 +0,0 @@
-#!/usr/bin/perl
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  See the NOTICE file distributed with
-#  this work for additional information regarding copyright ownership.
-#  The ASF licenses this file to You under the Apache License, Version 2.0
-#  (the "License"); you may not use this file except in compliance with
-#  the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-#######################################################################
-#
-# runant.pl
-#
-# wrapper script for invoking ant in a platform with Perl installed
-# this may include cgi-bin invocation, which is considered somewhat daft.
-# (slo: that should be a separate file which can be derived from this
-# and returns the XML formatted output)
-#
-# the code is not totally portable due to classpath and directory splitting
-# issues. oops. (NB, use File::Spec::Functions  will help and the code is
-# structured for the catfile() call, but because of perl version funnies
-# the code is not included. 
-#
-# created:         2000-8-24
-# author:          Steve Loughran steve_l at sourceforge.net
-#######################################################################
-#
-# Assumptions:
-#
-# - the "java" executable/script is on the command path
-# - ANT_HOME has been set
-# - target platform uses ":" as classpath separator or perl indicates it is dos/win32
-# - target platform uses "/" as directory separator.
-
-#be fussy about variables
-use strict;
-
-#platform specifics (disabled)
-#use File::Spec::Functions;
-
-#turn warnings on during dev; generates a few spurious uninitialised var access warnings
-#use warnings;
-
-#and set $debug to 1 to turn on trace info
-my $debug=1;
-
-#######################################################################
-#
-# check to make sure environment is setup
-#
-
-my $HOME = $ENV{ANT_HOME};
-if ($HOME eq "")
-        {
-    die "\n\nANT_HOME *MUST* be set!\n\n";
-        }
-
-my $JAVACMD = $ENV{JAVACMD};
-$JAVACMD = "java" if $JAVACMD eq "";
-
-my $onnetware = 0;
-if ($^O eq "NetWare")
-{
-  $onnetware = 1;
-}
-
-my $oncygwin = ($^O eq "cygwin");
-
-#ISSUE: what java wants to split up classpath varies from platform to platform 
-#and perl is not too hot at hinting which box it is on.
-#here I assume ":" 'cept on win32, dos, and netware. Add extra tests here as needed.
-my $s=":";
-if(($^O eq "MSWin32") || ($^O eq "dos") || ($^O eq "cygwin") ||
-   ($onnetware == 1))
-        {
-        $s=";";
-        }
-
-#build up standard classpath
-my $localpath = "$HOME/lib/ant-launcher.jar";
-#set JVM options and Ant arguments, if any
-my @ANT_OPTS=split(" ", $ENV{ANT_OPTS});
-my @ANT_ARGS=split(" ", $ENV{ANT_ARGS});
-
-#jikes
-if($ENV{JIKESPATH} ne "")
-        {
-        push @ANT_OPTS, "-Djikes.class.path=$ENV{JIKESPATH}";
-        }
-
-#construct arguments to java
-my @ARGS;
-push @ARGS, @ANT_OPTS;
-
-my $CYGHOME = "";
-
-my $classpath=$ENV{CLASSPATH};
-if ($oncygwin == 1) {
-  $localpath = `cygpath --path --windows $localpath`;
-  chomp ($localpath);
-  if (! $classpath eq "")
-  {
-    $classpath = `cygpath --path --windows "$classpath"`;
-    chomp ($classpath);
-  }
-  $HOME = `cygpath --path --windows $HOME`;
-  chomp ($HOME);
-  $CYGHOME = `cygpath --path --windows $ENV{HOME}`;
-  chomp ($CYGHOME);
-}
-push @ARGS, "-classpath", "$localpath";
-push @ARGS, "-Dant.home=$HOME";
-if ( ! $CYGHOME eq "" )
-{
-  push @ARGS, "-Dcygwin.user.home=\"$CYGHOME\""
-}
-push @ARGS, "org.apache.tools.ant.launch.Launcher", @ANT_ARGS;
-push @ARGS, @ARGV;
-if (! $classpath eq "")
-{
-  if ($onnetware == 1)
-  {
-    # make classpath literally $CLASSPATH
-    # this is to avoid pushing us over the 512 character limit
-    # even skip the ; - that is already in $localpath
-    push @ARGS, "-lib", "\$CLASSPATH";
-  }
-  else
-  {
-    push @ARGS, "-lib", "$classpath";
-  }
-}
-print "\n $JAVACMD @ARGS\n\n" if ($debug);
-
-my $returnValue = system $JAVACMD, @ARGS;
-if ($returnValue eq 0)
-        {
-        exit 0;
-        }
-else
-        {
-        # only 0 and 1 are widely recognized as exit values
-        # so change the exit value to 1
-        exit 1;
-        }
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/runant.py b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/runant.py
deleted file mode 100644
index eec549e..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/runant.py
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/python
-# Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  See the NOTICE file distributed with
-#  this work for additional information regarding copyright ownership.
-#  The ASF licenses this file to You under the Apache License, Version 2.0
-#  (the "License"); you may not use this file except in compliance with
-#  the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-
-"""
-
- runant.py
-
-    This script is a translation of the runant.pl written by Steve Loughran.
-    It runs ant with/out arguments, it should be quite portable (thanks to
-    the python os library)
-    This script has been tested with Python2.0/Win2K
-
- created:         2001-04-11
- author:          Pierre Dittgen pierre.dittgen at criltelecom.com
-
- Assumptions:
-
- - the "java" executable/script is on the command path
-"""
-import os, os.path, string, sys
-
-# Change it to 1 to get extra debug information
-debug = 0
-
-#######################################################################
-
-# If ANT_HOME is not set default to script's parent directory
-if os.environ.has_key('ANT_HOME'):
-    ANT_HOME = os.environ['ANT_HOME']
-else:
-    ANT_HOME = os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0])))
-
-# set ANT_LIB location
-ANT_LIB = os.path.join(ANT_HOME, 'lib')
-
-# set JAVACMD (check variables JAVACMD and JAVA_HOME)
-JAVACMD = None
-if not os.environ.has_key('JAVACMD'):
-    if os.environ.has_key('JAVA_HOME'):
-        if not os.path.exists(os.environ['JAVA_HOME']):
-            print "Warning: JAVA_HOME is not defined correctly."
-        else:
-            JAVACMD = os.path.join(os.environ['JAVA_HOME'], 'bin', 'java')
-    else:
-        print "Warning: JAVA_HOME not set."
-else:
-    JAVACMD = os.environ['JAVACMD']
-if not JAVACMD:
-    JAVACMD = 'java'
-
-launcher_jar = os.path.join(ANT_LIB, 'ant-launcher.jar')
-if not os.path.exists(launcher_jar):
-    print 'Unable to locate ant-launcher.jar. Expected to find it in %s' % \
-        ANT_LIB
-
-# Build up standard classpath (LOCALCLASSPATH)
-LOCALCLASSPATH = launcher_jar
-if os.environ.has_key('LOCALCLASSPATH'):
-    LOCALCLASSPATH += os.pathsep + os.environ['LOCALCLASSPATH']
-
-ANT_OPTS = ""
-if os.environ.has_key('ANT_OPTS'):
-    ANT_OPTS = os.environ['ANT_OPTS']
-
-OPTS = ""
-if os.environ.has_key('JIKESPATH'):
-    OPTS = '-Djikes.class.path=\"%s\"' % os.environ['JIKESPATH']
-
-ANT_ARGS = ""
-if os.environ.has_key('ANT_ARGS'):
-    ANT_ARGS = os.environ['ANT_ARGS']
-
-CLASSPATH = ""
-if os.environ.has_key('CLASSPATH'):
-    CLASSPATH = os.environ['CLASSPATH']
-
-# Builds the commandline
-cmdline = ('%s %s -classpath %s -Dant.home=%s %s ' + \
-    'org.apache.tools.ant.launch.Launcher %s -lib %s %s') \
-     % (JAVACMD, ANT_OPTS, LOCALCLASSPATH, ANT_HOME, OPTS, ANT_ARGS, \
-        CLASSPATH, string.join(sys.argv[1:], ' '))
-
-if debug:
-    print '\n%s\n\n' % (cmdline)
-sys.stdout.flush()
-
-# Run the biniou!
-os.system(cmdline)
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/runrc.cmd b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/runrc.cmd
deleted file mode 100644
index c68f04d..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/runrc.cmd
+++ /dev/null
@@ -1,60 +0,0 @@
-/* 
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-   Run RC file, name is in the first arg, second arg is either PATH
-   ENV  or -r or nothing 
-*/
-
-parse arg name path rest
-
-if name = '' then do
-  say 'RC file name is missing'
-  exit 1
-end
-
-if rest \= '' then do
-  say 'Too many parameters'
-  exit 1
-end
-
-call runit name path
-exit 0
-
-runit: procedure
-parse arg name path dir
-
-if path \= '' & path \= '-r' then do
-  dir = value(translate(path),,'OS2ENVIRONMENT')
-  if dir = '' then return
-  dir = translate(dir, '\', '/') /* change UNIX-like path to OS/2 */
-end
-
-if dir = '' then dir = directory()
-
-if path = '-r' then do /* recursive call */
-  subdir = filespec('path', dir)
-  if subdir \= '\' then do
-    subdir = left(subdir, length(subdir)-1)
-    call runit name path filespec('drive', dir) || subdir
-  end
-end
-
-/* Look for the file and run it */
-if right(dir, 1) \= '\' then dir = dir || '\'
-rcfile = stream(dir || name, 'c', 'query exists')
-if rcfile \= '' then interpret 'call "' || rcfile || '"'
-
-return
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/changelog.xsl b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/changelog.xsl
deleted file mode 100644
index c6aef8f..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/changelog.xsl
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<xsl:stylesheet
-    xmlns:xsl='http://www.w3.org/1999/XSL/Transform'
-    version='1.0'>
-
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   
--->
-  <xsl:param name="title"/>
-  <xsl:param name="module"/>
-  <xsl:param name="cvsweb"/>
-
-  <xsl:output method="html" indent="yes" encoding="US-ASCII"
-              doctype-public="-//W3C//DTD HTML 4.01//EN"
-              doctype-system="http://www.w3.org/TR/html401/strict.dtd"/>
-
-  <!-- Copy standard document elements.  Elements that
-       should be ignored must be filtered by apply-templates
-       tags. -->
-  <xsl:template match="*">
-    <xsl:copy>
-      <xsl:copy-of select="attribute::*[. != '']"/>
-      <xsl:apply-templates/>
-    </xsl:copy>
-  </xsl:template>
-
-  <xsl:template match="changelog">
-    <html>
-      <head>
-        <title><xsl:value-of select="$title"/></title>
-        <style type="text/css">
-          body, p {
-            font-family: Verdana, Arial, Helvetica, sans-serif;
-            font-size: 80%;
-            color: #000000;
-            background-color: #ffffff;
-          }
-          tr, td {
-            font-family: Verdana, Arial, Helvetica, sans-serif;
-            background: #eeeee0;
-          }
-          td {
-            padding-left: 20px;
-          }
-      .dateAndAuthor {
-            font-family: Verdana, Arial, Helvetica, sans-serif;
-            font-weight: bold;
-            text-align: left;
-            background: #a6caf0;
-            padding-left: 3px;
-      }
-          a {
-            color: #000000;
-          }
-          pre {
-            font-weight: bold;
-          }
-        </style>
-      </head>
-      <body>
-        <h1>
-          <a name="top"><xsl:value-of select="$title"/></a>
-        </h1>
-        <p style="text-align: right">Designed for use with <a href="http://ant.apache.org/">Apache Ant</a>.</p>
-        <hr/>
-        <table border="0" width="100%" cellspacing="1">
-          
-          <xsl:apply-templates select=".//entry">
-            <xsl:sort select="date" data-type="text" order="descending"/>
-            <xsl:sort select="time" data-type="text" order="descending"/>
-          </xsl:apply-templates>
-          
-        </table>
-        
-      </body>
-    </html>
-  </xsl:template>
-  
-  <xsl:template match="entry">
-    <tr>
-      <td class="dateAndAuthor">
-        <xsl:value-of select="date"/><xsl:text> </xsl:text><xsl:value-of select="time"/><xsl:text> </xsl:text><xsl:value-of select="author"/>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <pre>
-<xsl:apply-templates select="msg"/></pre>
-        <ul>
-          <xsl:apply-templates select="file"/>
-        </ul>
-      </td>
-    </tr>
-  </xsl:template>
-
-  <xsl:template match="date">
-    <i><xsl:value-of select="."/></i>
-  </xsl:template>
-
-  <xsl:template match="time">
-    <i><xsl:value-of select="."/></i>
-  </xsl:template>
-
-  <xsl:template match="author">
-    <i>
-      <a>
-        <xsl:attribute name="href">mailto:<xsl:value-of select="."/></xsl:attribute>
-        <xsl:value-of select="."/></a>
-    </i>
-  </xsl:template>
-
-  <xsl:template match="file">
-    <li>
-      <a>
-        <xsl:choose>
-          <xsl:when test="string-length(prevrevision) = 0 ">
-            <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?rev=<xsl:value-of select="revision" />&content-type=text/x-cvsweb-markup</xsl:attribute>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?r1=<xsl:value-of select="revision" />&r2=<xsl:value-of select="prevrevision"/></xsl:attribute>
-          </xsl:otherwise>
-        </xsl:choose>
-        <xsl:value-of select="name" /> (<xsl:value-of select="revision"/>)</a>
-    </li>
-  </xsl:template>
-
-  <!-- Any elements within a msg are processed,
-       so that we can preserve HTML tags. -->
-  <xsl:template match="msg">
-    <xsl:apply-templates/>
-  </xsl:template>
-  
-</xsl:stylesheet>
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/checkstyle/checkstyle-frames.xsl b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/checkstyle/checkstyle-frames.xsl
deleted file mode 100644
index abaafd6..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/checkstyle/checkstyle-frames.xsl
+++ /dev/null
@@ -1,299 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-    xmlns:lxslt="http://xml.apache.org/xslt"
-    xmlns:redirect="org.apache.xalan.lib.Redirect"
-    extension-element-prefixes="redirect">
-
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-    <xsl:output method="html" indent="yes" encoding="US-ASCII"/>
-    <xsl:decimal-format decimal-separator="." grouping-separator="," />
-
-    <xsl:param name="output.dir" select="'.'"/>
-    <xsl:param name="basedir" select="'.'"/>
-
-    <xsl:template match="checkstyle">
-        <!-- create the index.html -->
-        <redirect:write file="{$output.dir}/index.html">
-            <xsl:call-template name="index.html"/>
-        </redirect:write>
-
-        <!-- create the stylesheet.css -->
-        <redirect:write file="{$output.dir}/stylesheet.css">
-            <xsl:call-template name="stylesheet.css"/>
-        </redirect:write>
-
-        <!-- create the overview-summary.html at the root -->
-        <redirect:write file="{$output.dir}/overview-frame.html">
-            <xsl:apply-templates select="." mode="overview"/>
-        </redirect:write>
-
-        <!-- create the all-classes.html at the root -->
-        <redirect:write file="{$output.dir}/allclasses-frame.html">
-            <xsl:apply-templates select="." mode="all.classes"/>
-        </redirect:write>
-
-        <!-- process all files -->
-        <xsl:apply-templates select="file[count(error) != 0]"/>
-    </xsl:template>
-
-    <xsl:template name="index.html">
-        <html>
-            <head>
-                <title>CheckStyle Audit</title>
-            </head>
-            <frameset cols="20%,80%">
-                <frame src="allclasses-frame.html" name="fileListFrame"/>
-                <frame src="overview-frame.html" name="fileFrame"/>
-            </frameset>
-            <noframes>
-                <h2>Frame Alert</h2>
-                <p>
-                    This document is designed to be viewed using the frames feature.
-                    If you see this message, you are using a non-frame-capable web client.
-                </p>
-            </noframes>
-        </html>
-    </xsl:template>
-
-    <xsl:template name="pageHeader">
-        <table border="0" cellpadding="0" cellspacing="0" width="100%">
-            <tr>
-                <td class="text-align:right"><h2>CheckStyle Audit</h2></td>
-            </tr>
-            <tr>
-                <td class="text-align:right">Designed for use with
-                  <a href='http://checkstyle.sourceforge.net/'>CheckStyle</a> and
-                  <a href='http://ant.apache.org/'>Ant</a>.</td>
-            </tr>
-        </table>
-        <hr size="1"/>
-    </xsl:template>
-
-    <xsl:template match="checkstyle" mode="overview">
-        <html>
-            <head>
-                <link rel="stylesheet" type="text/css" href="stylesheet.css"/>
-            </head>
-            <body>
-                <!-- page header -->
-                <xsl:call-template name="pageHeader"/>
-
-                <!-- Summary part -->
-                <xsl:apply-templates select="." mode="summary"/>
-                <hr size="1" width="100%" align="left"/>
-
-                <!-- File list part -->
-                <xsl:apply-templates select="." mode="filelist"/>
-            </body>
-        </html>
-    </xsl:template>
-
-    <xsl:template name="stylesheet.css">
-        .bannercell {
-        border: 0px;
-        padding: 0px;
-        }
-        body {
-        margin-left: 10;
-        margin-right: 10;
-        font:normal 80% arial,helvetica,sanserif;
-        background-color:#FFFFFF;
-        color:#000000;
-        }
-        .oddrow td {
-        background: #efefef;
-        }
-        .evenrow td {
-        background: #fff;
-        }
-        th, td {
-        text-align: left;
-        vertical-align: top;
-        }
-        th {
-        font-weight:bold;
-        background: #ccc;
-        color: black;
-        }
-        table, th, td {
-        font-size:100%;
-        border: none
-        }
-        table.log tr td, tr th {
-
-        }
-        h2 {
-        font-weight:bold;
-        font-size:140%;
-        margin-bottom: 5;
-        }
-        h3 {
-        font-size:100%;
-        font-weight:bold;
-        background: #525D76;
-        color: white;
-        text-decoration: none;
-        padding: 5px;
-        margin-right: 2px;
-        margin-left: 2px;
-        margin-bottom: 0;
-        }
-    </xsl:template>
-
-    <!--
-    Creates an all-classes.html file that contains a link to all files.
-    -->
-    <xsl:template match="checkstyle" mode="all.classes">
-        <html>
-            <head>
-                <link rel="stylesheet" type="text/css" href="stylesheet.css"/>
-            </head>
-            <body>
-                <h2>Files</h2>
-                <p>
-                    <table width="100%">
-                        <!-- For each file create its part -->
-                        <xsl:apply-templates select="file[count(error) != 0]" mode="all.classes">
-                            <xsl:sort select="substring-after(@name, $basedir)"/>
-                        </xsl:apply-templates>
-                    </table>
-                </p>
-            </body>
-        </html>
-    </xsl:template>
-
-    <xsl:template match="checkstyle" mode="filelist">
-        <h3>Files</h3>
-        <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
-            <tr>
-                <th>Name</th>
-                <th>Errors</th>
-            </tr>
-            <xsl:apply-templates select="file[count(error) != 0]" mode="filelist">
-                <xsl:sort select="count(error)" order="descending" data-type="number"/>
-            </xsl:apply-templates>
-        </table>
-    </xsl:template>
-
-    <xsl:template match="file" mode="filelist">
-        <tr>
-            <xsl:call-template name="alternated-row"/>
-            <td nowrap="nowrap">
-                <a>
-                    <xsl:attribute name="href">
-                        <xsl:text>files/</xsl:text><xsl:value-of select="substring-after(@name, $basedir)"/><xsl:text>.html</xsl:text>
-                    </xsl:attribute>
-                    <xsl:value-of select="substring-after(@name, $basedir)"/>
-                </a>
-            </td>
-            <td><xsl:value-of select="count(error)"/></td>
-        </tr>
-    </xsl:template>
-
-    <xsl:template match="file" mode="all.classes">
-        <tr>
-            <td nowrap="nowrap">
-                <a target="fileFrame">
-                    <xsl:attribute name="href">
-                        <xsl:text>files/</xsl:text><xsl:value-of select="substring-after(@name, $basedir)"/><xsl:text>.html</xsl:text>
-                    </xsl:attribute>
-                    <xsl:value-of select="substring-after(@name, $basedir)"/>
-                </a>
-            </td>
-        </tr>
-    </xsl:template>
-
-    <!--
-    transform string like a/b/c to ../../../
-    @param path the path to transform into a descending directory path
-    -->
-    <xsl:template name="path">
-        <xsl:param name="path"/>
-
-        <!-- Convert a windows path '\' to a unix path '/' for further processing. -->
-        <xsl:variable name="path2" select="translate($path,'\','/')"/>
-
-        
-        <xsl:if test="contains($path2,'/')">
-            <xsl:text>../</xsl:text>
-            <xsl:call-template name="path">
-                <xsl:with-param name="path"><xsl:value-of select="substring-after($path2,'/')"/></xsl:with-param>
-            </xsl:call-template>
-        </xsl:if>
-        <xsl:if test="not(contains($path2,'/')) and not($path2 = '')">
-            <xsl:text>../</xsl:text>
-        </xsl:if>
-    </xsl:template>
-
-    <xsl:template match="file">
-        <redirect:write file="{$output.dir}/files/{substring-after(@name, $basedir)}.html">
-            <html>
-                <head>
-                    <link rel="stylesheet" type="text/css">
-                        <xsl:attribute name="href"><xsl:call-template name="path"><xsl:with-param name="path" select="substring-after(@name, $basedir)"/></xsl:call-template><xsl:text>stylesheet.css</xsl:text></xsl:attribute>
-                    </link>
-                </head>
-                <body>
-                    <xsl:call-template name="pageHeader"/>
-                    <h3>File <xsl:value-of select="substring-after(@name, $basedir)"/></h3>
-                    <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
-                        <tr>
-                            <th>Error Description</th>
-                            <th>Line:Column</th>
-                        </tr>
-                        <xsl:for-each select="error">
-                            <tr>
-                                <xsl:call-template name="alternated-row"/>
-                                <td><a title="{@source}"><xsl:value-of select="@message"/></a></td>
-                                <td align="center"><xsl:value-of select="@line"/><xsl:if test="@column">:<xsl:value-of select="@column"/></xsl:if></td>
-                            </tr>
-                        </xsl:for-each>
-                    </table>
-                </body>
-            </html>
-        </redirect:write>
-    </xsl:template>
-
-    <xsl:template match="checkstyle" mode="summary">
-        <h3>Summary</h3>
-        <xsl:variable name="fileCount" select="count(file)"/>
-        <xsl:variable name="errorCount" select="count(file/error)"/>
-        <xsl:variable name="fileErrorCount" select="count(file[count(error) != 0])"/>
-        <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
-            <tr>
-                <th>Total Files</th>
-                <th>Files With Errors</th>
-                <th>Errors</th>
-            </tr>
-            <tr>
-                <xsl:call-template name="alternated-row"/>
-                <td><xsl:value-of select="$fileCount"/></td>
-                <td><xsl:value-of select="$fileErrorCount"/></td>
-                <td><xsl:value-of select="$errorCount"/></td>
-            </tr>
-        </table>
-    </xsl:template>
-
-    <xsl:template name="alternated-row">
-        <xsl:attribute name="class">
-            <xsl:if test="position() mod 2 = 1">oddrow</xsl:if>
-            <xsl:if test="position() mod 2 = 0">evenrow</xsl:if>
-        </xsl:attribute>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/checkstyle/checkstyle-text.xsl b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/checkstyle/checkstyle-text.xsl
deleted file mode 100644
index 7359e41..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/checkstyle/checkstyle-text.xsl
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-    <xsl:strip-space elements="checkstyle"/>
-    <xsl:preserve-space elements="file"/>
-    <xsl:output method="text"/>
-    <xsl:template match="checkstyle/file/error">
-        <xsl:value-of select="../@name"/>
-        <xsl:text>:</xsl:text>
-        <xsl:value-of select="@line"/>
-        <xsl:text>:</xsl:text>
-        <xsl:value-of select="@column"/>
-        <xsl:text> </xsl:text>
-        <xsl:value-of select="@message"/>
-    </xsl:template>
-</xsl:stylesheet>
-
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/checkstyle/checkstyle-xdoc.xsl b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/checkstyle/checkstyle-xdoc.xsl
deleted file mode 100644
index 5fc6eab..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/checkstyle/checkstyle-xdoc.xsl
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-    xmlns:lxslt="http://xml.apache.org/xslt"
-    xmlns:redirect="org.apache.xalan.lib.Redirect"
-    extension-element-prefixes="redirect">
-
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-    <xsl:output method="xml" indent="yes"/>
-    <xsl:decimal-format decimal-separator="." grouping-separator="," />
-
-    <xsl:param name="output.dir" select="'.'"/>
-    <xsl:param name="basedir" select="'.'"/>
-
-    <xsl:template match="checkstyle">
-      <document>
-        <properties>
-          <title>Checkstyle Audit</title>
-        </properties>
-
-        <body>
-          <xsl:apply-templates select="." mode="summary"/>
-          <!-- File list part -->
-          <xsl:apply-templates select="." mode="filelist"/>
-          <xsl:apply-templates select="file[count(error) != 0]"/>
-        </body>
-      </document>
-    </xsl:template>
-
-    <xsl:template match="checkstyle" mode="filelist">
-      <section name="Files">
-        <table>
-            <tr>
-                <th>Name</th>
-                <th>Errors</th>
-            </tr>
-            <xsl:apply-templates select="file[count(error) != 0]" mode="filelist">
-                <xsl:sort select="count(error)" order="descending" data-type="number"/>
-            </xsl:apply-templates>
-        </table>
-      </section>
-    </xsl:template>
-
-    <xsl:template match="file" mode="filelist">
-        <tr>
-            <xsl:call-template name="alternated-row"/>
-            <td nowrap="nowrap">
-                <a>
-                    <xsl:attribute name="href">
-                        <xsl:text>files</xsl:text><xsl:value-of select="substring-after(@name, $basedir)"/><xsl:text>.html</xsl:text>
-                    </xsl:attribute>
-                    <xsl:value-of select="substring-after(@name, $basedir)"/>
-                </a>
-            </td>
-            <td><xsl:value-of select="count(error)"/></td>
-        </tr>
-    </xsl:template>
-
-    <xsl:template match="file">
-      <redirect:write file="{$output.dir}/files{substring-after(@name, $basedir)}.xml">
-        <document>
-          <properties>
-            <title>Checkstyle Audit</title>
-          </properties>
-
-          <body>
-            <section name="Details for {substring-after(@name, $basedir)}">
-              <table>
-                  <tr>
-                      <th>Error Description</th>
-                      <th>Line</th>
-                  </tr>
-                  <xsl:for-each select="error">
-                      <tr>
-                          <xsl:call-template name="alternated-row"/>
-                          <td><a title="{@source}"><xsl:value-of select="@message"/></a></td>
-                          <td><xsl:value-of select="@line"/></td>
-                      </tr>
-                  </xsl:for-each>
-              </table>
-            </section>
-          </body>
-        </document>
-      </redirect:write>
-    </xsl:template>
-
-    <xsl:template match="checkstyle" mode="summary">
-      <section name="Summary">
-        <xsl:variable name="fileCount" select="count(file)"/>
-        <xsl:variable name="errorCount" select="count(file/error)"/>
-        <xsl:variable name="fileErrorCount" select="count(file[count(error) != 0])"/>
-        <table>
-            <tr>
-                <th>Files</th>
-                <th>Files With Errors</th>
-                <th>Errors</th>
-            </tr>
-            <tr>
-                <xsl:call-template name="alternated-row"/>
-                <td><xsl:value-of select="$fileCount"/></td>
-                <td><xsl:value-of select="$fileErrorCount"/></td>
-                <td><xsl:value-of select="$errorCount"/></td>
-            </tr>
-        </table>
-      </section>
-    </xsl:template>
-
-    <xsl:template name="alternated-row">
-        <xsl:attribute name="class">
-            <xsl:if test="position() mod 2 = 1">oddrow</xsl:if>
-            <xsl:if test="position() mod 2 = 0">evenrow</xsl:if>
-        </xsl:attribute>
-    </xsl:template>
-</xsl:stylesheet>
-
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/coverage-frames.xsl b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/coverage-frames.xsl
deleted file mode 100644
index a55a52a..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/coverage-frames.xsl
+++ /dev/null
@@ -1,489 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-    xmlns:lxslt="http://xml.apache.org/xslt"
-    xmlns:redirect="org.apache.xalan.lib.Redirect"
-    extension-element-prefixes="redirect">
-<xsl:output method="html" indent="yes"/>
-<xsl:decimal-format decimal-separator="." grouping-separator="," />
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<!--
-
- Sample stylesheet to be used with JProbe 3.0 XML output.
-
- It creates a set of HTML files a la javadoc where you can browse easily
- through all packages and classes.
-
- It is best used with JProbe Coverage Ant task that gives you the benefit
- of a reference classpath so that you have the list of classes/methods
- that are not used at all in a given classpath.
-
- @author Stephane Bailliez <a href="mailto:sbailliez at apache.org"/>
-
--->
-
-<!-- default output directory is current directory -->
-<xsl:param name="output.dir" select="'.'"/>
-
-<!-- ======================================================================
-    Root element
-    ======================================================================= -->
-<xsl:template match="/snapshot">
-    <!-- create the index.html -->
-    <redirect:write file="{$output.dir}/index.html">
-        <xsl:call-template name="index.html"/>
-    </redirect:write>
-
-    <!-- create the stylesheet.css -->
-    <redirect:write file="{$output.dir}/stylesheet.css">
-        <xsl:call-template name="stylesheet.css"/>
-    </redirect:write>
-
-    <!-- create the overview-packages.html at the root -->
-    <redirect:write file="{$output.dir}/overview-summary.html">
-        <xsl:apply-templates select="." mode="overview.packages"/>
-    </redirect:write>
-
-    <!-- create the all-packages.html at the root -->
-    <redirect:write file="{$output.dir}/overview-frame.html">
-        <xsl:apply-templates select="." mode="all.packages"/>
-    </redirect:write>
-
-    <!-- create the all-classes.html at the root -->
-    <redirect:write file="{$output.dir}/allclasses-frame.html">
-        <xsl:apply-templates select="." mode="all.classes"/>
-    </redirect:write>
-
-    <!-- process all packages -->
-    <xsl:apply-templates select="./package" mode="write"/>
-</xsl:template>
-
-<!-- =======================================================================
-    Frameset definition. Entry point for the report.
-    3 frames: packageListFrame, classListFrame, classFrame
-    ======================================================================= -->
-<xsl:template name="index.html">
-<html>
-    <head><title>Coverage Results.</title></head>
-    <frameset cols="20%,80%">
-        <frameset rows="30%,70%">
-            <frame src="overview-frame.html" name="packageListFrame"/>
-            <frame src="allclasses-frame.html" name="classListFrame"/>
-        </frameset>
-        <frame src="overview-summary.html" name="classFrame"/>
-    </frameset>
-    <noframes>
-        <h2>Frame Alert</h2>
-        <p>
-        This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
-        </p>
-    </noframes>
-</html>
-</xsl:template>
-
-<!-- =======================================================================
-    Stylesheet CSS used
-    ======================================================================= -->
-<!-- this is the stylesheet css to use for nearly everything -->
-<xsl:template name="stylesheet.css">
-    .bannercell {
-      border: 0px;
-      padding: 0px;
-    }
-    body {
-      margin-left: 10;
-      margin-right: 10;
-      font:normal 80% arial,helvetica,sanserif;
-      background-color:#FFFFFF;
-      color:#000000;
-    }
-    .a td {
-      background: #efefef;
-    }
-    .b td {
-      background: #fff;
-    }
-    th, td {
-      text-align: left;
-      vertical-align: top;
-    }
-    th {
-      font-weight:bold;
-      background: #ccc;
-      color: black;
-    }
-    table, th, td {
-      font-size:100%;
-      border: none
-    }
-    table.log tr td, tr th {
-
-    }
-    h2 {
-      font-weight:bold;
-      font-size:140%;
-      margin-bottom: 5;
-    }
-    h3 {
-      font-size:100%;
-      font-weight:bold;
-      background: #525D76;
-      color: white;
-      text-decoration: none;
-      padding: 5px;
-      margin-right: 2px;
-      margin-left: 2px;
-      margin-bottom: 0;
-    }
-</xsl:template>
-
-<!-- =======================================================================
-    List of all classes in all packages
-    This will be the first page in the classListFrame
-    ======================================================================= -->
-<xsl:template match="snapshot" mode="all.classes">
-    <html>
-        <head>
-            <xsl:call-template name="create.stylesheet.link"/>
-        </head>
-        <body>
-            <h2>Classes</h2>
-            <table width="100%">
-                <xsl:for-each select="package/class">
-                    <xsl:sort select="@name"/>
-                    <xsl:variable name="package.name" select="(ancestor::package)[last()]/@name"/>
-                    <xsl:variable name="link">
-                        <xsl:if test="not($package.name='')">
-                            <xsl:value-of select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text>
-                        </xsl:if><xsl:value-of select="@name"/><xsl:text>.html</xsl:text>
-                    </xsl:variable>
-                    <tr>
-                        <td nowrap="nowrap">
-                            <a target="classFrame" href="{$link}"><xsl:value-of select="@name"/></a>
-                        </td>
-                    </tr>
-                </xsl:for-each>
-            </table>
-        </body>
-    </html>
-</xsl:template>
-
-<!-- list of all packages -->
-<xsl:template match="snapshot" mode="all.packages">
-    <html>
-        <head>
-            <xsl:call-template name="create.stylesheet.link"/>
-        </head>
-        <body>
-            <h2><a href="overview-summary.html" target="classFrame">Home</a></h2>
-            <h2>Packages</h2>
-            <table width="100%">
-                <xsl:for-each select="package">
-                    <xsl:sort select="@name" order="ascending"/>
-                    <tr>
-                        <td nowrap="nowrap">
-                            <a href="{translate(@name,'.','/')}/package-summary.html" target="classFrame">
-                                <xsl:value-of select="@name"/>
-                            </a>
-                        </td>
-                    </tr>
-                </xsl:for-each>
-            </table>
-        </body>
-    </html>
-</xsl:template>
-
-<!-- overview of statistics in packages -->
-<xsl:template match="snapshot" mode="overview.packages">
-    <html>
-        <head>
-            <xsl:call-template name="create.stylesheet.link"/>
-        </head>
-        <body onload="open('allclasses-frame.html','classListFrame')">
-        <xsl:call-template name="pageHeader"/>
-        <h3>Summary</h3>
-        <table class="log" cellpadding="5" cellspacing="2" width="100%">
-            <tr>
-                <!--th width="10%" nowrap="nowrap">Date</th>
-                <th width="10%" nowrap="nowrap">Elapsed time</th-->
-                <th width="10%" nowrap="nowrap">Reported Classes</th>
-                <th width="10%" nowrap="nowrap">Methods Hit</th>
-                <th width="10%" nowrap="nowrap">Lines Hit</th>
-            </tr>
-            <tr class="a">
-                <!--td nowrap="nowrap"><xsl:value-of select="execution_log/@program_start"/></td>
-                <td><xsl:value-of select="format-number(execution_log/@elapsed_time div 1000,'0.0')"/>secs</td-->
-                <td><xsl:value-of select="count(package/class)"/></td>
-                <td><xsl:value-of select="format-number(cov.data/@hit_methods div cov.data/@total_methods,'0.0%')"/></td>
-                <td><xsl:value-of select="format-number(cov.data/@hit_lines div cov.data/@total_lines,'0.0%')"/></td>
-            </tr>
-        </table>
-        <table border="0" width="100%">
-        <tr>
-        <td style="text-align: justify;">
-        To ensure accurate test runs on Java applications, developers need to know how much of
-        the code has been tested, and where to find any untested code. Coverage helps you
-        locate untested code, and measure precisely how much code has been exercised.
-        The result is a higher quality application in a shorter period of time.
-        <p/>
-        </td>
-        </tr>
-        </table>
-
-        <h3>Packages</h3>
-        <table class="log" cellpadding="5" cellspacing="2" width="100%">
-            <xsl:apply-templates select="package[1]" mode="stats.header"/>
-            <!-- display packages and sort them via their coverage rate -->
-            <xsl:for-each select="package">
-                <xsl:sort data-type="number" select="cov.data/@hit_lines div cov.data/@total_lines"/>
-                <tr>
-                  <xsl:call-template name="alternate-row"/>
-                    <td><a href="{translate(@name,'.','/')}/package-summary.html"><xsl:value-of select="@name"/></a></td>
-                    <td><xsl:value-of select="format-number(cov.data/@hit_methods div cov.data/@total_methods,'0.0%')"/></td>
-                    <td><xsl:value-of select="format-number(cov.data/@hit_lines div cov.data/@total_lines,'0.0%')"/></td>
-                </tr>
-            </xsl:for-each>
-        </table>
-        <xsl:call-template name="pageFooter"/>
-        </body>
-        </html>
-</xsl:template>
-
-<!--
- detailed info for a package. It will output the list of classes
-, the summary page, and the info for each class
--->
-<xsl:template match="package" mode="write">
-    <xsl:variable name="package.dir">
-        <xsl:if test="not(@name = '')"><xsl:value-of select="translate(@name,'.','/')"/></xsl:if>
-        <xsl:if test="@name = ''">.</xsl:if>
-    </xsl:variable>
-
-    <!-- create a classes-list.html in the package directory -->
-    <redirect:write file="{$output.dir}/{$package.dir}/package-frame.html">
-        <xsl:apply-templates select="." mode="classes.list"/>
-    </redirect:write>
-
-    <!-- create a package-summary.html in the package directory -->
-    <redirect:write file="{$output.dir}/{$package.dir}/package-summary.html">
-        <xsl:apply-templates select="." mode="package.summary"/>
-    </redirect:write>
-
-    <!-- for each class, creates a @name.html -->
-    <xsl:for-each select="class">
-        <redirect:write file="{$output.dir}/{$package.dir}/{@name}.html">
-            <xsl:apply-templates select="." mode="class.details"/>
-        </redirect:write>
-    </xsl:for-each>
-</xsl:template>
-
-<!-- list of classes in a package -->
-<xsl:template match="package" mode="classes.list">
-    <html>
-        <HEAD>
-            <xsl:call-template name="create.stylesheet.link">
-                <xsl:with-param name="package.name" select="@name"/>
-            </xsl:call-template>
-        </HEAD>
-        <BODY>
-            <table width="100%">
-                <tr>
-                    <td nowrap="nowrap">
-                        <H2><a href="package-summary.html" target="classFrame"><xsl:value-of select="@name"/></a></H2>
-                    </td>
-                </tr>
-            </table>
-
-            <H2>Classes</H2>
-            <TABLE WIDTH="100%">
-                <xsl:for-each select="class">
-                    <xsl:sort select="@name"/>
-                    <tr>
-                        <td nowrap="nowrap">
-                            <a href="{@name}.html" target="classFrame"><xsl:value-of select="@name"/></a>
-                        </td>
-                    </tr>
-                </xsl:for-each>
-            </TABLE>
-        </BODY>
-    </html>
-</xsl:template>
-
-<!-- summary of a package -->
-<xsl:template match="package" mode="package.summary">
-    <HTML>
-        <HEAD>
-            <xsl:call-template name="create.stylesheet.link">
-                <xsl:with-param name="package.name" select="@name"/>
-            </xsl:call-template>
-        </HEAD>
-        <!-- when loading this package, it will open the classes into the frame -->
-        <BODY onload="open('package-frame.html','classListFrame')">
-            <xsl:call-template name="pageHeader"/>
-            <h3>Package <xsl:value-of select="@name"/></h3>
-            <table class="log" cellpadding="5" cellspacing="2" width="100%">
-                <xsl:apply-templates select="." mode="stats.header"/>
-                <xsl:apply-templates select="." mode="stats"/>
-            </table>
-
-            <xsl:if test="count(class) > 0">
-                <H3>Classes</H3>
-                <table class="log" cellpadding="5" cellspacing="2" width="100%">
-                    <xsl:apply-templates select="." mode="stats.header"/>
-                    <xsl:apply-templates select="class" mode="stats">
-                        <xsl:sort data-type="number" select="cov.data/@hit_lines div cov.data/@total_lines"/>
-                    </xsl:apply-templates>
-                </table>
-            </xsl:if>
-            <xsl:call-template name="pageFooter"/>
-        </BODY>
-    </HTML>
-</xsl:template>
-
-<!-- details of a class -->
-<xsl:template match="class" mode="class.details">
-    <xsl:variable name="package.name" select="(ancestor::package)[last()]/@name"/>
-    <HTML>
-        <HEAD>
-            <xsl:call-template name="create.stylesheet.link">
-                <xsl:with-param name="package.name" select="$package.name"/>
-            </xsl:call-template>
-        </HEAD>
-        <BODY>
-            <xsl:call-template name="pageHeader"/>
-            <H3>Class <xsl:if test="not($package.name = '')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></H3>
-
-            <!-- class summary -->
-            <table class="log" cellpadding="5" cellspacing="2" width="100%">
-                <xsl:apply-templates select="." mode="stats.header"/>
-                <xsl:apply-templates select="." mode="stats"/>
-            </table>
-
-            <!-- details of methods -->
-            <H3>Methods</H3>
-            <table class="log" cellpadding="5" cellspacing="2" width="100%">
-                <xsl:apply-templates select="method[1]" mode="stats.header"/>
-                <xsl:apply-templates select="method" mode="stats">
-                    <xsl:sort data-type="number" select="cov.data/@hit_lines div cov.data/@total_lines"/>
-                </xsl:apply-templates>
-            </table>
-            <xsl:call-template name="pageFooter"/>
-        </BODY>
-    </HTML>
-
-</xsl:template>
-
-<!-- Page Header -->
-<xsl:template name="pageHeader">
-  <!-- jakarta logo -->
-  <table border="0" cellpadding="0" cellspacing="0" width="100%">
-  <tr>
-    <td class="bannercell" rowspan="2">
-      <a href="http://jakarta.apache.org/">
-      <img src="http://jakarta.apache.org/images/jakarta-logo.gif" alt="http://jakarta.apache.org" align="left" border="0"/>
-      </a>
-    </td>
-        <td style="text-align:right"><h2>Source Code Coverage</h2></td>
-        </tr>
-        <tr>
-        <td style="text-align:right">Designed for use with <a href='http://www.sitraka.com/jprobe'>Sitraka JProbe</a> and <a href='http://jakarta.apache.org'>Ant</a>.</td>
-        </tr>
-  </table>
-    <hr size="1"/>
-</xsl:template>
-
-<!-- Page Footer -->
-<xsl:template name="pageFooter">
-</xsl:template>
-
-
-<xsl:template name="table.header">
-    <tr>
-        <th width="80%">Name</th>
-        <th width="10%" nowrap="nowrap">Methods Hit</th>
-        <th width="10%" nowrap="nowrap">Lines Hit</th>
-    </tr>
-</xsl:template>
-
-<xsl:template match="method" mode="stats.header">
-    <tr>
-        <th width="90%">Name</th>
-        <th width="10%" nowrap="nowrap">Lines Hit</th>
-    </tr>
-</xsl:template>
-<xsl:template match="method" mode="stats">
-    <tr>
-      <xsl:call-template name="alternate-row"/>
-        <td><xsl:value-of select="@name"/></td>
-        <td>
-        <xsl:value-of select="format-number(cov.data/@hit_lines div cov.data/@total_lines,'0.0%')"/>
-        </td>
-    </tr>
-</xsl:template>
-
-<xsl:template match="package|class" mode="stats.header">
-    <tr>
-        <th width="80%">Name</th>
-        <th width="10%" nowrap="nowrap">Methods Hit</th>
-        <th width="10%" nowrap="nowrap">Lines Hit</th>
-    </tr>
-</xsl:template>
-<xsl:template match="package|class" mode="stats">
-    <tr>
-      <xsl:call-template name="alternate-row"/>
-        <td><xsl:value-of select="@name"/></td>
-        <td><xsl:value-of select="format-number(cov.data/@hit_methods div cov.data/@total_methods,'0.0%')"/></td>
-        <td><xsl:value-of select="format-number(cov.data/@hit_lines div cov.data/@total_lines,'0.0%')"/></td>
-    </tr>
-</xsl:template>
-
-<!--
-    transform string like a.b.c to ../../../
-    @param path the path to transform into a descending directory path
--->
-<xsl:template name="path">
-    <xsl:param name="path"/>
-    <xsl:if test="contains($path,'.')">
-        <xsl:text>../</xsl:text>
-        <xsl:call-template name="path">
-            <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'.')"/></xsl:with-param>
-        </xsl:call-template>
-    </xsl:if>
-    <xsl:if test="not(contains($path,'.')) and not($path = '')">
-        <xsl:text>../</xsl:text>
-    </xsl:if>
-</xsl:template>
-
-
-<!-- create the link to the stylesheet based on the package name -->
-<xsl:template name="create.stylesheet.link">
-    <xsl:param name="package.name"/>
-    <LINK REL ="stylesheet" TYPE="text/css" TITLE="Style"><xsl:attribute name="href"><xsl:if test="not($package.name = 'unnamed package')"><xsl:call-template name="path"><xsl:with-param name="path" select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></LINK>
-</xsl:template>
-
-<!-- alternated row style -->
-<xsl:template name="alternate-row">
-<xsl:attribute name="class">
-  <xsl:if test="position() mod 2 = 1">a</xsl:if>
-  <xsl:if test="position() mod 2 = 0">b</xsl:if>
-</xsl:attribute>
-</xsl:template>
-
-</xsl:stylesheet>
-
-
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/jdepend-frames.xsl b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/jdepend-frames.xsl
deleted file mode 100644
index ccc9dcc..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/jdepend-frames.xsl
+++ /dev/null
@@ -1,487 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:lxslt="http://xml.apache.org/xslt"
-  xmlns:redirect="org.apache.xalan.lib.Redirect"
-  extension-element-prefixes="redirect">
-<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   
--->
-<!--
-
- Sample stylesheet to be used with JDepend XML output.
-
- It creates a set of HTML files a la javadoc where you can browse easily
- through all packages and classes.
-
- @author <a href="mailto:jtulley at novell.com">Jeff Tulley</a>
-
-  -->
-<xsl:param name="output.dir" select="'.'"/>
-
-<xsl:template match="JDepend">
-   <!-- create the index.html -->
-   <redirect:write file="{$output.dir}/index.html">
-      <xsl:call-template name="index.html"/>
-   </redirect:write>
-
-  <!-- create the stylesheet.css -->
-  <redirect:write file="{$output.dir}/stylesheet.css">
-    <xsl:call-template name="stylesheet.css"/>
-   </redirect:write>
-
-   <!-- create the overview-packages.html at the root -->
-  <redirect:write file="{$output.dir}/overview-summary.html">
-    <xsl:apply-templates select="." mode="overview.packages"/>
-  </redirect:write>
-
-   <!-- create the overview-packages.html at the root -->
-   <redirect:write file="{$output.dir}/overview-packages.html">
-    <xsl:apply-templates select="." mode="packages.details"/>
-  </redirect:write>
-
-   <!-- create the overview-cycles.html at the root -->
-   <redirect:write file="{$output.dir}/overview-cycles.html">
-    <xsl:apply-templates select="." mode="cycles.details"/>
-  </redirect:write>
-
-   <!-- create the overview-cycles.html at the root -->
-   <redirect:write file="{$output.dir}/overview-explanations.html">
-    <xsl:apply-templates select="." mode="explanations"/>
-  </redirect:write>
-
-  <!-- create the all-packages.html at the root -->
-   <redirect:write file="{$output.dir}/all-packages.html">
-    <xsl:apply-templates select="Packages" mode="all.packages"/>
-  </redirect:write>
-
-  <!-- create the all-cycles.html at the root -->
-  <redirect:write file="{$output.dir}/all-cycles.html">
-    <xsl:apply-templates select="Cycles" mode="all.cycles"/>
-  </redirect:write>
-</xsl:template>
-
-
-<xsl:template name="index.html">
-<html>
-   <head>
-      <title>JDepend Analysis</title>
-   </head>
-      <frameset cols="20%,80%">
-         <frameset rows="30%,70%">
-            <frame src="all-packages.html" name="packageListFrame"/>
-            <frame src="all-cycles.html" name="classListFrame"/>
-         </frameset>
-         <frame src="overview-summary.html" name="classFrame"/>
-      </frameset>
-      <noframes>
-         <h2>Frame Alert</h2>
-         <p>
-            This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
-         </p>
-      </noframes>
-</html>
-</xsl:template>
-
-<!-- this is the stylesheet css to use for nearly everything -->
-<xsl:template name="stylesheet.css">
-   <style type="text/css">
-    body {
-    font:normal 68% verdana,arial,helvetica;
-    color:#000000;
-    }
-    table tr td, tr th {
-      font-size: 68%;
-    }
-    table.details tr th{
-    font-weight: bold;
-    text-align:left;
-    background:#a6caf0;
-    }
-    table.details tr td{
-    background:#eeeee0;
-    }
-
-    p {
-    line-height:1.5em;
-    margin-top:0.5em; margin-bottom:1.0em;
-    margin-left:2em;
-    margin-right:2em;
-    }
-    h1 {
-    margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
-    }
-    h2 {
-    margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica
-    }
-    h3 {
-    margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
-    }
-    h4 {
-    margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
-    }
-    h5 {
-    margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
-    }
-    h6 {
-    margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
-    }
-    .Error {
-    font-weight:bold; color:red;
-    }
-    .Failure {
-    font-weight:bold; color:purple;
-    }
-    .Properties {
-    text-align:right;
-    }
-  </style>
-</xsl:template>
-
-<xsl:template match="JDepend" mode="overview.packages">
-   <html>
-      <head>
-         <link rel="stylesheet" type="text/css" href="stylesheet.css"/>
-      </head>
-      <body>
-         <xsl:call-template name="pageHeader"/>
-  <table width="100%"><tr align="left"><h2>Summary</h2><td>
-  </td><td align="right">
-  [summary]
-  [<a href="overview-packages.html">packages</a>]
-  [<a href="overview-cycles.html">cycles</a>]
-  [<a href="overview-explanations.html">explanations</a>]
-   </td></tr></table>
-         <table width="100%" class="details">
-            <tr>
-               <th>Package</th>
-               <th>Total Classes</th>
-               <th><a href="overview-explanations.html#EXnumber">Abstract Classes</a></th>
-               <th><a href="overview-explanations.html#EXnumber">Concrete Classes</a></th>
-               <th><a href="overview-explanations.html#EXafferent">Afferent Couplings</a></th>
-               <th><a href="overview-explanations.html#EXefferent">Efferent Couplings</a></th>
-               <th><a href="overview-explanations.html#EXabstractness">Abstractness</a></th>
-               <th><a href="overview-explanations.html#EXinstability">Instability</a></th>
-               <th><a href="overview-explanations.html#EXdistance">Distance</a></th>
-
-            </tr>
-            <xsl:for-each select="./Packages/Package">
-               <xsl:if test="count(error) = 0">
-                  <tr>
-                     <td align="left">
-                        <a>
-                           <xsl:attribute name="href">overview-packages.html#PK<xsl:value-of select="@name"/>
-                           </xsl:attribute>
-                           <xsl:value-of select="@name"/>
-                        </a>
-                     </td>
-                     <td align="right"><xsl:value-of select="Stats/TotalClasses"/></td>
-                     <td align="right"><xsl:value-of select="Stats/AbstractClasses"/></td>
-                     <td align="right"><xsl:value-of select="Stats/ConcreteClasses"/></td>
-                     <td align="right"><xsl:value-of select="Stats/Ca"/></td>
-                     <td align="right"><xsl:value-of select="Stats/Ce"/></td>
-                     <td align="right"><xsl:value-of select="Stats/A"/></td>
-                     <td align="right"><xsl:value-of select="Stats/I"/></td>
-                     <td align="right"><xsl:value-of select="Stats/D"/></td>
-                  </tr>
-               </xsl:if>
-            </xsl:for-each>
-            <xsl:for-each select="./Packages/Package">
-               <xsl:if test="count(error) > 0">
-                  <tr>
-                     <td align="left">
-                        <xsl:value-of select="@name"/>
-                     </td>
-                     <td align="left" colspan="8"><xsl:value-of select="error"/></td>
-                  </tr>
-               </xsl:if>
-            </xsl:for-each>
-         </table>
-      </body>
-   </html>
-</xsl:template>
-
-<xsl:template match="JDepend" mode="packages.details">
-   <html>
-      <head>
-          <link rel="stylesheet" type="text/css" href="stylesheet.css"/>
-      </head>
-      <body>
-         <xsl:call-template name="pageHeader"/>
-  <table width="100%"><tr align="left"><h2>Packages</h2><td>
-  </td><td align="right">
-  [<a href="overview-summary.html">summary</a>]
-  [packages]
-  [<a href="overview-cycles.html">cycles</a>]
-  [<a href="overview-explanations.html">explanations</a>]
-   </td></tr></table>
-
-  <xsl:for-each select="./Packages/Package">
-    <xsl:if test="count(error) = 0">
-      <h3><a><xsl:attribute name="name">PK<xsl:value-of select="@name"/></xsl:attribute>
-      <xsl:value-of select="@name"/></a></h3>
-
-      <table width="100%"><tr>
-        <td><a href="overview-explanations.html#EXafferent">Afferent Couplings</a>: <xsl:value-of select="Stats/Ca"/></td>
-        <td><a href="overview-explanations.html#EXefferent">Efferent Couplings</a>: <xsl:value-of select="Stats/Ce"/></td>
-        <td><a href="overview-explanations.html#EXabstractness">Abstractness</a>: <xsl:value-of select="Stats/A"/></td>
-        <td><a href="overview-explanations.html#EXinstability">Instability</a>: <xsl:value-of select="Stats/I"/></td>
-        <td><a href="overview-explanations.html#EXdistance">Distance</a>: <xsl:value-of select="Stats/D"/></td>
-      </tr></table>
-
-      <table width="100%" class="details">
-        <tr>
-          <th>Abstract Classes</th>
-          <th>Concrete Classes</th>
-          <th>Used by Packages</th>
-          <th>Uses Packages</th>
-        </tr>
-        <tr>
-          <td valign="top" width="25%">
-          <xsl:if test="count(AbstractClasses/Class)=0">
-              <i>None</i>
-            </xsl:if>
-            <xsl:for-each select="AbstractClasses/Class">
-              <xsl:value-of select="node()"/><br/>
-            </xsl:for-each>
-          </td>
-          <td valign="top" width="25%">
-            <xsl:if test="count(ConcreteClasses/Class)=0">
-              <i>None</i>
-            </xsl:if>
-            <xsl:for-each select="ConcreteClasses/Class">
-              <xsl:value-of select="node()"/><br/>
-            </xsl:for-each>
-          </td>
-          <td valign="top" width="25%">
-            <xsl:if test="count(UsedBy/Package)=0">
-              <i>None</i>
-            </xsl:if>
-            <xsl:for-each select="UsedBy/Package">
-              <a>
-                        <xsl:attribute name="href">overview-packages.html#PK<xsl:value-of select="node()"/></xsl:attribute>
-                <xsl:value-of select="node()"/>
-              </a><br/>
-            </xsl:for-each>
-          </td>
-          <td valign="top" width="25%">
-            <xsl:if test="count(DependsUpon/Package)=0">
-              <i>None</i>
-            </xsl:if>
-            <xsl:for-each select="DependsUpon/Package">
-              <a>
-                        <xsl:attribute name="href">overview-packages.html#PK<xsl:value-of select="node()"/></xsl:attribute>
-                <xsl:value-of select="node()"/>
-              </a><br/>
-            </xsl:for-each>
-          </td>
-        </tr>
-      </table>
-    </xsl:if>
-  </xsl:for-each>
-  <!-- this is often a long listing; provide a lower navigation table also -->
-  <table width="100%"><tr align="left"><td></td><td align="right">
-  [<a href="overview-summary.html">summary</a>]
-  [packages]
-  [<a href="overview-cycles.html">cycles</a>]
-  [<a href="overview-explanations.html">explanations</a>]
-   </td></tr></table>
-      </body>
-   </html>
-</xsl:template>
-
-<xsl:template match="JDepend" mode="cycles.details">
-   <html>
-      <head>
-         <link rel="stylesheet" type="text/css" href="stylesheet.css"/>
-      </head>
-      <body>
-         <xsl:call-template name="pageHeader"/>
-  <table width="100%"><tr align="left"><h2>Cycles</h2><td>
-  </td><td align="right">
-  [<a href="overview-summary.html">summary</a>]
-  [<a href="overview-packages.html">packages</a>]
-  [cycles]
-  [<a href="overview-explanations.html">explanations</a>]
-   </td></tr></table>
-  <!--<table width="100%"><tr><td>
-  </td><td align="right">
-    [<a href="#NVsummary">summary</a>]
-  [<a href="#NVpackages">packages</a>]
-  [<a href="#NVcycles">cycles</a>]
-   [<a href="#NVexplanations">explanations</a>]
-  </td></tr></table> -->
-
-  <xsl:if test="count(Cycles/Package) = 0">
-    <p>There are no cyclic dependancies.</p>
-  </xsl:if>
-  <xsl:for-each select="Cycles/Package">
-     <h3><a><xsl:attribute name="name">#CY<xsl:value-of select="@Name"/></xsl:attribute><xsl:value-of select="@Name"/></a></h3><p>
-    <xsl:for-each select="Package">
-      <xsl:value-of select="."/><br/>
-    </xsl:for-each></p>
-  </xsl:for-each>
-  <!-- this is often a long listing; provide a lower navigation table also -->
-  <table width="100%"><tr align="left"><td></td><td align="right">
-  [<a href="overview-summary.html">summary</a>]
-  [<a href="overview-packages.html">packages</a>]
-  [cycles]
-  [<a href="overview-explanations.html">explanations</a>]
-   </td></tr></table>
-  </body>
-  </html>
-</xsl:template>
-
-<xsl:template match="JDepend" mode="explanations">
-   <html>
-      <head>
-         <link rel="stylesheet" type="text/css" href="stylesheet.css"/>
-      </head>
-      <body>
-         <xsl:call-template name="pageHeader"/>
-
-  <table width="100%"><tr align="left"><h2>Explanations</h2><td>
-  </td><td align="right">
-  [<a href="overview-summary.html">summary</a>]
-  [<a href="overview-packages.html">packages</a>]
-  [<a href="overview-cycles.html">cycles</a>]
-  [explanations]
-   </td></tr></table>
-
-  <p>The following explanations are for quick reference and are lifted directly from the original <a href="http://www.clarkware.com/software/JDepend.html">JDepend documentation</a>.</p>
-
-  <h3><a name="EXnumber">Number of Classes</a></h3>
-    <p>The number of concrete and abstract classes (and interfaces) in the package is an indicator of the extensibility of the package.</p>
-  <h3><a name="EXafferent">Afferent Couplings</a></h3>
-    <p>The number of other packages that depend upon classes within the package is an indicator of the package's responsibility. </p>
-  <h3><a name="EXefferent">Efferent Couplings</a></h3>
-    <p>The number of other packages that the classes in the package depend upon is an indicator of the package's independence. </p>
-  <h3><a name="EXabstractness">Abstractness</a></h3>
-    <p>The ratio of the number of abstract classes (and interfaces) in the analyzed package to the total number of classes in the analyzed package. </p>
-    <p>The range for this metric is 0 to 1, with A=0 indicating a completely concrete package and A=1 indicating a completely abstract package. </p>
-  <h3><a name="EXinstability">Instability</a></h3>
-    <p>The ratio of efferent coupling (Ce) to total coupling (Ce / (Ce + Ca)). This metric is an indicator of the package's resilience to change. </p>
-    <p>The range for this metric is 0 to 1, with I=0 indicating a completely stable package and I=1 indicating a completely instable package. </p>
-  <h3><a name="EXdistance">Distance</a></h3>
-    <p>The perpendicular distance of a package from the idealized line A + I = 1. This metric is an indicator of the package's balance between abstractness and stability. </p>
-    <p>A package squarely on the main sequence is optimally balanced with respect to its abstractness and stability. Ideal packages are either completely abstract and stable (x=0, y=1) or completely concrete and instable (x=1, y=0). </p>
-    <p>The range for this metric is 0 to 1, with D=0 indicating a package that is coincident with the main sequence and D=1 indicating a package that is as far from the main sequence as possible. </p>
-
-      </body>
-   </html>
-</xsl:template>
-
-
-<!--
-Creates an html file that contains a link to all package links in overview-packages.html.
-  @bug there will be a problem here, I don't know yet how to handle unnamed package :(
--->
-<xsl:template match="JDepend/Packages" mode="all.packages">
-  <html>
-    <head>
-      <link rel="stylesheet" type="text/css" href="stylesheet.css"/>
-    </head>
-    <body>
-  <table width="100%"><tr align="left"><td></td><td nowrap="nowrap" align="right">
-  [<a href="overview-summary.html" target="classFrame">summary</a>]
-  [<a href="overview-packages.html" target="classFrame">packages</a>]
-  [<a href="overview-cycles.html" target="classFrame">cycles</a>]
-  [<a href="overview-explanations.html" target="classFrame">explanations</a>]
-   </td></tr></table>
-      <h2>Packages</h2>
-        <table width="100%">
-          <xsl:apply-templates select="Package[count(error)=0]" mode="all.packages.link">
-            <xsl:sort select="@name"/>
-          </xsl:apply-templates>
-          <xsl:apply-templates select="Package[count(error) > 0]" mode="all.packages.nolink">
-            <xsl:sort select="@name"/>
-          </xsl:apply-templates>
-        </table>
-    </body>
-  </html>
-</xsl:template>
-
-<xsl:template match="JDepend/Packages/Package" mode="all.packages.link">
-  <tr>
-    <td nowrap="nowrap">
-         <a href="overview-packages.html#PK{@name}" target="classFrame">
-        <xsl:value-of select="@name"/>
-      </a>
-    </td>
-  </tr>
-</xsl:template>
-
-<!--
-I do not know JDepend enough to know if every error results in a non-analyzed package,
-but that is how I am presenting it to the viewer.  This may need to change.
-  @bug there will be a problem here, I don't know yet how to handle unnamed package :(
--->
-<xsl:template match="JDepend/Packages/Package" mode="all.packages.nolink">
-  <tr>
-    <td nowrap="nowrap">
-       Not Analyzed: <xsl:value-of select="@name"/>
-    </td>
-  </tr>
-</xsl:template>
-
-<!--
-Creates an html file that contains a link to all package links in overview-cycles.html.
-  @bug there will be a problem here, I don't know yet how to handle unnamed package :(
--->
-<xsl:template match="JDepend/Cycles" mode="all.cycles">
-  <html>
-    <head>
-      <link rel="stylesheet" type="text/css" href="stylesheet.css"/>
-    </head>
-    <body>
-  <table width="100%"><tr align="left"><td></td><td nowrap="nowrap" align="right">
-  [<a href="overview-summary.html" target="classFrame">summary</a>]
-  [<a href="overview-packages.html" target="classFrame">packages</a>]
-  [<a href="overview-cycles.html" target="classFrame">cycles</a>]
-  [<a href="overview-explanations.html" target="classFrame">explanations</a>]
-   </td></tr></table>
-      <h2>Cycles</h2>
-        <table width="100%">
-           <xsl:apply-templates select="Package" mode="all.cycles">
-            <xsl:sort select="@Name"/>
-          </xsl:apply-templates>
-        </table>
-    </body>
-  </html>
-</xsl:template>
-
-<xsl:template match="JDepend/Cycles/Package" mode="all.cycles">
-  <tr>
-    <td nowrap="nowrap">
-         <a href="overview-cycles.html#CY{@Name}" target="classFrame"><xsl:value-of select="@Name"/></a>
-    </td>
-  </tr>
-</xsl:template>
-
-<!-- Page HEADER -->
-<xsl:template name="pageHeader">
-   <h1>JDepend Analysis</h1>
-  <table width="100%">
-  <tr>
-    <td align="left"></td>
-      <td align="right">Designed for use with <a href="http://www.clarkware.com/software/JDepend.html">JDepend</a> and <a href="http://jakarta.apache.org">Ant</a>.</td>
-  </tr>
-  </table>
-  <hr size="1"/>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/jdepend.xsl b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/jdepend.xsl
deleted file mode 100644
index f813297..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/jdepend.xsl
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<xsl:output method="html" indent="yes"  encoding="US-ASCII"/>
-
-<xsl:template match="JDepend">
-    <html>
-    <head>
-        <title>JDepend Analysis</title>
-        
-    <style type="text/css">
-      body {
-        font:normal 68% verdana,arial,helvetica;
-        color:#000000;
-      }
-      table tr td, tr th {
-          font-size: 68%;
-      }
-      table.details tr th{
-        font-weight: bold;
-        text-align:left;
-        background:#a6caf0;
-      }
-      table.details tr td{
-        background:#eeeee0;
-      }
-      
-      p {
-        line-height:1.5em;
-        margin-top:0.5em; margin-bottom:1.0em;
-        margin-left:2em;
-        margin-right:2em;
-      }
-      h1 {
-        margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
-      }
-      h2 {
-        margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica
-      }
-      h3 {
-        margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
-      }
-      h4 {
-        margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
-      }
-      h5 {
-        margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
-      }
-      h6 {
-        margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
-      }
-      .Error {
-        font-weight:bold; color:red;
-      }
-      .Failure {
-        font-weight:bold; color:purple;
-      }
-      .Properties {
-        text-align:right;
-      }
-      </style>
-        
-        
-    </head>
-    <body>
-    <!--h1>JDepend Report</h1>
-    <ul>
-    <xsl:for-each select="./Packages/Package">
-                <xsl:sort select="@name"/>
-        <li><xsl:value-of select="@name"/></li>
-    </xsl:for-each>
-    </ul-->
-    
-    <h1><a name="top">JDepend Analysis</a></h1>
-    <p align="right">Designed for use with <a href="http://www.clarkware.com/software/JDepend.html">JDepend</a> and <a href="http://jakarta.apache.org">Ant</a>.</p>
-    <hr size="2" />
-    
-    <table width="100%"><tr><td>
-    <a name="NVsummary"><h2>Summary</h2></a>
-    </td><td align="right">
-    [<a href="#NVsummary">summary</a>]
-    [<a href="#NVpackages">packages</a>]
-    [<a href="#NVcycles">cycles</a>]
-    [<a href="#NVexplanations">explanations</a>]
-    </td></tr></table>
-    
-    <table width="100%" class="details">
-        <tr>
-            <th>Package</th>
-            <th>Total Classes</th>
-            <th><a href="#EXnumber">Abstract Classes</a></th>
-            <th><a href="#EXnumber">Concrete Classes</a></th>
-            <th><a href="#EXafferent">Afferent Couplings</a></th>
-            <th><a href="#EXefferent">Efferent Couplings</a></th>
-            <th><a href="#EXabstractness">Abstractness</a></th>
-            <th><a href="#EXinstability">Instability</a></th>
-            <th><a href="#EXdistance">Distance</a></th>
-            
-        </tr>
-    <xsl:for-each select="./Packages/Package">
-        <xsl:if test="count(error) = 0">
-            <tr>
-                <td align="left">
-                    <a>
-                    <xsl:attribute name="href">#PK<xsl:value-of select="@name"/>
-                    </xsl:attribute>
-                    <xsl:value-of select="@name"/>
-                    </a>
-                </td>
-                <td align="right"><xsl:value-of select="Stats/TotalClasses"/></td>
-                <td align="right"><xsl:value-of select="Stats/AbstractClasses"/></td>
-                <td align="right"><xsl:value-of select="Stats/ConcreteClasses"/></td>
-                <td align="right"><xsl:value-of select="Stats/Ca"/></td>
-                <td align="right"><xsl:value-of select="Stats/Ce"/></td>
-                <td align="right"><xsl:value-of select="Stats/A"/></td>
-                <td align="right"><xsl:value-of select="Stats/I"/></td>
-                <td align="right"><xsl:value-of select="Stats/D"/></td>
-                
-
-            </tr>
-        </xsl:if>
-    </xsl:for-each>
-    <xsl:for-each select="./Packages/Package">
-        <xsl:if test="count(error) > 0">
-            <tr>
-                <td align="left">
-                    <xsl:value-of select="@name"/>
-                </td>
-                <td align="left" colspan="8"><xsl:value-of select="error"/></td>
-            </tr>
-        </xsl:if>
-    </xsl:for-each>
-    </table>
-    
-    <table width="100%"><tr><td>
-    <a name="NVpackages"><h2>Packages</h2></a>
-    </td><td align="right">
-    [<a href="#NVsummary">summary</a>]
-    [<a href="#NVpackages">packages</a>]
-    [<a href="#NVcycles">cycles</a>]
-    [<a href="#NVexplanations">explanations</a>]
-    </td></tr></table>
-    
-    <xsl:for-each select="./Packages/Package">
-        <xsl:if test="count(error) = 0">
-            <h3><a><xsl:attribute name="name">PK<xsl:value-of select="@name"/></xsl:attribute>
-            <xsl:value-of select="@name"/></a></h3>
-            
-            <table width="100%"><tr>
-                <td><a href="#EXafferent">Afferent Couplings</a>: <xsl:value-of select="Stats/Ca"/></td>
-                <td><a href="#EXefferent">Efferent Couplings</a>: <xsl:value-of select="Stats/Ce"/></td>
-                <td><a href="#EXabstractness">Abstractness</a>: <xsl:value-of select="Stats/A"/></td>
-                <td><a href="#EXinstability">Instability</a>: <xsl:value-of select="Stats/I"/></td>
-                <td><a href="#EXdistance">Distance</a>: <xsl:value-of select="Stats/D"/></td>
-            </tr></table>
-            
-            <table width="100%" class="details">
-                <tr>
-                    <th>Abstract Classes</th>
-                    <th>Concrete Classes</th>
-                    <th>Used by Packages</th>
-                    <th>Uses Packages</th>
-                </tr>
-                <tr>
-                    <td valign="top" width="25%">
-                    <xsl:if test="count(AbstractClasses/Class)=0">
-                            <i>None</i>
-                        </xsl:if>
-                        <xsl:for-each select="AbstractClasses/Class">
-                            <xsl:value-of select="node()"/><br/>
-                        </xsl:for-each>
-                    </td>
-                    <td valign="top" width="25%">
-                        <xsl:if test="count(ConcreteClasses/Class)=0">
-                            <i>None</i>
-                        </xsl:if>
-                        <xsl:for-each select="ConcreteClasses/Class">
-                            <xsl:value-of select="node()"/><br/>
-                        </xsl:for-each>
-                    </td>
-                    <td valign="top" width="25%">
-                        <xsl:if test="count(UsedBy/Package)=0">
-                            <i>None</i>
-                        </xsl:if>
-                        <xsl:for-each select="UsedBy/Package">
-                            <a>
-                                <xsl:attribute name="href">#PK<xsl:value-of select="node()"/></xsl:attribute>
-                                <xsl:value-of select="node()"/>
-                            </a><br/>
-                        </xsl:for-each>
-                    </td>
-                    <td valign="top" width="25%">
-                        <xsl:if test="count(DependsUpon/Package)=0">
-                            <i>None</i>
-                        </xsl:if>
-                        <xsl:for-each select="DependsUpon/Package">
-                            <a>
-                                <xsl:attribute name="href">#PK<xsl:value-of select="node()"/></xsl:attribute>
-                                <xsl:value-of select="node()"/>
-                            </a><br/>
-                        </xsl:for-each>
-                    </td>
-                </tr>
-            </table>
-        </xsl:if>
-    </xsl:for-each>
-    
-    <table width="100%"><tr><td>
-    <a name="NVcycles"><h2>Cycles</h2></a>
-    </td><td align="right">
-    [<a href="#NVsummary">summary</a>]
-    [<a href="#NVpackages">packages</a>]
-    [<a href="#NVcycles">cycles</a>]
-    [<a href="#NVexplanations">explanations</a>]
-    </td></tr></table>
-    
-    <xsl:if test="count(Cycles/Package) = 0">
-        <p>There are no cyclic dependancies.</p>
-    </xsl:if>
-    <xsl:for-each select="Cycles/Package">
-        <h3><xsl:value-of select="@Name"/></h3><p>
-        <xsl:for-each select="Package">
-            <xsl:value-of select="."/><br/>
-        </xsl:for-each></p>
-    </xsl:for-each>
-    
-    <table width="100%"><tr><td>
-    <a name="NVexplanations"><h2>Explanations</h2></a>
-    </td><td align="right">
-    [<a href="#NVsummary">summary</a>]
-    [<a href="#NVpackages">packages</a>]
-    [<a href="#NVcycles">cycles</a>]
-    [<a href="#NVexplanations">explanations</a>]
-    </td></tr></table>
-    
-    <p>The following explanations are for quick reference and are lifted directly from the original <a href="http://www.clarkware.com/software/JDepend.html">JDepend documentation</a>.</p>
-    
-    <h3><a name="EXnumber">Number of Classes</a></h3>
-        <p>The number of concrete and abstract classes (and interfaces) in the package is an indicator of the extensibility of the package.</p>
-    <h3><a name="EXafferent">Afferent Couplings</a></h3>
-        <p>The number of other packages that depend upon classes within the package is an indicator of the package's responsibility. </p>
-    <h3><a name="EXefferent">Efferent Couplings</a></h3>
-        <p>The number of other packages that the classes in the package depend upon is an indicator of the package's independence. </p>
-    <h3><a name="EXabstractness">Abstractness</a></h3> 
-        <p>The ratio of the number of abstract classes (and interfaces) in the analyzed package to the total number of classes in the analyzed package. </p>
-        <p>The range for this metric is 0 to 1, with A=0 indicating a completely concrete package and A=1 indicating a completely abstract package. </p>
-    <h3><a name="EXinstability">Instability</a></h3>
-        <p>The ratio of efferent coupling (Ce) to total coupling (Ce / (Ce + Ca)). This metric is an indicator of the package's resilience to change. </p>
-        <p>The range for this metric is 0 to 1, with I=0 indicating a completely stable package and I=1 indicating a completely instable package. </p>
-    <h3><a name="EXdistance">Distance</a></h3>
-        <p>The perpendicular distance of a package from the idealized line A + I = 1. This metric is an indicator of the package's balance between abstractness and stability. </p>
-        <p>A package squarely on the main sequence is optimally balanced with respect to its abstractness and stability. Ideal packages are either completely abstract and stable (x=0, y=1) or completely concrete and instable (x=1, y=0). </p>
-        <p>The range for this metric is 0 to 1, with D=0 indicating a package that is coincident with the main sequence and D=1 indicating a package that is as far from the main sequence as possible. </p>
-    
-    </body>
-    </html>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/junit-frames-xalan1.xsl b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/junit-frames-xalan1.xsl
deleted file mode 100644
index 8cef4ca..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/junit-frames-xalan1.xsl
+++ /dev/null
@@ -1,719 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-    xmlns:lxslt="http://xml.apache.org/xslt"
-    xmlns:redirect="org.apache.xalan.lib.Redirect"
-    xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"
-    extension-element-prefixes="redirect">
-<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
-<xsl:decimal-format decimal-separator="." grouping-separator=","/>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- -->
-
-<!--
-
- Sample stylesheet to be used with Ant JUnitReport output.
-
- It creates a set of HTML files a la javadoc where you can browse easily
- through all packages and classes.
-
--->
-<xsl:param name="output.dir" select="'.'"/>
-
-
-<xsl:template match="testsuites">
-    <!-- create the index.html -->
-    <redirect:write file="{$output.dir}/index.html">
-        <xsl:call-template name="index.html"/>
-    </redirect:write>
-
-    <!-- create the stylesheet.css -->
-    <redirect:write file="{$output.dir}/stylesheet.css">
-        <xsl:call-template name="stylesheet.css"/>
-    </redirect:write>
-
-    <!-- create the overview-packages.html at the root -->
-    <redirect:write file="{$output.dir}/overview-summary.html">
-        <xsl:apply-templates select="." mode="overview.packages"/>
-    </redirect:write>
-
-    <!-- create the all-packages.html at the root -->
-    <redirect:write file="{$output.dir}/overview-frame.html">
-        <xsl:apply-templates select="." mode="all.packages"/>
-    </redirect:write>
-
-    <!-- create the all-classes.html at the root -->
-    <redirect:write file="{$output.dir}/allclasses-frame.html">
-        <xsl:apply-templates select="." mode="all.classes"/>
-    </redirect:write>
-
-    <!-- process all packages -->
-    <xsl:for-each select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-        <xsl:call-template name="package">
-            <xsl:with-param name="name" select="@package"/>
-        </xsl:call-template>
-    </xsl:for-each>
-</xsl:template>
-
-
-<xsl:template name="package">
-    <xsl:param name="name"/>
-    <xsl:variable name="package.dir">
-        <xsl:if test="not($name = '')"><xsl:value-of select="translate($name,'.','/')"/></xsl:if>
-        <xsl:if test="$name = ''">.</xsl:if>
-    </xsl:variable>
-    <!--Processing package <xsl:value-of select="@name"/> in <xsl:value-of select="$output.dir"/> -->
-    <!-- create a classes-list.html in the package directory -->
-    <redirect:write file="{$output.dir}/{$package.dir}/package-frame.html">
-        <xsl:call-template name="classes.list">
-            <xsl:with-param name="name" select="$name"/>
-        </xsl:call-template>
-    </redirect:write>
-
-    <!-- create a package-summary.html in the package directory -->
-    <redirect:write file="{$output.dir}/{$package.dir}/package-summary.html">
-        <xsl:call-template name="package.summary">
-            <xsl:with-param name="name" select="$name"/>
-        </xsl:call-template>
-    </redirect:write>
-
-    <!-- for each class, creates a @name.html -->
-    <!-- @bug there will be a problem with inner classes having the same name, it will be overwritten -->
-    <xsl:for-each select="/testsuites/testsuite[@package = $name]">
-        <redirect:write file="{$output.dir}/{$package.dir}/{@name}.html">
-            <xsl:apply-templates select="." mode="class.details"/>
-        </redirect:write>
-        <xsl:if test="string-length(./system-out)!=0">
-            <redirect:write file="{$output.dir}/{$package.dir}/{@name}-out.txt">
-                <xsl:value-of select="./system-out" />
-            </redirect:write>
-        </xsl:if>
-        <xsl:if test="string-length(./system-err)!=0">
-            <redirect:write file="{$output.dir}/{$package.dir}/{@name}-err.txt">
-                <xsl:value-of select="./system-err" />
-            </redirect:write>
-        </xsl:if>
-    </xsl:for-each>
-</xsl:template>
-
-<xsl:template name="index.html">
-<html>
-    <head>
-        <title>Unit Test Results.</title>
-    </head>
-    <frameset cols="20%,80%">
-        <frameset rows="30%,70%">
-            <frame src="overview-frame.html" name="packageListFrame"/>
-            <frame src="allclasses-frame.html" name="classListFrame"/>
-        </frameset>
-        <frame src="overview-summary.html" name="classFrame"/>
-        <noframes>
-            <h2>Frame Alert</h2>
-            <p>
-                This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
-            </p>
-        </noframes>
-    </frameset>
-</html>
-</xsl:template>
-
-<!-- this is the stylesheet css to use for nearly everything -->
-<xsl:template name="stylesheet.css">
-body {
-    font:normal 68% verdana,arial,helvetica;
-    color:#000000;
-}
-table tr td, table tr th {
-    font-size: 68%;
-}
-table.details tr th{
-    font-weight: bold;
-    text-align:left;
-    background:#a6caf0;
-}
-table.details tr td{
-    background:#eeeee0;
-}
-
-p {
-    line-height:1.5em;
-    margin-top:0.5em; margin-bottom:1.0em;
-}
-h1 {
-    margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
-}
-h2 {
-    margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica
-}
-h3 {
-    margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
-}
-h4 {
-    margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
-}
-h5 {
-    margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
-}
-h6 {
-    margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
-}
-.Error {
-    font-weight:bold; color:red;
-}
-.Failure {
-    font-weight:bold; color:purple;
-}
-.Properties {
-  text-align:right;
-}
-</xsl:template>
-
-
-<!-- ======================================================================
-    This page is created for every testsuite class.
-    It prints a summary of the testsuite and detailed information about
-    testcase methods.
-     ====================================================================== -->
-<xsl:template match="testsuite" mode="class.details">
-    <xsl:variable name="package.name" select="@package"/>
-    <xsl:variable name="class.name"><xsl:if test="not($package.name = '')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></xsl:variable>
-    <html>
-        <head>
-          <title>Unit Test Results: <xsl:value-of select="$class.name"/></title>
-            <xsl:call-template name="create.stylesheet.link">
-                <xsl:with-param name="package.name" select="$package.name"/>
-            </xsl:call-template>
-       <script type="text/javascript" language="JavaScript">
-        var TestCases = new Array();
-        var cur;
-        <xsl:apply-templates select="properties"/>
-       </script>
-       <script type="text/javascript" language="JavaScript"><![CDATA[
-        function displayProperties (name) {
-          var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
-          var doc = win.document;
-          doc.open();
-          doc.write("<html><head><title>Properties of " + name + "</title>");
-          doc.write("<style type=\"text/css\">");
-          doc.write("body {font:normal 68% verdana,arial,helvetica; color:#000000; }");
-          doc.write("table tr td, table tr th { font-size: 68%; }");
-          doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
-          doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }");
-          doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }");
-          doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }");
-          doc.write("</style>");
-          doc.write("</head><body>");
-          doc.write("<h3>Properties of " + name + "</h3>");
-          doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>");
-          doc.write("<table class='properties'>");
-          doc.write("<tr><th>Name</th><th>Value</th></tr>");
-          for (prop in TestCases[name]) {
-            doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>");
-          }
-          doc.write("</table>");
-          doc.write("</body></html>");
-          doc.close();
-          win.focus();
-        }
-      ]]>
-      </script>
-        </head>
-        <body>
-            <xsl:call-template name="pageHeader"/>
-            <h3>Class <xsl:value-of select="$class.name"/></h3>
-
-
-            <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
-                <xsl:call-template name="testsuite.test.header"/>
-                <xsl:apply-templates select="." mode="print.test"/>
-            </table>
-
-            <h2>Tests</h2>
-            <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
-        <xsl:call-template name="testcase.test.header"/>
-              <!--
-              test can even not be started at all (failure to load the class)
-              so report the error directly
-              -->
-                <xsl:if test="./error">
-                    <tr class="Error">
-                        <td colspan="4"><xsl:apply-templates select="./error"/></td>
-                    </tr>
-                </xsl:if>
-                <xsl:apply-templates select="./testcase" mode="print.test"/>
-            </table>
-            <div class="Properties">
-                <a>
-                    <xsl:attribute name="href">javascript:displayProperties('<xsl:value-of select="@package"/>.<xsl:value-of select="@name"/>');</xsl:attribute>
-                    Properties »
-                </a>
-            </div>
-            <xsl:if test="string-length(./system-out)!=0">
-                <div class="Properties">
-                    <a>
-                        <xsl:attribute name="href">./<xsl:value-of select="@name"/>-out.txt</xsl:attribute>
-                        System.out »
-                    </a>
-                </div>
-            </xsl:if>
-            <xsl:if test="string-length(./system-err)!=0">
-                <div class="Properties">
-                    <a>
-                        <xsl:attribute name="href">./<xsl:value-of select="@name"/>-err.txt</xsl:attribute>
-                        System.err »
-                    </a>
-                </div>
-            </xsl:if>
-        </body>
-    </html>
-</xsl:template>
-
-  <!--
-   Write properties into a JavaScript data structure.
-   This is based on the original idea by Erik Hatcher (ehatcher at apache.org)
-   -->
-  <xsl:template match="properties">
-    cur = TestCases['<xsl:value-of select="../@package"/>.<xsl:value-of select="../@name"/>'] = new Array();
-    <xsl:for-each select="property">
-    <xsl:sort select="@name"/>
-        cur['<xsl:value-of select="@name"/>'] = '<xsl:call-template name="JS-escape"><xsl:with-param name="string" select="@value"/></xsl:call-template>';
-    </xsl:for-each>
-  </xsl:template>
-
-
-<!-- ======================================================================
-    This page is created for every package.
-    It prints the name of all classes that belongs to this package.
-    @param name the package name to print classes.
-     ====================================================================== -->
-<!-- list of classes in a package -->
-<xsl:template name="classes.list">
-    <xsl:param name="name"/>
-    <html>
-        <head>
-            <title>Unit Test Classes: <xsl:value-of select="$name"/></title>
-            <xsl:call-template name="create.stylesheet.link">
-                <xsl:with-param name="package.name" select="$name"/>
-            </xsl:call-template>
-        </head>
-        <body>
-            <table width="100%">
-                <tr>
-                    <td nowrap="nowrap">
-                        <h2><a href="package-summary.html" target="classFrame">
-                            <xsl:value-of select="$name"/>
-                            <xsl:if test="$name = ''"><none></xsl:if>
-                        </a></h2>
-                    </td>
-                </tr>
-            </table>
-
-            <h2>Classes</h2>
-            <table width="100%">
-                <xsl:for-each select="/testsuites/testsuite[./@package = $name]">
-                    <xsl:sort select="@name"/>
-                    <tr>
-                        <td nowrap="nowrap">
-                            <a href="{@name}.html" target="classFrame"><xsl:value-of select="@name"/></a>
-                        </td>
-                    </tr>
-                </xsl:for-each>
-            </table>
-        </body>
-    </html>
-</xsl:template>
-
-
-<!--
-    Creates an all-classes.html file that contains a link to all package-summary.html
-    on each class.
--->
-<xsl:template match="testsuites" mode="all.classes">
-    <html>
-        <head>
-            <title>All Unit Test Classes</title>
-            <xsl:call-template name="create.stylesheet.link">
-                <xsl:with-param name="package.name"/>
-            </xsl:call-template>
-        </head>
-        <body>
-            <h2>Classes</h2>
-            <table width="100%">
-                <xsl:apply-templates select="testsuite" mode="all.classes">
-                    <xsl:sort select="@name"/>
-                </xsl:apply-templates>
-            </table>
-        </body>
-    </html>
-</xsl:template>
-
-<xsl:template match="testsuite" mode="all.classes">
-    <xsl:variable name="package.name" select="@package"/>
-    <tr>
-        <td nowrap="nowrap">
-            <a target="classFrame">
-                <xsl:attribute name="href">
-                    <xsl:if test="not($package.name='')">
-                        <xsl:value-of select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text>
-                    </xsl:if><xsl:value-of select="@name"/><xsl:text>.html</xsl:text>
-                </xsl:attribute>
-                <xsl:value-of select="@name"/>
-            </a>
-        </td>
-    </tr>
-</xsl:template>
-
-
-<!--
-    Creates an html file that contains a link to all package-summary.html files on
-    each package existing on testsuites.
-    @bug there will be a problem here, I don't know yet how to handle unnamed package :(
--->
-<xsl:template match="testsuites" mode="all.packages">
-    <html>
-        <head>
-            <title>All Unit Test Packages</title>
-            <xsl:call-template name="create.stylesheet.link">
-                <xsl:with-param name="package.name"/>
-            </xsl:call-template>
-        </head>
-        <body>
-            <h2><a href="overview-summary.html" target="classFrame">Home</a></h2>
-            <h2>Packages</h2>
-            <table width="100%">
-                <xsl:apply-templates select="testsuite[not(./@package = preceding-sibling::testsuite/@package)]" mode="all.packages">
-                    <xsl:sort select="@package"/>
-                </xsl:apply-templates>
-            </table>
-        </body>
-    </html>
-</xsl:template>
-
-<xsl:template match="testsuite" mode="all.packages">
-    <tr>
-        <td nowrap="nowrap">
-            <a href="./{translate(@package,'.','/')}/package-summary.html" target="classFrame">
-                <xsl:value-of select="@package"/>
-                <xsl:if test="@package = ''"><none></xsl:if>
-            </a>
-        </td>
-    </tr>
-</xsl:template>
-
-
-<xsl:template match="testsuites" mode="overview.packages">
-    <html>
-        <head>
-            <title>Unit Test Results: Summary</title>
-            <xsl:call-template name="create.stylesheet.link">
-                <xsl:with-param name="package.name"/>
-            </xsl:call-template>
-        </head>
-        <body>
-        <xsl:attribute name="onload">open('allclasses-frame.html','classListFrame')</xsl:attribute>
-        <xsl:call-template name="pageHeader"/>
-        <h2>Summary</h2>
-        <xsl:variable name="testCount" select="sum(testsuite/@tests)"/>
-        <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/>
-        <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/>
-        <xsl:variable name="timeCount" select="sum(testsuite/@time)"/>
-        <xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/>
-        <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
-        <tr valign="top">
-            <th>Tests</th>
-            <th>Failures</th>
-            <th>Errors</th>
-            <th>Success rate</th>
-            <th>Time</th>
-        </tr>
-        <tr valign="top">
-            <xsl:attribute name="class">
-                <xsl:choose>
-                    <xsl:when test="$errorCount > 0">Error</xsl:when>
-                    <xsl:when test="$failureCount > 0">Failure</xsl:when>
-                    <xsl:otherwise>Pass</xsl:otherwise>
-                </xsl:choose>
-            </xsl:attribute>
-            <td><xsl:value-of select="$testCount"/></td>
-            <td><xsl:value-of select="$failureCount"/></td>
-            <td><xsl:value-of select="$errorCount"/></td>
-            <td>
-                <xsl:call-template name="display-percent">
-                    <xsl:with-param name="value" select="$successRate"/>
-                </xsl:call-template>
-            </td>
-            <td>
-                <xsl:call-template name="display-time">
-                    <xsl:with-param name="value" select="$timeCount"/>
-                </xsl:call-template>
-            </td>
-        </tr>
-        </table>
-        <table border="0" width="95%">
-        <tr>
-        <td style="text-align: justify;">
-        Note: <em>failures</em> are anticipated and checked for with assertions while <em>errors</em> are unanticipated.
-        </td>
-        </tr>
-        </table>
-
-        <h2>Packages</h2>
-        <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
-            <xsl:call-template name="testsuite.test.header"/>
-            <xsl:for-each select="testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-                <xsl:sort select="@package" order="ascending"/>
-                <!-- get the node set containing all testsuites that have the same package -->
-                <xsl:variable name="insamepackage" select="/testsuites/testsuite[./@package = current()/@package]"/>
-                <tr valign="top">
-                    <!-- display a failure if there is any failure/error in the package -->
-                    <xsl:attribute name="class">
-                        <xsl:choose>
-                            <xsl:when test="sum($insamepackage/@errors) > 0">Error</xsl:when>
-                            <xsl:when test="sum($insamepackage/@failures) > 0">Failure</xsl:when>
-                            <xsl:otherwise>Pass</xsl:otherwise>
-                        </xsl:choose>
-                    </xsl:attribute>
-                    <td><a href="./{translate(@package,'.','/')}/package-summary.html">
-                        <xsl:value-of select="@package"/>
-                        <xsl:if test="@package = ''"><none></xsl:if>
-                    </a></td>
-                    <td><xsl:value-of select="sum($insamepackage/@tests)"/></td>
-                    <td><xsl:value-of select="sum($insamepackage/@errors)"/></td>
-                    <td><xsl:value-of select="sum($insamepackage/@failures)"/></td>
-                    <td>
-                    <xsl:call-template name="display-time">
-                        <xsl:with-param name="value" select="sum($insamepackage/@time)"/>
-                    </xsl:call-template>
-                    </td>
-                    <td><xsl:value-of select="$insamepackage/@timestamp"/></td>
-                    <td><xsl:value-of select="$insamepackage/@hostname"/></td>
-                </tr>
-            </xsl:for-each>
-        </table>
-        </body>
-        </html>
-</xsl:template>
-
-
-<xsl:template name="package.summary">
-    <xsl:param name="name"/>
-    <html>
-        <head>
-            <xsl:call-template name="create.stylesheet.link">
-                <xsl:with-param name="package.name" select="$name"/>
-            </xsl:call-template>
-        </head>
-        <body>
-            <xsl:attribute name="onload">open('package-frame.html','classListFrame')</xsl:attribute>
-            <xsl:call-template name="pageHeader"/>
-            <h3>Package <xsl:value-of select="$name"/></h3>
-
-            <!--table border="0" cellpadding="5" cellspacing="2" width="95%">
-                <xsl:call-template name="class.metrics.header"/>
-                <xsl:apply-templates select="." mode="print.metrics"/>
-            </table-->
-
-            <xsl:variable name="insamepackage" select="/testsuites/testsuite[./@package = $name]"/>
-            <xsl:if test="count($insamepackage) > 0">
-                <h2>Classes</h2>
-                <p>
-                <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
-                    <xsl:call-template name="testsuite.test.header"/>
-                    <xsl:apply-templates select="$insamepackage" mode="print.test">
-                        <xsl:sort select="@name"/>
-                    </xsl:apply-templates>
-                </table>
-                </p>
-            </xsl:if>
-        </body>
-    </html>
-</xsl:template>
-
-
-<!--
-    transform string like a.b.c to ../../../
-    @param path the path to transform into a descending directory path
--->
-<xsl:template name="path">
-    <xsl:param name="path"/>
-    <xsl:if test="contains($path,'.')">
-        <xsl:text>../</xsl:text>
-        <xsl:call-template name="path">
-            <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'.')"/></xsl:with-param>
-        </xsl:call-template>
-    </xsl:if>
-    <xsl:if test="not(contains($path,'.')) and not($path = '')">
-        <xsl:text>../</xsl:text>
-    </xsl:if>
-</xsl:template>
-
-
-<!-- create the link to the stylesheet based on the package name -->
-<xsl:template name="create.stylesheet.link">
-    <xsl:param name="package.name"/>
-    <link rel="stylesheet" type="text/css" title="Style"><xsl:attribute name="href"><xsl:if test="not($package.name = 'unnamed package')"><xsl:call-template name="path"><xsl:with-param name="path" select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></link>
-</xsl:template>
-
-
-<!-- Page HEADER -->
-<xsl:template name="pageHeader">
-    <h1>Unit Test Results</h1>
-    <table width="100%">
-    <tr>
-        <td align="left"></td>
-        <td align="right">Designed for use with <a href="http://www.junit.org/">JUnit</a> and <a href="http://ant.apache.org/">Ant</a>.</td>
-    </tr>
-    </table>
-    <hr size="1"/>
-</xsl:template>
-
-<!-- class header -->
-<xsl:template name="testsuite.test.header">
-    <tr valign="top">
-        <th width="80%">Name</th>
-        <th>Tests</th>
-        <th>Errors</th>
-        <th>Failures</th>
-        <th nowrap="nowrap">Time(s)</th>
-        <th nowrap="nowrap">Time Stamp</th>
-        <th>Host</th>
-    </tr>
-</xsl:template>
-
-<!-- method header -->
-<xsl:template name="testcase.test.header">
-    <tr valign="top">
-        <th>Name</th>
-        <th>Status</th>
-        <th width="80%">Type</th>
-        <th nowrap="nowrap">Time(s)</th>
-    </tr>
-</xsl:template>
-
-
-<!-- class information -->
-<xsl:template match="testsuite" mode="print.test">
-    <tr valign="top">
-        <xsl:attribute name="class">
-            <xsl:choose>
-                <xsl:when test="@errors[.> 0]">Error</xsl:when>
-                <xsl:when test="@failures[.> 0]">Failure</xsl:when>
-                <xsl:otherwise>Pass</xsl:otherwise>
-            </xsl:choose>
-        </xsl:attribute>
-        <td><a href="{@name}.html"><xsl:value-of select="@name"/></a></td>
-        <td><xsl:apply-templates select="@tests"/></td>
-        <td><xsl:apply-templates select="@errors"/></td>
-        <td><xsl:apply-templates select="@failures"/></td>
-        <td><xsl:call-template name="display-time">
-                <xsl:with-param name="value" select="@time"/>
-            </xsl:call-template>
-        </td>
-        <td><xsl:apply-templates select="@timestamp"/></td>
-        <td><xsl:apply-templates select="@hostname"/></td>
-    </tr>
-</xsl:template>
-
-<xsl:template match="testcase" mode="print.test">
-    <tr valign="top">
-        <xsl:attribute name="class">
-            <xsl:choose>
-                <xsl:when test="error">Error</xsl:when>
-                <xsl:when test="failure">Failure</xsl:when>
-                <xsl:otherwise>TableRowColor</xsl:otherwise>
-            </xsl:choose>
-        </xsl:attribute>
-        <td><xsl:value-of select="@name"/></td>
-        <xsl:choose>
-            <xsl:when test="failure">
-                <td>Failure</td>
-                <td><xsl:apply-templates select="failure"/></td>
-            </xsl:when>
-            <xsl:when test="error">
-                <td>Error</td>
-                <td><xsl:apply-templates select="error"/></td>
-            </xsl:when>
-            <xsl:otherwise>
-                <td>Success</td>
-                <td></td>
-            </xsl:otherwise>
-        </xsl:choose>
-        <td>
-            <xsl:call-template name="display-time">
-                <xsl:with-param name="value" select="@time"/>
-            </xsl:call-template>
-        </td>
-    </tr>
-</xsl:template>
-
-
-<!-- Note : the below template error and failure are the same style
-            so just call the same style store in the toolkit template -->
-<xsl:template match="failure">
-    <xsl:call-template name="display-failures"/>
-</xsl:template>
-
-<xsl:template match="error">
-    <xsl:call-template name="display-failures"/>
-</xsl:template>
-
-<!-- Style for the error and failure in the testcase template -->
-<xsl:template name="display-failures">
-    <xsl:choose>
-        <xsl:when test="not(@message)">N/A</xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="@message"/>
-        </xsl:otherwise>
-    </xsl:choose>
-    <!-- display the stacktrace -->
-    <br/><br/>
-    <code>
-        <xsl:call-template name="br-replace">
-            <xsl:with-param name="word" select="."/>
-        </xsl:call-template>
-    </code>
-    <!-- the latter is better but might be problematic for non-21" monitors... -->
-    <!--pre><xsl:value-of select="."/></pre-->
-</xsl:template>
-
-<xsl:template name="JS-escape">
-    <xsl:param name="string"/>
-    <xsl:param name="tmp1" select="stringutils:replace(string($string),'\','\\')"/>
-    <xsl:param name="tmp2" select="stringutils:replace(string($tmp1),"'","\'")"/>
-    <xsl:value-of select="$tmp2"/>
-</xsl:template>
-
-
-<!--
-    template that will convert a carriage return into a br tag
-    @param word the text from which to convert CR to BR tag
--->
-<xsl:template name="br-replace">
-    <xsl:param name="word"/>
-    <xsl:param name="br"><br/></xsl:param>
-    <xsl:value-of select='stringutils:replace(string($word),"&#xA;",$br)'/>
-</xsl:template>
-
-<xsl:template name="display-time">
-    <xsl:param name="value"/>
-    <xsl:value-of select="format-number($value,'0.000')"/>
-</xsl:template>
-
-<xsl:template name="display-percent">
-    <xsl:param name="value"/>
-    <xsl:value-of select="format-number($value,'0.00%')"/>
-</xsl:template>
-</xsl:stylesheet>
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/junit-frames.xsl b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/junit-frames.xsl
deleted file mode 100644
index 9ea322a..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/junit-frames.xsl
+++ /dev/null
@@ -1,877 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-    xmlns:lxslt="http://xml.apache.org/xslt"
-    xmlns:redirect="http://xml.apache.org/xalan/redirect"
-    xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"
-    extension-element-prefixes="redirect">
-<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
-<xsl:decimal-format decimal-separator="." grouping-separator=","/>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- -->
-
-<!--
-
- Sample stylesheet to be used with Ant JUnitReport output.
-
- It creates a set of HTML files a la javadoc where you can browse easily
- through all packages and classes.
-
--->
-<xsl:param name="output.dir" select="'.'"/>
-<xsl:param name="TITLE">Unit Test Results.</xsl:param>
-
-
-<xsl:template match="testsuites">
-    <!-- create the index.html -->
-    <redirect:write file="{$output.dir}/index.html">
-        <xsl:call-template name="index.html"/>
-    </redirect:write>
-
-    <!-- create the stylesheet.css -->
-    <redirect:write file="{$output.dir}/stylesheet.css">
-        <xsl:call-template name="stylesheet.css"/>
-    </redirect:write>
-
-    <!-- create the overview-packages.html at the root -->
-    <redirect:write file="{$output.dir}/overview-summary.html">
-        <xsl:apply-templates select="." mode="overview.packages"/>
-    </redirect:write>
-
-    <!-- create the all-packages.html at the root -->
-    <redirect:write file="{$output.dir}/overview-frame.html">
-        <xsl:apply-templates select="." mode="all.packages"/>
-    </redirect:write>
-
-    <!-- create the all-classes.html at the root -->
-    <redirect:write file="{$output.dir}/allclasses-frame.html">
-        <xsl:apply-templates select="." mode="all.classes"/>
-    </redirect:write>
-
-    <!-- create the all-tests.html at the root -->
-    <redirect:write file="{$output.dir}/all-tests.html">
-        <xsl:apply-templates select="." mode="all.tests"/>
-    </redirect:write>
-
-    <!-- create the alltests-fails.html at the root -->
-    <redirect:write file="{$output.dir}/alltests-fails.html">
-      <xsl:apply-templates select="." mode="all.tests">
-        <xsl:with-param name="type" select="'fails'"/>
-      </xsl:apply-templates>
-    </redirect:write>
-
-  <!-- create the alltests-errors.html at the root -->
-    <redirect:write file="{$output.dir}/alltests-errors.html">
-      <xsl:apply-templates select="." mode="all.tests">
-        <xsl:with-param name="type" select="'errors'"/>
-      </xsl:apply-templates>
-    </redirect:write>
-
-  <!-- process all packages -->
-    <xsl:for-each select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-        <xsl:call-template name="package">
-            <xsl:with-param name="name" select="@package"/>
-        </xsl:call-template>
-    </xsl:for-each>
-</xsl:template>
-
-
-<xsl:template name="package">
-    <xsl:param name="name"/>
-    <xsl:variable name="package.dir">
-        <xsl:if test="not($name = '')"><xsl:value-of select="translate($name,'.','/')"/></xsl:if>
-        <xsl:if test="$name = ''">.</xsl:if>
-    </xsl:variable>
-    <!--Processing package <xsl:value-of select="@name"/> in <xsl:value-of select="$output.dir"/> -->
-    <!-- create a classes-list.html in the package directory -->
-    <redirect:write file="{$output.dir}/{$package.dir}/package-frame.html">
-        <xsl:call-template name="classes.list">
-            <xsl:with-param name="name" select="$name"/>
-        </xsl:call-template>
-    </redirect:write>
-
-    <!-- create a package-summary.html in the package directory -->
-    <redirect:write file="{$output.dir}/{$package.dir}/package-summary.html">
-        <xsl:call-template name="package.summary">
-            <xsl:with-param name="name" select="$name"/>
-        </xsl:call-template>
-    </redirect:write>
-
-    <!-- for each class, creates a @name.html -->
-    <!-- @bug there will be a problem with inner classes having the same name, it will be overwritten -->
-  <xsl:for-each select="/testsuites/testsuite[@package = $name]">
-    <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}.html">
-      <xsl:apply-templates select="." mode="class.details"/>
-    </redirect:write>
-    <xsl:if test="string-length(./system-out)!=0">
-      <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-out.txt">
-        <xsl:value-of disable-output-escaping="yes" select="./system-out"/>
-      </redirect:write>
-    </xsl:if>
-    <xsl:if test="string-length(./system-err)!=0">
-      <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-err.txt">
-        <xsl:value-of disable-output-escaping="yes" select="./system-err"/>
-      </redirect:write>
-    </xsl:if>
-    <xsl:if test="@failures != 0">
-      <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-fails.html">
-        <xsl:apply-templates select="." mode="class.details">
-          <xsl:with-param name="type" select="'fails'"/>
-        </xsl:apply-templates>
-      </redirect:write>
-    </xsl:if>
-    <xsl:if test="@errors != 0">
-      <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-errors.html">
-        <xsl:apply-templates select="." mode="class.details">
-          <xsl:with-param name="type" select="'errors'"/>
-        </xsl:apply-templates>
-      </redirect:write>
-    </xsl:if>
-  </xsl:for-each>
-</xsl:template>
-
-<xsl:template name="index.html">
-<html>
-    <head>
-        <title><xsl:value-of select="$TITLE"/></title>
-    </head>
-    <frameset cols="20%,80%">
-        <frameset rows="30%,70%">
-            <frame src="overview-frame.html" name="packageListFrame"/>
-            <frame src="allclasses-frame.html" name="classListFrame"/>
-        </frameset>
-        <frame src="overview-summary.html" name="classFrame"/>
-        <noframes>
-            <h2>Frame Alert</h2>
-            <p>
-                This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
-            </p>
-        </noframes>
-    </frameset>
-</html>
-</xsl:template>
-
-<!-- this is the stylesheet css to use for nearly everything -->
-<xsl:template name="stylesheet.css">
-body {
-    font:normal 68% verdana,arial,helvetica;
-    color:#000000;
-}
-table tr td, table tr th {
-    font-size: 68%;
-}
-table.details tr th{
-    font-weight: bold;
-    text-align:left;
-    background:#a6caf0;
-}
-table.details tr td{
-    background:#eeeee0;
-}
-
-p {
-    line-height:1.5em;
-    margin-top:0.5em; margin-bottom:1.0em;
-}
-h1 {
-    margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
-}
-h2 {
-    margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica
-}
-h3 {
-    margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
-}
-h4 {
-    margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
-}
-h5 {
-    margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
-}
-h6 {
-    margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
-}
-.Error {
-    font-weight:bold; color:red;
-}
-.Failure {
-    font-weight:bold; color:purple;
-}
-.Properties {
-  text-align:right;
-}
-</xsl:template>
-
-<!-- Create list of all/failed/errored tests -->
-<xsl:template match="testsuites" mode="all.tests">
-    <xsl:param name="type" select="'all'"/>
-    <html>
-	<xsl:variable name="title">
-	    <xsl:choose>
-		<xsl:when test="$type = 'fails'">
-		    <xsl:text>All Failures</xsl:text>
-		</xsl:when>
-		<xsl:when test="$type = 'errors'">
-		    <xsl:text>All Errors</xsl:text>
-		</xsl:when>
-		<xsl:otherwise>
-		    <xsl:text>All Tests</xsl:text>
-		</xsl:otherwise>
-	    </xsl:choose>
-	</xsl:variable>
-	<head>
-	    <title>Unit Test Results: <xsl:value-of select="$title"/></title>
-	    <xsl:call-template name="create.stylesheet.link">
-                <xsl:with-param name="package.name"/>
-            </xsl:call-template>
-	</head>
-	<body>
-	    <xsl:attribute name="onload">open('allclasses-frame.html','classListFrame')</xsl:attribute>
-            <xsl:call-template name="pageHeader"/>
-            <h2><xsl:value-of select="$title"/></h2>
-
-            <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
-		<xsl:call-template name="testcase.test.header">
-		    <xsl:with-param name="show.class" select="'yes'"/>
-		</xsl:call-template>
-		<!--
-                test can even not be started at all (failure to load the class)
-		so report the error directly
-		-->
-              <xsl:if test="./error">
-                <tr class="Error">
-                  <td colspan="4">
-                    <xsl:apply-templates select="./error"/>
-                  </td>
-                </tr>
-              </xsl:if>
-              <xsl:choose>
-                <xsl:when test="$type = 'fails'">
-                  <xsl:apply-templates select=".//testcase[failure]" mode="print.test">
-                    <xsl:with-param name="show.class" select="'yes'"/>
-                  </xsl:apply-templates>
-                </xsl:when>
-                <xsl:when test="$type = 'errors'">
-                  <xsl:apply-templates select=".//testcase[error]" mode="print.test">
-                    <xsl:with-param name="show.class" select="'yes'"/>
-                  </xsl:apply-templates>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:apply-templates select=".//testcase" mode="print.test">
-                    <xsl:with-param name="show.class" select="'yes'"/>
-                  </xsl:apply-templates>
-                </xsl:otherwise>
-              </xsl:choose>
-            </table>
-        </body>
-    </html>
-</xsl:template>
-
-
-<!-- ======================================================================
-    This page is created for every testsuite class.
-    It prints a summary of the testsuite and detailed information about
-    testcase methods.
-     ====================================================================== -->
-<xsl:template match="testsuite" mode="class.details">
-    <xsl:param name="type" select="'all'"/>
-    <xsl:variable name="package.name" select="@package"/>
-    <xsl:variable name="class.name"><xsl:if test="not($package.name = '')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></xsl:variable>
-    <html>
-        <head>
-          <title>Unit Test Results: <xsl:value-of select="$class.name"/></title>
-            <xsl:call-template name="create.stylesheet.link">
-                <xsl:with-param name="package.name" select="$package.name"/>
-            </xsl:call-template>
-       <script type="text/javascript" language="JavaScript">
-        var TestCases = new Array();
-        var cur;
-        <xsl:apply-templates select="properties"/>
-       </script>
-       <script type="text/javascript" language="JavaScript"><![CDATA[
-        function displayProperties (name) {
-          var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
-          var doc = win.document;
-          doc.open();
-          doc.write("<html><head><title>Properties of " + name + "</title>");
-          doc.write("<style type=\"text/css\">");
-          doc.write("body {font:normal 68% verdana,arial,helvetica; color:#000000; }");
-          doc.write("table tr td, table tr th { font-size: 68%; }");
-          doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
-          doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }");
-          doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }");
-          doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }");
-          doc.write("</style>");
-          doc.write("</head><body>");
-          doc.write("<h3>Properties of " + name + "</h3>");
-          doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>");
-          doc.write("<table class='properties'>");
-          doc.write("<tr><th>Name</th><th>Value</th></tr>");
-          for (prop in TestCases[name]) {
-            doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>");
-          }
-          doc.write("</table>");
-          doc.write("</body></html>");
-          doc.close();
-          win.focus();
-        }
-      ]]>
-      </script>
-        </head>
-        <body>
-            <xsl:call-template name="pageHeader"/>
-            <h3>Class <xsl:value-of select="$class.name"/></h3>
-
-
-            <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
-                <xsl:call-template name="testsuite.test.header"/>
-                <xsl:apply-templates select="." mode="print.test"/>
-            </table>
-
-	    <xsl:choose>
-		<xsl:when test="$type = 'fails'">
-		    <h2>Failures</h2>
-		</xsl:when>
-		<xsl:when test="$type = 'errors'">
-		    <h2>Errors</h2>
-		</xsl:when>
-		<xsl:otherwise>
-		    <h2>Tests</h2>
-		</xsl:otherwise>
-	    </xsl:choose>
-            <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
-		<xsl:call-template name="testcase.test.header"/>
-		<!--
-                test can even not be started at all (failure to load the class)
-		so report the error directly
-		-->
-                <xsl:if test="./error">
-                    <tr class="Error">
-                        <td colspan="4"><xsl:apply-templates select="./error"/></td>
-                    </tr>
-                </xsl:if>
-		<xsl:choose>
-		    <xsl:when test="$type = 'fails'">
-			<xsl:apply-templates select="./testcase[failure]" mode="print.test"/>
-		    </xsl:when>
-		    <xsl:when test="$type = 'errors'">
-			<xsl:apply-templates select="./testcase[error]" mode="print.test"/>
-		    </xsl:when>
-		    <xsl:otherwise>
-			<xsl:apply-templates select="./testcase" mode="print.test"/>
-		    </xsl:otherwise>
-		</xsl:choose>
-            </table>
-            <div class="Properties">
-                <a>
-                    <xsl:attribute name="href">javascript:displayProperties('<xsl:value-of select="@package"/>.<xsl:value-of select="@name"/>');</xsl:attribute>
-                    Properties »
-                </a>
-            </div>
-            <xsl:if test="string-length(./system-out)!=0">
-                <div class="Properties">
-                    <a>
-                        <xsl:attribute name="href">./<xsl:value-of select="@id"/>_<xsl:value-of select="@name"/>-out.txt</xsl:attribute>
-                        System.out »
-                    </a>
-                </div>
-            </xsl:if>
-            <xsl:if test="string-length(./system-err)!=0">
-                <div class="Properties">
-                    <a>
-                        <xsl:attribute name="href">./<xsl:value-of select="@id"/>_<xsl:value-of select="@name"/>-err.txt</xsl:attribute>
-                        System.err »
-                    </a>
-                </div>
-            </xsl:if>
-        </body>
-    </html>
-</xsl:template>
-
-  <!--
-   Write properties into a JavaScript data structure.
-   This is based on the original idea by Erik Hatcher (ehatcher at apache.org)
-   -->
-  <xsl:template match="properties">
-    cur = TestCases['<xsl:value-of select="../@package"/>.<xsl:value-of select="../@name"/>'] = new Array();
-    <xsl:for-each select="property">
-    <xsl:sort select="@name"/>
-        cur['<xsl:value-of select="@name"/>'] = '<xsl:call-template name="JS-escape"><xsl:with-param name="string" select="@value"/></xsl:call-template>';
-    </xsl:for-each>
-  </xsl:template>
-
-
-<!-- ======================================================================
-    This page is created for every package.
-    It prints the name of all classes that belongs to this package.
-    @param name the package name to print classes.
-     ====================================================================== -->
-<!-- list of classes in a package -->
-<xsl:template name="classes.list">
-    <xsl:param name="name"/>
-    <html>
-        <head>
-            <title>Unit Test Classes: <xsl:value-of select="$name"/></title>
-            <xsl:call-template name="create.stylesheet.link">
-                <xsl:with-param name="package.name" select="$name"/>
-            </xsl:call-template>
-        </head>
-        <body>
-            <table width="100%">
-                <tr>
-                    <td nowrap="nowrap">
-                        <h2><a href="package-summary.html" target="classFrame">
-                            <xsl:value-of select="$name"/>
-                            <xsl:if test="$name = ''"><none></xsl:if>
-                        </a></h2>
-                    </td>
-                </tr>
-            </table>
-
-            <h2>Classes</h2>
-            <table width="100%">
-                <xsl:for-each select="/testsuites/testsuite[./@package = $name]">
-                    <xsl:sort select="@name"/>
-                    <tr>
-                        <td nowrap="nowrap">
-                            <a href="{@id}_{@name}.html" target="classFrame"><xsl:value-of select="@name"/></a>
-                        </td>
-                    </tr>
-                </xsl:for-each>
-            </table>
-        </body>
-    </html>
-</xsl:template>
-
-
-<!--
-    Creates an all-classes.html file that contains a link to all package-summary.html
-    on each class.
--->
-<xsl:template match="testsuites" mode="all.classes">
-    <html>
-        <head>
-            <title>All Unit Test Classes</title>
-            <xsl:call-template name="create.stylesheet.link">
-                <xsl:with-param name="package.name"/>
-            </xsl:call-template>
-        </head>
-        <body>
-            <h2>Classes</h2>
-            <table width="100%">
-                <xsl:apply-templates select="testsuite" mode="all.classes">
-                    <xsl:sort select="@name"/>
-                </xsl:apply-templates>
-            </table>
-        </body>
-    </html>
-</xsl:template>
-
-<xsl:template match="testsuite" mode="all.classes">
-    <xsl:variable name="package.name" select="@package"/>
-    <tr>
-        <td nowrap="nowrap">
-            <a target="classFrame">
-                <xsl:attribute name="href">
-                    <xsl:if test="not($package.name='')">
-                        <xsl:value-of select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text>
-                    </xsl:if><xsl:value-of select="@id"/>_<xsl:value-of select="@name"/><xsl:text>.html</xsl:text>
-                </xsl:attribute>
-                <xsl:value-of select="@name"/>
-            </a>
-        </td>
-    </tr>
-</xsl:template>
-
-
-<!--
-    Creates an html file that contains a link to all package-summary.html files on
-    each package existing on testsuites.
-    @bug there will be a problem here, I don't know yet how to handle unnamed package :(
--->
-<xsl:template match="testsuites" mode="all.packages">
-    <html>
-        <head>
-            <title>All Unit Test Packages</title>
-            <xsl:call-template name="create.stylesheet.link">
-                <xsl:with-param name="package.name"/>
-            </xsl:call-template>
-        </head>
-        <body>
-            <h2><a href="overview-summary.html" target="classFrame">Home</a></h2>
-            <h2>Packages</h2>
-            <table width="100%">
-                <xsl:apply-templates select="testsuite[not(./@package = preceding-sibling::testsuite/@package)]" mode="all.packages">
-                    <xsl:sort select="@package"/>
-                </xsl:apply-templates>
-            </table>
-        </body>
-    </html>
-</xsl:template>
-
-<xsl:template match="testsuite" mode="all.packages">
-    <tr>
-        <td nowrap="nowrap">
-            <a href="./{translate(@package,'.','/')}/package-summary.html" target="classFrame">
-                <xsl:value-of select="@package"/>
-                <xsl:if test="@package = ''"><none></xsl:if>
-            </a>
-        </td>
-    </tr>
-</xsl:template>
-
-
-<xsl:template match="testsuites" mode="overview.packages">
-    <html>
-        <head>
-            <title>Unit Test Results: Summary</title>
-            <xsl:call-template name="create.stylesheet.link">
-                <xsl:with-param name="package.name"/>
-            </xsl:call-template>
-        </head>
-        <body>
-        <xsl:attribute name="onload">open('allclasses-frame.html','classListFrame')</xsl:attribute>
-        <xsl:call-template name="pageHeader"/>
-        <h2>Summary</h2>
-        <xsl:variable name="testCount" select="sum(testsuite/@tests)"/>
-        <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/>
-        <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/>
-        <xsl:variable name="timeCount" select="sum(testsuite/@time)"/>
-        <xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/>
-        <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
-        <tr valign="top">
-            <th>Tests</th>
-            <th>Failures</th>
-            <th>Errors</th>
-            <th>Success rate</th>
-            <th>Time</th>
-        </tr>
-        <tr valign="top">
-            <xsl:attribute name="class">
-                <xsl:choose>
-                    <xsl:when test="$errorCount > 0">Error</xsl:when>
-                    <xsl:when test="$failureCount > 0">Failure</xsl:when>
-                    <xsl:otherwise>Pass</xsl:otherwise>
-                </xsl:choose>
-            </xsl:attribute>
-            <td><a title="Display all tests" href="all-tests.html"><xsl:value-of select="$testCount"/></a></td>
-            <td><a title="Display all failures" href="alltests-fails.html"><xsl:value-of select="$failureCount"/></a></td>
-            <td><a title="Display all errors" href="alltests-errors.html"><xsl:value-of select="$errorCount"/></a></td>
-            <td>
-                <xsl:call-template name="display-percent">
-                    <xsl:with-param name="value" select="$successRate"/>
-                </xsl:call-template>
-            </td>
-            <td>
-                <xsl:call-template name="display-time">
-                    <xsl:with-param name="value" select="$timeCount"/>
-                </xsl:call-template>
-            </td>
-        </tr>
-        </table>
-        <table border="0" width="95%">
-        <tr>
-        <td style="text-align: justify;">
-        Note: <em>failures</em> are anticipated and checked for with assertions while <em>errors</em> are unanticipated.
-        </td>
-        </tr>
-        </table>
-
-        <h2>Packages</h2>
-        <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
-            <xsl:call-template name="testsuite.test.header"/>
-            <xsl:for-each select="testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-                <xsl:sort select="@package" order="ascending"/>
-                <!-- get the node set containing all testsuites that have the same package -->
-                <xsl:variable name="insamepackage" select="/testsuites/testsuite[./@package = current()/@package]"/>
-                <tr valign="top">
-                    <!-- display a failure if there is any failure/error in the package -->
-                    <xsl:attribute name="class">
-                        <xsl:choose>
-                            <xsl:when test="sum($insamepackage/@errors) > 0">Error</xsl:when>
-                            <xsl:when test="sum($insamepackage/@failures) > 0">Failure</xsl:when>
-                            <xsl:otherwise>Pass</xsl:otherwise>
-                        </xsl:choose>
-                    </xsl:attribute>
-                    <td><a href="./{translate(@package,'.','/')}/package-summary.html">
-                        <xsl:value-of select="@package"/>
-                        <xsl:if test="@package = ''"><none></xsl:if>
-                    </a></td>
-                    <td><xsl:value-of select="sum($insamepackage/@tests)"/></td>
-                    <td><xsl:value-of select="sum($insamepackage/@errors)"/></td>
-                    <td><xsl:value-of select="sum($insamepackage/@failures)"/></td>
-                    <td>
-                    <xsl:call-template name="display-time">
-                        <xsl:with-param name="value" select="sum($insamepackage/@time)"/>
-                    </xsl:call-template>
-                    </td>
-                    <td><xsl:value-of select="$insamepackage/@timestamp"/></td>
-                    <td><xsl:value-of select="$insamepackage/@hostname"/></td>
-                </tr>
-            </xsl:for-each>
-        </table>
-        </body>
-        </html>
-</xsl:template>
-
-
-<xsl:template name="package.summary">
-    <xsl:param name="name"/>
-    <html>
-        <head>
-            <xsl:call-template name="create.stylesheet.link">
-                <xsl:with-param name="package.name" select="$name"/>
-            </xsl:call-template>
-        </head>
-        <body>
-            <xsl:attribute name="onload">open('package-frame.html','classListFrame')</xsl:attribute>
-            <xsl:call-template name="pageHeader"/>
-            <h3>Package <xsl:value-of select="$name"/></h3>
-
-            <!--table border="0" cellpadding="5" cellspacing="2" width="95%">
-                <xsl:call-template name="class.metrics.header"/>
-                <xsl:apply-templates select="." mode="print.metrics"/>
-            </table-->
-
-            <xsl:variable name="insamepackage" select="/testsuites/testsuite[./@package = $name]"/>
-            <xsl:if test="count($insamepackage) > 0">
-                <h2>Classes</h2>
-                <p>
-                <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
-                    <xsl:call-template name="testsuite.test.header"/>
-                    <xsl:apply-templates select="$insamepackage" mode="print.test">
-                        <xsl:sort select="@name"/>
-                    </xsl:apply-templates>
-                </table>
-                </p>
-            </xsl:if>
-        </body>
-    </html>
-</xsl:template>
-
-
-<!--
-    transform string like a.b.c to ../../../
-    @param path the path to transform into a descending directory path
--->
-<xsl:template name="path">
-    <xsl:param name="path"/>
-    <xsl:if test="contains($path,'.')">
-        <xsl:text>../</xsl:text>
-        <xsl:call-template name="path">
-            <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'.')"/></xsl:with-param>
-        </xsl:call-template>
-    </xsl:if>
-    <xsl:if test="not(contains($path,'.')) and not($path = '')">
-        <xsl:text>../</xsl:text>
-    </xsl:if>
-</xsl:template>
-
-
-<!-- create the link to the stylesheet based on the package name -->
-<xsl:template name="create.stylesheet.link">
-    <xsl:param name="package.name"/>
-    <link rel="stylesheet" type="text/css" title="Style"><xsl:attribute name="href"><xsl:if test="not($package.name = 'unnamed package')"><xsl:call-template name="path"><xsl:with-param name="path" select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></link>
-</xsl:template>
-
-
-<!-- Page HEADER -->
-<xsl:template name="pageHeader">
-    <h1><xsl:value-of select="$TITLE"/></h1>
-    <table width="100%">
-    <tr>
-        <td align="left"></td>
-        <td align="right">Designed for use with <a href="http://www.junit.org/">JUnit</a> and <a href="http://ant.apache.org/">Ant</a>.</td>
-    </tr>
-    </table>
-    <hr size="1"/>
-</xsl:template>
-
-<!-- class header -->
-<xsl:template name="testsuite.test.header">
-    <tr valign="top">
-        <th width="80%">Name</th>
-        <th>Tests</th>
-        <th>Errors</th>
-        <th>Failures</th>
-        <th nowrap="nowrap">Time(s)</th>
-        <th nowrap="nowrap">Time Stamp</th>
-        <th>Host</th>
-    </tr>
-</xsl:template>
-
-<!-- method header -->
-<xsl:template name="testcase.test.header">
-    <xsl:param name="show.class" select="''"/>
-    <tr valign="top">
-	<xsl:if test="boolean($show.class)">
-	    <th>Class</th>
-	</xsl:if>
-        <th>Name</th>
-        <th>Status</th>
-        <th width="80%">Type</th>
-        <th nowrap="nowrap">Time(s)</th>
-    </tr>
-</xsl:template>
-
-
-<!-- class information -->
-<xsl:template match="testsuite" mode="print.test">
-    <tr valign="top">
-        <xsl:attribute name="class">
-            <xsl:choose>
-                <xsl:when test="@errors[.> 0]">Error</xsl:when>
-                <xsl:when test="@failures[.> 0]">Failure</xsl:when>
-                <xsl:otherwise>Pass</xsl:otherwise>
-            </xsl:choose>
-        </xsl:attribute>
-        <td><a title="Display all tests" href="{@id}_{@name}.html"><xsl:value-of select="@name"/></a></td>
-        <td><a title="Display all tests" href="{@id}_{@name}.html"><xsl:apply-templates select="@tests"/></a></td>
-        <td>
-	    <xsl:choose>
-		<xsl:when test="@errors != 0">
-		    <a title="Display only errors" href="{@id}_{@name}-errors.html"><xsl:apply-templates select="@errors"/></a>
-		</xsl:when>
-		<xsl:otherwise>
-		    <xsl:apply-templates select="@errors"/>
-		</xsl:otherwise>
-	    </xsl:choose>
-	</td>
-        <td>
-	    <xsl:choose>
-		<xsl:when test="@failures != 0">
-		    <a title="Display only failures" href="{@id}_{@name}-fails.html"><xsl:apply-templates select="@failures"/></a>
-		</xsl:when>
-		<xsl:otherwise>
-		    <xsl:apply-templates select="@failures"/>
-		</xsl:otherwise>
-	    </xsl:choose>
-	</td>
-        <td><xsl:call-template name="display-time">
-                <xsl:with-param name="value" select="@time"/>
-            </xsl:call-template>
-        </td>
-        <td><xsl:apply-templates select="@timestamp"/></td>
-        <td><xsl:apply-templates select="@hostname"/></td>
-    </tr>
-</xsl:template>
-
-<xsl:template match="testcase" mode="print.test">
-    <xsl:param name="show.class" select="''"/>
-    <tr valign="top">
-        <xsl:attribute name="class">
-            <xsl:choose>
-                <xsl:when test="error">Error</xsl:when>
-                <xsl:when test="failure">Failure</xsl:when>
-                <xsl:otherwise>TableRowColor</xsl:otherwise>
-            </xsl:choose>
-        </xsl:attribute>
-	<xsl:variable name="class.href">
-	    <xsl:value-of select="concat(translate(../@package,'.','/'), '/', ../@id, '_', ../@name, '.html')"/>
-	</xsl:variable>
-	<xsl:if test="boolean($show.class)">
-	    <td><a href="{$class.href}"><xsl:value-of select="../@name"/></a></td>
-	</xsl:if>
-        <td>
-	    <a name="{@name}"/>
-	    <xsl:choose>
-		<xsl:when test="boolean($show.class)">
-		    <a href="{concat($class.href, '#', @name)}"><xsl:value-of select="@name"/></a>
-		</xsl:when>
-		<xsl:otherwise>
-		    <xsl:value-of select="@name"/>
-		</xsl:otherwise>
-	    </xsl:choose>
-	</td>
-        <xsl:choose>
-            <xsl:when test="failure">
-                <td>Failure</td>
-                <td><xsl:apply-templates select="failure"/></td>
-            </xsl:when>
-            <xsl:when test="error">
-                <td>Error</td>
-                <td><xsl:apply-templates select="error"/></td>
-            </xsl:when>
-            <xsl:otherwise>
-                <td>Success</td>
-                <td></td>
-            </xsl:otherwise>
-        </xsl:choose>
-        <td>
-            <xsl:call-template name="display-time">
-                <xsl:with-param name="value" select="@time"/>
-            </xsl:call-template>
-        </td>
-    </tr>
-</xsl:template>
-
-
-<!-- Note : the below template error and failure are the same style
-            so just call the same style store in the toolkit template -->
-<xsl:template match="failure">
-    <xsl:call-template name="display-failures"/>
-</xsl:template>
-
-<xsl:template match="error">
-    <xsl:call-template name="display-failures"/>
-</xsl:template>
-
-<!-- Style for the error and failure in the testcase template -->
-<xsl:template name="display-failures">
-    <xsl:choose>
-        <xsl:when test="not(@message)">N/A</xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="@message"/>
-        </xsl:otherwise>
-    </xsl:choose>
-    <!-- display the stacktrace -->
-    <br/><br/>
-    <code>
-        <xsl:call-template name="br-replace">
-            <xsl:with-param name="word" select="."/>
-        </xsl:call-template>
-    </code>
-    <!-- the latter is better but might be problematic for non-21" monitors... -->
-    <!--pre><xsl:value-of select="."/></pre-->
-</xsl:template>
-
-<xsl:template name="JS-escape">
-    <xsl:param name="string"/>
-    <xsl:param name="tmp1" select="stringutils:replace(string($string),'\','\\')"/>
-    <xsl:param name="tmp2" select="stringutils:replace(string($tmp1),"'","\'")"/>
-    <xsl:value-of select="$tmp2"/>
-</xsl:template>
-
-
-<!--
-    template that will convert a carriage return into a br tag
-    @param word the text from which to convert CR to BR tag
--->
-<xsl:template name="br-replace">
-    <xsl:param name="word"/>
-    <xsl:value-of disable-output-escaping="yes" select='stringutils:replace(string($word),"&#xA;","<br/>")'/>
-</xsl:template>
-
-<xsl:template name="display-time">
-    <xsl:param name="value"/>
-    <xsl:value-of select="format-number($value,'0.000')"/>
-</xsl:template>
-
-<xsl:template name="display-percent">
-    <xsl:param name="value"/>
-    <xsl:value-of select="format-number($value,'0.00%')"/>
-</xsl:template>
-</xsl:stylesheet>
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/junit-noframes.xsl b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/junit-noframes.xsl
deleted file mode 100644
index f0ab964..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/junit-noframes.xsl
+++ /dev/null
@@ -1,467 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-        xmlns:lxslt="http://xml.apache.org/xslt"
-        xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils">
-<xsl:output method="html" indent="yes" encoding="US-ASCII"
-  doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
-<xsl:decimal-format decimal-separator="." grouping-separator="," />
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- -->
-
-<xsl:param name="TITLE">Unit Test Results.</xsl:param>
-
-<!--
-
- Sample stylesheet to be used with Ant JUnitReport output.
-
- It creates a non-framed report that can be useful to send via
- e-mail or such.
-
--->
-<xsl:template match="testsuites">
-    <html>
-        <head>
-            <title><xsl:value-of select="$TITLE"/></title>
-    <style type="text/css">
-      body {
-        font:normal 68% verdana,arial,helvetica;
-        color:#000000;
-      }
-      table tr td, table tr th {
-          font-size: 68%;
-      }
-      table.details tr th{
-        font-weight: bold;
-        text-align:left;
-        background:#a6caf0;
-      }
-      table.details tr td{
-        background:#eeeee0;
-      }
-
-      p {
-        line-height:1.5em;
-        margin-top:0.5em; margin-bottom:1.0em;
-      }
-      h1 {
-        margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
-      }
-      h2 {
-        margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica
-      }
-      h3 {
-        margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
-      }
-      h4 {
-        margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
-      }
-      h5 {
-        margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
-      }
-      h6 {
-        margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
-      }
-      .Error {
-        font-weight:bold; color:red;
-      }
-      .Failure {
-        font-weight:bold; color:purple;
-      }
-      .Properties {
-        text-align:right;
-      }
-      </style>
-      <script type="text/javascript" language="JavaScript">
-        var TestCases = new Array();
-        var cur;
-        <xsl:for-each select="./testsuite">
-            <xsl:apply-templates select="properties"/>
-        </xsl:for-each>
-
-       </script>
-       <script type="text/javascript" language="JavaScript"><![CDATA[
-        function displayProperties (name) {
-          var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
-          var doc = win.document;
-          doc.open();
-          doc.write("<html><head><title>Properties of " + name + "</title>");
-          doc.write("<style>")
-          doc.write("body {font:normal 68% verdana,arial,helvetica; color:#000000; }");
-          doc.write("table tr td, table tr th { font-size: 68%; }");
-          doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
-          doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }");
-          doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }");
-          doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }");
-          doc.write("</style>");
-          doc.write("</head><body>");
-          doc.write("<h3>Properties of " + name + "</h3>");
-          doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>");
-          doc.write("<table class='properties'>");
-          doc.write("<tr><th>Name</th><th>Value</th></tr>");
-          for (prop in TestCases[name]) {
-            doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>");
-          }
-          doc.write("</table>");
-          doc.write("</body></html>");
-          doc.close();
-          win.focus();
-        }
-      ]]>
-      </script>
-        </head>
-        <body>
-            <a name="top"></a>
-            <xsl:call-template name="pageHeader"/>
-
-            <!-- Summary part -->
-            <xsl:call-template name="summary"/>
-            <hr size="1" width="95%" align="left"/>
-
-            <!-- Package List part -->
-            <xsl:call-template name="packagelist"/>
-            <hr size="1" width="95%" align="left"/>
-
-            <!-- For each package create its part -->
-            <xsl:call-template name="packages"/>
-            <hr size="1" width="95%" align="left"/>
-
-            <!-- For each class create the  part -->
-            <xsl:call-template name="classes"/>
-
-        </body>
-    </html>
-</xsl:template>
-
-
-
-    <!-- ================================================================== -->
-    <!-- Write a list of all packages with an hyperlink to the anchor of    -->
-    <!-- of the package name.                                               -->
-    <!-- ================================================================== -->
-    <xsl:template name="packagelist">
-        <h2>Packages</h2>
-        Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers.
-        <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
-            <xsl:call-template name="testsuite.test.header"/>
-            <!-- list all packages recursively -->
-            <xsl:for-each select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-                <xsl:sort select="@package"/>
-                <xsl:variable name="testsuites-in-package" select="/testsuites/testsuite[./@package = current()/@package]"/>
-                <xsl:variable name="testCount" select="sum($testsuites-in-package/@tests)"/>
-                <xsl:variable name="errorCount" select="sum($testsuites-in-package/@errors)"/>
-                <xsl:variable name="failureCount" select="sum($testsuites-in-package/@failures)"/>
-                <xsl:variable name="timeCount" select="sum($testsuites-in-package/@time)"/>
-
-                <!-- write a summary for the package -->
-                <tr valign="top">
-                    <!-- set a nice color depending if there is an error/failure -->
-                    <xsl:attribute name="class">
-                        <xsl:choose>
-                            <xsl:when test="$failureCount > 0">Failure</xsl:when>
-                            <xsl:when test="$errorCount > 0">Error</xsl:when>
-                        </xsl:choose>
-                    </xsl:attribute>
-                    <td><a href="#{@package}"><xsl:value-of select="@package"/></a></td>
-                    <td><xsl:value-of select="$testCount"/></td>
-                    <td><xsl:value-of select="$errorCount"/></td>
-                    <td><xsl:value-of select="$failureCount"/></td>
-                    <td>
-                    <xsl:call-template name="display-time">
-                        <xsl:with-param name="value" select="$timeCount"/>
-                    </xsl:call-template>
-                    </td>
-                    <td><xsl:value-of select="$testsuites-in-package/@timestamp"/></td>
-                    <td><xsl:value-of select="$testsuites-in-package/@hostname"/></td>
-                </tr>
-            </xsl:for-each>
-        </table>
-    </xsl:template>
-
-
-    <!-- ================================================================== -->
-    <!-- Write a package level report                                       -->
-    <!-- It creates a table with values from the document:                  -->
-    <!-- Name | Tests | Errors | Failures | Time                            -->
-    <!-- ================================================================== -->
-    <xsl:template name="packages">
-        <!-- create an anchor to this package name -->
-        <xsl:for-each select="/testsuites/testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-            <xsl:sort select="@package"/>
-                <a name="{@package}"></a>
-                <h3>Package <xsl:value-of select="@package"/></h3>
-
-                <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
-                    <xsl:call-template name="testsuite.test.header"/>
-
-                    <!-- match the testsuites of this package -->
-                    <xsl:apply-templates select="/testsuites/testsuite[./@package = current()/@package]" mode="print.test"/>
-                </table>
-                <a href="#top">Back to top</a>
-                <p/>
-                <p/>
-        </xsl:for-each>
-    </xsl:template>
-
-    <xsl:template name="classes">
-        <xsl:for-each select="testsuite">
-            <xsl:sort select="@name"/>
-            <!-- create an anchor to this class name -->
-            <a name="{@name}"></a>
-            <h3>TestCase <xsl:value-of select="@name"/></h3>
-
-            <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
-              <xsl:call-template name="testcase.test.header"/>
-              <!--
-              test can even not be started at all (failure to load the class)
-              so report the error directly
-              -->
-                <xsl:if test="./error">
-                    <tr class="Error">
-                        <td colspan="4"><xsl:apply-templates select="./error"/></td>
-                    </tr>
-                </xsl:if>
-                <xsl:apply-templates select="./testcase" mode="print.test"/>
-            </table>
-            <div class="Properties">
-                <a>
-                    <xsl:attribute name="href">javascript:displayProperties('<xsl:value-of select="@package"/>.<xsl:value-of select="@name"/>');</xsl:attribute>
-                    Properties »
-                </a>
-            </div>
-            <p/>
-
-            <a href="#top">Back to top</a>
-        </xsl:for-each>
-    </xsl:template>
-
-    <xsl:template name="summary">
-        <h2>Summary</h2>
-        <xsl:variable name="testCount" select="sum(testsuite/@tests)"/>
-        <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/>
-        <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/>
-        <xsl:variable name="timeCount" select="sum(testsuite/@time)"/>
-        <xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/>
-        <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
-        <tr valign="top">
-            <th>Tests</th>
-            <th>Failures</th>
-            <th>Errors</th>
-            <th>Success rate</th>
-            <th>Time</th>
-        </tr>
-        <tr valign="top">
-            <xsl:attribute name="class">
-                <xsl:choose>
-                    <xsl:when test="$failureCount > 0">Failure</xsl:when>
-                    <xsl:when test="$errorCount > 0">Error</xsl:when>
-                </xsl:choose>
-            </xsl:attribute>
-            <td><xsl:value-of select="$testCount"/></td>
-            <td><xsl:value-of select="$failureCount"/></td>
-            <td><xsl:value-of select="$errorCount"/></td>
-            <td>
-                <xsl:call-template name="display-percent">
-                    <xsl:with-param name="value" select="$successRate"/>
-                </xsl:call-template>
-            </td>
-            <td>
-                <xsl:call-template name="display-time">
-                    <xsl:with-param name="value" select="$timeCount"/>
-                </xsl:call-template>
-            </td>
-
-        </tr>
-        </table>
-        <table border="0" width="95%">
-        <tr>
-        <td style="text-align: justify;">
-        Note: <i>failures</i> are anticipated and checked for with assertions while <i>errors</i> are unanticipated.
-        </td>
-        </tr>
-        </table>
-    </xsl:template>
-
-  <!--
-   Write properties into a JavaScript data structure.
-   This is based on the original idea by Erik Hatcher (ehatcher at apache.org)
-   -->
-  <xsl:template match="properties">
-    cur = TestCases['<xsl:value-of select="../@package"/>.<xsl:value-of select="../@name"/>'] = new Array();
-    <xsl:for-each select="property">
-    <xsl:sort select="@name"/>
-        cur['<xsl:value-of select="@name"/>'] = '<xsl:call-template name="JS-escape"><xsl:with-param name="string" select="@value"/></xsl:call-template>';
-    </xsl:for-each>
-  </xsl:template>
-
-<!-- Page HEADER -->
-<xsl:template name="pageHeader">
-    <h1><xsl:value-of select="$TITLE"/></h1>
-    <table width="100%">
-    <tr>
-        <td align="left"></td>
-        <td align="right">Designed for use with <a href='http://www.junit.org'>JUnit</a> and <a href='http://ant.apache.org/ant'>Ant</a>.</td>
-    </tr>
-    </table>
-    <hr size="1"/>
-</xsl:template>
-
-<xsl:template match="testsuite" mode="header">
-    <tr valign="top">
-        <th width="80%">Name</th>
-        <th>Tests</th>
-        <th>Errors</th>
-        <th>Failures</th>
-        <th nowrap="nowrap">Time(s)</th>
-    </tr>
-</xsl:template>
-
-<!-- class header -->
-<xsl:template name="testsuite.test.header">
-    <tr valign="top">
-        <th width="80%">Name</th>
-        <th>Tests</th>
-        <th>Errors</th>
-        <th>Failures</th>
-        <th nowrap="nowrap">Time(s)</th>
-        <th nowrap="nowrap">Time Stamp</th>
-        <th>Host</th>
-    </tr>
-</xsl:template>
-
-<!-- method header -->
-<xsl:template name="testcase.test.header">
-    <tr valign="top">
-        <th>Name</th>
-        <th>Status</th>
-        <th width="80%">Type</th>
-        <th nowrap="nowrap">Time(s)</th>
-    </tr>
-</xsl:template>
-
-
-<!-- class information -->
-<xsl:template match="testsuite" mode="print.test">
-    <tr valign="top">
-        <!-- set a nice color depending if there is an error/failure -->
-        <xsl:attribute name="class">
-            <xsl:choose>
-                <xsl:when test="@failures[.> 0]">Failure</xsl:when>
-                <xsl:when test="@errors[.> 0]">Error</xsl:when>
-            </xsl:choose>
-        </xsl:attribute>
-
-        <!-- print testsuite information -->
-        <td><a href="#{@name}"><xsl:value-of select="@name"/></a></td>
-        <td><xsl:value-of select="@tests"/></td>
-        <td><xsl:value-of select="@errors"/></td>
-        <td><xsl:value-of select="@failures"/></td>
-        <td>
-            <xsl:call-template name="display-time">
-                <xsl:with-param name="value" select="@time"/>
-            </xsl:call-template>
-        </td>
-        <td><xsl:apply-templates select="@timestamp"/></td>
-        <td><xsl:apply-templates select="@hostname"/></td>
-    </tr>
-</xsl:template>
-
-<xsl:template match="testcase" mode="print.test">
-    <tr valign="top">
-        <xsl:attribute name="class">
-            <xsl:choose>
-                <xsl:when test="failure | error">Error</xsl:when>
-            </xsl:choose>
-        </xsl:attribute>
-        <td><xsl:value-of select="@name"/></td>
-        <xsl:choose>
-            <xsl:when test="failure">
-                <td>Failure</td>
-                <td><xsl:apply-templates select="failure"/></td>
-            </xsl:when>
-            <xsl:when test="error">
-                <td>Error</td>
-                <td><xsl:apply-templates select="error"/></td>
-            </xsl:when>
-            <xsl:otherwise>
-                <td>Success</td>
-                <td></td>
-            </xsl:otherwise>
-        </xsl:choose>
-        <td>
-            <xsl:call-template name="display-time">
-                <xsl:with-param name="value" select="@time"/>
-            </xsl:call-template>
-        </td>
-    </tr>
-</xsl:template>
-
-
-<xsl:template match="failure">
-    <xsl:call-template name="display-failures"/>
-</xsl:template>
-
-<xsl:template match="error">
-    <xsl:call-template name="display-failures"/>
-</xsl:template>
-
-<!-- Style for the error and failure in the tescase template -->
-<xsl:template name="display-failures">
-    <xsl:choose>
-        <xsl:when test="not(@message)">N/A</xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="@message"/>
-        </xsl:otherwise>
-    </xsl:choose>
-    <!-- display the stacktrace -->
-    <code>
-        <br/><br/>
-        <xsl:call-template name="br-replace">
-            <xsl:with-param name="word" select="."/>
-        </xsl:call-template>
-    </code>
-    <!-- the later is better but might be problematic for non-21" monitors... -->
-    <!--pre><xsl:value-of select="."/></pre-->
-</xsl:template>
-
-<xsl:template name="JS-escape">
-    <xsl:param name="string"/>
-    <xsl:param name="tmp1" select="stringutils:replace(string($string),'\','\\')"/>
-    <xsl:param name="tmp2" select="stringutils:replace(string($tmp1),"'","\'")"/>
-    <xsl:value-of select="$tmp2"/>
-</xsl:template>
-
-
-<!--
-    template that will convert a carriage return into a br tag
-    @param word the text from which to convert CR to BR tag
--->
-<xsl:template name="br-replace">
-    <xsl:param name="word"/>
-    <xsl:value-of disable-output-escaping="yes" select='stringutils:replace(string($word),"&#xA;","<br/>")'/>
-</xsl:template>
-
-<xsl:template name="display-time">
-    <xsl:param name="value"/>
-    <xsl:value-of select="format-number($value,'0.000')"/>
-</xsl:template>
-
-<xsl:template name="display-percent">
-    <xsl:param name="value"/>
-    <xsl:value-of select="format-number($value,'0.00%')"/>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/log.xsl b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/log.xsl
deleted file mode 100644
index 5040993..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/log.xsl
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   
--->
- 
-<!--
-
-  The purpose have this XSL is to provide a nice way to look at the output
-  from the Ant XmlLogger (ie: ant -listener org.apache.tools.ant.XmlLogger )
-  
-  @author <a href="mailto:sbailliez at apache.org">Stephane Bailliez</a>
-  
--->
-<xsl:decimal-format decimal-separator="." grouping-separator="," />
-
-<xsl:template match="/">
-<html>
-  <head>
-    <style type="text/css">
-    .bannercell {
-      border: 0px;
-      padding: 0px;
-    }
-    body {
-      margin: 0;
-      font:normal 100% arial,helvetica,sanserif;
-      background-color:#FFFFFF;
-      color:#000000;
-    }
-    table.status {
-      font:bold 80% arial,helvetica,sanserif;
-      background-color:#525D76;
-      color:#ffffff;
-    }
-    table.log tr td, tr th {
-      font-size: 80%;
-    }
-    .error {
-      color:red;
-    }
-    .warn {
-      color:brown;
-    }
-    .info {
-      color:gray;
-    }
-    .debug{
-      color:gray;
-    }
-    .failed {
-      font-size:80%;
-      background-color: red;
-      color:#FFFFFF;
-      font-weight: bold
-    }
-    .complete {
-      font-size:80%;
-      background-color: #525D76;
-      color:#FFFFFF;
-      font-weight: bold
-    }
-    .a td { 
-      background: #efefef;
-    }
-    .b td { 
-      background: #fff;
-    }
-    th, td {
-      text-align: left;
-      vertical-align: top;
-    }
-    th {
-      background: #ccc;
-      color: black;
-    }
-    table, th, td {
-      border: none
-    }
-    h3 {
-      font:bold 80% arial,helvetica,sanserif;
-      background: #525D76;
-      color: white;
-      text-decoration: none;
-      padding: 5px;
-      margin-right: 2px;
-      margin-left: 2px;
-      margin-bottom: 0;
-    }
-    </style>
-  </head>
-  <body>
-    <!-- jakarta logo -->
-    <table border="0" cellpadding="0" cellspacing="0" width="100%">
-    <tr>
-      <td valign="top" class="bannercell">
-        <a href="http://jakarta.apache.org/">
-        <img src="http://jakarta.apache.org/images/jakarta-logo.gif" alt="http://jakarta.apache.org" align="left" border="0"/>
-        </a>
-      </td>
-      <td style="text-align:right;vertical-align:bottom">
-        <a href="http://ant.apache.org/">Apache Ant</a>
-      </td>
-    </tr>
-    </table>
-      
-    <table border="0" width="100%">
-    <tr><td><hr noshade="yes" size="1"/></td></tr>
-    </table>
-
-    <xsl:apply-templates select="build"/>
-
-  </body>
-</html>
-</xsl:template>
-
-<xsl:template match="build">
-  <!-- build status -->
-  <table width="100%">
-    <xsl:attribute name="class">
-      <xsl:if test="@error">failed</xsl:if>
-      <xsl:if test="not(@error)">complete</xsl:if>
-    </xsl:attribute>
-    <tr>
-      <xsl:if test="@error">
-        <td nowrap="yes">Build Failed</td> 
-      </xsl:if>
-      <xsl:if test="not(@error)">
-        <td nowrap="yes">Build Complete</td>
-      </xsl:if>
-        <td style="text-align:right" nowrap="yes">Total Time: <xsl:value-of select="@time"/></td>
-    </tr>
-    <tr>
-      <td colspan="2">
-        <xsl:if test="@error">
-          <tt><xsl:value-of select="@error"/></tt><br/>
-          <i style="font-size:80%">See the <a href="#stacktrace" alt="Click for details">stacktrace</a>.</i>
-        </xsl:if>
-      </td>
-    </tr>
-  </table>
-  <table border="1" cellspacing="2" cellpadding="3" width="100%" style="font-size:80%">
-    <tr class="a"><td width="1">ant.file</td><td><xsl:value-of select="substring-after(//message[contains(text(),'ant.file')], '->')"/></td></tr>
-    <tr class="b"><td width="1">ant.version</td><td><xsl:value-of select="substring-after(//message[contains(text(),'ant.version')], '->')"/></td></tr>
-    <tr class="a"><td width="1">java.version</td><td><xsl:value-of select="substring-after(//message[contains(text(),'java.vm.version')], '->')"/></td></tr>
-    <tr class="b"><td width="1">os.name</td><td><xsl:value-of select="substring-after(//message[contains(text(),'os.name')], '->')"/></td></tr>
-  </table>
-  <!-- build information -->
-  <h3>Build events</h3>
-  <table class="log" border="1" cellspacing="2" cellpadding="3" width="100%">
-  <tr>
-    <th nowrap="yes" align="left" width="1%">target</th>
-    <th nowrap="yes" align="left" width="1%">task</th>
-    <th nowrap="yes" align="left">message</th>
-  </tr>
-  <xsl:apply-templates select=".//message[@priority != 'debug']"/>
-  </table>
-  <p>
-  <!-- stacktrace -->
-  <xsl:if test="stacktrace">
-  <a name="stacktrace"/>
-  <h3>Error details</h3>
-  <table width="100%">
-    <tr><td>
-      <pre><xsl:value-of select="stacktrace"/></pre>
-    </td></tr>
-  </table>
-  </xsl:if>
-  </p>
-</xsl:template>
-
-<!-- report every message but those with debug priority -->
-<xsl:template match="message[@priority!='debug']">
-  <tr valign="top">
-    <!-- alternated row style -->
-    <xsl:attribute name="class">
-      <xsl:if test="position() mod 2 = 1">a</xsl:if>
-      <xsl:if test="position() mod 2 = 0">b</xsl:if>
-    </xsl:attribute>
-    <td nowrap="yes" width="1%"><xsl:value-of select="../../@name"/></td>
-    <td nowrap="yes" style="text-align:right" width="1%">[ <xsl:value-of select="../@name"/> ]</td>
-    <td class="{@priority}" nowrap="yes">
-            <xsl:value-of select="text()"/>
-    </td>
-  </tr>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/maudit-frames.xsl b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/maudit-frames.xsl
deleted file mode 100644
index 257c0c8..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/maudit-frames.xsl
+++ /dev/null
@@ -1,503 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-    xmlns:lxslt="http://xml.apache.org/xslt"
-    xmlns:redirect="org.apache.xalan.lib.Redirect"
-    extension-element-prefixes="redirect">
-<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
-<xsl:decimal-format decimal-separator="." grouping-separator="," />
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<!--
-
-    Stylesheet to transform an XML file generated by the Ant MAudit task into
-    a set of JavaDoc-like HTML page to make pages more convenient to be browsed.
-
-    It use the Xalan redirect extension to write to multiple output files.
-
-    @author Stephane Bailliez <a href="mailto:sbailliez at apache.org"/>
--->
-
-<xsl:param name="output.dir" select="'.'"/>
-
-
-<xsl:template match="classes">
-    <!-- create the index.html -->
-    <redirect:write file="{$output.dir}/index.html">
-        <xsl:call-template name="index.html"/>
-    </redirect:write>
-
-    <!-- create the stylesheet.css -->
-    <redirect:write file="{$output.dir}/stylesheet.css">
-        <xsl:call-template name="stylesheet.css"/>
-    </redirect:write>
-
-    <!-- create the overview-packages.html at the root -->
-    <redirect:write file="{$output.dir}/overview-summary.html">
-        <xsl:apply-templates select="." mode="overview.packages"/>
-    </redirect:write>
-
-    <!-- create the all-packages.html at the root -->
-    <redirect:write file="{$output.dir}/overview-frame.html">
-        <xsl:apply-templates select="." mode="all.packages"/>
-    </redirect:write>
-
-    <!-- create the all-classes.html at the root -->
-    <redirect:write file="{$output.dir}/allclasses-frame.html">
-        <xsl:apply-templates select="." mode="all.classes"/>
-    </redirect:write>
-
-    <!-- process all packages -->
-    <xsl:for-each select="./class[not(./@package = preceding-sibling::class/@package)]">
-        <xsl:call-template name="package">
-            <xsl:with-param name="name" select="@package"/>
-        </xsl:call-template>
-    </xsl:for-each>
-</xsl:template>
-
-
-<xsl:template name="package">
-    <xsl:param name="name"/>
-    <xsl:variable name="package.dir">
-        <xsl:if test="not($name = '')"><xsl:value-of select="translate($name,'.','/')"/></xsl:if>
-        <xsl:if test="$name = ''">.</xsl:if>
-    </xsl:variable>
-    <!--Processing package <xsl:value-of select="@name"/> in <xsl:value-of select="$output.dir"/> -->
-    <!-- create a classes-list.html in the package directory -->
-    <redirect:write file="{$output.dir}/{$package.dir}/package-frame.html">
-        <xsl:call-template name="classes.list">
-            <xsl:with-param name="name" select="$name"/>
-        </xsl:call-template>
-    </redirect:write>
-
-    <!-- create a package-summary.html in the package directory -->
-    <redirect:write file="{$output.dir}/{$package.dir}/package-summary.html">
-        <xsl:call-template name="package.summary">
-            <xsl:with-param name="name" select="$name"/>
-        </xsl:call-template>
-    </redirect:write>
-
-    <!-- for each class, creates a @name.html -->
-    <!-- @bug there will be a problem with inner classes having the same name, it will be overwritten -->
-    <xsl:for-each select="/classes/class[@package = $name]">
-        <redirect:write file="{$output.dir}/{$package.dir}/{@name}.html">
-            <xsl:apply-templates select="." mode="class.details"/>
-        </redirect:write>
-    </xsl:for-each>
-</xsl:template>
-
-<xsl:template name="index.html">
-<HTML>
-    <HEAD><TITLE>Audit Results.</TITLE></HEAD>
-    <FRAMESET cols="20%,80%">
-        <FRAMESET rows="30%,70%">
-            <FRAME src="overview-frame.html" name="packageListFrame"/>
-            <FRAME src="allclasses-frame.html" name="classListFrame"/>
-        </FRAMESET>
-        <FRAME src="overview-summary.html" name="classFrame"/>
-    </FRAMESET>
-    <noframes>
-        <H2>Frame Alert</H2>
-        <P>
-        This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
-        </P>
-    </noframes>
-</HTML>
-</xsl:template>
-
-
-<!-- this is the stylesheet css to use for nearly everything -->
-<xsl:template name="stylesheet.css">
-    .bannercell {
-      border: 0px;
-      padding: 0px;
-    }
-    body {
-      margin-left: 10;
-      margin-right: 10;
-      font:normal 80% arial,helvetica,sanserif;
-      background-color:#FFFFFF;
-      color:#000000;
-    }
-    .a td {
-      background: #efefef;
-    }
-    .b td {
-      background: #fff;
-    }
-    th, td {
-      text-align: left;
-      vertical-align: top;
-    }
-    th {
-      font-weight:bold;
-      background: #ccc;
-      color: black;
-    }
-    table, th, td {
-      font-size:100%;
-      border: none
-    }
-    table.log tr td, tr th {
-
-    }
-    h2 {
-      font-weight:bold;
-      font-size:140%;
-      margin-bottom: 5;
-    }
-    h3 {
-      font-size:100%;
-      font-weight:bold;
-      background: #525D76;
-      color: white;
-      text-decoration: none;
-      padding: 5px;
-      margin-right: 2px;
-      margin-left: 2px;
-      margin-bottom: 0;
-    }
-</xsl:template>
-
-
-<!-- print the violations of the class -->
-<xsl:template match="class" mode="class.details">
-    <xsl:variable name="package.name" select="@package"/>
-    <HTML>
-        <HEAD>
-            <xsl:call-template name="create.stylesheet.link">
-                <xsl:with-param name="package.name" select="$package.name"/>
-            </xsl:call-template>
-        </HEAD>
-        <BODY>
-            <xsl:call-template name="pageHeader"/>
-            <H3>Class <xsl:if test="not($package.name = '')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></H3>
-
-            <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
-                <xsl:call-template name="class.audit.header"/>
-                <xsl:apply-templates select="." mode="print.audit"/>
-            </table>
-
-            <H3>Violations</H3>
-            <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
-                <xsl:call-template name="violation.audit.header"/>
-                <xsl:apply-templates select="./violation" mode="print.audit">
-                    <xsl:sort data-type="number" select="@line"/>
-                </xsl:apply-templates>
-            </table>
-            <xsl:call-template name="pageFooter"/>
-        </BODY>
-    </HTML>
-</xsl:template>
-
-
-<!-- list of classes in a package -->
-<xsl:template name="classes.list">
-    <xsl:param name="name"/>
-    <HTML>
-        <HEAD>
-            <xsl:call-template name="create.stylesheet.link">
-                <xsl:with-param name="package.name" select="$name"/>
-            </xsl:call-template>
-        </HEAD>
-        <BODY>
-            <table width="100%">
-                <tr>
-                    <td nowrap="nowrap">
-                        <H2><a href="package-summary.html" target="classFrame"><xsl:value-of select="$name"/></a></H2>
-                    </td>
-                </tr>
-            </table>
-
-            <h2>Classes</h2>
-            <TABLE WIDTH="100%">
-                <xsl:apply-templates select="/classes/class[./@package = $name]" mode="classes.list">
-                    <xsl:sort select="@name"/>
-                </xsl:apply-templates>
-            </TABLE>
-        </BODY>
-    </HTML>
-</xsl:template>
-<!-- the class to list -->
-<xsl:template match="class" mode="classes.list">
-    <tr>
-        <td nowrap="nowrap">
-            <!-- @bug naming to fix for inner classes -->
-            <a href="{@name}.html" target="classFrame"><xsl:value-of select="@name"/></a>
-        </td>
-    </tr>
-</xsl:template>
-
-
-<!--
-    Creates an all-classes.html file that contains a link to all package-summary.html
-    on each class.
--->
-<xsl:template match="classes" mode="all.classes">
-    <html>
-        <head>
-            <xsl:call-template name="create.stylesheet.link">
-                <xsl:with-param name="package.name"/>
-            </xsl:call-template>
-        </head>
-        <body>
-            <h2>Classes</h2>
-            <table width="100%">
-                <xsl:apply-templates select=".//class" mode="all.classes">
-                    <xsl:sort select="@name"/>
-                </xsl:apply-templates>
-            </table>
-        </body>
-    </html>
-</xsl:template>
-
-<xsl:template match="class" mode="all.classes">
-    <!-- (ancestor::package)[last()] is buggy in MSXML3 ? -->
-    <xsl:variable name="package.name" select="@package"/>
-    <tr>
-        <td nowrap="nowrap">
-            <a target="classFrame">
-                <xsl:attribute name="href">
-                    <xsl:if test="not($package.name='')">
-                        <xsl:value-of select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text>
-                    </xsl:if><xsl:value-of select="@name"/><xsl:text>.html</xsl:text>
-                </xsl:attribute>
-                <xsl:value-of select="@name"/>
-            </a>
-        </td>
-    </tr>
-</xsl:template>
-
-
-<!--
-    Creates an html file that contains a link to all package-summary.html files on
-    each package existing on testsuites.
-    @bug there will be a problem here, I don't know yet how to handle unnamed package :(
--->
-<xsl:template match="classes" mode="all.packages">
-    <html>
-        <head>
-            <xsl:call-template name="create.stylesheet.link">
-                <xsl:with-param name="package.name"/>
-            </xsl:call-template>
-        </head>
-        <body>
-            <h2><a href="overview-summary.html" target="classFrame">Home</a></h2>
-            <h2>Packages</h2>
-                <table width="100%">
-                    <xsl:apply-templates select="class[not(./@package = preceding-sibling::class/@package)]" mode="all.packages">
-                        <xsl:sort select="@package" order="ascending"/>
-                    </xsl:apply-templates>
-                </table>
-        </body>
-    </html>
-</xsl:template>
-
-<xsl:template match="class" mode="all.packages">
-    <tr>
-        <td nowrap="nowrap">
-            <a href="{translate(@package,'.','/')}/package-summary.html" target="classFrame">
-                <xsl:value-of select="@package"/>
-            </a>
-        </td>
-    </tr>
-</xsl:template>
-
-
-<xsl:template match="classes" mode="overview.packages">
-    <html>
-        <head>
-            <xsl:call-template name="create.stylesheet.link">
-                <xsl:with-param name="package.name"/>
-            </xsl:call-template>
-        </head>
-        <body onload="open('allclasses-frame.html','classListFrame')">
-        <xsl:call-template name="pageHeader"/>
-        <h3>Summary</h3>
-        <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
-        <tr>
-            <th>Audited classes</th>
-            <th>Reported classes</th>
-            <th>Violations</th>
-        </tr>
-        <tr class="a">
-            <td><xsl:value-of select="@audited"/></td>
-            <td><xsl:value-of select="@reported"/></td>
-            <td><xsl:value-of select="@violations"/></td>
-        </tr>
-        </table>
-        <table border="0" width="100%">
-        <tr>
-        <td style="text-align: justify;">
-        Note: Rules checked have originated from style guidelines suggested by the language designers,
-        experience from the Java development community and insite experience. Violations are generally
-        reported with a reference to the <a href="http://java.sun.com/docs/books/jls/second_edition/html/jTOC.doc.html">Java Language Specifications</a> (JLS x.x.x)
-        and Metamata Audit rules (x.x).
-        Please consult these documents for additional information about violations.
-        <p/>
-        Rules checked also enforce adherence to <a href="http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html">Sun Java coding guidelines</a> in use at Jakarta.
-        <p/>
-        One should note that these violations do not necessary underline errors but should be used
-        as an indication for <i>possible</i> errors. As always, use your best judgment and review
-        them carefully, it might save you hours of debugging.
-        </td>
-        </tr>
-        </table>
-
-        <h3>Packages</h3>
-        <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
-            <xsl:call-template name="class.audit.header"/>
-            <xsl:for-each select="class[not(./@package = preceding-sibling::class/@package)]">
-                <xsl:sort select="@package" order="ascending"/>
-                <tr>
-          <xsl:call-template name="alternate-row"/>
-                    <td><a href="{translate(@package,'.','/')}/package-summary.html"><xsl:value-of select="@package"/></a></td>
-                    <td><xsl:value-of select="sum(/classes/class[./@package = current()/@package]/@violations)"/></td>
-                </tr>
-            </xsl:for-each>
-        </table>
-        <xsl:call-template name="pageFooter"/>
-        </body>
-        </html>
-</xsl:template>
-
-
-<xsl:template name="package.summary">
-    <xsl:param name="name"/>
-    <HTML>
-        <HEAD>
-            <xsl:call-template name="create.stylesheet.link">
-                <xsl:with-param name="package.name" select="$name"/>
-            </xsl:call-template>
-        </HEAD>
-        <BODY>
-            <xsl:attribute name="onload">open('package-frame.html','classListFrame')</xsl:attribute>
-            <xsl:call-template name="pageHeader"/>
-            <h3>Package <xsl:value-of select="$name"/></h3>
-
-            <!--table border="0" cellpadding="5" cellspacing="2" width="100%">
-                <xsl:call-template name="class.metrics.header"/>
-                <xsl:apply-templates select="." mode="print.metrics"/>
-            </table-->
-
-            <xsl:if test="count(/classes/class[./@package = $name]) > 0">
-                <H3>Classes</H3>
-                <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
-                    <xsl:call-template name="class.audit.header"/>
-                    <xsl:apply-templates select="/classes/class[./@package = $name]" mode="print.audit">
-                        <xsl:sort select="@name"/>
-                    </xsl:apply-templates>
-                </table>
-            </xsl:if>
-            <xsl:call-template name="pageFooter"/>
-        </BODY>
-    </HTML>
-</xsl:template>
-
-
-<!--
-    transform string like a.b.c to ../../../
-    @param path the path to transform into a descending directory path
--->
-<xsl:template name="path">
-    <xsl:param name="path"/>
-    <xsl:if test="contains($path,'.')">
-        <xsl:text>../</xsl:text>
-        <xsl:call-template name="path">
-            <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'.')"/></xsl:with-param>
-        </xsl:call-template>
-    </xsl:if>
-    <xsl:if test="not(contains($path,'.')) and not($path = '')">
-        <xsl:text>../</xsl:text>
-    </xsl:if>
-</xsl:template>
-
-
-<!-- create the link to the stylesheet based on the package name -->
-<xsl:template name="create.stylesheet.link">
-    <xsl:param name="package.name"/>
-    <LINK REL ="stylesheet" TYPE="text/css" TITLE="Style"><xsl:attribute name="href"><xsl:if test="not($package.name = 'unnamed package')"><xsl:call-template name="path"><xsl:with-param name="path" select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></LINK>
-</xsl:template>
-
-<!-- Page HEADER -->
-<xsl:template name="pageHeader">
-
-  <!-- jakarta logo -->
-  <table border="0" cellpadding="0" cellspacing="0" width="100%">
-  <tr>
-    <td class="bannercell" rowspan="2">
-      <a href="http://jakarta.apache.org/">
-      <img src="http://jakarta.apache.org/images/jakarta-logo.gif" alt="http://jakarta.apache.org" align="left" border="0"/>
-      </a>
-    </td>
-        <td style="text-align:right"><h2>Source Code Audit</h2></td>
-        </tr>
-        <tr>
-        <td style="text-align:right">Designed for use with <a href='http://www.webgain.com/products/quality_analyzer/'>Webgain QA/Metamata Audit</a> and <a href='http://jakarta.apache.org'>Ant</a>.</td>
-        </tr>
-  </table>
-    <hr size="1"/>
-</xsl:template>
-
-<!-- Page HEADER -->
-<xsl:template name="pageFooter">
-</xsl:template>
-
-
-<!-- class header -->
-<xsl:template name="class.audit.header">
-    <tr>
-        <th width="80%">Name</th>
-        <th>Violations</th>
-    </tr>
-</xsl:template>
-
-<!-- method header -->
-<xsl:template name="violation.audit.header">
-    <tr>
-        <th>Line</th>
-        <th>Message</th>
-    </tr>
-</xsl:template>
-
-
-<!-- class information -->
-<xsl:template match="class" mode="print.audit">
-    <tr>
-    <xsl:call-template name="alternate-row"/>
-        <td><a href="{@name}.html"><xsl:value-of select="@name"/></a></td>
-        <td><xsl:apply-templates select="@violations"/></td>
-    </tr>
-</xsl:template>
-
-<xsl:template match="violation" mode="print.audit">
-    <tr>
-    <xsl:call-template name="alternate-row"/>
-        <td><xsl:value-of select="@line"/></td>
-        <td><xsl:apply-templates select="@message"/></td>
-    </tr>
-</xsl:template>
-
-<!-- alternated row style -->
-<xsl:template name="alternate-row">
-<xsl:attribute name="class">
-  <xsl:if test="position() mod 2 = 1">a</xsl:if>
-  <xsl:if test="position() mod 2 = 0">b</xsl:if>
-</xsl:attribute>
-</xsl:template>
-
-</xsl:stylesheet>
-
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/mmetrics-frames.xsl b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/mmetrics-frames.xsl
deleted file mode 100644
index 8b4643a..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/mmetrics-frames.xsl
+++ /dev/null
@@ -1,1026 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:lxslt="http://xml.apache.org/xslt"
-  xmlns:xalan="http://xml.apache.org/xalan"
-  xmlns:redirect="org.apache.xalan.lib.Redirect"
-  exclude-result-prefixes="xalan"
-  extension-element-prefixes="redirect">
-<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
-<xsl:decimal-format decimal-separator="." grouping-separator="," />
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<!--
-  @author Stephane Bailliez <a href="mailto:sbailliez at apache.org"/>
-  -->
-<xsl:param name="output.dir" select="'.'"/>
-
-<!-- default max value for the metrics -->
-<xsl:param name="vg.max" select="10"/>
-<xsl:param name="loc.max" select="1000"/>
-<xsl:param name="dit.max" select="10"/>
-<xsl:param name="noa.max" select="250"/>
-<xsl:param name="nrm.max" select="50"/>
-<xsl:param name="nlm.max" select="250"/>
-<xsl:param name="wmc.max" select="250"/>
-<xsl:param name="rfc.max" select="50"/>
-<xsl:param name="dac.max" select="10"/>
-<xsl:param name="fanout.max" select="10"/>
-<xsl:param name="cbo.max" select="15"/>
-<xsl:param name="lcom.max" select="10"/>
-<xsl:param name="nocl.max" select="10"/>
-
-
-<!-- create a tree fragment to speed up processing -->
-<xsl:variable name="doctree.var">
-  <xsl:element name="classes">
-    <xsl:for-each select=".//class">
-      <xsl:element name="class">
-        <xsl:attribute name="package">
-          <xsl:value-of select="(ancestor::package)[last()]/@name"/>
-        </xsl:attribute>
-        <xsl:copy-of select="@*"/>
-        <xsl:attribute name="name">
-          <xsl:apply-templates select="." mode="class.name"/>
-        </xsl:attribute>
-        <xsl:copy-of select="method"/>
-      </xsl:element>
-    </xsl:for-each>
-  </xsl:element>
-</xsl:variable>
-
-<xsl:variable name="doctree" select="xalan:nodeset($doctree.var)"/>
-
-<xsl:template match="metrics">
-
-  <!-- create the index.html -->
-  <redirect:write file="{$output.dir}/index.html">
-    <xsl:call-template name="index.html"/>
-  </redirect:write>
-
-  <!-- create the stylesheet.css -->
-  <redirect:write file="{$output.dir}/stylesheet.css">
-    <xsl:call-template name="stylesheet.css"/>
-  </redirect:write>
-
-  <redirect:write file="{$output.dir}/metrics-reference.html">
-    <xsl:call-template name="metrics-reference.html"/>
-  </redirect:write>
-
-  <!-- create the overview-packages.html at the root -->
-  <redirect:write file="{$output.dir}/overview-summary.html">
-    <xsl:apply-templates select="." mode="overview.packages"/>
-  </redirect:write>
-
-  <!-- create the all-packages.html at the root -->
-  <redirect:write file="{$output.dir}/overview-frame.html">
-    <xsl:apply-templates select="." mode="all.packages"/>
-  </redirect:write>
-
-  <!-- create the all-classes.html at the root -->
-  <redirect:write file="{$output.dir}/allclasses-frame.html">
-    <xsl:apply-templates select="." mode="all.classes"/>
-  </redirect:write>
-
-  <!-- process all packages -->
-  <xsl:apply-templates select=".//package"/>
-</xsl:template>
-
-
-<xsl:template match="package">
-  <xsl:variable name="package.name" select="@name"/>
-  <xsl:variable name="package.dir">
-    <xsl:if test="not($package.name = 'unnamed package')"><xsl:value-of select="translate($package.name,'.','/')"/></xsl:if>
-    <xsl:if test="$package.name = 'unnamed package'">.</xsl:if>
-  </xsl:variable>
-  <!-- create a classes-list.html in the package directory -->
-  <redirect:write file="{$output.dir}/{$package.dir}/package-frame.html">
-    <xsl:apply-templates select="." mode="classes.list"/>
-  </redirect:write>
-
-  <!-- create a package-summary.html in the package directory -->
-  <redirect:write file="{$output.dir}/{$package.dir}/package-summary.html">
-    <xsl:apply-templates select="." mode="package.summary"/>
-  </redirect:write>
-
-  <!-- for each class, creates a @name.html -->
-  <!-- @bug there will be a problem with inner classes having the same name, it will be overwritten -->
-  <xsl:for-each select="$doctree/classes/class[@package = current()/@name]">
-      <!--Processing <xsl:value-of select="$class.name"/><xsl:text>
</xsl:text> -->
-    <redirect:write file="{$output.dir}/{$package.dir}/{@name}.html">
-      <xsl:apply-templates select="." mode="class.details"/>
-    </redirect:write>
-  </xsl:for-each>
-</xsl:template>
-
-<!-- little trick to compute the classname for inner and non inner classes -->
-<!-- this is all in one line to avoid CRLF in the name -->
-<xsl:template match="class" mode="class.name">
-    <xsl:if test="parent::class"><xsl:apply-templates select="parent::class" mode="class.name"/>.<xsl:value-of select="@name"/></xsl:if><xsl:if test="not(parent::class)"><xsl:value-of select="@name"/></xsl:if>
-</xsl:template>
-
-
-<xsl:template name="index.html">
-<HTML>
-  <HEAD><TITLE>Metrics Results.</TITLE></HEAD>
-  <FRAMESET cols="20%,80%">
-    <FRAMESET rows="30%,70%">
-      <FRAME src="overview-frame.html" name="packageListFrame"/>
-      <FRAME src="allclasses-frame.html" name="classListFrame"/>
-    </FRAMESET>
-    <FRAME src="overview-summary.html" name="classFrame"/>
-  </FRAMESET>
-  <noframes>
-    <H2>Frame Alert</H2>
-    <P>
-    This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
-    </P>
-  </noframes>
-</HTML>
-</xsl:template>
-
-<!-- this is the stylesheet css to use for nearly everything -->
-<xsl:template name="metrics-reference.html">
-<html>
-<head>
-<link title="Style" type="text/css" rel="stylesheet" href="stylesheet.css"/>
-</head>
-<body style="text-align:justify;">
-<h2>Metrics Reference</h2>
-<a href="#V(G)">V(G)</a> |
-<a href="#LOC">LOC</a> |
-<a href="#DIT">DIT</a> |
-<a href="#NOA">NOA</a> |
-<a href="#NRM">NRM</a> |
-<a href="#NLM">NLM</a> |
-<a href="#WMC">WMC</a> |
-<a href="#RFC">RFC</a> |
-<a href="#DAC">DAC</a> |
-<a href="#FANOUT">FANOUT</a> |
-<a href="#CBO">CBO</a> |
-<a href="#LCOM">LCOM</a> |
-<a href="#NOC">NOC</a>
-
-<a name="V(G)"/>
-<h3>Cyclomatic Complexity - V(G)</h3>
-This metric was introduced in the 1970s to measure the amount of control
-flow complexity or branching complexity in a module such as a
-subroutine. It gives the number of paths that may be taken through the
-code, and was initially developed to give some measure of the cost of
-producing a test case for the module by executing each path.
-<p/>
-Methods with a high cyclomatic complexity tend to be more difficult to
-understand and maintain. In general the more complex the methods of an
-application, the more difficult it will be to test it, and this will adversely
-affect its reliability.
-<p/>
-V(G) is a measure of the control flow complexity of a method or
-constructor.  It counts the number of branches in the body of the method,
-defined as:
-<ul>
-<li>while statements;</li>
-<li>if statements;</li>
-<li>for statements.</li>
-</ul>
-
-The metric can also be configured to count each case of a switch
-statement as well.
-
-<a name="LOC"/>
-<h3>Lines of Code - LOC</h3>
-
-This is perhaps the simplest of all the metrics to define and compute.
-Counting lines has a long history as a software metric dating from before
-the rise of structured programming, and it is still in widespread use today.
-The size of a method affects the ease with which it can be understood, its
-reusability and its maintainability. There are a variety of ways that the size
-can be calculated. These include counting all the lines of code, the number
-of statements, the blank lines of code, the lines of commentary, and the
-lines consisting only of syntax such as block delimiters.
-<p/>
-This metric can also be used for sizing other constructs as well, for
-example, the overall size of a Java class or package can be measured by
-counting the number of source lines it consists of.
-<p/>
-LOC can be used to determine the size of a compilation unit (source file),
-class or interface, method, constructor, or field.  It can be configured to
-ignore:
-<ul>
-<li>blank lines;</li>
-<li>lines consisting only of comments;</li>
-<li>lines consisting only of opening and closing braces.</li>
-</ul>
-
-<a name="DIT"/>
-<h3>Depth of Inheritance Hierarchy - DIT</h3>
-
-This metric calculates how far down the inheritance hierarchy a class is
-declared. In Java all classes have java.lang.Object as their ultimate
-superclass, which is defined to have a depth of 1. So a class that
-immediately extends java.lang.Object has a metric value of 2; any of its
-subclasses will have a value of 3, and so on.
-<p/>
-A class that is deep within the tree inherits more methods and state
-variables, thereby increasing its complexity and making it difficult to
-predict its behavior. It can be harder to understand a system with many
-inheritance layers.
-<p/>
-DIT is defined for classes and interfaces:
-<ul>
-<li>all interface types have a depth of 1;</li>
-<li>the class java.lang.Object has a depth of 1;</li>
-<li>all other classes have a depth of 1 + the depth of their super class.</li>
-</ul>
-
-<a name="NOA"/>
-<h3>Number of Attributes - NOA</h3>
-
-The number of distinct state variables in a class serves as one measure of
-its complexity. The more state a class represents the more difficult it is to
-maintain invariants for it. It also hinders comprehensibility and reuse.
-<p/>
-In Java, state can be exposed to subclasses through protected fields, which
-entails that the subclass also be aware of and maintain any invariants. This
-interference with the class's data encapsulation can be a source of defects
-and hidden dependencies between the state variables.
-<p/>
-NOA is defined for classes and interfaces.  It counts the number of fields
-declared in the class or interface.
-
-<a name="NRM"/>
-<h3>Number of Remote Methods - NRM</h3>
-
-NRM is defined for classes.  A remote method call is defined as an
-invocation of a method that is not declared in any of:
-<ul>
-<li>the class itself;</li>
-<li>a class or interface that the class extends or implements;</li>
-<li>a class or method that extends the class.</li>
-</ul>
-
-The value is the count of all the remote method calls in all of the methods
-and constructors of the class.
-
-<a name="NLM"/>
-<h3>Number of Local Methods - NLM</h3>
-
-NLM is defined for classes and interfaces.  A local method is defined as a
-method that is declared in the class or interface. NLM can be configured to
-include the local methods of all of the class's superclasses.  Methods with
-public, protected, package and private visibility can be independently
-counted by setting configuration parameters.
-
-<a name="WMC"/>
-<h3>Weighted Methods per Class - WMC</h3>
-
-If the number of methods in a class can be determined during the design
-and modeling phase of a project, it can be used as a predictor of how
-much time and effort is needed to develop, debug and maintain it. This
-metric can be further refined by incorporating a weighting for the
-complexity of each method. The usual weighting is given by the cyclomatic
-complexity of the method.
-<p/>
-The subclasses of a class inherit all of its public and protected methods,
-and possibly its package methods as well, so the number of methods a
-class has directly impacts the complexity of its subclasses. Classes with
-large numbers of methods are often specific to a particular application,
-reducing the ability to reuse them.
-<p/>
-The definition of WMC is based upon NLM, and it provides the same
-configuration parameters for counting inherited methods and of varying
-visibility. The main difference is that NLM always counts each method as 1,
-whereas WMC will weight each method. There are two weighting schemes:
-<ul>
-<li>V(G) the cyclomatic complexity of the method is used as its weight.
-   Methods from class files are given a V(G) of 1.</li>
-<li>the arity, or the number of parameters of the method are used to
-   determine the weight.</li>
-</ul>
-
-<a name="RFC"/>
-<h3>Response For Class - RFC</h3>
-
-The response set of a class is the set of all methods that can be invoked as
-a result of a message sent to an object of the class. This includes methods
-in the class's inheritance hierarchy and methods that can be invoked on
-other objects. The Response For Class metric is defined to be size of the
-response set for the class. A class which provides a larger response set is
-considered to be more complex than one with a smaller response set.
-<p/>
-One reason for this is that if a method call on a class can result in a large
-number of different method calls on the target and other classes, then it
-can be harder to test the behavior of the class and debug problems. It will
-typically require a deeper understanding of the potential interactions that
-objects of the class can have with the rest of the system.
-<p/>
-RFC is defined as the sum of NLM and NRM for the class.  The local methods
-include all of the public, protected, package and private methods, but not
-methods declared only in a superclass.
-
-<a name="DAC"/>
-<h3>Data Abstraction Coupling - DAC</h3>
-
-DAC is defined for classes and interfaces.  It counts the number of reference
-types that are used in the field declarations of the class or interface.  The
-component types of arrays are also counted.  Any field with a type that is
-either a supertype or a subtype of the class is not counted.
-
-<a name="FANOUT"/>
-<h3>Fan Out - FANOUT</h3>
-
-FANOUT is defined for classes and interfaces, constructors and methods. It
-counts the number of reference types that are used in:
-<ul>
-<li>field declarations;</li>
-<li>formal parameters and return types;</li>
-<li>throws declarations;</li>
-<li>local variables.</li>
-</ul>
-
-The component types of arrays are also counted. Any type that is either a
-supertype or a subtype of the class is not counted.
-
-<a name="CBO"/>
-<h3>Coupling Between Objects - CBO</h3>
-
-When one object or class uses another object or class they are said to be
-coupled. One major source of coupling is that between a superclass and a
-subclass. A coupling is also introduced when a method or field in another
-class is accessed, or when an object of another class is passed into or out
-of a method invocation. Coupling Between Objects is a measure of the
-non-inheritance coupling between two objects.
-<p/>
-A high value of coupling reduces the modularity of the class and makes
-reuse more difficult. The more independent a class is the more likely it is
-that it will be possible to reuse it in another part of the system. When a
-class is coupled to another class it becomes sensitive to changes in that
-class, thereby making maintenance for difficult. In addition, a class that is
-overly dependent on other classes can be difficult to understand and test in
-isolation.
-<p/>
-CBO is defined for classes and interfaces, constructors and methods. It
-counts the number of reference types that are used in:
-<ul>
-<li>field declarations</li>
-<li>formal parameters and return types</li>
-<li>throws declarations</li>
-<li>local variables</li>
-</ul>
-
-It also counts:
-<ul>
-<li>types from which field and method selections are made</li>
-</ul>
-
-The component types of arrays are also counted. Any type that is either a
-supertype or a subtype of the class is not counted.
-
-<a name="LCOM"/>
-<h3>Lack of Cohesion Of Methods - LCOM</h3>
-
-The cohesion of a class is the degree to which its methods are related to
-each other. It is determined by examining the pattern of state variable
-accesses within the set of methods. If all the methods access the same state
-variables then they have high cohesion; if they access disjoint sets of
-variables then the cohesion is low. An extreme example of low cohesion
-would be if none of the methods accessed any of the state variables.
-
-If a class exhibits low method cohesion it indicates that the design of the
-class has probably been partitioned incorrectly, and could benefit by being
-split into more classes with individually higher cohesion. On the other
-hand, a high value of cohesion (a low lack of cohesion) implies that the
-class is well designed. A cohesive class will tend to provide a high degree
-of encapsulation, whereas a lack of cohesion decreases encapsulation and
-increases complexity.
-<p/>
-Another form of cohesion that is useful for Java programs is cohesion
-between nested and enclosing classes. A nested class that has very low
-cohesion with its enclosing class would probably better designed as a peer
-class rather than a nested class.
-<p/>
-LCOM is defined for classes. Operationally, LCOM takes each pair of
-methods in the class and determines the set of fields they each access. If
-they have disjoint sets of field accesses increase the count P by one. If they
-share at least one field access then increase Q by one. After considering
-each pair of methods,
-LCOM = (P > Q) ? (P - Q) : 0
-<p/>
-Indirect access to fields via local methods can be considered by setting a
-metric configuration parameter.
-
-<a name="NOC"/>
-<h3>Number Of Classes - NOC</h3>
-
-The overall size of the system can be estimated by calculating the number
-of classes it contains. A large system with more classes is more complex
-than a smaller one because the number of potential interactions between
-objects is higher. This reduces the comprehensibility of the system which
-in turn makes it harder to test, debug and maintain.
-<p/>
-If the number of classes in the system can be projected during the initial
-design phase of the project it can serve as a base for estimating the total
-effort and cost of developing, debugging and maintaining the system.
-<p/>
-The NOC metric can also usefully be applied at the package and class level
-as well as the total system.
-<p/>
-NOCL is defined for class and interfaces. It counts the number of classes or
-interfaces that are declared. This is usually 1, but nested class declarations
-will increase this number.
-</body>
-</html>
-</xsl:template>
-
-<!-- this is the stylesheet css to use for nearly everything -->
-<xsl:template name="stylesheet.css">
-    .bannercell {
-      border: 0px;
-      padding: 0px;
-    }
-    body {
-      margin-left: 10;
-      margin-right: 10;
-      font:normal 80% arial,helvetica,sanserif;
-      background-color:#FFFFFF;
-      color:#000000;
-    }
-    .a td {
-      background: #efefef;
-    }
-    .b td {
-      background: #fff;
-    }
-    th, td {
-      text-align: left;
-      vertical-align: top;
-    }
-    th {
-      font-weight:bold;
-      background: #ccc;
-      color: black;
-    }
-    table, th, td {
-      font-size:100%;
-      border: none
-    }
-    table.log tr td, tr th {
-
-    }
-    h2 {
-      font-weight:bold;
-      font-size:140%;
-      margin-bottom: 5;
-    }
-    h3 {
-      font-size:100%;
-      font-weight:bold;
-      background: #525D76;
-      color: white;
-      text-decoration: none;
-      padding: 5px;
-      margin-right: 2px;
-      margin-left: 2px;
-      margin-bottom: 0;
-    }
-    .Error {
-      font-weight:bold; color:red;
-    }
-
-</xsl:template>
-
-<!-- print the metrics of the class -->
-<xsl:template match="class" mode="class.details">
-  <!--xsl:variable name="package.name" select="(ancestor::package)[last()]/@name"/-->
-  <xsl:variable name="package.name" select="@package"/>
-  <HTML>
-    <HEAD>
-      <xsl:call-template name="create.stylesheet.link">
-        <xsl:with-param name="package.name" select="$package.name"/>
-      </xsl:call-template>
-    </HEAD>
-    <BODY>
-      <xsl:call-template name="pageHeader"/>
-
-      <H3>Class <xsl:if test="not($package.name = 'unnamed package')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></H3>
-      <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
-        <xsl:call-template name="all.metrics.header"/>
-        <xsl:apply-templates select="." mode="print.metrics"/>
-      </table>
-
-      <H3>Methods</H3>
-      <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
-        <xsl:call-template name="method.metrics.header"/>
-        <xsl:apply-templates select="method" mode="print.metrics"/>
-      </table>
-
-      <xsl:call-template name="pageFooter"/>
-    </BODY>
-  </HTML>
-</xsl:template>
-
-
-<!-- list of classes in a package -->
-<xsl:template match="package" mode="classes.list">
-  <HTML>
-    <HEAD>
-      <xsl:call-template name="create.stylesheet.link">
-        <xsl:with-param name="package.name" select="@name"/>
-      </xsl:call-template>
-    </HEAD>
-    <BODY>
-      <table width="100%">
-        <tr>
-          <td nowrap="nowrap">
-            <H2><a href="package-summary.html" target="classFrame"><xsl:value-of select="@name"/></a></H2>
-          </td>
-        </tr>
-      </table>
-
-      <H2>Classes</H2>
-      <TABLE WIDTH="100%">
-        <!-- xalan-nodeset:nodeset for Xalan 1.2.2 -->
-            <xsl:for-each select="$doctree/classes/class[@package = current()/@name]">
-                <xsl:sort select="@name"/>
-          <tr>
-            <td nowrap="nowrap">
-              <a href="{@name}.html" target="classFrame"><xsl:value-of select="@name"/></a>
-            </td>
-          </tr>
-            </xsl:for-each>
-      </TABLE>
-    </BODY>
-  </HTML>
-</xsl:template>
-
-
-<!--
-  Creates an all-classes.html file that contains a link to all package-summary.html
-  on each class.
--->
-<xsl:template match="metrics" mode="all.classes">
-  <html>
-    <head>
-      <xsl:call-template name="create.stylesheet.link">
-        <xsl:with-param name="package.name" select="''"/>
-      </xsl:call-template>
-    </head>
-    <body>
-      <h2>Classes</h2>
-      <table width="100%">
-          <xsl:for-each select="$doctree/classes/class">
-              <xsl:sort select="@name"/>
-              <xsl:apply-templates select="." mode="all.classes"/>
-          </xsl:for-each>
-      </table>
-    </body>
-  </html>
-</xsl:template>
-
-<xsl:template match="class" mode="all.classes">
-    <xsl:variable name="package.name" select="@package"/>
-    <xsl:variable name="class.name" select="@name"/>
-  <tr>
-    <td nowrap="nowrap">
-      <a target="classFrame">
-        <xsl:attribute name="href">
-          <xsl:if test="not($package.name='unnamed package')">
-            <xsl:value-of select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text>
-          </xsl:if>
-          <xsl:value-of select="$class.name"/><xsl:text>.html</xsl:text>
-        </xsl:attribute>
-        <xsl:value-of select="$class.name"/>
-      </a>
-    </td>
-  </tr>
-</xsl:template>
-
-<!--
-  Creates an html file that contains a link to all package-summary.html files on
-  each package existing on testsuites.
-  @bug there will be a problem here, I don't know yet how to handle unnamed package :(
--->
-<xsl:template match="metrics" mode="all.packages">
-  <html>
-    <head>
-      <xsl:call-template name="create.stylesheet.link">
-        <xsl:with-param name="package.name" select="./package/@name"/>
-      </xsl:call-template>
-    </head>
-    <body>
-      <h2><a href="overview-summary.html" target="classFrame">Home</a></h2>
-      <h2>Packages</h2>
-        <table width="100%">
-          <xsl:apply-templates select=".//package[not(./@name = 'unnamed package')]" mode="all.packages">
-            <xsl:sort select="@name"/>
-          </xsl:apply-templates>
-        </table>
-    </body>
-  </html>
-</xsl:template>
-
-<xsl:template match="package" mode="all.packages">
-  <tr>
-    <td nowrap="nowrap">
-      <a href="{translate(@name,'.','/')}/package-summary.html" target="classFrame">
-        <xsl:value-of select="@name"/>
-      </a>
-    </td>
-  </tr>
-</xsl:template>
-
-
-<xsl:template match="metrics" mode="overview.packages">
-  <html>
-    <head>
-      <xsl:call-template name="create.stylesheet.link">
-        <xsl:with-param name="package.name" select="''"/>
-      </xsl:call-template>
-    </head>
-    <body onload="open('allclasses-frame.html','classListFrame')">
-    <xsl:call-template name="pageHeader"/>
-    <h3>Summary</h3>
-    <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
-    <tr>
-      <th><a href="metrics-reference.html#V(G)">V(G)</a></th>
-      <th><a href="metrics-reference.html#LOC">LOC</a></th>
-      <th><a href="metrics-reference.html#DIT">DIT</a></th>
-      <th><a href="metrics-reference.html#NOA">NOA</a></th>
-      <th><a href="metrics-reference.html#NRM">NRM</a></th>
-      <th><a href="metrics-reference.html#NLM">NLM</a></th>
-      <th><a href="metrics-reference.html#WMC">WMC</a></th>
-      <th><a href="metrics-reference.html#RFC">RFC</a></th>
-      <th><a href="metrics-reference.html#DAC">DAC</a></th>
-      <th><a href="metrics-reference.html#FANOUT">FANOUT</a></th>
-      <th><a href="metrics-reference.html#CBO">CBO</a></th>
-      <th><a href="metrics-reference.html#LCOM">LCOM</a></th>
-      <th><a href="metrics-reference.html#NOCL">NOCL</a></th>
-    </tr>
-    <xsl:apply-templates select="." mode="print.metrics"/>
-    </table>
-    <table border="0" width="100%">
-    <tr>
-    <td style="text-align: justify;">
-    Note: Metrics evaluate the quality of software by analyzing the program source and quantifying
-    various kind of complexity. Complexity is a common source of problems and defects in software.
-    High complexity makes it more difficult to develop, understand, maintain, extend, test and debug
-    a program.
-    <p/>
-    The primary use of metrics is to focus your attention on those parts of code that potentially are
-    complexity hot spots. Once the complex areas your program have been uncovered, you can take remedial
-    actions.
-    For additional information about metrics and their meaning, please consult
-    Metamata Metrics manual.
-    </td>
-    </tr>
-    </table>
-
-    <h3>Packages</h3>
-    <table border="0" cellpadding="5" cellspacing="2" width="100%">
-      <xsl:call-template name="all.metrics.header"/>
-      <xsl:for-each select=".//package[not(@name = 'unnamed package')]">
-        <xsl:sort select="@name" order="ascending"/>
-        <xsl:apply-templates select="." mode="print.metrics"/>
-      </xsl:for-each>
-    </table>
-    <!-- @bug there could some classes at this level (classes in unnamed package) -->
-    <xsl:call-template name="pageFooter"/>
-    </body>
-    </html>
-</xsl:template>
-
-<xsl:template match="package" mode="package.summary">
-  <HTML>
-    <HEAD>
-      <xsl:call-template name="create.stylesheet.link">
-        <xsl:with-param name="package.name" select="@name"/>
-      </xsl:call-template>
-    </HEAD>
-    <body onload="open('package-frame.html','classListFrame')">
-      <xsl:call-template name="pageHeader"/>
-      <!-- create an anchor to this package name -->
-      <h3>Package <xsl:value-of select="@name"/></h3>
-
-      <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
-        <xsl:call-template name="all.metrics.header"/>
-        <xsl:apply-templates select="." mode="print.metrics"/>
-      </table>
-
-      <table border="0" width="100%">
-      <tr>
-      <td style="text-align: justify;">
-      Note: Metrics evaluate the quality of software by analyzing the program source and quantifying
-      various kind of complexity. Complexity is a common source of problems and defects in software.
-      High complexity makes it more difficult to develop, understand, maintain, extend, test and debug
-      a program.
-      <p/>
-      The primary use of metrics is to focus your attention on those parts of code that potentially are
-      complexity hot spots. Once the complex areas your program have been uncovered, you can take remedial
-      actions.
-      For additional information about metrics and their meaning, please consult
-      Metamata Metrics manual.
-      </td>
-      </tr>
-      </table>
-
-      <xsl:variable name="classes-in-package" select="$doctree/classes/class[@package = current()/@name]"/>
-      <xsl:if test="count($classes-in-package) > 0">
-        <H3>Classes</H3>
-        <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
-          <xsl:call-template name="all.metrics.header"/>
-          <xsl:for-each select="$classes-in-package">
-                <xsl:sort select="@name"/>
-                <xsl:apply-templates select="." mode="print.metrics"/>
-          </xsl:for-each>
-        </table>
-      </xsl:if>
-
-      <xsl:call-template name="pageFooter"/>
-    </body>
-  </HTML>
-</xsl:template>
-
-
-<!--
-    transform string like a.b.c to ../../../
-    @param path the path to transform into a descending directory path
--->
-<xsl:template name="path">
-  <xsl:param name="path"/>
-  <xsl:if test="contains($path,'.')">
-    <xsl:text>../</xsl:text>
-    <xsl:call-template name="path">
-      <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'.')"/></xsl:with-param>
-    </xsl:call-template>
-  </xsl:if>
-  <xsl:if test="not(contains($path,'.')) and not($path = '')">
-    <xsl:text>../</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-
-<!-- create the link to the stylesheet based on the package name -->
-<xsl:template name="create.stylesheet.link">
-  <xsl:param name="package.name"/>
-  <LINK REL ="stylesheet" TYPE="text/css" TITLE="Style"><xsl:attribute name="href"><xsl:if test="not($package.name = 'unnamed package')"><xsl:call-template name="path"><xsl:with-param name="path" select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></LINK>
-</xsl:template>
-
-
-<!-- Page Header -->
-<xsl:template name="pageHeader">
-
-  <!-- jakarta logo -->
-  <table border="0" cellpadding="0" cellspacing="0" width="100%">
-  <tr>
-    <td class="bannercell" rowspan="2">
-      <a href="http://jakarta.apache.org/">
-      <img src="http://jakarta.apache.org/images/jakarta-logo.gif" alt="http://jakarta.apache.org" align="left" border="0"/>
-      </a>
-    </td>
-    <td style="text-align:right"><h2>Source Code Metrics</h2></td>
-    </tr>
-    <tr>
-    <td style="text-align:right">Designed for use with <a href='http://www.webgain.com/products/quality_analyzer/'>Webgain QA/Metamata Metrics</a> and <a href='http://jakarta.apache.org'>Ant</a>.</td>
-    </tr>
-  </table>
-  <hr size="1"/>
-</xsl:template>
-
-<!-- Page Footer -->
-<xsl:template name="pageFooter">
-</xsl:template>
-
-<!-- class header -->
-<xsl:template name="all.metrics.header">
-  <tr>
-    <th width="80%">Name</th>
-    <th nowrap="nowrap">V(G)</th>
-    <th>LOC</th>
-    <th>DIT</th>
-    <th>NOA</th>
-    <th>NRM</th>
-    <th>NLM</th>
-    <th>WMC</th>
-    <th>RFC</th>
-    <th>DAC</th>
-    <th>FANOUT</th>
-    <th>CBO</th>
-    <th>LCOM</th>
-    <th>NOCL</th>
-  </tr>
-</xsl:template>
-
-<!-- method header -->
-<xsl:template name="method.metrics.header">
-  <tr>
-    <th width="80%">Name</th>
-    <th nowrap="nowrap">V(G)</th>
-    <th>LOC</th>
-    <th>FANOUT</th>
-    <th>CBO</th>
-  </tr>
-</xsl:template>
-
-<!-- method information -->
-<xsl:template match="method" mode="print.metrics">
-  <tr>
-    <xsl:call-template name="alternate-row"/>
-    <td><xsl:apply-templates select="@name"/></td>
-    <td><xsl:apply-templates select="@vg"/></td>
-    <td><xsl:apply-templates select="@loc"/></td>
-    <td><xsl:apply-templates select="@fanout"/></td>
-    <td><xsl:apply-templates select="@cbo"/></td>
-  </tr>
-</xsl:template>
-
-<!-- class information -->
-<xsl:template match="class" mode="print.metrics">
-  <tr>
-    <xsl:call-template name="alternate-row"/>
-    <td><a href="{@name}.html"><xsl:value-of select="@name"/></a></td>
-    <td><xsl:apply-templates select="@vg"/></td>
-    <td><xsl:apply-templates select="@loc"/></td>
-    <td><xsl:apply-templates select="@dit"/></td>
-    <td><xsl:apply-templates select="@noa"/></td>
-    <td><xsl:apply-templates select="@nrm"/></td>
-    <td><xsl:apply-templates select="@nlm"/></td>
-    <td><xsl:apply-templates select="@wmc"/></td>
-    <td><xsl:apply-templates select="@rfc"/></td>
-    <td><xsl:apply-templates select="@dac"/></td>
-    <td><xsl:apply-templates select="@fanout"/></td>
-    <td><xsl:apply-templates select="@cbo"/></td>
-    <td><xsl:apply-templates select="@lcom"/></td>
-    <td><xsl:apply-templates select="@nocl"/></td>
-  </tr>
-</xsl:template>
-
-<xsl:template match="file|package" mode="print.metrics">
-  <tr>
-    <xsl:call-template name="alternate-row"/>
-    <td>
-    <a href="{translate(@name,'.','/')}/package-summary.html" target="classFrame">
-    <xsl:value-of select="@name"/>
-    </a>
-    </td>
-    <td><xsl:apply-templates select="@vg"/></td>
-    <td><xsl:apply-templates select="@loc"/></td>
-    <td><xsl:apply-templates select="@dit"/></td>
-    <td><xsl:apply-templates select="@noa"/></td>
-    <td><xsl:apply-templates select="@nrm"/></td>
-    <td><xsl:apply-templates select="@nlm"/></td>
-    <td><xsl:apply-templates select="@wmc"/></td>
-    <td><xsl:apply-templates select="@rfc"/></td>
-    <td><xsl:apply-templates select="@dac"/></td>
-    <td><xsl:apply-templates select="@fanout"/></td>
-    <td><xsl:apply-templates select="@cbo"/></td>
-    <td><xsl:apply-templates select="@lcom"/></td>
-    <td><xsl:apply-templates select="@nocl"/></td>
-  </tr>
-</xsl:template>
-
-<xsl:template match="metrics" mode="print.metrics">
-  <tr>
-    <xsl:call-template name="alternate-row"/>
-      <!-- the global metrics is the top package metrics -->
-    <td><xsl:apply-templates select="./package/@vg"/></td>
-    <td><xsl:apply-templates select="./package/@loc"/></td>
-    <td><xsl:apply-templates select="./package/@dit"/></td>
-    <td><xsl:apply-templates select="./package/@noa"/></td>
-    <td><xsl:apply-templates select="./package/@nrm"/></td>
-    <td><xsl:apply-templates select="./package/@nlm"/></td>
-    <td><xsl:apply-templates select="./package/@wmc"/></td>
-    <td><xsl:apply-templates select="./package/@rfc"/></td>
-    <td><xsl:apply-templates select="./package/@dac"/></td>
-    <td><xsl:apply-templates select="./package/@fanout"/></td>
-    <td><xsl:apply-templates select="./package/@cbo"/></td>
-    <td><xsl:apply-templates select="./package/@lcom"/></td>
-    <td><xsl:apply-templates select="./package/@nocl"/></td>
-  </tr>
-</xsl:template>
-
-<!-- alternated row style -->
-<xsl:template name="alternate-row">
-<xsl:attribute name="class">
-  <xsl:if test="position() mod 2 = 1">a</xsl:if>
-  <xsl:if test="position() mod 2 = 0">b</xsl:if>
-</xsl:attribute>
-</xsl:template>
-
-
-<!-- how to display the metrics with their max value -->
-<!-- @todo the max values must be external to the xsl -->
-
-  <xsl:template match="@vg">
-    <xsl:call-template name="display-value">
-      <xsl:with-param name="value" select="current()"/>
-      <xsl:with-param name="max" select="$vg.max"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template match="@loc">
-    <xsl:call-template name="display-value">
-      <xsl:with-param name="value" select="current()"/>
-      <xsl:with-param name="max" select="$loc.max"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template match="@dit">
-    <xsl:call-template name="display-value">
-      <xsl:with-param name="value" select="current()"/>
-      <xsl:with-param name="max" select="$dit.max"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template match="@noa">
-    <xsl:call-template name="display-value">
-      <xsl:with-param name="value" select="current()"/>
-      <xsl:with-param name="max" select="$noa.max"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template match="@nrm">
-    <xsl:call-template name="display-value">
-      <xsl:with-param name="value" select="current()"/>
-      <xsl:with-param name="max" select="$nrm.max"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template match="@nlm">
-    <xsl:call-template name="display-value">
-      <xsl:with-param name="value" select="current()"/>
-      <xsl:with-param name="max" select="$nlm.max"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template match="@wmc">
-    <xsl:call-template name="display-value">
-      <xsl:with-param name="value" select="current()"/>
-      <xsl:with-param name="max" select="$wmc.max"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template match="@rfc">
-    <xsl:call-template name="display-value">
-      <xsl:with-param name="value" select="current()"/>
-      <xsl:with-param name="max" select="$rfc.max"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template match="@dac">
-    <xsl:call-template name="display-value">
-      <xsl:with-param name="value" select="current()"/>
-      <xsl:with-param name="max" select="$dac.max"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template match="@fanout">
-    <xsl:call-template name="display-value">
-      <xsl:with-param name="value" select="current()"/>
-      <xsl:with-param name="max" select="$fanout.max"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template match="@cbo">
-    <xsl:call-template name="display-value">
-      <xsl:with-param name="value" select="current()"/>
-      <xsl:with-param name="max" select="$cbo.max"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template match="@lcom">
-    <xsl:call-template name="display-value">
-      <xsl:with-param name="value" select="current()"/>
-      <xsl:with-param name="max" select="$lcom.max"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template match="@nocl">
-    <xsl:call-template name="display-value">
-      <xsl:with-param name="value" select="current()"/>
-      <xsl:with-param name="max" select="$nocl.max"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template name="display-value">
-    <xsl:param name="value"/>
-    <xsl:param name="max"/>
-    <xsl:if test="$value > $max">
-      <xsl:attribute name="class">Error</xsl:attribute>
-    </xsl:if>
-    <xsl:value-of select="$value"/>
-  </xsl:template>
-
-</xsl:stylesheet>
-
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/tagdiff.xsl b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/tagdiff.xsl
deleted file mode 100644
index 5d430a7..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/tagdiff.xsl
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<!-- a stylesheet to display changelogs ala netbeans -->
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0">
-  <xsl:param name="title"/>
-  <xsl:param name="module"/>
-  <xsl:param name="cvsweb"/>
-
-  <xsl:output method="html" indent="yes"/>
-
-  <!-- Copy standard document elements.  Elements that
-       should be ignored must be filtered by apply-templates
-       tags. -->
-  <xsl:template match="*">
-    <xsl:copy>
-      <xsl:copy-of select="attribute::*[. != '']"/>
-      <xsl:apply-templates/>
-    </xsl:copy>
-  </xsl:template>
-
-  <xsl:template match="tagdiff">
-    <html>
-      <head>
-        <title><xsl:value-of select="$title"/></title>
-        <style type="text/css">
-          body, p {
-          font-family: verdana,arial,helvetica;
-          font-size: 80%;
-          color:#000000;
-          }
-	  .dateAndAuthor {
-          font-family: verdana,arial,helvetica;
-          font-size: 80%;
-          font-weight: bold;
-          text-align:left;
-          background:#a6caf0;
-	  }
-          tr, td{
-          font-family: verdana,arial,helvetica;
-          font-size: 80%;
-          background:#eeeee0;
-          }	  
-	  </style> 
-      </head>
-      <body link="#000000" alink="#000000" vlink="#000000" text="#000000">       
-          <h1>
-            <a name="top"><xsl:value-of select="$title"/></a>
-          </h1>
-          Tagdiff between <xsl:value-of select="@startTag"/> <xsl:value-of select="@startDate"/> and
-			<xsl:value-of select="@endTag"/> <xsl:value-of select="@endDate"/>
-          <p align="right">Designed for use with <a href="http://ant.apache.org/">Ant</a>.</p>
-          <hr size="2"/>
-	<a name="TOP"/>
-	<table width="100%">
-		<tr>
-			<td align="right">
-				<a href="#New">New Files</a> |
-				<a href="#Modified">Modified Files</a> |
-				<a href="#Removed">Removed Files</a>
-			</td>
-		</tr>
-	</table>
-        <table border="0" width="100%" cellpadding="3" cellspacing="1">
-		<xsl:call-template name="show-entries">
-			<xsl:with-param name="title">New Files</xsl:with-param>
-			<xsl:with-param name="anchor">New</xsl:with-param>
-			<xsl:with-param name="entries" select=".//entry[file/revision][not(file/prevrevision)]"/>
-		</xsl:call-template>
-
-		<xsl:call-template name="show-entries">
-			<xsl:with-param name="title">Modified Files</xsl:with-param>
-			<xsl:with-param name="anchor">Modified</xsl:with-param>
-			<xsl:with-param name="entries" select=".//entry[file/revision][file/prevrevision]"/>
-		</xsl:call-template>
-
-		<!-- change to entries select to address bug #36827 -->
-		<xsl:call-template name="show-entries">
-			<xsl:with-param name="title">Removed Files</xsl:with-param>
-			<xsl:with-param name="anchor">Removed</xsl:with-param>
-			<xsl:with-param name="entries" select=".//entry[not(file/revision)][file/prevrevision]"/>
-		</xsl:call-template>
-        </table>
-        
-      </body>
-    </html>
-  </xsl:template>
-
-  <xsl:template name="show-entries">
-	<xsl:param name="title"/>
-	<xsl:param name="anchor"/>
-	<xsl:param name="entries"/>
-	<tr>
-		<td colspan="2" class="dateAndAuthor">
-			<a>
-				<xsl:attribute name="name"><xsl:value-of select="$anchor"/></xsl:attribute>
-				<xsl:value-of select="$title"/> - <xsl:value-of select="count($entries)"/> entries
-			</a>
-			<a href="#TOP">(back to top)</a>
-		</td>
-	</tr>
-	<tr>
-		<td width="20">
-			<xsl:text>    </xsl:text>
-		</td>
-		<td>
-		        <ul>
-				<xsl:apply-templates select="$entries"/>
-			</ul>
-		</td>
-	</tr>
-  </xsl:template>  
-
-  <xsl:template match="entry">
-	<xsl:apply-templates select="file"/>
-  </xsl:template>
-
-  <xsl:template match="date">
-    <i><xsl:value-of select="."/></i>
-  </xsl:template>
-
-  <xsl:template match="time">
-    <i><xsl:value-of select="."/></i>
-  </xsl:template>
-
-  <xsl:template match="author">
-    <i>
-      <a>
-        <xsl:attribute name="href">mailto:<xsl:value-of select="."/></xsl:attribute>
-        <xsl:value-of select="."/>
-      </a>
-    </i>
-  </xsl:template>
-
-  <xsl:template match="file">
-    <li>
-      <a target="_new">
-        <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" /></xsl:attribute>
-        <xsl:value-of select="name" />
-      </a>
-      <xsl:if test="string-length(prevrevision) > 0 or string-length(revision) > 0">
-      <xsl:text> </xsl:text>
-      <a target="_new">
-        <xsl:choose>
-          <xsl:when test="string-length(prevrevision) = 0 ">
-            <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?rev=<xsl:value-of select="revision" />&content-type=text/x-cvsweb-markup</xsl:attribute>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?r1=<xsl:value-of select="revision" />&r2=<xsl:value-of select="prevrevision"/>&diff_format=h</xsl:attribute>
-          </xsl:otherwise>
-        </xsl:choose> (<xsl:if test="count(prevrevision) > 0"> <xsl:value-of select="prevrevision"/> --> </xsl:if> <xsl:value-of select="revision"/>)
-      </a>
-      </xsl:if>
-    </li>
-  </xsl:template>
-
-  <!-- Any elements within a msg are processed,
-       so that we can preserve HTML tags. -->
-  <xsl:template match="msg">
-    <b><xsl:apply-templates/></b>
-  </xsl:template>
-  
-</xsl:stylesheet>
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/plugin.properties b/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/plugin.properties
deleted file mode 100644
index 658714d..0000000
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName = Apache Ant
-providerName = Eclipse Orbit
diff --git a/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/META-INF/ECLIPSEF.RSA b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/META-INF/ECLIPSEF.RSA
new file mode 100644
index 0000000..b9fa242
Binary files /dev/null and b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/META-INF/ECLIPSEF.RSA differ
diff --git a/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/META-INF/ECLIPSEF.SF b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/META-INF/ECLIPSEF.SF
new file mode 100644
index 0000000..2cef7a9
--- /dev/null
+++ b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/META-INF/ECLIPSEF.SF
@@ -0,0 +1,143 @@
+Signature-Version: 1.0
+SHA1-Digest-Manifest: 5qcdbN+Zu4xlonmZNbpSRAcSWgc=
+Created-By: 1.6.0 (IBM Corporation)
+SHA1-Digest-Manifest-Main-Attributes: XvqHfuBjHWjSfOONdfd9/8zjfQo=
+
+Name: lib/ant-jmf.jar
+SHA1-Digest: UbcW+ksShEmXIUcQa5S95dvKVRI=
+
+Name: lib/ant-apache-bcel.jar
+SHA1-Digest: tbJ3kPD68JXpKAq9ylYx+VO+YzM=
+
+Name: etc/mmetrics-frames.xsl
+SHA1-Digest: uY7jITIeh5zWGHqitcCH+BXFi9Y=
+
+Name: about_files/SAX-LICENSE.html
+SHA1-Digest: wfcxz3PMKKjNrpG0aXSbqRs/EEk=
+
+Name: etc/tagdiff.xsl
+SHA1-Digest: SRM+krXj9faGqiSbtW4EoDiwb+s=
+
+Name: OSGI-INF/l10n/bundle.properties
+SHA1-Digest: SbtnFwBsTocONv+0XWtS0Aui4aY=
+
+Name: lib/ant-apache-oro.jar
+SHA1-Digest: RNKQUg3NrX2kiZjPlPMV1GKqGTg=
+
+Name: lib/ant.jar
+SHA1-Digest: CuF+Gzo/CDpbCM/xIH4L33hFSp4=
+
+Name: lib/ant-jsch.jar
+SHA1-Digest: Sorqzp+yadcU0UJRFGMhISVAVe8=
+
+Name: about_files/ASL-LICENSE-2.0.txt
+SHA1-Digest: rwxLKF3abAAfm7UMkgtQnA9n+jU=
+
+Name: lib/ant-netrexx.jar
+SHA1-Digest: UtFq/iGc2VswtDMm7fOSQQAuY38=
+
+Name: plugin.properties
+SHA1-Digest: lAjq1ZqcPElR/8nFFtA+YyHitzo=
+
+Name: lib/ant-jai.jar
+SHA1-Digest: ZzCI28+CBQaJpD/T3yFPFFBeIVs=
+
+Name: lib/ant-jdepend.jar
+SHA1-Digest: 1/3ekAGQZrH3QNgCBbuTFVnX+lM=
+
+Name: lib/ant-apache-bsf.jar
+SHA1-Digest: fVbNlVOwMi79QcKWJUev9lD5OUc=
+
+Name: etc/coverage-frames.xsl
+SHA1-Digest: Gm3habNRgdpkq7h0e54JskKlyLs=
+
+Name: about_files/LICENSE
+SHA1-Digest: WURQbjdp+UeDnBBRMfdLZPsudhw=
+
+Name: lib/ant-apache-log4j.jar
+SHA1-Digest: b3E7Alczb5eoUnIjEoC1jMn0fB4=
+
+Name: lib/ant-apache-resolver.jar
+SHA1-Digest: DyLHejoMfGuYn8sTAwndGdzU6Cc=
+
+Name: etc/checkstyle/checkstyle-frames.xsl
+SHA1-Digest: E90g3bhhw2/jxZu2OKjjT0CCGE8=
+
+Name: about_files/NOTICE
+SHA1-Digest: Gx0bQjD9abtB8UfkZy/EG2p6jmk=
+
+Name: lib/ant-junit4.jar
+SHA1-Digest: V1wuSBsN5DbG6C9RRy6vNLwP4uI=
+
+Name: etc/junit-frames.xsl
+SHA1-Digest: md5CK99JRxedw9KxLKj0oBAQmsE=
+
+Name: etc/junit-noframes.xsl
+SHA1-Digest: gSonXHTWIi/n6tGFX7bBf1OnIXc=
+
+Name: META-INF/eclipse.inf
+SHA1-Digest: Z+e4UrhAmTCBR1UpP/RqMf9OX00=
+
+Name: lib/ant-apache-regexp.jar
+SHA1-Digest: Zl2fYJ/ki77udi2j2yLXqaoG0DI=
+
+Name: etc/checkstyle/checkstyle-text.xsl
+SHA1-Digest: k0Lt9eVayUNooipspvmFOL3Pnq8=
+
+Name: lib/ant-antlr.jar
+SHA1-Digest: JHADSrsTEVWd8U0lwNkwDBiGvRQ=
+
+Name: lib/ant-junit.jar
+SHA1-Digest: 7tvFW2XO5pJq3oouw7u1YRNh318=
+
+Name: etc/log.xsl
+SHA1-Digest: wERs+JIuI7AqhXfOfJeEspw0988=
+
+Name: about.html
+SHA1-Digest: jDTkyEWRRCxVb2VP5IVO8g8KIxI=
+
+Name: etc/maudit-frames.xsl
+SHA1-Digest: ALKNWC8rT5LzA6OX8H49bRV8T3Q=
+
+Name: about_files/DOM-LICENSE.html
+SHA1-Digest: SjQGRnT57q7bMbrYLDqao3XYtr8=
+
+Name: etc/junit-frames-xalan1.xsl
+SHA1-Digest: MmPga2CFObtLV5UX3ZseR4WCxQI=
+
+Name: lib/ant-testutil.jar
+SHA1-Digest: XYaVCDSh9e2+MVPOyubztWoBT8I=
+
+Name: lib/ant-commons-net.jar
+SHA1-Digest: R2Fj6TOSo4sCom2+KJoANVGKDGM=
+
+Name: lib/ant-javamail.jar
+SHA1-Digest: oRGkU8nktP4/9lQjP47JhLYNh/E=
+
+Name: lib/ant-commons-logging.jar
+SHA1-Digest: 3jjuvaFKm+mcNuGGHJlxaxUlSKM=
+
+Name: etc/ant-bootstrap.jar
+SHA1-Digest: 7j2bLnXfpY8JgGr5dMdg1OUy6F4=
+
+Name: etc/jdepend-frames.xsl
+SHA1-Digest: eH9sUSIIShS+gY8MVO6SeOS/p7E=
+
+Name: lib/ant-swing.jar
+SHA1-Digest: WtG9vUTJCiDWjXDMuk9i2GEExUE=
+
+Name: etc/checkstyle/checkstyle-xdoc.xsl
+SHA1-Digest: 6CpvgWQX0oP7GBNUrADbtW7bA6Y=
+
+Name: etc/changelog.xsl
+SHA1-Digest: BpCViFm/89N/0Ona5MJCljwxgaA=
+
+Name: lib/ant-launcher.jar
+SHA1-Digest: 0M1p8TOzAp3MmFLGgTeCgnhQ5B8=
+
+Name: etc/jdepend.xsl
+SHA1-Digest: gLN/5j5Db1raGOXaWj3JeZ1tOsM=
+
+Name: lib/ant-apache-xalan2.jar
+SHA1-Digest: emdwaTUznI6nX2CxCyO2PgPPUBg=
+
diff --git a/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/META-INF/MANIFEST.MF b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..5be67ff
--- /dev/null
+++ b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/META-INF/MANIFEST.MF
@@ -0,0 +1,196 @@
+Manifest-Version: 1.0
+Bundle-ClassPath: lib/ant-antlr.jar,lib/ant-apache-bcel.jar,lib/ant-ap
+ ache-bsf.jar,lib/ant-apache-log4j.jar,lib/ant-apache-oro.jar,lib/ant-
+ apache-regexp.jar,lib/ant-apache-resolver.jar,lib/ant-apache-xalan2.j
+ ar,lib/ant-commons-logging.jar,lib/ant-commons-net.jar,lib/ant-jai.ja
+ r,lib/ant-javamail.jar,lib/ant-jdepend.jar,lib/ant-jmf.jar,lib/ant-js
+ ch.jar,lib/ant-junit.jar,lib/ant-junit4.jar,lib/ant-launcher.jar,lib/
+ ant-netrexx.jar,lib/ant-swing.jar,lib/ant-testutil.jar,lib/ant.jar
+Bundle-Vendor: %Bundle-Vendor
+Bundle-RequiredExecutionEnvironment: J2SE-1.2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.apache.ant;singleton:=true
+Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/too
+ ls:org.eclipse.orbit/org.apache.ant;tag=v20110505-1300
+Require-Bundle: org.eclipse.osgi
+Export-Package: org.apache.tools.ant,org.apache.tools.ant.dispatch,org
+ .apache.tools.ant.filters,org.apache.tools.ant.filters.util,org.apach
+ e.tools.ant.helper,org.apache.tools.ant.input,org.apache.tools.ant.la
+ unch,org.apache.tools.ant.listener,org.apache.tools.ant.loader,org.ap
+ ache.tools.ant.property,org.apache.tools.ant.taskdefs,org.apache.tool
+ s.ant.taskdefs.compilers,org.apache.tools.ant.taskdefs.condition,org.
+ apache.tools.ant.taskdefs.cvslib,org.apache.tools.ant.taskdefs.email,
+ org.apache.tools.ant.taskdefs.optional,org.apache.tools.ant.taskdefs.
+ optional.ccm,org.apache.tools.ant.taskdefs.optional.clearcase,org.apa
+ che.tools.ant.taskdefs.optional.depend,org.apache.tools.ant.taskdefs.
+ optional.depend.constantpool,org.apache.tools.ant.taskdefs.optional.e
+ jb,org.apache.tools.ant.taskdefs.optional.extension,org.apache.tools.
+ ant.taskdefs.optional.extension.resolvers,org.apache.tools.ant.taskde
+ fs.optional.i18n,org.apache.tools.ant.taskdefs.optional.image,org.apa
+ che.tools.ant.taskdefs.optional.j2ee,org.apache.tools.ant.taskdefs.op
+ tional.javacc,org.apache.tools.ant.taskdefs.optional.javah,org.apache
+ .tools.ant.taskdefs.optional.jdepend,org.apache.tools.ant.taskdefs.op
+ tional.jlink,org.apache.tools.ant.taskdefs.optional.jsp,org.apache.to
+ ols.ant.taskdefs.optional.jsp.compilers,org.apache.tools.ant.taskdefs
+ .optional.junit,org.apache.tools.ant.taskdefs.optional.native2ascii,o
+ rg.apache.tools.ant.taskdefs.optional.net,org.apache.tools.ant.taskde
+ fs.optional.perforce,org.apache.tools.ant.taskdefs.optional.pvcs,org.
+ apache.tools.ant.taskdefs.optional.script,org.apache.tools.ant.taskde
+ fs.optional.sos,org.apache.tools.ant.taskdefs.optional.sound,org.apac
+ he.tools.ant.taskdefs.optional.splash,org.apache.tools.ant.taskdefs.o
+ ptional.ssh,org.apache.tools.ant.taskdefs.optional.testing,org.apache
+ .tools.ant.taskdefs.optional.unix,org.apache.tools.ant.taskdefs.optio
+ nal.vss,org.apache.tools.ant.taskdefs.optional.windows,org.apache.too
+ ls.ant.taskdefs.rmic,org.apache.tools.ant.types,org.apache.tools.ant.
+ types.mappers,org.apache.tools.ant.types.optional,org.apache.tools.an
+ t.types.optional.depend,org.apache.tools.ant.types.optional.image,org
+ .apache.tools.ant.types.resolver,org.apache.tools.ant.types.resources
+ ,org.apache.tools.ant.types.resources.comparators,org.apache.tools.an
+ t.types.resources.selectors,org.apache.tools.ant.types.selectors,org.
+ apache.tools.ant.types.selectors.modifiedselector,org.apache.tools.an
+ t.types.spi,org.apache.tools.ant.util,org.apache.tools.ant.util.depen
+ d,org.apache.tools.ant.util.depend.bcel,org.apache.tools.ant.util.fac
+ ade,org.apache.tools.ant.util.java15,org.apache.tools.ant.util.option
+ al,org.apache.tools.ant.util.regexp,org.apache.tools.bzip2,org.apache
+ .tools.mail,org.apache.tools.tar,org.apache.tools.zip
+Bundle-Version: 1.8.2.v20110505-1300
+Bundle-ManifestVersion: 2
+
+Name: lib/ant-jmf.jar
+SHA1-Digest: 4XTIeiybkrnTWf3tIpvEv6crdEc=
+
+Name: lib/ant-apache-bcel.jar
+SHA1-Digest: sI/oavxhZYjgg+astBIx0P2Ydac=
+
+Name: about_files/SAX-LICENSE.html
+SHA1-Digest: piMH5omfqbi7lC6boj3RJCIzHGk=
+
+Name: etc/mmetrics-frames.xsl
+SHA1-Digest: ANFdCjWYJHjShgRgwUK/dsGRb5E=
+
+Name: etc/tagdiff.xsl
+SHA1-Digest: sfSzexHzWhEnzgaKBk/5d8jmiXM=
+
+Name: OSGI-INF/l10n/bundle.properties
+SHA1-Digest: Gvp9C/3B+pTm68y7Qfw9HA4zJGY=
+
+Name: lib/ant.jar
+SHA1-Digest: bq/bqNAOfW5iYSvlMqTTQFUXsAU=
+
+Name: lib/ant-apache-oro.jar
+SHA1-Digest: QF2yCHxJZD54rWwFY00fj2e+E6U=
+
+Name: lib/ant-jsch.jar
+SHA1-Digest: WIWsF5zz4CPy6Azi6p+Xkw3aiqg=
+
+Name: lib/ant-netrexx.jar
+SHA1-Digest: 5misiQIvC4eEHRlltnKSU9Fk+qU=
+
+Name: about_files/ASL-LICENSE-2.0.txt
+SHA1-Digest: K4uBUimqimHkg/tLoFiLi2xJGJA=
+
+Name: plugin.properties
+SHA1-Digest: rUeBSrYaj7Yj+sa6iRGcSwD0lpg=
+
+Name: lib/ant-jai.jar
+SHA1-Digest: yu/onBG5/QP+xZwsXfxD6yz32pM=
+
+Name: lib/ant-jdepend.jar
+SHA1-Digest: AwsgpuplbKOan4FHsgnLHseCOAU=
+
+Name: lib/ant-apache-bsf.jar
+SHA1-Digest: Vsbtj4QOjs+frvOdKk8Dg8aMq6o=
+
+Name: etc/coverage-frames.xsl
+SHA1-Digest: JHDppTq5SfIuV1GC/wXaueDvT/Q=
+
+Name: about_files/LICENSE
+SHA1-Digest: UuIC0ICov6vx3JdTJsMcRm5XaPA=
+
+Name: lib/ant-apache-log4j.jar
+SHA1-Digest: +WM8xm0VJuCjMdYrso6ABYHTSKM=
+
+Name: lib/ant-apache-resolver.jar
+SHA1-Digest: l1lBn9skcCWw/RrpmI3s3EfY7ZU=
+
+Name: etc/checkstyle/checkstyle-frames.xsl
+SHA1-Digest: laoNV00T2H6nt+mbBJ0OV5v9QXs=
+
+Name: about_files/NOTICE
+SHA1-Digest: UEEpmbTrBBVn1/ZzHrPcDMN32KI=
+
+Name: lib/ant-junit4.jar
+SHA1-Digest: 0lhYn9Avy9VeJ8m/+PP9JODyw6g=
+
+Name: etc/junit-frames.xsl
+SHA1-Digest: f6SbMZ9ifmAf7jaIbA1QAiw+B7M=
+
+Name: META-INF/eclipse.inf
+SHA1-Digest: u+F8j/GAE8tzrDry9+wT3Cvg81Y=
+
+Name: etc/junit-noframes.xsl
+SHA1-Digest: C1FRPEArSG+umNklrEBlPtwCm78=
+
+Name: lib/ant-apache-regexp.jar
+SHA1-Digest: 12HU5kz10VisHJ8e8GUria5HDKw=
+
+Name: etc/checkstyle/checkstyle-text.xsl
+SHA1-Digest: M2Mfi0GqTpCMLjuI5zXtGn9bJNY=
+
+Name: lib/ant-antlr.jar
+SHA1-Digest: tZXIKsFmMM8q3eN8SvOSJIQ2WXE=
+
+Name: lib/ant-junit.jar
+SHA1-Digest: garc72OE4vUH7PajdnbJU2oeH2A=
+
+Name: about.html
+SHA1-Digest: +xKddo86MpaguXP67tAuODwLjkI=
+
+Name: etc/log.xsl
+SHA1-Digest: GTQQ3CQPmTcir+XasJVs+gPOqwk=
+
+Name: about_files/DOM-LICENSE.html
+SHA1-Digest: yPiF8tE2Hke5piMIdzyuu4VNSjk=
+
+Name: etc/maudit-frames.xsl
+SHA1-Digest: aMXYnmnDX3WL04KbvCeXl1L2dF4=
+
+Name: lib/ant-testutil.jar
+SHA1-Digest: rvslwZIazGgB91rMx5YRE7Z8B1M=
+
+Name: etc/junit-frames-xalan1.xsl
+SHA1-Digest: dUVqi2d3KSiyo8E+KL0mq+ZawZE=
+
+Name: lib/ant-commons-net.jar
+SHA1-Digest: aZrJp6i/DueOM8h8Ngu1HUYF0kQ=
+
+Name: lib/ant-javamail.jar
+SHA1-Digest: wrxiIFgTy42K+3HyDbOTqB7ZDr4=
+
+Name: lib/ant-commons-logging.jar
+SHA1-Digest: Y5hINFRXIaAlSOfM2o97W+ynxlA=
+
+Name: etc/ant-bootstrap.jar
+SHA1-Digest: Itotp7/eRa5Mp2FCTvo/Vr80iLY=
+
+Name: lib/ant-swing.jar
+SHA1-Digest: luiXrFQr60HvXXzvIhUQQ8aqLuo=
+
+Name: etc/jdepend-frames.xsl
+SHA1-Digest: 7SXktiL6gSxGMCTMqKCXZmWqsEk=
+
+Name: etc/changelog.xsl
+SHA1-Digest: 2Q6Z3z9DyAwQkba7rYQcns0EB4s=
+
+Name: etc/checkstyle/checkstyle-xdoc.xsl
+SHA1-Digest: BRAN84UDA9rSi86GOq9S3zfbcGE=
+
+Name: lib/ant-launcher.jar
+SHA1-Digest: qX6Eq8IEtHxkpQ6XAwpTGO+v4rM=
+
+Name: lib/ant-apache-xalan2.jar
+SHA1-Digest: 5jc/RjtRymySPsomMDvVhubRoXM=
+
+Name: etc/jdepend.xsl
+SHA1-Digest: B9c3t3v0IYGzRRshVv781Nc7JPQ=
+
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/META-INF/eclipse.inf b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/META-INF/eclipse.inf
similarity index 100%
rename from eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/META-INF/eclipse.inf
rename to eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/META-INF/eclipse.inf
diff --git a/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/OSGI-INF/l10n/bundle.properties b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..c51b2b8
--- /dev/null
+++ b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2010, 2011 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials 
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+Bundle-Vendor = Eclipse.org
+Bundle-Name = Apache Ant
\ No newline at end of file
diff --git a/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/about.html b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/about.html
new file mode 100644
index 0000000..e542126
--- /dev/null
+++ b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/about.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>December, 2010</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+<h3>Third Party Content</h3>
+
+<p>
+The Content includes items that have been sourced from third parties as set out below. If you 
+did not receive this Content directly from the Eclipse Foundation, the following is provided 
+for informational purposes only, and you should look to the Redistributor’s license for 
+terms and conditions of use.
+</p>
+
+<h4>Ant 1.8.2</h4>
+<p>
+The plug-in includes software developed by The Apache Software Foundation as part of the Ant project.
+</p>
+
+<p>
+The Ant binary code in ant.jar and the scripts ant, ant.bat, ant.cmd, antenv.cmd, antRun, antRun.bat, antRun.pl, complete-ant-cmd.pl, envset.cmd, lcp.bat, runant.pl, runant.py and runrc.cmd are included with the plug-in with no modifications.
+</p>
+
+<p>
+Your use of the Ant code and the scripts is subject to the terms and conditions of the Apache License, Version 2.0.  A copy of the license is contained
+in the file <a href="about_files/ASL-LICENSE-2.0.txt" target="_blank">ASL-LICENSE-2.0.txt</a> and is also available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html" target="_blank">http://www.apache.org/licenses/LICENSE-2.0.html</a>.
+</p>
+<p>
+The names "Ant" and "Apache Software Foundation" must not be used to endorse or promote products derived from this 
+software without prior written permission.  For written permission, please contact <a href="mailto:apache at apache.org">apache at apache.org</a>.
+</p>
+
+<p>
+The Apache attribution <a href="about_files/NOTICE" target="_blank">NOTICE</a> file is included with the Content in accordance with 4d of the Apache License, Version 2.0.
+</p>
+
+<p>Ant includes the following software:</p>
+
+<blockquote>
+	<h4>DOM</h4>
+	<p>
+	DOM is developed by the World Wide Web Consortium.  Your use of DOM is subject to the terms and conditions of the license found in the
+	file <a href="about_files/DOM-LICENSE.html" target="_blank">DOM-LICENSE.html</a> which is included with this plug-in and can also be found at
+	<a href="http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231" target="_blank">http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231</a>.
+	</p>
+	
+	<h4>SAX</h4>
+	
+	<p>SAX is developed by the SAX project (<a href="http://www.saxproject.org" target="_blank">http://www.saxproject.org</a>).  Your use of SAX is subject to the
+	terms and conditions of the license found in the file <a href="about_files/SAX-LICENSE.html" target="_blank">SAX-LICENSE.html</a> which is included with this plug-in.</p>
+</blockquote>
+</body>
+</html>
\ No newline at end of file
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/about_files/asl-v20.txt b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/about_files/ASL-LICENSE-2.0.txt
similarity index 100%
rename from eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/about_files/asl-v20.txt
rename to eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/about_files/ASL-LICENSE-2.0.txt
diff --git a/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/about_files/DOM-LICENSE.html b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/about_files/DOM-LICENSE.html
new file mode 100644
index 0000000..a14bbd1
--- /dev/null
+++ b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/about_files/DOM-LICENSE.html
@@ -0,0 +1,111 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content=
+"text/html; charset=utf-8" />
+<meta name="generator" content=
+"HTML Tidy for Linux/x86 (vers 25 March 2009), see www.w3.org" />
+<title>DOM License</title>
+<link rel="stylesheet" href="./DOM-LICENSE_files/minimum" type=
+"text/css" media="all" />
+<style type="text/css" media="all" xml:space="preserve">
+/*<![CDATA[*/
+     @import url("/2008/site/css/advanced");
+/*]]>*/
+</style>
+<link href="./DOM-LICENSE_files/minimum" rel="stylesheet" type=
+"text/css" media=
+"handheld, only screen and (max-device-width: 480px)" disabled=
+"disabled" />
+<meta name="viewport" content="width=device-width" />
+<link rel="stylesheet" href="./DOM-LICENSE_files/print" type=
+"text/css" media="all" />
+<link rel="shortcut icon" href=
+"http://www.w3.org/2008/site/images/favicon.ico" type=
+"image/x-icon" />
+</head>
+<body id="www-w3-org" class="w3c_public w3c_javascript w3c_print">
+<div id="w3c_container">
+<div id="w3c_main">
+<h1 class="title">W3C Software Notice and License</h1>
+<div id="w3c_content_body">
+<div class="line">
+<p class="intro tPadding">This work (and included software,
+documentation such as READMEs, or other related items) is being
+provided by the copyright holders under the following license.</p>
+<h2>License</h2>
+<p class="tPadding">By obtaining, using and/or copying this work,
+you (the licensee) agree that you have read, understood, and will
+comply with the following terms and conditions.</p>
+<p>Permission to copy, modify, and distribute this software and its
+documentation, with or without modification, for any purpose
+and without fee or royalty is hereby granted, provided that you
+include the following on ALL copies of the software and
+documentation or portions thereof, including modifications:</p>
+<ul class="show_items">
+<li>The full text of this NOTICE in a location viewable to users of
+the redistributed or derivative work.</li>
+<li>Any pre-existing intellectual property disclaimers, notices, or
+terms and conditions. If none exist, the <a href=
+"http://www.w3.org/Consortium/Legal/2002/copyright-software-short-notice-20021231.html">
+W3C Software Short Notice</a> should be included (hypertext is
+preferred, text is permitted) within the body of any redistributed
+or derivative code.</li>
+<li>Notice of any changes or modifications to the files, including
+the date changes were made. (We recommend you provide URIs to the
+location from which the code is derived.)</li>
+</ul>
+<h2>Disclaimers</h2>
+<p>THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND
+COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE
+USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD
+PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</p>
+<p>COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,
+SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE
+SOFTWARE OR DOCUMENTATION.</p>
+<p>The name and trademarks of copyright holders may NOT be used in
+advertising or publicity pertaining to the software without
+specific, written prior permission. Title to copyright in this
+software and any associated documentation will at all times remain
+with copyright holders.</p>
+<h2>Notes</h2>
+<p>This version:
+http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231</p>
+<p>This formulation of W3C's notice and license became active on
+December 31 2002. This version removes the copyright ownership
+notice such that this license can be used with materials other than
+those owned by the W3C, reflects that ERCIM is now a host of the
+W3C, includes references to this specific dated version of the
+license, and removes the ambiguous grant of "use". Otherwise, this
+version is the same as the <a href=
+"http://www.w3.org/Consortium/Legal/copyright-software-19980720">previous
+version</a> and is written so as to preserve the <a href=
+"http://www.gnu.org/philosophy/license-list.html#GPLCompatibleLicenses">
+Free Software Foundation's assessment of GPL compatibility</a> and
+<a href="http://www.opensource.org/licenses/W3C.php">OSI's
+certification</a> under the <a href=
+"http://www.opensource.org/docs/definition.php">Open Source
+Definition</a>.</p>
+</div>
+</div>
+</div>
+</div>
+<p class="copyright">Copyright © 2009 W3C <sup>®</sup> ( <a href=
+"http://www.csail.mit.edu/"><acronym title=
+"Massachusetts Institute of Technology">MIT</acronym></a> ,
+<a href="http://www.ercim.org/"><acronym title=
+"European Research Consortium for Informatics and Mathematics">ERCIM</acronym></a>
+, <a href="http://www.keio.ac.jp/">Keio</a>) <a href=
+"http://www.w3.org/Consortium/Legal/2002/ipr-notice-20021231">Usage
+policies apply</a>.</p>
+<!-- Generated from data/scripts.php, ../../smarty/{scripts.tpl} --><!-- At the bottom for performance reasons -->
+<div id="w3c_scripts"><script type="text/javascript" src=
+"./DOM-LICENSE_files/main" xml:space="preserve">
+//<![CDATA[
+<!-- -->
+//]]>
+</script></div>
+</body>
+</html>
diff --git a/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/about_files/LICENSE b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/about_files/LICENSE
new file mode 100644
index 0000000..e7789e0
--- /dev/null
+++ b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/about_files/LICENSE
@@ -0,0 +1,272 @@
+/*
+ *                                 Apache License
+ *                           Version 2.0, January 2004
+ *                        http://www.apache.org/licenses/
+ *
+ *   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ *
+ *   1. Definitions.
+ *
+ *      "License" shall mean the terms and conditions for use, reproduction,
+ *      and distribution as defined by Sections 1 through 9 of this document.
+ *
+ *      "Licensor" shall mean the copyright owner or entity authorized by
+ *      the copyright owner that is granting the License.
+ *
+ *      "Legal Entity" shall mean the union of the acting entity and all
+ *      other entities that control, are controlled by, or are under common
+ *      control with that entity. For the purposes of this definition,
+ *      "control" means (i) the power, direct or indirect, to cause the
+ *      direction or management of such entity, whether by contract or
+ *      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ *      outstanding shares, or (iii) beneficial ownership of such entity.
+ *
+ *      "You" (or "Your") shall mean an individual or Legal Entity
+ *      exercising permissions granted by this License.
+ *
+ *      "Source" form shall mean the preferred form for making modifications,
+ *      including but not limited to software source code, documentation
+ *      source, and configuration files.
+ *
+ *      "Object" form shall mean any form resulting from mechanical
+ *      transformation or translation of a Source form, including but
+ *      not limited to compiled object code, generated documentation,
+ *      and conversions to other media types.
+ *
+ *      "Work" shall mean the work of authorship, whether in Source or
+ *      Object form, made available under the License, as indicated by a
+ *      copyright notice that is included in or attached to the work
+ *      (an example is provided in the Appendix below).
+ *
+ *      "Derivative Works" shall mean any work, whether in Source or Object
+ *      form, that is based on (or derived from) the Work and for which the
+ *      editorial revisions, annotations, elaborations, or other modifications
+ *      represent, as a whole, an original work of authorship. For the purposes
+ *      of this License, Derivative Works shall not include works that remain
+ *      separable from, or merely link (or bind by name) to the interfaces of,
+ *      the Work and Derivative Works thereof.
+ *
+ *      "Contribution" shall mean any work of authorship, including
+ *      the original version of the Work and any modifications or additions
+ *      to that Work or Derivative Works thereof, that is intentionally
+ *      submitted to Licensor for inclusion in the Work by the copyright owner
+ *      or by an individual or Legal Entity authorized to submit on behalf of
+ *      the copyright owner. For the purposes of this definition, "submitted"
+ *      means any form of electronic, verbal, or written communication sent
+ *      to the Licensor or its representatives, including but not limited to
+ *      communication on electronic mailing lists, source code control systems,
+ *      and issue tracking systems that are managed by, or on behalf of, the
+ *      Licensor for the purpose of discussing and improving the Work, but
+ *      excluding communication that is conspicuously marked or otherwise
+ *      designated in writing by the copyright owner as "Not a Contribution."
+ *
+ *      "Contributor" shall mean Licensor and any individual or Legal Entity
+ *      on behalf of whom a Contribution has been received by Licensor and
+ *      subsequently incorporated within the Work.
+ *
+ *   2. Grant of Copyright License. Subject to the terms and conditions of
+ *      this License, each Contributor hereby grants to You a perpetual,
+ *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ *      copyright license to reproduce, prepare Derivative Works of,
+ *      publicly display, publicly perform, sublicense, and distribute the
+ *      Work and such Derivative Works in Source or Object form.
+ *
+ *   3. Grant of Patent License. Subject to the terms and conditions of
+ *      this License, each Contributor hereby grants to You a perpetual,
+ *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ *      (except as stated in this section) patent license to make, have made,
+ *      use, offer to sell, sell, import, and otherwise transfer the Work,
+ *      where such license applies only to those patent claims licensable
+ *      by such Contributor that are necessarily infringed by their
+ *      Contribution(s) alone or by combination of their Contribution(s)
+ *      with the Work to which such Contribution(s) was submitted. If You
+ *      institute patent litigation against any entity (including a
+ *      cross-claim or counterclaim in a lawsuit) alleging that the Work
+ *      or a Contribution incorporated within the Work constitutes direct
+ *      or contributory patent infringement, then any patent licenses
+ *      granted to You under this License for that Work shall terminate
+ *      as of the date such litigation is filed.
+ *
+ *   4. Redistribution. You may reproduce and distribute copies of the
+ *      Work or Derivative Works thereof in any medium, with or without
+ *      modifications, and in Source or Object form, provided that You
+ *      meet the following conditions:
+ *
+ *      (a) You must give any other recipients of the Work or
+ *          Derivative Works a copy of this License; and
+ *
+ *      (b) You must cause any modified files to carry prominent notices
+ *          stating that You changed the files; and
+ *
+ *      (c) You must retain, in the Source form of any Derivative Works
+ *          that You distribute, all copyright, patent, trademark, and
+ *          attribution notices from the Source form of the Work,
+ *          excluding those notices that do not pertain to any part of
+ *          the Derivative Works; and
+ *
+ *      (d) If the Work includes a "NOTICE" text file as part of its
+ *          distribution, then any Derivative Works that You distribute must
+ *          include a readable copy of the attribution notices contained
+ *          within such NOTICE file, excluding those notices that do not
+ *          pertain to any part of the Derivative Works, in at least one
+ *          of the following places: within a NOTICE text file distributed
+ *          as part of the Derivative Works; within the Source form or
+ *          documentation, if provided along with the Derivative Works; or,
+ *          within a display generated by the Derivative Works, if and
+ *          wherever such third-party notices normally appear. The contents
+ *          of the NOTICE file are for informational purposes only and
+ *          do not modify the License. You may add Your own attribution
+ *          notices within Derivative Works that You distribute, alongside
+ *          or as an addendum to the NOTICE text from the Work, provided
+ *          that such additional attribution notices cannot be construed
+ *          as modifying the License.
+ *
+ *      You may add Your own copyright statement to Your modifications and
+ *      may provide additional or different license terms and conditions
+ *      for use, reproduction, or distribution of Your modifications, or
+ *      for any such Derivative Works as a whole, provided Your use,
+ *      reproduction, and distribution of the Work otherwise complies with
+ *      the conditions stated in this License.
+ *
+ *   5. Submission of Contributions. Unless You explicitly state otherwise,
+ *      any Contribution intentionally submitted for inclusion in the Work
+ *      by You to the Licensor shall be under the terms and conditions of
+ *      this License, without any additional terms or conditions.
+ *      Notwithstanding the above, nothing herein shall supersede or modify
+ *      the terms of any separate license agreement you may have executed
+ *      with Licensor regarding such Contributions.
+ *
+ *   6. Trademarks. This License does not grant permission to use the trade
+ *      names, trademarks, service marks, or product names of the Licensor,
+ *      except as required for reasonable and customary use in describing the
+ *      origin of the Work and reproducing the content of the NOTICE file.
+ *
+ *   7. Disclaimer of Warranty. Unless required by applicable law or
+ *      agreed to in writing, Licensor provides the Work (and each
+ *      Contributor provides its Contributions) on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ *      implied, including, without limitation, any warranties or conditions
+ *      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ *      PARTICULAR PURPOSE. You are solely responsible for determining the
+ *      appropriateness of using or redistributing the Work and assume any
+ *      risks associated with Your exercise of permissions under this License.
+ *
+ *   8. Limitation of Liability. In no event and under no legal theory,
+ *      whether in tort (including negligence), contract, or otherwise,
+ *      unless required by applicable law (such as deliberate and grossly
+ *      negligent acts) or agreed to in writing, shall any Contributor be
+ *      liable to You for damages, including any direct, indirect, special,
+ *      incidental, or consequential damages of any character arising as a
+ *      result of this License or out of the use or inability to use the
+ *      Work (including but not limited to damages for loss of goodwill,
+ *      work stoppage, computer failure or malfunction, or any and all
+ *      other commercial damages or losses), even if such Contributor
+ *      has been advised of the possibility of such damages.
+ *
+ *   9. Accepting Warranty or Additional Liability. While redistributing
+ *      the Work or Derivative Works thereof, You may choose to offer,
+ *      and charge a fee for, acceptance of support, warranty, indemnity,
+ *      or other liability obligations and/or rights consistent with this
+ *      License. However, in accepting such obligations, You may act only
+ *      on Your own behalf and on Your sole responsibility, not on behalf
+ *      of any other Contributor, and only if You agree to indemnify,
+ *      defend, and hold each Contributor harmless for any liability
+ *      incurred by, or claims asserted against, such Contributor by reason
+ *      of your accepting any such warranty or additional liability.
+ *
+ *   END OF TERMS AND CONDITIONS
+ *
+ *   APPENDIX: How to apply the Apache License to your work.
+ *
+ *      To apply the Apache License to your work, attach the following
+ *      boilerplate notice, with the fields enclosed by brackets "[]"
+ *      replaced with your own identifying information. (Don't include
+ *      the brackets!)  The text should be enclosed in the appropriate
+ *      comment syntax for the file format. We also recommend that a
+ *      file or class name and description of purpose be included on the
+ *      same "printed page" as the copyright notice for easier
+ *      identification within third-party archives.
+ *
+ *   Copyright [yyyy] [name of copyright owner]
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+W3C® SOFTWARE NOTICE AND LICENSE
+http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+This work (and included software, documentation such as READMEs, or other
+related items) is being provided by the copyright holders under the following
+license. By obtaining, using and/or copying this work, you (the licensee) agree
+that you have read, understood, and will comply with the following terms and
+conditions.
+
+Permission to copy, modify, and distribute this software and its documentation,
+with or without modification, for any purpose and without fee or royalty is
+hereby granted, provided that you include the following on ALL copies of the
+software and documentation or portions thereof, including modifications:
+
+  1. The full text of this NOTICE in a location viewable to users of the
+     redistributed or derivative work. 
+  2. Any pre-existing intellectual property disclaimers, notices, or terms
+     and conditions. If none exist, the W3C Software Short Notice should be
+     included (hypertext is preferred, text is permitted) within the body
+     of any redistributed or derivative code.
+  3. Notice of any changes or modifications to the files, including the date
+     changes were made. (We recommend you provide URIs to the location from
+     which the code is derived.)
+     
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE
+NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT
+THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY
+PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the software without specific, written prior permission.
+Title to copyright in this software and any associated documentation will at
+all times remain with copyright holders.
+
+____________________________________
+
+This formulation of W3C's notice and license became active on December 31 2002.
+This version removes the copyright ownership notice such that this license can
+be used with materials other than those owned by the W3C, reflects that ERCIM
+is now a host of the W3C, includes references to this specific dated version of
+the license, and removes the ambiguous grant of "use". Otherwise, this version
+is the same as the previous version and is written so as to preserve the Free
+Software Foundation's assessment of GPL compatibility and OSI's certification
+under the Open Source Definition. Please see our Copyright FAQ for common
+questions about using materials from our site, including specific terms and
+conditions for packages like libwww, Amaya, and Jigsaw. Other questions about
+this notice can be directed to site-policy at w3.org.
+ 
+Joseph Reagle <site-policy at w3.org> 
+
+This license came from: http://www.megginson.com/SAX/copying.html
+  However please note future versions of SAX may be covered 
+  under http://saxproject.org/?selected=pd
+
+SAX2 is Free!
+
+I hereby abandon any property rights to SAX 2.0 (the Simple API for
+XML), and release all of the SAX 2.0 source code, compiled code, and
+documentation contained in this distribution into the Public Domain.
+SAX comes with NO WARRANTY or guarantee of fitness for any
+purpose.
+
+David Megginson, david at megginson.com
+2000-05-05
diff --git a/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/about_files/NOTICE b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/about_files/NOTICE
new file mode 100644
index 0000000..a47f692
--- /dev/null
+++ b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/about_files/NOTICE
@@ -0,0 +1,6 @@
+   Apache Ant
+   Copyright 1999-2010 The Apache Software Foundation
+
+   The <sync> task is based on code Copyright (c) 2002, Landmark
+   Graphics Corp that has been kindly donated to the Apache Software
+   Foundation.
diff --git a/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/about_files/SAX-LICENSE.html b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/about_files/SAX-LICENSE.html
new file mode 100644
index 0000000..5ebc705
--- /dev/null
+++ b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/about_files/SAX-LICENSE.html
@@ -0,0 +1,81 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta name="generator" content=
+"HTML Tidy for Linux/x86 (vers 25 March 2009), see www.w3.org" />
+<meta http-equiv="Content-Type" content=
+"text/html; charset=utf-8" />
+<title>SAX License</title>
+
+<style type="text/css">
+/*<![CDATA[*/
+<!--
+        h1, h2, h3, h4, h5, h6 { color: maroon; }
+        /* make sure that goes OK with the nav column background
+         * net-friendly colors include: yellow/ffffcc, blue/ccccff
+         */
+    -->
+/*]]>*/
+</style>
+</head>
+<body color="#000000">
+<h2>Origin</h2>
+<p>This page was originally taken from: <a href=
+"http://www.saxproject.org/copying.html">http://www.saxproject.org/copying.html</a>
+with the navigation links remove from the left-hand-side of the
+page.</p>
+<h2>Copyright Status</h2>
+<div>
+<p><em>SAX is free!</em></p>
+<p>In fact, it's not possible to own a license to SAX, since it's
+been placed in the public domain.</p>
+<h2>No Warranty</h2>
+<p>Because SAX is released to the public domain, there is no
+warranty for the design or for the software implementation, to the
+extent permitted by applicable law. Except when otherwise stated in
+writing the copyright holders and/or other parties provide SAX "as
+is" without warranty of any kind, either expressed or implied,
+including, but not limited to, the implied warranties of
+merchantability and fitness for a particular purpose. The entire
+risk as to the quality and performance of SAX is with you. Should
+SAX prove defective, you assume the cost of all necessary
+servicing, repair or correction.</p>
+<p>In no event unless required by applicable law or agreed to in
+writing will any copyright holder, or any other party who may
+modify and/or redistribute SAX, be liable to you for damages,
+including any general, special, incidental or consequential damages
+arising out of the use or inability to use SAX (including but not
+limited to loss of data or data being rendered inaccurate or losses
+sustained by you or third parties or a failure of the SAX to
+operate with any other programs), even if such holder or other
+party has been advised of the possibility of such damages.</p>
+<h2>Copyright Disclaimers</h2>
+<p>This page includes statements to that effect by David Megginson,
+who would have been able to claim copyright for the original
+work.</p>
+<!-- MAYBE:  link to archived copies of the messages? -->
+<h3>SAX 1.0</h3>
+<p>Version 1.0 of the Simple API for XML (SAX), created
+collectively by the membership of the XML-DEV mailing list, is
+hereby released into the public domain.</p>
+<p>No one owns SAX: you may use it freely in both commercial and
+non-commercial applications, bundle it with your software
+distribution, include it on a CD-ROM, list the source code in a
+book, mirror the documentation at your own web site, or use it in
+any other way you see fit.</p>
+<p><em>David Megginson, <a href=
+"http://www.megginson.com/">Megginson Technologies Ltd.</a><br />
+1998-05-11</em></p>
+<h3>SAX 2.0</h3>
+<p>I hereby abandon any property rights to SAX 2.0 (the Simple API
+for XML), and release all of the SAX 2.0 source code, compiled
+code, and documentation contained in this distribution into the
+Public Domain. SAX comes with NO WARRANTY or guarantee of fitness
+for any purpose.</p>
+<p><em>David Megginson, <a href=
+"http://www.megginson.com/">Megginson Technologies Ltd.</a><br />
+2000-05-05</em></p>
+</div>
+<br />
+</body>
+</html>
diff --git a/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/changelog.xsl b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/changelog.xsl
new file mode 100644
index 0000000..5e6d848
--- /dev/null
+++ b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/changelog.xsl
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<xsl:stylesheet
+    xmlns:xsl='http://www.w3.org/1999/XSL/Transform'
+    version='1.0'>
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   
+-->
+  <xsl:param name="title"/>
+  <xsl:param name="module"/>
+  <xsl:param name="cvsweb"/>
+
+  <xsl:output method="html" indent="yes" encoding="US-ASCII"
+              doctype-public="-//W3C//DTD HTML 4.01//EN"
+              doctype-system="http://www.w3.org/TR/html401/strict.dtd"/>
+
+  <!-- Copy standard document elements.  Elements that
+       should be ignored must be filtered by apply-templates
+       tags. -->
+  <xsl:template match="*">
+    <xsl:copy>
+      <xsl:copy-of select="attribute::*[. != '']"/>
+      <xsl:apply-templates/>
+    </xsl:copy>
+  </xsl:template>
+
+  <xsl:template match="changelog">
+    <html>
+      <head>
+        <title><xsl:value-of select="$title"/></title>
+        <style type="text/css">
+          body, p {
+            font-family: Verdana, Arial, Helvetica, sans-serif;
+            font-size: 80%;
+            color: #000000;
+            background-color: #ffffff;
+          }
+          tr, td {
+            font-family: Verdana, Arial, Helvetica, sans-serif;
+            background: #eeeee0;
+          }
+          td {
+            padding-left: 20px;
+          }
+      .dateAndAuthor {
+            font-family: Verdana, Arial, Helvetica, sans-serif;
+            font-weight: bold;
+            text-align: left;
+            background: #a6caf0;
+            padding-left: 3px;
+      }
+          a {
+            color: #000000;
+          }
+          pre {
+            font-weight: bold;
+          }
+        </style>
+      </head>
+      <body>
+        <h1>
+          <a name="top"><xsl:value-of select="$title"/></a>
+        </h1>
+        <p style="text-align: right">Designed for use with <a href="http://ant.apache.org/">Apache Ant</a>.</p>
+        <hr/>
+        <table border="0" width="100%" cellspacing="1">
+          
+          <xsl:apply-templates select=".//entry">
+            <xsl:sort select="date" data-type="text" order="descending"/>
+            <xsl:sort select="time" data-type="text" order="descending"/>
+          </xsl:apply-templates>
+          
+        </table>
+        
+      </body>
+    </html>
+  </xsl:template>
+  
+  <xsl:template match="entry">
+    <tr>
+      <td class="dateAndAuthor">
+        <xsl:value-of select="date"/><xsl:text> </xsl:text><xsl:value-of select="time"/><xsl:text> </xsl:text><xsl:value-of select="author"/>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <pre>
+<xsl:apply-templates select="msg"/></pre>
+        <ul>
+          <xsl:apply-templates select="file"/>
+        </ul>
+      </td>
+    </tr>
+  </xsl:template>
+
+  <xsl:template match="date">
+    <i><xsl:value-of select="."/></i>
+  </xsl:template>
+
+  <xsl:template match="time">
+    <i><xsl:value-of select="."/></i>
+  </xsl:template>
+
+  <xsl:template match="author">
+    <i>
+      <a>
+        <xsl:attribute name="href">mailto:<xsl:value-of select="."/></xsl:attribute>
+        <xsl:value-of select="."/></a>
+    </i>
+  </xsl:template>
+
+  <xsl:template match="file">
+    <li>
+      <a>
+        <xsl:choose>
+          <xsl:when test="string-length(prevrevision) = 0 ">
+            <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?rev=<xsl:value-of select="revision" />&content-type=text/x-cvsweb-markup</xsl:attribute>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?r1=<xsl:value-of select="revision" />&r2=<xsl:value-of select="prevrevision"/></xsl:attribute>
+          </xsl:otherwise>
+        </xsl:choose>
+        <xsl:value-of select="name" /> (<xsl:value-of select="revision"/>)</a>
+    </li>
+  </xsl:template>
+
+  <!-- Any elements within a msg are processed,
+       so that we can preserve HTML tags. -->
+  <xsl:template match="msg">
+    <xsl:apply-templates/>
+  </xsl:template>
+  
+</xsl:stylesheet>
diff --git a/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/checkstyle/checkstyle-frames.xsl b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/checkstyle/checkstyle-frames.xsl
new file mode 100644
index 0000000..47aa2f7
--- /dev/null
+++ b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/checkstyle/checkstyle-frames.xsl
@@ -0,0 +1,299 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+    xmlns:lxslt="http://xml.apache.org/xslt"
+    xmlns:redirect="http://xml.apache.org/xalan/redirect"
+    extension-element-prefixes="redirect">
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+    <xsl:output method="html" indent="yes" encoding="US-ASCII"/>
+    <xsl:decimal-format decimal-separator="." grouping-separator="," />
+
+    <xsl:param name="output.dir" select="'.'"/>
+    <xsl:param name="basedir" select="'.'"/>
+
+    <xsl:template match="checkstyle">
+        <!-- create the index.html -->
+        <redirect:write file="{$output.dir}/index.html">
+            <xsl:call-template name="index.html"/>
+        </redirect:write>
+
+        <!-- create the stylesheet.css -->
+        <redirect:write file="{$output.dir}/stylesheet.css">
+            <xsl:call-template name="stylesheet.css"/>
+        </redirect:write>
+
+        <!-- create the overview-summary.html at the root -->
+        <redirect:write file="{$output.dir}/overview-frame.html">
+            <xsl:apply-templates select="." mode="overview"/>
+        </redirect:write>
+
+        <!-- create the all-classes.html at the root -->
+        <redirect:write file="{$output.dir}/allclasses-frame.html">
+            <xsl:apply-templates select="." mode="all.classes"/>
+        </redirect:write>
+
+        <!-- process all files -->
+        <xsl:apply-templates select="file[count(error) != 0]"/>
+    </xsl:template>
+
+    <xsl:template name="index.html">
+        <html>
+            <head>
+                <title>CheckStyle Audit</title>
+            </head>
+            <frameset cols="20%,80%">
+                <frame src="allclasses-frame.html" name="fileListFrame"/>
+                <frame src="overview-frame.html" name="fileFrame"/>
+            </frameset>
+            <noframes>
+                <h2>Frame Alert</h2>
+                <p>
+                    This document is designed to be viewed using the frames feature.
+                    If you see this message, you are using a non-frame-capable web client.
+                </p>
+            </noframes>
+        </html>
+    </xsl:template>
+
+    <xsl:template name="pageHeader">
+        <table border="0" cellpadding="0" cellspacing="0" width="100%">
+            <tr>
+                <td class="text-align:right"><h2>CheckStyle Audit</h2></td>
+            </tr>
+            <tr>
+                <td class="text-align:right">Designed for use with
+                  <a href='http://checkstyle.sourceforge.net/'>CheckStyle</a> and
+                  <a href='http://ant.apache.org/'>Ant</a>.</td>
+            </tr>
+        </table>
+        <hr size="1"/>
+    </xsl:template>
+
+    <xsl:template match="checkstyle" mode="overview">
+        <html>
+            <head>
+                <link rel="stylesheet" type="text/css" href="stylesheet.css"/>
+            </head>
+            <body>
+                <!-- page header -->
+                <xsl:call-template name="pageHeader"/>
+
+                <!-- Summary part -->
+                <xsl:apply-templates select="." mode="summary"/>
+                <hr size="1" width="100%" align="left"/>
+
+                <!-- File list part -->
+                <xsl:apply-templates select="." mode="filelist"/>
+            </body>
+        </html>
+    </xsl:template>
+
+    <xsl:template name="stylesheet.css">
+        .bannercell {
+        border: 0px;
+        padding: 0px;
+        }
+        body {
+        margin-left: 10;
+        margin-right: 10;
+        font:normal 80% arial,helvetica,sanserif;
+        background-color:#FFFFFF;
+        color:#000000;
+        }
+        .oddrow td {
+        background: #efefef;
+        }
+        .evenrow td {
+        background: #fff;
+        }
+        th, td {
+        text-align: left;
+        vertical-align: top;
+        }
+        th {
+        font-weight:bold;
+        background: #ccc;
+        color: black;
+        }
+        table, th, td {
+        font-size:100%;
+        border: none
+        }
+        table.log tr td, tr th {
+
+        }
+        h2 {
+        font-weight:bold;
+        font-size:140%;
+        margin-bottom: 5;
+        }
+        h3 {
+        font-size:100%;
+        font-weight:bold;
+        background: #525D76;
+        color: white;
+        text-decoration: none;
+        padding: 5px;
+        margin-right: 2px;
+        margin-left: 2px;
+        margin-bottom: 0;
+        }
+    </xsl:template>
+
+    <!--
+    Creates an all-classes.html file that contains a link to all files.
+    -->
+    <xsl:template match="checkstyle" mode="all.classes">
+        <html>
+            <head>
+                <link rel="stylesheet" type="text/css" href="stylesheet.css"/>
+            </head>
+            <body>
+                <h2>Files</h2>
+                <p>
+                    <table width="100%">
+                        <!-- For each file create its part -->
+                        <xsl:apply-templates select="file[count(error) != 0]" mode="all.classes">
+                            <xsl:sort select="substring-after(@name, $basedir)"/>
+                        </xsl:apply-templates>
+                    </table>
+                </p>
+            </body>
+        </html>
+    </xsl:template>
+
+    <xsl:template match="checkstyle" mode="filelist">
+        <h3>Files</h3>
+        <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
+            <tr>
+                <th>Name</th>
+                <th>Errors</th>
+            </tr>
+            <xsl:apply-templates select="file[count(error) != 0]" mode="filelist">
+                <xsl:sort select="count(error)" order="descending" data-type="number"/>
+            </xsl:apply-templates>
+        </table>
+    </xsl:template>
+
+    <xsl:template match="file" mode="filelist">
+        <tr>
+            <xsl:call-template name="alternated-row"/>
+            <td nowrap="nowrap">
+                <a>
+                    <xsl:attribute name="href">
+                        <xsl:text>files/</xsl:text><xsl:value-of select="substring-after(@name, $basedir)"/><xsl:text>.html</xsl:text>
+                    </xsl:attribute>
+                    <xsl:value-of select="substring-after(@name, $basedir)"/>
+                </a>
+            </td>
+            <td><xsl:value-of select="count(error)"/></td>
+        </tr>
+    </xsl:template>
+
+    <xsl:template match="file" mode="all.classes">
+        <tr>
+            <td nowrap="nowrap">
+                <a target="fileFrame">
+                    <xsl:attribute name="href">
+                        <xsl:text>files/</xsl:text><xsl:value-of select="substring-after(@name, $basedir)"/><xsl:text>.html</xsl:text>
+                    </xsl:attribute>
+                    <xsl:value-of select="substring-after(@name, $basedir)"/>
+                </a>
+            </td>
+        </tr>
+    </xsl:template>
+
+    <!--
+    transform string like a/b/c to ../../../
+    @param path the path to transform into a descending directory path
+    -->
+    <xsl:template name="path">
+        <xsl:param name="path"/>
+
+        <!-- Convert a windows path '\' to a unix path '/' for further processing. -->
+        <xsl:variable name="path2" select="translate($path,'\','/')"/>
+
+        
+        <xsl:if test="contains($path2,'/')">
+            <xsl:text>../</xsl:text>
+            <xsl:call-template name="path">
+                <xsl:with-param name="path"><xsl:value-of select="substring-after($path2,'/')"/></xsl:with-param>
+            </xsl:call-template>
+        </xsl:if>
+        <xsl:if test="not(contains($path2,'/')) and not($path2 = '')">
+            <xsl:text>../</xsl:text>
+        </xsl:if>
+    </xsl:template>
+
+    <xsl:template match="file">
+        <redirect:write file="{$output.dir}/files/{substring-after(@name, $basedir)}.html">
+            <html>
+                <head>
+                    <link rel="stylesheet" type="text/css">
+                        <xsl:attribute name="href"><xsl:call-template name="path"><xsl:with-param name="path" select="substring-after(@name, $basedir)"/></xsl:call-template><xsl:text>stylesheet.css</xsl:text></xsl:attribute>
+                    </link>
+                </head>
+                <body>
+                    <xsl:call-template name="pageHeader"/>
+                    <h3>File <xsl:value-of select="substring-after(@name, $basedir)"/></h3>
+                    <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
+                        <tr>
+                            <th>Error Description</th>
+                            <th>Line:Column</th>
+                        </tr>
+                        <xsl:for-each select="error">
+                            <tr>
+                                <xsl:call-template name="alternated-row"/>
+                                <td><a title="{@source}"><xsl:value-of select="@message"/></a></td>
+                                <td align="center"><xsl:value-of select="@line"/><xsl:if test="@column">:<xsl:value-of select="@column"/></xsl:if></td>
+                            </tr>
+                        </xsl:for-each>
+                    </table>
+                </body>
+            </html>
+        </redirect:write>
+    </xsl:template>
+
+    <xsl:template match="checkstyle" mode="summary">
+        <h3>Summary</h3>
+        <xsl:variable name="fileCount" select="count(file)"/>
+        <xsl:variable name="errorCount" select="count(file/error)"/>
+        <xsl:variable name="fileErrorCount" select="count(file[count(error) != 0])"/>
+        <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
+            <tr>
+                <th>Total Files</th>
+                <th>Files With Errors</th>
+                <th>Errors</th>
+            </tr>
+            <tr>
+                <xsl:call-template name="alternated-row"/>
+                <td><xsl:value-of select="$fileCount"/></td>
+                <td><xsl:value-of select="$fileErrorCount"/></td>
+                <td><xsl:value-of select="$errorCount"/></td>
+            </tr>
+        </table>
+    </xsl:template>
+
+    <xsl:template name="alternated-row">
+        <xsl:attribute name="class">
+            <xsl:if test="position() mod 2 = 1">oddrow</xsl:if>
+            <xsl:if test="position() mod 2 = 0">evenrow</xsl:if>
+        </xsl:attribute>
+    </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/checkstyle/checkstyle-text.xsl b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/checkstyle/checkstyle-text.xsl
new file mode 100644
index 0000000..aab5161
--- /dev/null
+++ b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/checkstyle/checkstyle-text.xsl
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+    <xsl:strip-space elements="checkstyle"/>
+    <xsl:preserve-space elements="file"/>
+    <xsl:output method="text"/>
+    <xsl:template match="checkstyle/file/error">
+        <xsl:value-of select="../@name"/>
+        <xsl:text>:</xsl:text>
+        <xsl:value-of select="@line"/>
+        <xsl:text>:</xsl:text>
+        <xsl:value-of select="@column"/>
+        <xsl:text> </xsl:text>
+        <xsl:value-of select="@message"/>
+    </xsl:template>
+</xsl:stylesheet>
+
diff --git a/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/checkstyle/checkstyle-xdoc.xsl b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/checkstyle/checkstyle-xdoc.xsl
new file mode 100644
index 0000000..bacf11e
--- /dev/null
+++ b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/checkstyle/checkstyle-xdoc.xsl
@@ -0,0 +1,130 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+    xmlns:lxslt="http://xml.apache.org/xslt"
+    xmlns:redirect="org.apache.xalan.lib.Redirect"
+    extension-element-prefixes="redirect">
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+    <xsl:output method="xml" indent="yes"/>
+    <xsl:decimal-format decimal-separator="." grouping-separator="," />
+
+    <xsl:param name="output.dir" select="'.'"/>
+    <xsl:param name="basedir" select="'.'"/>
+
+    <xsl:template match="checkstyle">
+      <document>
+        <properties>
+          <title>Checkstyle Audit</title>
+        </properties>
+
+        <body>
+          <xsl:apply-templates select="." mode="summary"/>
+          <!-- File list part -->
+          <xsl:apply-templates select="." mode="filelist"/>
+          <xsl:apply-templates select="file[count(error) != 0]"/>
+        </body>
+      </document>
+    </xsl:template>
+
+    <xsl:template match="checkstyle" mode="filelist">
+      <section name="Files">
+        <table>
+            <tr>
+                <th>Name</th>
+                <th>Errors</th>
+            </tr>
+            <xsl:apply-templates select="file[count(error) != 0]" mode="filelist">
+                <xsl:sort select="count(error)" order="descending" data-type="number"/>
+            </xsl:apply-templates>
+        </table>
+      </section>
+    </xsl:template>
+
+    <xsl:template match="file" mode="filelist">
+        <tr>
+            <xsl:call-template name="alternated-row"/>
+            <td nowrap="nowrap">
+                <a>
+                    <xsl:attribute name="href">
+                        <xsl:text>files</xsl:text><xsl:value-of select="substring-after(@name, $basedir)"/><xsl:text>.html</xsl:text>
+                    </xsl:attribute>
+                    <xsl:value-of select="substring-after(@name, $basedir)"/>
+                </a>
+            </td>
+            <td><xsl:value-of select="count(error)"/></td>
+        </tr>
+    </xsl:template>
+
+    <xsl:template match="file">
+      <redirect:write file="{$output.dir}/files{substring-after(@name, $basedir)}.xml">
+        <document>
+          <properties>
+            <title>Checkstyle Audit</title>
+          </properties>
+
+          <body>
+            <section name="Details for {substring-after(@name, $basedir)}">
+              <table>
+                  <tr>
+                      <th>Error Description</th>
+                      <th>Line</th>
+                  </tr>
+                  <xsl:for-each select="error">
+                      <tr>
+                          <xsl:call-template name="alternated-row"/>
+                          <td><a title="{@source}"><xsl:value-of select="@message"/></a></td>
+                          <td><xsl:value-of select="@line"/></td>
+                      </tr>
+                  </xsl:for-each>
+              </table>
+            </section>
+          </body>
+        </document>
+      </redirect:write>
+    </xsl:template>
+
+    <xsl:template match="checkstyle" mode="summary">
+      <section name="Summary">
+        <xsl:variable name="fileCount" select="count(file)"/>
+        <xsl:variable name="errorCount" select="count(file/error)"/>
+        <xsl:variable name="fileErrorCount" select="count(file[count(error) != 0])"/>
+        <table>
+            <tr>
+                <th>Files</th>
+                <th>Files With Errors</th>
+                <th>Errors</th>
+            </tr>
+            <tr>
+                <xsl:call-template name="alternated-row"/>
+                <td><xsl:value-of select="$fileCount"/></td>
+                <td><xsl:value-of select="$fileErrorCount"/></td>
+                <td><xsl:value-of select="$errorCount"/></td>
+            </tr>
+        </table>
+      </section>
+    </xsl:template>
+
+    <xsl:template name="alternated-row">
+        <xsl:attribute name="class">
+            <xsl:if test="position() mod 2 = 1">oddrow</xsl:if>
+            <xsl:if test="position() mod 2 = 0">evenrow</xsl:if>
+        </xsl:attribute>
+    </xsl:template>
+</xsl:stylesheet>
+
diff --git a/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/coverage-frames.xsl b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/coverage-frames.xsl
new file mode 100644
index 0000000..357bea3
--- /dev/null
+++ b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/coverage-frames.xsl
@@ -0,0 +1,489 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+    xmlns:lxslt="http://xml.apache.org/xslt"
+    xmlns:redirect="org.apache.xalan.lib.Redirect"
+    extension-element-prefixes="redirect">
+<xsl:output method="html" indent="yes"/>
+<xsl:decimal-format decimal-separator="." grouping-separator="," />
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+<!--
+
+ Sample stylesheet to be used with JProbe 3.0 XML output.
+
+ It creates a set of HTML files a la javadoc where you can browse easily
+ through all packages and classes.
+
+ It is best used with JProbe Coverage Ant task that gives you the benefit
+ of a reference classpath so that you have the list of classes/methods
+ that are not used at all in a given classpath.
+
+ @author Stephane Bailliez <a href="mailto:sbailliez at apache.org"/>
+
+-->
+
+<!-- default output directory is current directory -->
+<xsl:param name="output.dir" select="'.'"/>
+
+<!-- ======================================================================
+    Root element
+    ======================================================================= -->
+<xsl:template match="/snapshot">
+    <!-- create the index.html -->
+    <redirect:write file="{$output.dir}/index.html">
+        <xsl:call-template name="index.html"/>
+    </redirect:write>
+
+    <!-- create the stylesheet.css -->
+    <redirect:write file="{$output.dir}/stylesheet.css">
+        <xsl:call-template name="stylesheet.css"/>
+    </redirect:write>
+
+    <!-- create the overview-packages.html at the root -->
+    <redirect:write file="{$output.dir}/overview-summary.html">
+        <xsl:apply-templates select="." mode="overview.packages"/>
+    </redirect:write>
+
+    <!-- create the all-packages.html at the root -->
+    <redirect:write file="{$output.dir}/overview-frame.html">
+        <xsl:apply-templates select="." mode="all.packages"/>
+    </redirect:write>
+
+    <!-- create the all-classes.html at the root -->
+    <redirect:write file="{$output.dir}/allclasses-frame.html">
+        <xsl:apply-templates select="." mode="all.classes"/>
+    </redirect:write>
+
+    <!-- process all packages -->
+    <xsl:apply-templates select="./package" mode="write"/>
+</xsl:template>
+
+<!-- =======================================================================
+    Frameset definition. Entry point for the report.
+    3 frames: packageListFrame, classListFrame, classFrame
+    ======================================================================= -->
+<xsl:template name="index.html">
+<html>
+    <head><title>Coverage Results.</title></head>
+    <frameset cols="20%,80%">
+        <frameset rows="30%,70%">
+            <frame src="overview-frame.html" name="packageListFrame"/>
+            <frame src="allclasses-frame.html" name="classListFrame"/>
+        </frameset>
+        <frame src="overview-summary.html" name="classFrame"/>
+    </frameset>
+    <noframes>
+        <h2>Frame Alert</h2>
+        <p>
+        This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
+        </p>
+    </noframes>
+</html>
+</xsl:template>
+
+<!-- =======================================================================
+    Stylesheet CSS used
+    ======================================================================= -->
+<!-- this is the stylesheet css to use for nearly everything -->
+<xsl:template name="stylesheet.css">
+    .bannercell {
+      border: 0px;
+      padding: 0px;
+    }
+    body {
+      margin-left: 10;
+      margin-right: 10;
+      font:normal 80% arial,helvetica,sanserif;
+      background-color:#FFFFFF;
+      color:#000000;
+    }
+    .a td {
+      background: #efefef;
+    }
+    .b td {
+      background: #fff;
+    }
+    th, td {
+      text-align: left;
+      vertical-align: top;
+    }
+    th {
+      font-weight:bold;
+      background: #ccc;
+      color: black;
+    }
+    table, th, td {
+      font-size:100%;
+      border: none
+    }
+    table.log tr td, tr th {
+
+    }
+    h2 {
+      font-weight:bold;
+      font-size:140%;
+      margin-bottom: 5;
+    }
+    h3 {
+      font-size:100%;
+      font-weight:bold;
+      background: #525D76;
+      color: white;
+      text-decoration: none;
+      padding: 5px;
+      margin-right: 2px;
+      margin-left: 2px;
+      margin-bottom: 0;
+    }
+</xsl:template>
+
+<!-- =======================================================================
+    List of all classes in all packages
+    This will be the first page in the classListFrame
+    ======================================================================= -->
+<xsl:template match="snapshot" mode="all.classes">
+    <html>
+        <head>
+            <xsl:call-template name="create.stylesheet.link"/>
+        </head>
+        <body>
+            <h2>Classes</h2>
+            <table width="100%">
+                <xsl:for-each select="package/class">
+                    <xsl:sort select="@name"/>
+                    <xsl:variable name="package.name" select="(ancestor::package)[last()]/@name"/>
+                    <xsl:variable name="link">
+                        <xsl:if test="not($package.name='')">
+                            <xsl:value-of select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text>
+                        </xsl:if><xsl:value-of select="@name"/><xsl:text>.html</xsl:text>
+                    </xsl:variable>
+                    <tr>
+                        <td nowrap="nowrap">
+                            <a target="classFrame" href="{$link}"><xsl:value-of select="@name"/></a>
+                        </td>
+                    </tr>
+                </xsl:for-each>
+            </table>
+        </body>
+    </html>
+</xsl:template>
+
+<!-- list of all packages -->
+<xsl:template match="snapshot" mode="all.packages">
+    <html>
+        <head>
+            <xsl:call-template name="create.stylesheet.link"/>
+        </head>
+        <body>
+            <h2><a href="overview-summary.html" target="classFrame">Home</a></h2>
+            <h2>Packages</h2>
+            <table width="100%">
+                <xsl:for-each select="package">
+                    <xsl:sort select="@name" order="ascending"/>
+                    <tr>
+                        <td nowrap="nowrap">
+                            <a href="{translate(@name,'.','/')}/package-summary.html" target="classFrame">
+                                <xsl:value-of select="@name"/>
+                            </a>
+                        </td>
+                    </tr>
+                </xsl:for-each>
+            </table>
+        </body>
+    </html>
+</xsl:template>
+
+<!-- overview of statistics in packages -->
+<xsl:template match="snapshot" mode="overview.packages">
+    <html>
+        <head>
+            <xsl:call-template name="create.stylesheet.link"/>
+        </head>
+        <body onload="open('allclasses-frame.html','classListFrame')">
+        <xsl:call-template name="pageHeader"/>
+        <h3>Summary</h3>
+        <table class="log" cellpadding="5" cellspacing="2" width="100%">
+            <tr>
+                <!--th width="10%" nowrap="nowrap">Date</th>
+                <th width="10%" nowrap="nowrap">Elapsed time</th-->
+                <th width="10%" nowrap="nowrap">Reported Classes</th>
+                <th width="10%" nowrap="nowrap">Methods Hit</th>
+                <th width="10%" nowrap="nowrap">Lines Hit</th>
+            </tr>
+            <tr class="a">
+                <!--td nowrap="nowrap"><xsl:value-of select="execution_log/@program_start"/></td>
+                <td><xsl:value-of select="format-number(execution_log/@elapsed_time div 1000,'0.0')"/>secs</td-->
+                <td><xsl:value-of select="count(package/class)"/></td>
+                <td><xsl:value-of select="format-number(cov.data/@hit_methods div cov.data/@total_methods,'0.0%')"/></td>
+                <td><xsl:value-of select="format-number(cov.data/@hit_lines div cov.data/@total_lines,'0.0%')"/></td>
+            </tr>
+        </table>
+        <table border="0" width="100%">
+        <tr>
+        <td style="text-align: justify;">
+        To ensure accurate test runs on Java applications, developers need to know how much of
+        the code has been tested, and where to find any untested code. Coverage helps you
+        locate untested code, and measure precisely how much code has been exercised.
+        The result is a higher quality application in a shorter period of time.
+        <p/>
+        </td>
+        </tr>
+        </table>
+
+        <h3>Packages</h3>
+        <table class="log" cellpadding="5" cellspacing="2" width="100%">
+            <xsl:apply-templates select="package[1]" mode="stats.header"/>
+            <!-- display packages and sort them via their coverage rate -->
+            <xsl:for-each select="package">
+                <xsl:sort data-type="number" select="cov.data/@hit_lines div cov.data/@total_lines"/>
+                <tr>
+                  <xsl:call-template name="alternate-row"/>
+                    <td><a href="{translate(@name,'.','/')}/package-summary.html"><xsl:value-of select="@name"/></a></td>
+                    <td><xsl:value-of select="format-number(cov.data/@hit_methods div cov.data/@total_methods,'0.0%')"/></td>
+                    <td><xsl:value-of select="format-number(cov.data/@hit_lines div cov.data/@total_lines,'0.0%')"/></td>
+                </tr>
+            </xsl:for-each>
+        </table>
+        <xsl:call-template name="pageFooter"/>
+        </body>
+        </html>
+</xsl:template>
+
+<!--
+ detailed info for a package. It will output the list of classes
+, the summary page, and the info for each class
+-->
+<xsl:template match="package" mode="write">
+    <xsl:variable name="package.dir">
+        <xsl:if test="not(@name = '')"><xsl:value-of select="translate(@name,'.','/')"/></xsl:if>
+        <xsl:if test="@name = ''">.</xsl:if>
+    </xsl:variable>
+
+    <!-- create a classes-list.html in the package directory -->
+    <redirect:write file="{$output.dir}/{$package.dir}/package-frame.html">
+        <xsl:apply-templates select="." mode="classes.list"/>
+    </redirect:write>
+
+    <!-- create a package-summary.html in the package directory -->
+    <redirect:write file="{$output.dir}/{$package.dir}/package-summary.html">
+        <xsl:apply-templates select="." mode="package.summary"/>
+    </redirect:write>
+
+    <!-- for each class, creates a @name.html -->
+    <xsl:for-each select="class">
+        <redirect:write file="{$output.dir}/{$package.dir}/{@name}.html">
+            <xsl:apply-templates select="." mode="class.details"/>
+        </redirect:write>
+    </xsl:for-each>
+</xsl:template>
+
+<!-- list of classes in a package -->
+<xsl:template match="package" mode="classes.list">
+    <html>
+        <HEAD>
+            <xsl:call-template name="create.stylesheet.link">
+                <xsl:with-param name="package.name" select="@name"/>
+            </xsl:call-template>
+        </HEAD>
+        <BODY>
+            <table width="100%">
+                <tr>
+                    <td nowrap="nowrap">
+                        <H2><a href="package-summary.html" target="classFrame"><xsl:value-of select="@name"/></a></H2>
+                    </td>
+                </tr>
+            </table>
+
+            <H2>Classes</H2>
+            <TABLE WIDTH="100%">
+                <xsl:for-each select="class">
+                    <xsl:sort select="@name"/>
+                    <tr>
+                        <td nowrap="nowrap">
+                            <a href="{@name}.html" target="classFrame"><xsl:value-of select="@name"/></a>
+                        </td>
+                    </tr>
+                </xsl:for-each>
+            </TABLE>
+        </BODY>
+    </html>
+</xsl:template>
+
+<!-- summary of a package -->
+<xsl:template match="package" mode="package.summary">
+    <HTML>
+        <HEAD>
+            <xsl:call-template name="create.stylesheet.link">
+                <xsl:with-param name="package.name" select="@name"/>
+            </xsl:call-template>
+        </HEAD>
+        <!-- when loading this package, it will open the classes into the frame -->
+        <BODY onload="open('package-frame.html','classListFrame')">
+            <xsl:call-template name="pageHeader"/>
+            <h3>Package <xsl:value-of select="@name"/></h3>
+            <table class="log" cellpadding="5" cellspacing="2" width="100%">
+                <xsl:apply-templates select="." mode="stats.header"/>
+                <xsl:apply-templates select="." mode="stats"/>
+            </table>
+
+            <xsl:if test="count(class) > 0">
+                <H3>Classes</H3>
+                <table class="log" cellpadding="5" cellspacing="2" width="100%">
+                    <xsl:apply-templates select="." mode="stats.header"/>
+                    <xsl:apply-templates select="class" mode="stats">
+                        <xsl:sort data-type="number" select="cov.data/@hit_lines div cov.data/@total_lines"/>
+                    </xsl:apply-templates>
+                </table>
+            </xsl:if>
+            <xsl:call-template name="pageFooter"/>
+        </BODY>
+    </HTML>
+</xsl:template>
+
+<!-- details of a class -->
+<xsl:template match="class" mode="class.details">
+    <xsl:variable name="package.name" select="(ancestor::package)[last()]/@name"/>
+    <HTML>
+        <HEAD>
+            <xsl:call-template name="create.stylesheet.link">
+                <xsl:with-param name="package.name" select="$package.name"/>
+            </xsl:call-template>
+        </HEAD>
+        <BODY>
+            <xsl:call-template name="pageHeader"/>
+            <H3>Class <xsl:if test="not($package.name = '')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></H3>
+
+            <!-- class summary -->
+            <table class="log" cellpadding="5" cellspacing="2" width="100%">
+                <xsl:apply-templates select="." mode="stats.header"/>
+                <xsl:apply-templates select="." mode="stats"/>
+            </table>
+
+            <!-- details of methods -->
+            <H3>Methods</H3>
+            <table class="log" cellpadding="5" cellspacing="2" width="100%">
+                <xsl:apply-templates select="method[1]" mode="stats.header"/>
+                <xsl:apply-templates select="method" mode="stats">
+                    <xsl:sort data-type="number" select="cov.data/@hit_lines div cov.data/@total_lines"/>
+                </xsl:apply-templates>
+            </table>
+            <xsl:call-template name="pageFooter"/>
+        </BODY>
+    </HTML>
+
+</xsl:template>
+
+<!-- Page Header -->
+<xsl:template name="pageHeader">
+  <!-- jakarta logo -->
+  <table border="0" cellpadding="0" cellspacing="0" width="100%">
+  <tr>
+    <td class="bannercell" rowspan="2">
+      <a href="http://jakarta.apache.org/">
+      <img src="http://jakarta.apache.org/images/jakarta-logo.gif" alt="http://jakarta.apache.org" align="left" border="0"/>
+      </a>
+    </td>
+        <td style="text-align:right"><h2>Source Code Coverage</h2></td>
+        </tr>
+        <tr>
+        <td style="text-align:right">Designed for use with <a href='http://www.sitraka.com/jprobe'>Sitraka JProbe</a> and <a href='http://jakarta.apache.org'>Ant</a>.</td>
+        </tr>
+  </table>
+    <hr size="1"/>
+</xsl:template>
+
+<!-- Page Footer -->
+<xsl:template name="pageFooter">
+</xsl:template>
+
+
+<xsl:template name="table.header">
+    <tr>
+        <th width="80%">Name</th>
+        <th width="10%" nowrap="nowrap">Methods Hit</th>
+        <th width="10%" nowrap="nowrap">Lines Hit</th>
+    </tr>
+</xsl:template>
+
+<xsl:template match="method" mode="stats.header">
+    <tr>
+        <th width="90%">Name</th>
+        <th width="10%" nowrap="nowrap">Lines Hit</th>
+    </tr>
+</xsl:template>
+<xsl:template match="method" mode="stats">
+    <tr>
+      <xsl:call-template name="alternate-row"/>
+        <td><xsl:value-of select="@name"/></td>
+        <td>
+        <xsl:value-of select="format-number(cov.data/@hit_lines div cov.data/@total_lines,'0.0%')"/>
+        </td>
+    </tr>
+</xsl:template>
+
+<xsl:template match="package|class" mode="stats.header">
+    <tr>
+        <th width="80%">Name</th>
+        <th width="10%" nowrap="nowrap">Methods Hit</th>
+        <th width="10%" nowrap="nowrap">Lines Hit</th>
+    </tr>
+</xsl:template>
+<xsl:template match="package|class" mode="stats">
+    <tr>
+      <xsl:call-template name="alternate-row"/>
+        <td><xsl:value-of select="@name"/></td>
+        <td><xsl:value-of select="format-number(cov.data/@hit_methods div cov.data/@total_methods,'0.0%')"/></td>
+        <td><xsl:value-of select="format-number(cov.data/@hit_lines div cov.data/@total_lines,'0.0%')"/></td>
+    </tr>
+</xsl:template>
+
+<!--
+    transform string like a.b.c to ../../../
+    @param path the path to transform into a descending directory path
+-->
+<xsl:template name="path">
+    <xsl:param name="path"/>
+    <xsl:if test="contains($path,'.')">
+        <xsl:text>../</xsl:text>
+        <xsl:call-template name="path">
+            <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'.')"/></xsl:with-param>
+        </xsl:call-template>
+    </xsl:if>
+    <xsl:if test="not(contains($path,'.')) and not($path = '')">
+        <xsl:text>../</xsl:text>
+    </xsl:if>
+</xsl:template>
+
+
+<!-- create the link to the stylesheet based on the package name -->
+<xsl:template name="create.stylesheet.link">
+    <xsl:param name="package.name"/>
+    <LINK REL ="stylesheet" TYPE="text/css" TITLE="Style"><xsl:attribute name="href"><xsl:if test="not($package.name = 'unnamed package')"><xsl:call-template name="path"><xsl:with-param name="path" select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></LINK>
+</xsl:template>
+
+<!-- alternated row style -->
+<xsl:template name="alternate-row">
+<xsl:attribute name="class">
+  <xsl:if test="position() mod 2 = 1">a</xsl:if>
+  <xsl:if test="position() mod 2 = 0">b</xsl:if>
+</xsl:attribute>
+</xsl:template>
+
+</xsl:stylesheet>
+
+
diff --git a/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/jdepend-frames.xsl b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/jdepend-frames.xsl
new file mode 100644
index 0000000..d693280
--- /dev/null
+++ b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/jdepend-frames.xsl
@@ -0,0 +1,487 @@
+<?xml version="1.0"?>
+<xsl:stylesheet  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+  xmlns:lxslt="http://xml.apache.org/xslt"
+  xmlns:redirect="org.apache.xalan.lib.Redirect"
+  extension-element-prefixes="redirect">
+<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   
+-->
+<!--
+
+ Sample stylesheet to be used with JDepend XML output.
+
+ It creates a set of HTML files a la javadoc where you can browse easily
+ through all packages and classes.
+
+ @author <a href="mailto:jtulley at novell.com">Jeff Tulley</a>
+
+  -->
+<xsl:param name="output.dir" select="'.'"/>
+
+<xsl:template match="JDepend">
+   <!-- create the index.html -->
+   <redirect:write file="{$output.dir}/index.html">
+      <xsl:call-template name="index.html"/>
+   </redirect:write>
+
+  <!-- create the stylesheet.css -->
+  <redirect:write file="{$output.dir}/stylesheet.css">
+    <xsl:call-template name="stylesheet.css"/>
+   </redirect:write>
+
+   <!-- create the overview-packages.html at the root -->
+  <redirect:write file="{$output.dir}/overview-summary.html">
+    <xsl:apply-templates select="." mode="overview.packages"/>
+  </redirect:write>
+
+   <!-- create the overview-packages.html at the root -->
+   <redirect:write file="{$output.dir}/overview-packages.html">
+    <xsl:apply-templates select="." mode="packages.details"/>
+  </redirect:write>
+
+   <!-- create the overview-cycles.html at the root -->
+   <redirect:write file="{$output.dir}/overview-cycles.html">
+    <xsl:apply-templates select="." mode="cycles.details"/>
+  </redirect:write>
+
+   <!-- create the overview-cycles.html at the root -->
+   <redirect:write file="{$output.dir}/overview-explanations.html">
+    <xsl:apply-templates select="." mode="explanations"/>
+  </redirect:write>
+
+  <!-- create the all-packages.html at the root -->
+   <redirect:write file="{$output.dir}/all-packages.html">
+    <xsl:apply-templates select="Packages" mode="all.packages"/>
+  </redirect:write>
+
+  <!-- create the all-cycles.html at the root -->
+  <redirect:write file="{$output.dir}/all-cycles.html">
+    <xsl:apply-templates select="Cycles" mode="all.cycles"/>
+  </redirect:write>
+</xsl:template>
+
+
+<xsl:template name="index.html">
+<html>
+   <head>
+      <title>JDepend Analysis</title>
+   </head>
+      <frameset cols="20%,80%">
+         <frameset rows="30%,70%">
+            <frame src="all-packages.html" name="packageListFrame"/>
+            <frame src="all-cycles.html" name="classListFrame"/>
+         </frameset>
+         <frame src="overview-summary.html" name="classFrame"/>
+      </frameset>
+      <noframes>
+         <h2>Frame Alert</h2>
+         <p>
+            This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
+         </p>
+      </noframes>
+</html>
+</xsl:template>
+
+<!-- this is the stylesheet css to use for nearly everything -->
+<xsl:template name="stylesheet.css">
+   <style type="text/css">
+    body {
+    font:normal 68% verdana,arial,helvetica;
+    color:#000000;
+    }
+    table tr td, tr th {
+      font-size: 68%;
+    }
+    table.details tr th{
+    font-weight: bold;
+    text-align:left;
+    background:#a6caf0;
+    }
+    table.details tr td{
+    background:#eeeee0;
+    }
+
+    p {
+    line-height:1.5em;
+    margin-top:0.5em; margin-bottom:1.0em;
+    margin-left:2em;
+    margin-right:2em;
+    }
+    h1 {
+    margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
+    }
+    h2 {
+    margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica
+    }
+    h3 {
+    margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
+    }
+    h4 {
+    margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+    }
+    h5 {
+    margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+    }
+    h6 {
+    margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+    }
+    .Error {
+    font-weight:bold; color:red;
+    }
+    .Failure {
+    font-weight:bold; color:purple;
+    }
+    .Properties {
+    text-align:right;
+    }
+  </style>
+</xsl:template>
+
+<xsl:template match="JDepend" mode="overview.packages">
+   <html>
+      <head>
+         <link rel="stylesheet" type="text/css" href="stylesheet.css"/>
+      </head>
+      <body>
+         <xsl:call-template name="pageHeader"/>
+  <table width="100%"><tr align="left"><h2>Summary</h2><td>
+  </td><td align="right">
+  [summary]
+  [<a href="overview-packages.html">packages</a>]
+  [<a href="overview-cycles.html">cycles</a>]
+  [<a href="overview-explanations.html">explanations</a>]
+   </td></tr></table>
+         <table width="100%" class="details">
+            <tr>
+               <th>Package</th>
+               <th>Total Classes</th>
+               <th><a href="overview-explanations.html#EXnumber">Abstract Classes</a></th>
+               <th><a href="overview-explanations.html#EXnumber">Concrete Classes</a></th>
+               <th><a href="overview-explanations.html#EXafferent">Afferent Couplings</a></th>
+               <th><a href="overview-explanations.html#EXefferent">Efferent Couplings</a></th>
+               <th><a href="overview-explanations.html#EXabstractness">Abstractness</a></th>
+               <th><a href="overview-explanations.html#EXinstability">Instability</a></th>
+               <th><a href="overview-explanations.html#EXdistance">Distance</a></th>
+
+            </tr>
+            <xsl:for-each select="./Packages/Package">
+               <xsl:if test="count(error) = 0">
+                  <tr>
+                     <td align="left">
+                        <a>
+                           <xsl:attribute name="href">overview-packages.html#PK<xsl:value-of select="@name"/>
+                           </xsl:attribute>
+                           <xsl:value-of select="@name"/>
+                        </a>
+                     </td>
+                     <td align="right"><xsl:value-of select="Stats/TotalClasses"/></td>
+                     <td align="right"><xsl:value-of select="Stats/AbstractClasses"/></td>
+                     <td align="right"><xsl:value-of select="Stats/ConcreteClasses"/></td>
+                     <td align="right"><xsl:value-of select="Stats/Ca"/></td>
+                     <td align="right"><xsl:value-of select="Stats/Ce"/></td>
+                     <td align="right"><xsl:value-of select="Stats/A"/></td>
+                     <td align="right"><xsl:value-of select="Stats/I"/></td>
+                     <td align="right"><xsl:value-of select="Stats/D"/></td>
+                  </tr>
+               </xsl:if>
+            </xsl:for-each>
+            <xsl:for-each select="./Packages/Package">
+               <xsl:if test="count(error) > 0">
+                  <tr>
+                     <td align="left">
+                        <xsl:value-of select="@name"/>
+                     </td>
+                     <td align="left" colspan="8"><xsl:value-of select="error"/></td>
+                  </tr>
+               </xsl:if>
+            </xsl:for-each>
+         </table>
+      </body>
+   </html>
+</xsl:template>
+
+<xsl:template match="JDepend" mode="packages.details">
+   <html>
+      <head>
+          <link rel="stylesheet" type="text/css" href="stylesheet.css"/>
+      </head>
+      <body>
+         <xsl:call-template name="pageHeader"/>
+  <table width="100%"><tr align="left"><h2>Packages</h2><td>
+  </td><td align="right">
+  [<a href="overview-summary.html">summary</a>]
+  [packages]
+  [<a href="overview-cycles.html">cycles</a>]
+  [<a href="overview-explanations.html">explanations</a>]
+   </td></tr></table>
+
+  <xsl:for-each select="./Packages/Package">
+    <xsl:if test="count(error) = 0">
+      <h3><a><xsl:attribute name="name">PK<xsl:value-of select="@name"/></xsl:attribute>
+      <xsl:value-of select="@name"/></a></h3>
+
+      <table width="100%"><tr>
+        <td><a href="overview-explanations.html#EXafferent">Afferent Couplings</a>: <xsl:value-of select="Stats/Ca"/></td>
+        <td><a href="overview-explanations.html#EXefferent">Efferent Couplings</a>: <xsl:value-of select="Stats/Ce"/></td>
+        <td><a href="overview-explanations.html#EXabstractness">Abstractness</a>: <xsl:value-of select="Stats/A"/></td>
+        <td><a href="overview-explanations.html#EXinstability">Instability</a>: <xsl:value-of select="Stats/I"/></td>
+        <td><a href="overview-explanations.html#EXdistance">Distance</a>: <xsl:value-of select="Stats/D"/></td>
+      </tr></table>
+
+      <table width="100%" class="details">
+        <tr>
+          <th>Abstract Classes</th>
+          <th>Concrete Classes</th>
+          <th>Used by Packages</th>
+          <th>Uses Packages</th>
+        </tr>
+        <tr>
+          <td valign="top" width="25%">
+          <xsl:if test="count(AbstractClasses/Class)=0">
+              <i>None</i>
+            </xsl:if>
+            <xsl:for-each select="AbstractClasses/Class">
+              <xsl:value-of select="node()"/><br/>
+            </xsl:for-each>
+          </td>
+          <td valign="top" width="25%">
+            <xsl:if test="count(ConcreteClasses/Class)=0">
+              <i>None</i>
+            </xsl:if>
+            <xsl:for-each select="ConcreteClasses/Class">
+              <xsl:value-of select="node()"/><br/>
+            </xsl:for-each>
+          </td>
+          <td valign="top" width="25%">
+            <xsl:if test="count(UsedBy/Package)=0">
+              <i>None</i>
+            </xsl:if>
+            <xsl:for-each select="UsedBy/Package">
+              <a>
+                        <xsl:attribute name="href">overview-packages.html#PK<xsl:value-of select="node()"/></xsl:attribute>
+                <xsl:value-of select="node()"/>
+              </a><br/>
+            </xsl:for-each>
+          </td>
+          <td valign="top" width="25%">
+            <xsl:if test="count(DependsUpon/Package)=0">
+              <i>None</i>
+            </xsl:if>
+            <xsl:for-each select="DependsUpon/Package">
+              <a>
+                        <xsl:attribute name="href">overview-packages.html#PK<xsl:value-of select="node()"/></xsl:attribute>
+                <xsl:value-of select="node()"/>
+              </a><br/>
+            </xsl:for-each>
+          </td>
+        </tr>
+      </table>
+    </xsl:if>
+  </xsl:for-each>
+  <!-- this is often a long listing; provide a lower navigation table also -->
+  <table width="100%"><tr align="left"><td></td><td align="right">
+  [<a href="overview-summary.html">summary</a>]
+  [packages]
+  [<a href="overview-cycles.html">cycles</a>]
+  [<a href="overview-explanations.html">explanations</a>]
+   </td></tr></table>
+      </body>
+   </html>
+</xsl:template>
+
+<xsl:template match="JDepend" mode="cycles.details">
+   <html>
+      <head>
+         <link rel="stylesheet" type="text/css" href="stylesheet.css"/>
+      </head>
+      <body>
+         <xsl:call-template name="pageHeader"/>
+  <table width="100%"><tr align="left"><h2>Cycles</h2><td>
+  </td><td align="right">
+  [<a href="overview-summary.html">summary</a>]
+  [<a href="overview-packages.html">packages</a>]
+  [cycles]
+  [<a href="overview-explanations.html">explanations</a>]
+   </td></tr></table>
+  <!--<table width="100%"><tr><td>
+  </td><td align="right">
+    [<a href="#NVsummary">summary</a>]
+  [<a href="#NVpackages">packages</a>]
+  [<a href="#NVcycles">cycles</a>]
+   [<a href="#NVexplanations">explanations</a>]
+  </td></tr></table> -->
+
+  <xsl:if test="count(Cycles/Package) = 0">
+    <p>There are no cyclic dependancies.</p>
+  </xsl:if>
+  <xsl:for-each select="Cycles/Package">
+     <h3><a><xsl:attribute name="name">#CY<xsl:value-of select="@Name"/></xsl:attribute><xsl:value-of select="@Name"/></a></h3><p>
+    <xsl:for-each select="Package">
+      <xsl:value-of select="."/><br/>
+    </xsl:for-each></p>
+  </xsl:for-each>
+  <!-- this is often a long listing; provide a lower navigation table also -->
+  <table width="100%"><tr align="left"><td></td><td align="right">
+  [<a href="overview-summary.html">summary</a>]
+  [<a href="overview-packages.html">packages</a>]
+  [cycles]
+  [<a href="overview-explanations.html">explanations</a>]
+   </td></tr></table>
+  </body>
+  </html>
+</xsl:template>
+
+<xsl:template match="JDepend" mode="explanations">
+   <html>
+      <head>
+         <link rel="stylesheet" type="text/css" href="stylesheet.css"/>
+      </head>
+      <body>
+         <xsl:call-template name="pageHeader"/>
+
+  <table width="100%"><tr align="left"><h2>Explanations</h2><td>
+  </td><td align="right">
+  [<a href="overview-summary.html">summary</a>]
+  [<a href="overview-packages.html">packages</a>]
+  [<a href="overview-cycles.html">cycles</a>]
+  [explanations]
+   </td></tr></table>
+
+  <p>The following explanations are for quick reference and are lifted directly from the original <a href="http://www.clarkware.com/software/JDepend.html">JDepend documentation</a>.</p>
+
+  <h3><a name="EXnumber">Number of Classes</a></h3>
+    <p>The number of concrete and abstract classes (and interfaces) in the package is an indicator of the extensibility of the package.</p>
+  <h3><a name="EXafferent">Afferent Couplings</a></h3>
+    <p>The number of other packages that depend upon classes within the package is an indicator of the package's responsibility. </p>
+  <h3><a name="EXefferent">Efferent Couplings</a></h3>
+    <p>The number of other packages that the classes in the package depend upon is an indicator of the package's independence. </p>
+  <h3><a name="EXabstractness">Abstractness</a></h3>
+    <p>The ratio of the number of abstract classes (and interfaces) in the analyzed package to the total number of classes in the analyzed package. </p>
+    <p>The range for this metric is 0 to 1, with A=0 indicating a completely concrete package and A=1 indicating a completely abstract package. </p>
+  <h3><a name="EXinstability">Instability</a></h3>
+    <p>The ratio of efferent coupling (Ce) to total coupling (Ce / (Ce + Ca)). This metric is an indicator of the package's resilience to change. </p>
+    <p>The range for this metric is 0 to 1, with I=0 indicating a completely stable package and I=1 indicating a completely instable package. </p>
+  <h3><a name="EXdistance">Distance</a></h3>
+    <p>The perpendicular distance of a package from the idealized line A + I = 1. This metric is an indicator of the package's balance between abstractness and stability. </p>
+    <p>A package squarely on the main sequence is optimally balanced with respect to its abstractness and stability. Ideal packages are either completely abstract and stable (x=0, y=1) or completely concrete and instable (x=1, y=0). </p>
+    <p>The range for this metric is 0 to 1, with D=0 indicating a package that is coincident with the main sequence and D=1 indicating a package that is as far from the main sequence as possible. </p>
+
+      </body>
+   </html>
+</xsl:template>
+
+
+<!--
+Creates an html file that contains a link to all package links in overview-packages.html.
+  @bug there will be a problem here, I don't know yet how to handle unnamed package :(
+-->
+<xsl:template match="JDepend/Packages" mode="all.packages">
+  <html>
+    <head>
+      <link rel="stylesheet" type="text/css" href="stylesheet.css"/>
+    </head>
+    <body>
+  <table width="100%"><tr align="left"><td></td><td nowrap="nowrap" align="right">
+  [<a href="overview-summary.html" target="classFrame">summary</a>]
+  [<a href="overview-packages.html" target="classFrame">packages</a>]
+  [<a href="overview-cycles.html" target="classFrame">cycles</a>]
+  [<a href="overview-explanations.html" target="classFrame">explanations</a>]
+   </td></tr></table>
+      <h2>Packages</h2>
+        <table width="100%">
+          <xsl:apply-templates select="Package[count(error)=0]" mode="all.packages.link">
+            <xsl:sort select="@name"/>
+          </xsl:apply-templates>
+          <xsl:apply-templates select="Package[count(error) > 0]" mode="all.packages.nolink">
+            <xsl:sort select="@name"/>
+          </xsl:apply-templates>
+        </table>
+    </body>
+  </html>
+</xsl:template>
+
+<xsl:template match="JDepend/Packages/Package" mode="all.packages.link">
+  <tr>
+    <td nowrap="nowrap">
+         <a href="overview-packages.html#PK{@name}" target="classFrame">
+        <xsl:value-of select="@name"/>
+      </a>
+    </td>
+  </tr>
+</xsl:template>
+
+<!--
+I do not know JDepend enough to know if every error results in a non-analyzed package,
+but that is how I am presenting it to the viewer.  This may need to change.
+  @bug there will be a problem here, I don't know yet how to handle unnamed package :(
+-->
+<xsl:template match="JDepend/Packages/Package" mode="all.packages.nolink">
+  <tr>
+    <td nowrap="nowrap">
+       Not Analyzed: <xsl:value-of select="@name"/>
+    </td>
+  </tr>
+</xsl:template>
+
+<!--
+Creates an html file that contains a link to all package links in overview-cycles.html.
+  @bug there will be a problem here, I don't know yet how to handle unnamed package :(
+-->
+<xsl:template match="JDepend/Cycles" mode="all.cycles">
+  <html>
+    <head>
+      <link rel="stylesheet" type="text/css" href="stylesheet.css"/>
+    </head>
+    <body>
+  <table width="100%"><tr align="left"><td></td><td nowrap="nowrap" align="right">
+  [<a href="overview-summary.html" target="classFrame">summary</a>]
+  [<a href="overview-packages.html" target="classFrame">packages</a>]
+  [<a href="overview-cycles.html" target="classFrame">cycles</a>]
+  [<a href="overview-explanations.html" target="classFrame">explanations</a>]
+   </td></tr></table>
+      <h2>Cycles</h2>
+        <table width="100%">
+           <xsl:apply-templates select="Package" mode="all.cycles">
+            <xsl:sort select="@Name"/>
+          </xsl:apply-templates>
+        </table>
+    </body>
+  </html>
+</xsl:template>
+
+<xsl:template match="JDepend/Cycles/Package" mode="all.cycles">
+  <tr>
+    <td nowrap="nowrap">
+         <a href="overview-cycles.html#CY{@Name}" target="classFrame"><xsl:value-of select="@Name"/></a>
+    </td>
+  </tr>
+</xsl:template>
+
+<!-- Page HEADER -->
+<xsl:template name="pageHeader">
+   <h1>JDepend Analysis</h1>
+  <table width="100%">
+  <tr>
+    <td align="left"></td>
+      <td align="right">Designed for use with <a href="http://www.clarkware.com/software/JDepend.html">JDepend</a> and <a href="http://jakarta.apache.org">Ant</a>.</td>
+  </tr>
+  </table>
+  <hr size="1"/>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/jdepend.xsl b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/jdepend.xsl
new file mode 100644
index 0000000..028b6da
--- /dev/null
+++ b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/jdepend.xsl
@@ -0,0 +1,276 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+<xsl:output method="html" indent="yes"  encoding="US-ASCII"/>
+
+<xsl:template match="JDepend">
+    <html>
+    <head>
+        <title>JDepend Analysis</title>
+        
+    <style type="text/css">
+      body {
+        font:normal 68% verdana,arial,helvetica;
+        color:#000000;
+      }
+      table tr td, tr th {
+          font-size: 68%;
+      }
+      table.details tr th{
+        font-weight: bold;
+        text-align:left;
+        background:#a6caf0;
+      }
+      table.details tr td{
+        background:#eeeee0;
+      }
+      
+      p {
+        line-height:1.5em;
+        margin-top:0.5em; margin-bottom:1.0em;
+        margin-left:2em;
+        margin-right:2em;
+      }
+      h1 {
+        margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
+      }
+      h2 {
+        margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica
+      }
+      h3 {
+        margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
+      }
+      h4 {
+        margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+      }
+      h5 {
+        margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+      }
+      h6 {
+        margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+      }
+      .Error {
+        font-weight:bold; color:red;
+      }
+      .Failure {
+        font-weight:bold; color:purple;
+      }
+      .Properties {
+        text-align:right;
+      }
+      </style>
+        
+        
+    </head>
+    <body>
+    <!--h1>JDepend Report</h1>
+    <ul>
+    <xsl:for-each select="./Packages/Package">
+                <xsl:sort select="@name"/>
+        <li><xsl:value-of select="@name"/></li>
+    </xsl:for-each>
+    </ul-->
+    
+    <h1><a name="top">JDepend Analysis</a></h1>
+    <p align="right">Designed for use with <a href="http://www.clarkware.com/software/JDepend.html">JDepend</a> and <a href="http://jakarta.apache.org">Ant</a>.</p>
+    <hr size="2" />
+    
+    <table width="100%"><tr><td>
+    <a name="NVsummary"><h2>Summary</h2></a>
+    </td><td align="right">
+    [<a href="#NVsummary">summary</a>]
+    [<a href="#NVpackages">packages</a>]
+    [<a href="#NVcycles">cycles</a>]
+    [<a href="#NVexplanations">explanations</a>]
+    </td></tr></table>
+    
+    <table width="100%" class="details">
+        <tr>
+            <th>Package</th>
+            <th>Total Classes</th>
+            <th><a href="#EXnumber">Abstract Classes</a></th>
+            <th><a href="#EXnumber">Concrete Classes</a></th>
+            <th><a href="#EXafferent">Afferent Couplings</a></th>
+            <th><a href="#EXefferent">Efferent Couplings</a></th>
+            <th><a href="#EXabstractness">Abstractness</a></th>
+            <th><a href="#EXinstability">Instability</a></th>
+            <th><a href="#EXdistance">Distance</a></th>
+            
+        </tr>
+    <xsl:for-each select="./Packages/Package">
+        <xsl:if test="count(error) = 0">
+            <tr>
+                <td align="left">
+                    <a>
+                    <xsl:attribute name="href">#PK<xsl:value-of select="@name"/>
+                    </xsl:attribute>
+                    <xsl:value-of select="@name"/>
+                    </a>
+                </td>
+                <td align="right"><xsl:value-of select="Stats/TotalClasses"/></td>
+                <td align="right"><xsl:value-of select="Stats/AbstractClasses"/></td>
+                <td align="right"><xsl:value-of select="Stats/ConcreteClasses"/></td>
+                <td align="right"><xsl:value-of select="Stats/Ca"/></td>
+                <td align="right"><xsl:value-of select="Stats/Ce"/></td>
+                <td align="right"><xsl:value-of select="Stats/A"/></td>
+                <td align="right"><xsl:value-of select="Stats/I"/></td>
+                <td align="right"><xsl:value-of select="Stats/D"/></td>
+                
+
+            </tr>
+        </xsl:if>
+    </xsl:for-each>
+    <xsl:for-each select="./Packages/Package">
+        <xsl:if test="count(error) > 0">
+            <tr>
+                <td align="left">
+                    <xsl:value-of select="@name"/>
+                </td>
+                <td align="left" colspan="8"><xsl:value-of select="error"/></td>
+            </tr>
+        </xsl:if>
+    </xsl:for-each>
+    </table>
+    
+    <table width="100%"><tr><td>
+    <a name="NVpackages"><h2>Packages</h2></a>
+    </td><td align="right">
+    [<a href="#NVsummary">summary</a>]
+    [<a href="#NVpackages">packages</a>]
+    [<a href="#NVcycles">cycles</a>]
+    [<a href="#NVexplanations">explanations</a>]
+    </td></tr></table>
+    
+    <xsl:for-each select="./Packages/Package">
+        <xsl:if test="count(error) = 0">
+            <h3><a><xsl:attribute name="name">PK<xsl:value-of select="@name"/></xsl:attribute>
+            <xsl:value-of select="@name"/></a></h3>
+            
+            <table width="100%"><tr>
+                <td><a href="#EXafferent">Afferent Couplings</a>: <xsl:value-of select="Stats/Ca"/></td>
+                <td><a href="#EXefferent">Efferent Couplings</a>: <xsl:value-of select="Stats/Ce"/></td>
+                <td><a href="#EXabstractness">Abstractness</a>: <xsl:value-of select="Stats/A"/></td>
+                <td><a href="#EXinstability">Instability</a>: <xsl:value-of select="Stats/I"/></td>
+                <td><a href="#EXdistance">Distance</a>: <xsl:value-of select="Stats/D"/></td>
+            </tr></table>
+            
+            <table width="100%" class="details">
+                <tr>
+                    <th>Abstract Classes</th>
+                    <th>Concrete Classes</th>
+                    <th>Used by Packages</th>
+                    <th>Uses Packages</th>
+                </tr>
+                <tr>
+                    <td valign="top" width="25%">
+                    <xsl:if test="count(AbstractClasses/Class)=0">
+                            <i>None</i>
+                        </xsl:if>
+                        <xsl:for-each select="AbstractClasses/Class">
+                            <xsl:value-of select="node()"/><br/>
+                        </xsl:for-each>
+                    </td>
+                    <td valign="top" width="25%">
+                        <xsl:if test="count(ConcreteClasses/Class)=0">
+                            <i>None</i>
+                        </xsl:if>
+                        <xsl:for-each select="ConcreteClasses/Class">
+                            <xsl:value-of select="node()"/><br/>
+                        </xsl:for-each>
+                    </td>
+                    <td valign="top" width="25%">
+                        <xsl:if test="count(UsedBy/Package)=0">
+                            <i>None</i>
+                        </xsl:if>
+                        <xsl:for-each select="UsedBy/Package">
+                            <a>
+                                <xsl:attribute name="href">#PK<xsl:value-of select="node()"/></xsl:attribute>
+                                <xsl:value-of select="node()"/>
+                            </a><br/>
+                        </xsl:for-each>
+                    </td>
+                    <td valign="top" width="25%">
+                        <xsl:if test="count(DependsUpon/Package)=0">
+                            <i>None</i>
+                        </xsl:if>
+                        <xsl:for-each select="DependsUpon/Package">
+                            <a>
+                                <xsl:attribute name="href">#PK<xsl:value-of select="node()"/></xsl:attribute>
+                                <xsl:value-of select="node()"/>
+                            </a><br/>
+                        </xsl:for-each>
+                    </td>
+                </tr>
+            </table>
+        </xsl:if>
+    </xsl:for-each>
+    
+    <table width="100%"><tr><td>
+    <a name="NVcycles"><h2>Cycles</h2></a>
+    </td><td align="right">
+    [<a href="#NVsummary">summary</a>]
+    [<a href="#NVpackages">packages</a>]
+    [<a href="#NVcycles">cycles</a>]
+    [<a href="#NVexplanations">explanations</a>]
+    </td></tr></table>
+    
+    <xsl:if test="count(Cycles/Package) = 0">
+        <p>There are no cyclic dependancies.</p>
+    </xsl:if>
+    <xsl:for-each select="Cycles/Package">
+        <h3><xsl:value-of select="@Name"/></h3><p>
+        <xsl:for-each select="Package">
+            <xsl:value-of select="."/><br/>
+        </xsl:for-each></p>
+    </xsl:for-each>
+    
+    <table width="100%"><tr><td>
+    <a name="NVexplanations"><h2>Explanations</h2></a>
+    </td><td align="right">
+    [<a href="#NVsummary">summary</a>]
+    [<a href="#NVpackages">packages</a>]
+    [<a href="#NVcycles">cycles</a>]
+    [<a href="#NVexplanations">explanations</a>]
+    </td></tr></table>
+    
+    <p>The following explanations are for quick reference and are lifted directly from the original <a href="http://www.clarkware.com/software/JDepend.html">JDepend documentation</a>.</p>
+    
+    <h3><a name="EXnumber">Number of Classes</a></h3>
+        <p>The number of concrete and abstract classes (and interfaces) in the package is an indicator of the extensibility of the package.</p>
+    <h3><a name="EXafferent">Afferent Couplings</a></h3>
+        <p>The number of other packages that depend upon classes within the package is an indicator of the package's responsibility. </p>
+    <h3><a name="EXefferent">Efferent Couplings</a></h3>
+        <p>The number of other packages that the classes in the package depend upon is an indicator of the package's independence. </p>
+    <h3><a name="EXabstractness">Abstractness</a></h3> 
+        <p>The ratio of the number of abstract classes (and interfaces) in the analyzed package to the total number of classes in the analyzed package. </p>
+        <p>The range for this metric is 0 to 1, with A=0 indicating a completely concrete package and A=1 indicating a completely abstract package. </p>
+    <h3><a name="EXinstability">Instability</a></h3>
+        <p>The ratio of efferent coupling (Ce) to total coupling (Ce / (Ce + Ca)). This metric is an indicator of the package's resilience to change. </p>
+        <p>The range for this metric is 0 to 1, with I=0 indicating a completely stable package and I=1 indicating a completely instable package. </p>
+    <h3><a name="EXdistance">Distance</a></h3>
+        <p>The perpendicular distance of a package from the idealized line A + I = 1. This metric is an indicator of the package's balance between abstractness and stability. </p>
+        <p>A package squarely on the main sequence is optimally balanced with respect to its abstractness and stability. Ideal packages are either completely abstract and stable (x=0, y=1) or completely concrete and instable (x=1, y=0). </p>
+        <p>The range for this metric is 0 to 1, with D=0 indicating a package that is coincident with the main sequence and D=1 indicating a package that is as far from the main sequence as possible. </p>
+    
+    </body>
+    </html>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/junit-frames-xalan1.xsl b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/junit-frames-xalan1.xsl
new file mode 100644
index 0000000..3258412
--- /dev/null
+++ b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/junit-frames-xalan1.xsl
@@ -0,0 +1,733 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+    xmlns:lxslt="http://xml.apache.org/xslt"
+    xmlns:redirect="org.apache.xalan.lib.Redirect"
+    xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"
+    extension-element-prefixes="redirect">
+<xsl:output method="html" indent="yes" encoding="UTF-8"/>
+<xsl:decimal-format decimal-separator="." grouping-separator=","/>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ -->
+
+<!--
+
+ Sample stylesheet to be used with Ant JUnitReport output.
+
+ It creates a set of HTML files a la javadoc where you can browse easily
+ through all packages and classes.
+
+-->
+<xsl:param name="output.dir" select="'.'"/>
+
+
+<xsl:template match="testsuites">
+    <!-- create the index.html -->
+    <redirect:write file="{$output.dir}/index.html">
+        <xsl:call-template name="index.html"/>
+    </redirect:write>
+
+    <!-- create the stylesheet.css -->
+    <redirect:write file="{$output.dir}/stylesheet.css">
+        <xsl:call-template name="stylesheet.css"/>
+    </redirect:write>
+
+    <!-- create the overview-packages.html at the root -->
+    <redirect:write file="{$output.dir}/overview-summary.html">
+        <xsl:apply-templates select="." mode="overview.packages"/>
+    </redirect:write>
+
+    <!-- create the all-packages.html at the root -->
+    <redirect:write file="{$output.dir}/overview-frame.html">
+        <xsl:apply-templates select="." mode="all.packages"/>
+    </redirect:write>
+
+    <!-- create the all-classes.html at the root -->
+    <redirect:write file="{$output.dir}/allclasses-frame.html">
+        <xsl:apply-templates select="." mode="all.classes"/>
+    </redirect:write>
+
+    <!-- process all packages -->
+    <xsl:for-each select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
+        <xsl:call-template name="package">
+            <xsl:with-param name="name" select="@package"/>
+        </xsl:call-template>
+    </xsl:for-each>
+</xsl:template>
+
+
+<xsl:template name="package">
+    <xsl:param name="name"/>
+    <xsl:variable name="package.dir">
+        <xsl:if test="not($name = '')"><xsl:value-of select="translate($name,'.','/')"/></xsl:if>
+        <xsl:if test="$name = ''">.</xsl:if>
+    </xsl:variable>
+    <!--Processing package <xsl:value-of select="@name"/> in <xsl:value-of select="$output.dir"/> -->
+    <!-- create a classes-list.html in the package directory -->
+    <redirect:write file="{$output.dir}/{$package.dir}/package-frame.html">
+        <xsl:call-template name="classes.list">
+            <xsl:with-param name="name" select="$name"/>
+        </xsl:call-template>
+    </redirect:write>
+
+    <!-- create a package-summary.html in the package directory -->
+    <redirect:write file="{$output.dir}/{$package.dir}/package-summary.html">
+        <xsl:call-template name="package.summary">
+            <xsl:with-param name="name" select="$name"/>
+        </xsl:call-template>
+    </redirect:write>
+
+    <!-- for each class, creates a @name.html -->
+    <!-- @bug there will be a problem with inner classes having the same name, it will be overwritten -->
+    <xsl:for-each select="/testsuites/testsuite[@package = $name]">
+        <redirect:write file="{$output.dir}/{$package.dir}/{@name}.html">
+            <xsl:apply-templates select="." mode="class.details"/>
+        </redirect:write>
+        <xsl:if test="string-length(./system-out)!=0">
+          <redirect:write file="{$output.dir}/{$package.dir}/{@name}-out.html">
+            <html>
+              <head>
+                <title>Standard Output from <xsl:value-of select="@name"/></title>
+              </head>
+              <body>
+                <pre><xsl:value-of select="./system-out"/></pre>
+              </body>
+            </html>
+          </redirect:write>
+        </xsl:if>
+        <xsl:if test="string-length(./system-err)!=0">
+          <redirect:write file="{$output.dir}/{$package.dir}/{@name}-err.html">
+            <html>
+              <head>
+                <title>Standard Error from <xsl:value-of select="@name"/></title>
+              </head>
+              <body>
+                <pre><xsl:value-of select="./system-err"/></pre>
+              </body>
+            </html>
+          </redirect:write>
+        </xsl:if>
+    </xsl:for-each>
+</xsl:template>
+
+<xsl:template name="index.html">
+<html>
+    <head>
+        <title>Unit Test Results.</title>
+    </head>
+    <frameset cols="20%,80%">
+        <frameset rows="30%,70%">
+            <frame src="overview-frame.html" name="packageListFrame"/>
+            <frame src="allclasses-frame.html" name="classListFrame"/>
+        </frameset>
+        <frame src="overview-summary.html" name="classFrame"/>
+        <noframes>
+            <h2>Frame Alert</h2>
+            <p>
+                This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
+            </p>
+        </noframes>
+    </frameset>
+</html>
+</xsl:template>
+
+<!-- this is the stylesheet css to use for nearly everything -->
+<xsl:template name="stylesheet.css">
+body {
+    font:normal 68% verdana,arial,helvetica;
+    color:#000000;
+}
+table tr td, table tr th {
+    font-size: 68%;
+}
+table.details tr th{
+    font-weight: bold;
+    text-align:left;
+    background:#a6caf0;
+}
+table.details tr td{
+    background:#eeeee0;
+}
+
+p {
+    line-height:1.5em;
+    margin-top:0.5em; margin-bottom:1.0em;
+}
+h1 {
+    margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
+}
+h2 {
+    margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica
+}
+h3 {
+    margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
+}
+h4 {
+    margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+}
+h5 {
+    margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+}
+h6 {
+    margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+}
+.Error {
+    font-weight:bold; color:red;
+}
+.Failure {
+    font-weight:bold; color:purple;
+}
+.Properties {
+  text-align:right;
+}
+</xsl:template>
+
+
+<!-- ======================================================================
+    This page is created for every testsuite class.
+    It prints a summary of the testsuite and detailed information about
+    testcase methods.
+     ====================================================================== -->
+<xsl:template match="testsuite" mode="class.details">
+    <xsl:variable name="package.name" select="@package"/>
+    <xsl:variable name="class.name"><xsl:if test="not($package.name = '')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></xsl:variable>
+    <html>
+        <head>
+          <title>Unit Test Results: <xsl:value-of select="$class.name"/></title>
+            <xsl:call-template name="create.stylesheet.link">
+                <xsl:with-param name="package.name" select="$package.name"/>
+            </xsl:call-template>
+       <script type="text/javascript" language="JavaScript">
+        var TestCases = new Array();
+        var cur;
+        <xsl:apply-templates select="properties"/>
+       </script>
+       <script type="text/javascript" language="JavaScript"><![CDATA[
+        function displayProperties (name) {
+          var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
+          var doc = win.document;
+          doc.open();
+          doc.write("<html><head><title>Properties of " + name + "</title>");
+          doc.write("<style type=\"text/css\">");
+          doc.write("body {font:normal 68% verdana,arial,helvetica; color:#000000; }");
+          doc.write("table tr td, table tr th { font-size: 68%; }");
+          doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
+          doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }");
+          doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }");
+          doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }");
+          doc.write("</style>");
+          doc.write("</head><body>");
+          doc.write("<h3>Properties of " + name + "</h3>");
+          doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>");
+          doc.write("<table class='properties'>");
+          doc.write("<tr><th>Name</th><th>Value</th></tr>");
+          for (prop in TestCases[name]) {
+            doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>");
+          }
+          doc.write("</table>");
+          doc.write("</body></html>");
+          doc.close();
+          win.focus();
+        }
+      ]]>
+      </script>
+        </head>
+        <body>
+            <xsl:call-template name="pageHeader"/>
+            <h3>Class <xsl:value-of select="$class.name"/></h3>
+
+
+            <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+                <xsl:call-template name="testsuite.test.header"/>
+                <xsl:apply-templates select="." mode="print.test"/>
+            </table>
+
+            <h2>Tests</h2>
+            <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+        <xsl:call-template name="testcase.test.header"/>
+              <!--
+              test can even not be started at all (failure to load the class)
+              so report the error directly
+              -->
+                <xsl:if test="./error">
+                    <tr class="Error">
+                        <td colspan="4"><xsl:apply-templates select="./error"/></td>
+                    </tr>
+                </xsl:if>
+                <xsl:apply-templates select="./testcase" mode="print.test"/>
+            </table>
+            <div class="Properties">
+                <a>
+                    <xsl:attribute name="href">javascript:displayProperties('<xsl:value-of select="@package"/>.<xsl:value-of select="@name"/>');</xsl:attribute>
+                    Properties »
+                </a>
+            </div>
+            <xsl:if test="string-length(./system-out)!=0">
+                <div class="Properties">
+                    <a>
+                        <xsl:attribute name="href">./<xsl:value-of select="@name"/>-out.html</xsl:attribute>
+                        System.out »
+                    </a>
+                </div>
+            </xsl:if>
+            <xsl:if test="string-length(./system-err)!=0">
+                <div class="Properties">
+                    <a>
+                        <xsl:attribute name="href">./<xsl:value-of select="@name"/>-err.html</xsl:attribute>
+                        System.err »
+                    </a>
+                </div>
+            </xsl:if>
+        </body>
+    </html>
+</xsl:template>
+
+  <!--
+   Write properties into a JavaScript data structure.
+   This is based on the original idea by Erik Hatcher (ehatcher at apache.org)
+   -->
+  <xsl:template match="properties">
+    cur = TestCases['<xsl:value-of select="../@package"/>.<xsl:value-of select="../@name"/>'] = new Array();
+    <xsl:for-each select="property">
+    <xsl:sort select="@name"/>
+        cur['<xsl:value-of select="@name"/>'] = '<xsl:call-template name="JS-escape"><xsl:with-param name="string" select="@value"/></xsl:call-template>';
+    </xsl:for-each>
+  </xsl:template>
+
+
+<!-- ======================================================================
+    This page is created for every package.
+    It prints the name of all classes that belongs to this package.
+    @param name the package name to print classes.
+     ====================================================================== -->
+<!-- list of classes in a package -->
+<xsl:template name="classes.list">
+    <xsl:param name="name"/>
+    <html>
+        <head>
+            <title>Unit Test Classes: <xsl:value-of select="$name"/></title>
+            <xsl:call-template name="create.stylesheet.link">
+                <xsl:with-param name="package.name" select="$name"/>
+            </xsl:call-template>
+        </head>
+        <body>
+            <table width="100%">
+                <tr>
+                    <td nowrap="nowrap">
+                        <h2><a href="package-summary.html" target="classFrame">
+                            <xsl:value-of select="$name"/>
+                            <xsl:if test="$name = ''"><none></xsl:if>
+                        </a></h2>
+                    </td>
+                </tr>
+            </table>
+
+            <h2>Classes</h2>
+            <table width="100%">
+                <xsl:for-each select="/testsuites/testsuite[./@package = $name]">
+                    <xsl:sort select="@name"/>
+                    <tr>
+                        <td nowrap="nowrap">
+                            <a href="{@name}.html" target="classFrame"><xsl:value-of select="@name"/></a>
+                        </td>
+                    </tr>
+                </xsl:for-each>
+            </table>
+        </body>
+    </html>
+</xsl:template>
+
+
+<!--
+    Creates an all-classes.html file that contains a link to all package-summary.html
+    on each class.
+-->
+<xsl:template match="testsuites" mode="all.classes">
+    <html>
+        <head>
+            <title>All Unit Test Classes</title>
+            <xsl:call-template name="create.stylesheet.link">
+                <xsl:with-param name="package.name"/>
+            </xsl:call-template>
+        </head>
+        <body>
+            <h2>Classes</h2>
+            <table width="100%">
+                <xsl:apply-templates select="testsuite" mode="all.classes">
+                    <xsl:sort select="@name"/>
+                </xsl:apply-templates>
+            </table>
+        </body>
+    </html>
+</xsl:template>
+
+<xsl:template match="testsuite" mode="all.classes">
+    <xsl:variable name="package.name" select="@package"/>
+    <tr>
+        <td nowrap="nowrap">
+            <a target="classFrame">
+                <xsl:attribute name="href">
+                    <xsl:if test="not($package.name='')">
+                        <xsl:value-of select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text>
+                    </xsl:if><xsl:value-of select="@name"/><xsl:text>.html</xsl:text>
+                </xsl:attribute>
+                <xsl:value-of select="@name"/>
+            </a>
+        </td>
+    </tr>
+</xsl:template>
+
+
+<!--
+    Creates an html file that contains a link to all package-summary.html files on
+    each package existing on testsuites.
+    @bug there will be a problem here, I don't know yet how to handle unnamed package :(
+-->
+<xsl:template match="testsuites" mode="all.packages">
+    <html>
+        <head>
+            <title>All Unit Test Packages</title>
+            <xsl:call-template name="create.stylesheet.link">
+                <xsl:with-param name="package.name"/>
+            </xsl:call-template>
+        </head>
+        <body>
+            <h2><a href="overview-summary.html" target="classFrame">Home</a></h2>
+            <h2>Packages</h2>
+            <table width="100%">
+                <xsl:apply-templates select="testsuite[not(./@package = preceding-sibling::testsuite/@package)]" mode="all.packages">
+                    <xsl:sort select="@package"/>
+                </xsl:apply-templates>
+            </table>
+        </body>
+    </html>
+</xsl:template>
+
+<xsl:template match="testsuite" mode="all.packages">
+    <tr>
+        <td nowrap="nowrap">
+            <a href="./{translate(@package,'.','/')}/package-summary.html" target="classFrame">
+                <xsl:value-of select="@package"/>
+                <xsl:if test="@package = ''"><none></xsl:if>
+            </a>
+        </td>
+    </tr>
+</xsl:template>
+
+
+<xsl:template match="testsuites" mode="overview.packages">
+    <html>
+        <head>
+            <title>Unit Test Results: Summary</title>
+            <xsl:call-template name="create.stylesheet.link">
+                <xsl:with-param name="package.name"/>
+            </xsl:call-template>
+        </head>
+        <body>
+        <xsl:attribute name="onload">open('allclasses-frame.html','classListFrame')</xsl:attribute>
+        <xsl:call-template name="pageHeader"/>
+        <h2>Summary</h2>
+        <xsl:variable name="testCount" select="sum(testsuite/@tests)"/>
+        <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/>
+        <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/>
+        <xsl:variable name="timeCount" select="sum(testsuite/@time)"/>
+        <xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/>
+        <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+        <tr valign="top">
+            <th>Tests</th>
+            <th>Failures</th>
+            <th>Errors</th>
+            <th>Success rate</th>
+            <th>Time</th>
+        </tr>
+        <tr valign="top">
+            <xsl:attribute name="class">
+                <xsl:choose>
+                    <xsl:when test="$errorCount > 0">Error</xsl:when>
+                    <xsl:when test="$failureCount > 0">Failure</xsl:when>
+                    <xsl:otherwise>Pass</xsl:otherwise>
+                </xsl:choose>
+            </xsl:attribute>
+            <td><xsl:value-of select="$testCount"/></td>
+            <td><xsl:value-of select="$failureCount"/></td>
+            <td><xsl:value-of select="$errorCount"/></td>
+            <td>
+                <xsl:call-template name="display-percent">
+                    <xsl:with-param name="value" select="$successRate"/>
+                </xsl:call-template>
+            </td>
+            <td>
+                <xsl:call-template name="display-time">
+                    <xsl:with-param name="value" select="$timeCount"/>
+                </xsl:call-template>
+            </td>
+        </tr>
+        </table>
+        <table border="0" width="95%">
+        <tr>
+        <td style="text-align: justify;">
+        Note: <em>failures</em> are anticipated and checked for with assertions while <em>errors</em> are unanticipated.
+        </td>
+        </tr>
+        </table>
+
+        <h2>Packages</h2>
+        <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+            <xsl:call-template name="testsuite.test.header"/>
+            <xsl:for-each select="testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
+                <xsl:sort select="@package" order="ascending"/>
+                <!-- get the node set containing all testsuites that have the same package -->
+                <xsl:variable name="insamepackage" select="/testsuites/testsuite[./@package = current()/@package]"/>
+                <tr valign="top">
+                    <!-- display a failure if there is any failure/error in the package -->
+                    <xsl:attribute name="class">
+                        <xsl:choose>
+                            <xsl:when test="sum($insamepackage/@errors) > 0">Error</xsl:when>
+                            <xsl:when test="sum($insamepackage/@failures) > 0">Failure</xsl:when>
+                            <xsl:otherwise>Pass</xsl:otherwise>
+                        </xsl:choose>
+                    </xsl:attribute>
+                    <td><a href="./{translate(@package,'.','/')}/package-summary.html">
+                        <xsl:value-of select="@package"/>
+                        <xsl:if test="@package = ''"><none></xsl:if>
+                    </a></td>
+                    <td><xsl:value-of select="sum($insamepackage/@tests)"/></td>
+                    <td><xsl:value-of select="sum($insamepackage/@errors)"/></td>
+                    <td><xsl:value-of select="sum($insamepackage/@failures)"/></td>
+                    <td>
+                    <xsl:call-template name="display-time">
+                        <xsl:with-param name="value" select="sum($insamepackage/@time)"/>
+                    </xsl:call-template>
+                    </td>
+                    <td><xsl:value-of select="$insamepackage/@timestamp"/></td>
+                    <td><xsl:value-of select="$insamepackage/@hostname"/></td>
+                </tr>
+            </xsl:for-each>
+        </table>
+        </body>
+        </html>
+</xsl:template>
+
+
+<xsl:template name="package.summary">
+    <xsl:param name="name"/>
+    <html>
+        <head>
+            <xsl:call-template name="create.stylesheet.link">
+                <xsl:with-param name="package.name" select="$name"/>
+            </xsl:call-template>
+        </head>
+        <body>
+            <xsl:attribute name="onload">open('package-frame.html','classListFrame')</xsl:attribute>
+            <xsl:call-template name="pageHeader"/>
+            <h3>Package <xsl:value-of select="$name"/></h3>
+
+            <!--table border="0" cellpadding="5" cellspacing="2" width="95%">
+                <xsl:call-template name="class.metrics.header"/>
+                <xsl:apply-templates select="." mode="print.metrics"/>
+            </table-->
+
+            <xsl:variable name="insamepackage" select="/testsuites/testsuite[./@package = $name]"/>
+            <xsl:if test="count($insamepackage) > 0">
+                <h2>Classes</h2>
+                <p>
+                <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+                    <xsl:call-template name="testsuite.test.header"/>
+                    <xsl:apply-templates select="$insamepackage" mode="print.test">
+                        <xsl:sort select="@name"/>
+                    </xsl:apply-templates>
+                </table>
+                </p>
+            </xsl:if>
+        </body>
+    </html>
+</xsl:template>
+
+
+<!--
+    transform string like a.b.c to ../../../
+    @param path the path to transform into a descending directory path
+-->
+<xsl:template name="path">
+    <xsl:param name="path"/>
+    <xsl:if test="contains($path,'.')">
+        <xsl:text>../</xsl:text>
+        <xsl:call-template name="path">
+            <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'.')"/></xsl:with-param>
+        </xsl:call-template>
+    </xsl:if>
+    <xsl:if test="not(contains($path,'.')) and not($path = '')">
+        <xsl:text>../</xsl:text>
+    </xsl:if>
+</xsl:template>
+
+
+<!-- create the link to the stylesheet based on the package name -->
+<xsl:template name="create.stylesheet.link">
+    <xsl:param name="package.name"/>
+    <link rel="stylesheet" type="text/css" title="Style"><xsl:attribute name="href"><xsl:if test="not($package.name = 'unnamed package')"><xsl:call-template name="path"><xsl:with-param name="path" select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></link>
+</xsl:template>
+
+
+<!-- Page HEADER -->
+<xsl:template name="pageHeader">
+    <h1>Unit Test Results</h1>
+    <table width="100%">
+    <tr>
+        <td align="left"></td>
+        <td align="right">Designed for use with <a href="http://www.junit.org/">JUnit</a> and <a href="http://ant.apache.org/">Ant</a>.</td>
+    </tr>
+    </table>
+    <hr size="1"/>
+</xsl:template>
+
+<!-- class header -->
+<xsl:template name="testsuite.test.header">
+    <tr valign="top">
+        <th width="80%">Name</th>
+        <th>Tests</th>
+        <th>Errors</th>
+        <th>Failures</th>
+        <th nowrap="nowrap">Time(s)</th>
+        <th nowrap="nowrap">Time Stamp</th>
+        <th>Host</th>
+    </tr>
+</xsl:template>
+
+<!-- method header -->
+<xsl:template name="testcase.test.header">
+    <tr valign="top">
+        <th>Name</th>
+        <th>Status</th>
+        <th width="80%">Type</th>
+        <th nowrap="nowrap">Time(s)</th>
+    </tr>
+</xsl:template>
+
+
+<!-- class information -->
+<xsl:template match="testsuite" mode="print.test">
+    <tr valign="top">
+        <xsl:attribute name="class">
+            <xsl:choose>
+                <xsl:when test="@errors[.> 0]">Error</xsl:when>
+                <xsl:when test="@failures[.> 0]">Failure</xsl:when>
+                <xsl:otherwise>Pass</xsl:otherwise>
+            </xsl:choose>
+        </xsl:attribute>
+        <td><a href="{@name}.html"><xsl:value-of select="@name"/></a></td>
+        <td><xsl:apply-templates select="@tests"/></td>
+        <td><xsl:apply-templates select="@errors"/></td>
+        <td><xsl:apply-templates select="@failures"/></td>
+        <td><xsl:call-template name="display-time">
+                <xsl:with-param name="value" select="@time"/>
+            </xsl:call-template>
+        </td>
+        <td><xsl:apply-templates select="@timestamp"/></td>
+        <td><xsl:apply-templates select="@hostname"/></td>
+    </tr>
+</xsl:template>
+
+<xsl:template match="testcase" mode="print.test">
+    <tr valign="top">
+        <xsl:attribute name="class">
+            <xsl:choose>
+                <xsl:when test="error">Error</xsl:when>
+                <xsl:when test="failure">Failure</xsl:when>
+                <xsl:otherwise>TableRowColor</xsl:otherwise>
+            </xsl:choose>
+        </xsl:attribute>
+        <td><xsl:value-of select="@name"/></td>
+        <xsl:choose>
+            <xsl:when test="failure">
+                <td>Failure</td>
+                <td><xsl:apply-templates select="failure"/></td>
+            </xsl:when>
+            <xsl:when test="error">
+                <td>Error</td>
+                <td><xsl:apply-templates select="error"/></td>
+            </xsl:when>
+            <xsl:otherwise>
+                <td>Success</td>
+                <td></td>
+            </xsl:otherwise>
+        </xsl:choose>
+        <td>
+            <xsl:call-template name="display-time">
+                <xsl:with-param name="value" select="@time"/>
+            </xsl:call-template>
+        </td>
+    </tr>
+</xsl:template>
+
+
+<!-- Note : the below template error and failure are the same style
+            so just call the same style store in the toolkit template -->
+<xsl:template match="failure">
+    <xsl:call-template name="display-failures"/>
+</xsl:template>
+
+<xsl:template match="error">
+    <xsl:call-template name="display-failures"/>
+</xsl:template>
+
+<!-- Style for the error and failure in the testcase template -->
+<xsl:template name="display-failures">
+    <xsl:choose>
+        <xsl:when test="not(@message)">N/A</xsl:when>
+        <xsl:otherwise>
+            <xsl:value-of select="@message"/>
+        </xsl:otherwise>
+    </xsl:choose>
+    <!-- display the stacktrace -->
+    <br/><br/>
+    <code>
+        <xsl:call-template name="br-replace">
+            <xsl:with-param name="word" select="."/>
+        </xsl:call-template>
+    </code>
+    <!-- the latter is better but might be problematic for non-21" monitors... -->
+    <!--pre><xsl:value-of select="."/></pre-->
+</xsl:template>
+
+<xsl:template name="JS-escape">
+    <xsl:param name="string"/>
+    <xsl:param name="tmp1" select="stringutils:replace(string($string),'\','\\')"/>
+    <xsl:param name="tmp2" select="stringutils:replace(string($tmp1),"'","\'")"/>
+    <xsl:value-of select="$tmp2"/>
+</xsl:template>
+
+
+<!--
+    template that will convert a carriage return into a br tag
+    @param word the text from which to convert CR to BR tag
+-->
+<xsl:template name="br-replace">
+    <xsl:param name="word"/>
+    <xsl:param name="br"><br/></xsl:param>
+    <xsl:value-of select='stringutils:replace(string($word),"&#xA;",$br)'/>
+</xsl:template>
+
+<xsl:template name="display-time">
+    <xsl:param name="value"/>
+    <xsl:value-of select="format-number($value,'0.000')"/>
+</xsl:template>
+
+<xsl:template name="display-percent">
+    <xsl:param name="value"/>
+    <xsl:value-of select="format-number($value,'0.00%')"/>
+</xsl:template>
+</xsl:stylesheet>
diff --git a/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/junit-frames.xsl b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/junit-frames.xsl
new file mode 100644
index 0000000..2149fe2
--- /dev/null
+++ b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/junit-frames.xsl
@@ -0,0 +1,902 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+    xmlns:lxslt="http://xml.apache.org/xslt"
+    xmlns:redirect="http://xml.apache.org/xalan/redirect"
+    xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"
+    extension-element-prefixes="redirect">
+<xsl:output method="html" indent="yes" encoding="UTF-8"/>
+<xsl:decimal-format decimal-separator="." grouping-separator=","/>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ -->
+
+<!--
+
+ Sample stylesheet to be used with Ant JUnitReport output.
+
+ It creates a set of HTML files a la javadoc where you can browse easily
+ through all packages and classes.
+
+-->
+<xsl:param name="output.dir" select="'.'"/>
+<xsl:param name="TITLE">Unit Test Results.</xsl:param>
+
+
+<xsl:template match="testsuites">
+    <!-- create the index.html -->
+    <redirect:write file="{$output.dir}/index.html">
+        <xsl:call-template name="index.html"/>
+    </redirect:write>
+
+    <!-- create the stylesheet.css -->
+    <redirect:write file="{$output.dir}/stylesheet.css">
+        <xsl:call-template name="stylesheet.css"/>
+    </redirect:write>
+
+    <!-- create the overview-packages.html at the root -->
+    <redirect:write file="{$output.dir}/overview-summary.html">
+        <xsl:apply-templates select="." mode="overview.packages"/>
+    </redirect:write>
+
+    <!-- create the all-packages.html at the root -->
+    <redirect:write file="{$output.dir}/overview-frame.html">
+        <xsl:apply-templates select="." mode="all.packages"/>
+    </redirect:write>
+
+    <!-- create the all-classes.html at the root -->
+    <redirect:write file="{$output.dir}/allclasses-frame.html">
+        <xsl:apply-templates select="." mode="all.classes"/>
+    </redirect:write>
+
+    <!-- create the all-tests.html at the root -->
+    <redirect:write file="{$output.dir}/all-tests.html">
+        <xsl:apply-templates select="." mode="all.tests"/>
+    </redirect:write>
+
+    <!-- create the alltests-fails.html at the root -->
+    <redirect:write file="{$output.dir}/alltests-fails.html">
+      <xsl:apply-templates select="." mode="all.tests">
+        <xsl:with-param name="type" select="'fails'"/>
+      </xsl:apply-templates>
+    </redirect:write>
+
+  <!-- create the alltests-errors.html at the root -->
+    <redirect:write file="{$output.dir}/alltests-errors.html">
+      <xsl:apply-templates select="." mode="all.tests">
+        <xsl:with-param name="type" select="'errors'"/>
+      </xsl:apply-templates>
+    </redirect:write>
+
+  <!-- process all packages -->
+    <xsl:for-each select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
+        <xsl:call-template name="package">
+            <xsl:with-param name="name" select="@package"/>
+        </xsl:call-template>
+    </xsl:for-each>
+</xsl:template>
+
+
+<xsl:template name="package">
+    <xsl:param name="name"/>
+    <xsl:variable name="package.dir">
+        <xsl:if test="not($name = '')"><xsl:value-of select="translate($name,'.','/')"/></xsl:if>
+        <xsl:if test="$name = ''">.</xsl:if>
+    </xsl:variable>
+    <!--Processing package <xsl:value-of select="@name"/> in <xsl:value-of select="$output.dir"/> -->
+    <!-- create a classes-list.html in the package directory -->
+    <redirect:write file="{$output.dir}/{$package.dir}/package-frame.html">
+        <xsl:call-template name="classes.list">
+            <xsl:with-param name="name" select="$name"/>
+        </xsl:call-template>
+    </redirect:write>
+
+    <!-- create a package-summary.html in the package directory -->
+    <redirect:write file="{$output.dir}/{$package.dir}/package-summary.html">
+        <xsl:call-template name="package.summary">
+            <xsl:with-param name="name" select="$name"/>
+        </xsl:call-template>
+    </redirect:write>
+
+    <!-- for each class, creates a @name.html -->
+    <!-- @bug there will be a problem with inner classes having the same name, it will be overwritten -->
+  <xsl:for-each select="/testsuites/testsuite[@package = $name]">
+    <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}.html">
+      <xsl:apply-templates select="." mode="class.details"/>
+    </redirect:write>
+    <xsl:if test="string-length(./system-out)!=0">
+      <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-out.html">
+        <html>
+          <head>
+            <title>Standard Output from <xsl:value-of select="@name"/></title>
+          </head>
+          <body>
+            <pre><xsl:value-of select="./system-out"/></pre>
+          </body>
+        </html>
+      </redirect:write>
+    </xsl:if>
+    <xsl:if test="string-length(./system-err)!=0">
+      <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-err.html">
+        <html>
+          <head>
+            <title>Standard Error from <xsl:value-of select="@name"/></title>
+          </head>
+          <body>
+            <pre><xsl:value-of select="./system-err"/></pre>
+          </body>
+        </html>
+      </redirect:write>
+    </xsl:if>
+    <xsl:if test="@failures != 0">
+      <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-fails.html">
+        <xsl:apply-templates select="." mode="class.details">
+          <xsl:with-param name="type" select="'fails'"/>
+        </xsl:apply-templates>
+      </redirect:write>
+    </xsl:if>
+    <xsl:if test="@errors != 0">
+      <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-errors.html">
+        <xsl:apply-templates select="." mode="class.details">
+          <xsl:with-param name="type" select="'errors'"/>
+        </xsl:apply-templates>
+      </redirect:write>
+    </xsl:if>
+  </xsl:for-each>
+</xsl:template>
+
+<xsl:template name="index.html">
+<html>
+    <head>
+        <title><xsl:value-of select="$TITLE"/></title>
+    </head>
+    <frameset cols="20%,80%">
+        <frameset rows="30%,70%">
+            <frame src="overview-frame.html" name="packageListFrame"/>
+            <frame src="allclasses-frame.html" name="classListFrame"/>
+        </frameset>
+        <frame src="overview-summary.html" name="classFrame"/>
+        <noframes>
+            <h2>Frame Alert</h2>
+            <p>
+                This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
+            </p>
+        </noframes>
+    </frameset>
+</html>
+</xsl:template>
+
+<!-- this is the stylesheet css to use for nearly everything -->
+<xsl:template name="stylesheet.css">
+body {
+    font:normal 68% verdana,arial,helvetica;
+    color:#000000;
+}
+table tr td, table tr th {
+    font-size: 68%;
+}
+table.details tr th{
+    font-weight: bold;
+    text-align:left;
+    background:#a6caf0;
+}
+table.details tr td{
+    background:#eeeee0;
+}
+
+p {
+    line-height:1.5em;
+    margin-top:0.5em; margin-bottom:1.0em;
+}
+h1 {
+    margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
+}
+h2 {
+    margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica
+}
+h3 {
+    margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
+}
+h4 {
+    margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+}
+h5 {
+    margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+}
+h6 {
+    margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+}
+.Error {
+    font-weight:bold; color:red;
+}
+.Failure {
+    font-weight:bold; color:purple;
+}
+.Properties {
+  text-align:right;
+}
+</xsl:template>
+
+<!-- Create list of all/failed/errored tests -->
+<xsl:template match="testsuites" mode="all.tests">
+    <xsl:param name="type" select="'all'"/>
+    <html>
+	<xsl:variable name="title">
+	    <xsl:choose>
+		<xsl:when test="$type = 'fails'">
+		    <xsl:text>All Failures</xsl:text>
+		</xsl:when>
+		<xsl:when test="$type = 'errors'">
+		    <xsl:text>All Errors</xsl:text>
+		</xsl:when>
+		<xsl:otherwise>
+		    <xsl:text>All Tests</xsl:text>
+		</xsl:otherwise>
+	    </xsl:choose>
+	</xsl:variable>
+	<head>
+	    <title>Unit Test Results: <xsl:value-of select="$title"/></title>
+	    <xsl:call-template name="create.stylesheet.link">
+                <xsl:with-param name="package.name"/>
+            </xsl:call-template>
+	</head>
+	<body>
+	    <xsl:attribute name="onload">open('allclasses-frame.html','classListFrame')</xsl:attribute>
+            <xsl:call-template name="pageHeader"/>
+            <h2><xsl:value-of select="$title"/></h2>
+
+            <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+		<xsl:call-template name="testcase.test.header">
+		    <xsl:with-param name="show.class" select="'yes'"/>
+		</xsl:call-template>
+		<!--
+                test can even not be started at all (failure to load the class)
+		so report the error directly
+		-->
+              <xsl:if test="./error">
+                <tr class="Error">
+                  <td colspan="4">
+                    <xsl:apply-templates select="./error"/>
+                  </td>
+                </tr>
+              </xsl:if>
+              <xsl:choose>
+                <xsl:when test="$type = 'fails'">
+                  <xsl:apply-templates select=".//testcase[failure]" mode="print.test">
+                    <xsl:with-param name="show.class" select="'yes'"/>
+                  </xsl:apply-templates>
+                </xsl:when>
+                <xsl:when test="$type = 'errors'">
+                  <xsl:apply-templates select=".//testcase[error]" mode="print.test">
+                    <xsl:with-param name="show.class" select="'yes'"/>
+                  </xsl:apply-templates>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:apply-templates select=".//testcase" mode="print.test">
+                    <xsl:with-param name="show.class" select="'yes'"/>
+                  </xsl:apply-templates>
+                </xsl:otherwise>
+              </xsl:choose>
+            </table>
+        </body>
+    </html>
+</xsl:template>
+
+
+<!-- ======================================================================
+    This page is created for every testsuite class.
+    It prints a summary of the testsuite and detailed information about
+    testcase methods.
+     ====================================================================== -->
+<xsl:template match="testsuite" mode="class.details">
+    <xsl:param name="type" select="'all'"/>
+    <xsl:variable name="package.name" select="@package"/>
+    <xsl:variable name="class.name"><xsl:if test="not($package.name = '')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></xsl:variable>
+    <html>
+        <head>
+          <title>Unit Test Results: <xsl:value-of select="$class.name"/></title>
+            <xsl:call-template name="create.stylesheet.link">
+                <xsl:with-param name="package.name" select="$package.name"/>
+            </xsl:call-template>
+       <script type="text/javascript" language="JavaScript">
+        var TestCases = new Array();
+        var cur;
+        <xsl:apply-templates select="properties"/>
+       </script>
+       <script type="text/javascript" language="JavaScript"><![CDATA[
+        function displayProperties (name) {
+          var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
+          var doc = win.document;
+          doc.open();
+          doc.write("<html><head><title>Properties of " + name + "</title>");
+          doc.write("<style type=\"text/css\">");
+          doc.write("body {font:normal 68% verdana,arial,helvetica; color:#000000; }");
+          doc.write("table tr td, table tr th { font-size: 68%; }");
+          doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
+          doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }");
+          doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }");
+          doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }");
+          doc.write("</style>");
+          doc.write("</head><body>");
+          doc.write("<h3>Properties of " + name + "</h3>");
+          doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>");
+          doc.write("<table class='properties'>");
+          doc.write("<tr><th>Name</th><th>Value</th></tr>");
+          for (prop in TestCases[name]) {
+            doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>");
+          }
+          doc.write("</table>");
+          doc.write("</body></html>");
+          doc.close();
+          win.focus();
+        }
+      ]]>
+      </script>
+        </head>
+        <body>
+            <xsl:call-template name="pageHeader"/>
+            <h3>Class <xsl:value-of select="$class.name"/></h3>
+
+
+            <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+                <xsl:call-template name="testsuite.test.header"/>
+                <xsl:apply-templates select="." mode="print.test"/>
+            </table>
+
+	    <xsl:choose>
+		<xsl:when test="$type = 'fails'">
+		    <h2>Failures</h2>
+		</xsl:when>
+		<xsl:when test="$type = 'errors'">
+		    <h2>Errors</h2>
+		</xsl:when>
+		<xsl:otherwise>
+		    <h2>Tests</h2>
+		</xsl:otherwise>
+	    </xsl:choose>
+            <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+		<xsl:call-template name="testcase.test.header"/>
+		<!--
+                test can even not be started at all (failure to load the class)
+		so report the error directly
+		-->
+                <xsl:if test="./error">
+                    <tr class="Error">
+                        <td colspan="4"><xsl:apply-templates select="./error"/></td>
+                    </tr>
+                </xsl:if>
+		<xsl:choose>
+		    <xsl:when test="$type = 'fails'">
+			<xsl:apply-templates select="./testcase[failure]" mode="print.test"/>
+		    </xsl:when>
+		    <xsl:when test="$type = 'errors'">
+			<xsl:apply-templates select="./testcase[error]" mode="print.test"/>
+		    </xsl:when>
+		    <xsl:otherwise>
+			<xsl:apply-templates select="./testcase" mode="print.test"/>
+		    </xsl:otherwise>
+		</xsl:choose>
+            </table>
+            <div class="Properties">
+                <a>
+                    <xsl:attribute name="href">javascript:displayProperties('<xsl:value-of select="@package"/>.<xsl:value-of select="@name"/>');</xsl:attribute>
+                    Properties »
+                </a>
+            </div>
+            <xsl:if test="string-length(./system-out)!=0">
+                <div class="Properties">
+                    <a>
+                        <xsl:attribute name="href">./<xsl:value-of select="@id"/>_<xsl:value-of select="@name"/>-out.html</xsl:attribute>
+                        System.out »
+                    </a>
+                </div>
+            </xsl:if>
+            <xsl:if test="string-length(./system-err)!=0">
+                <div class="Properties">
+                    <a>
+                        <xsl:attribute name="href">./<xsl:value-of select="@id"/>_<xsl:value-of select="@name"/>-err.html</xsl:attribute>
+                        System.err »
+                    </a>
+                </div>
+            </xsl:if>
+        </body>
+    </html>
+</xsl:template>
+
+  <!--
+   Write properties into a JavaScript data structure.
+   This is based on the original idea by Erik Hatcher (ehatcher at apache.org)
+   -->
+  <xsl:template match="properties">
+    cur = TestCases['<xsl:value-of select="../@package"/>.<xsl:value-of select="../@name"/>'] = new Array();
+    <xsl:for-each select="property">
+    <xsl:sort select="@name"/>
+        cur['<xsl:value-of select="@name"/>'] = '<xsl:call-template name="JS-escape"><xsl:with-param name="string" select="@value"/></xsl:call-template>';
+    </xsl:for-each>
+  </xsl:template>
+
+
+<!-- ======================================================================
+    This page is created for every package.
+    It prints the name of all classes that belongs to this package.
+    @param name the package name to print classes.
+     ====================================================================== -->
+<!-- list of classes in a package -->
+<xsl:template name="classes.list">
+    <xsl:param name="name"/>
+    <html>
+        <head>
+            <title>Unit Test Classes: <xsl:value-of select="$name"/></title>
+            <xsl:call-template name="create.stylesheet.link">
+                <xsl:with-param name="package.name" select="$name"/>
+            </xsl:call-template>
+        </head>
+        <body>
+            <table width="100%">
+                <tr>
+                    <td nowrap="nowrap">
+                        <h2><a href="package-summary.html" target="classFrame">
+                            <xsl:value-of select="$name"/>
+                            <xsl:if test="$name = ''"><none></xsl:if>
+                        </a></h2>
+                    </td>
+                </tr>
+            </table>
+
+            <h2>Classes</h2>
+            <table width="100%">
+                <xsl:for-each select="/testsuites/testsuite[./@package = $name]">
+                    <xsl:sort select="@name"/>
+                    <tr>
+                        <td nowrap="nowrap">
+                            <a href="{@id}_{@name}.html" target="classFrame"><xsl:value-of select="@name"/></a>
+                        </td>
+                    </tr>
+                </xsl:for-each>
+            </table>
+        </body>
+    </html>
+</xsl:template>
+
+
+<!--
+    Creates an all-classes.html file that contains a link to all package-summary.html
+    on each class.
+-->
+<xsl:template match="testsuites" mode="all.classes">
+    <html>
+        <head>
+            <title>All Unit Test Classes</title>
+            <xsl:call-template name="create.stylesheet.link">
+                <xsl:with-param name="package.name"/>
+            </xsl:call-template>
+        </head>
+        <body>
+            <h2>Classes</h2>
+            <table width="100%">
+                <xsl:apply-templates select="testsuite" mode="all.classes">
+                    <xsl:sort select="@name"/>
+                </xsl:apply-templates>
+            </table>
+        </body>
+    </html>
+</xsl:template>
+
+<xsl:template match="testsuite" mode="all.classes">
+    <xsl:variable name="package.name" select="@package"/>
+    <tr>
+        <td nowrap="nowrap">
+            <a target="classFrame">
+                <xsl:attribute name="href">
+                    <xsl:if test="not($package.name='')">
+                        <xsl:value-of select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text>
+                    </xsl:if><xsl:value-of select="@id"/>_<xsl:value-of select="@name"/><xsl:text>.html</xsl:text>
+                </xsl:attribute>
+                <xsl:value-of select="@name"/>
+            </a>
+        </td>
+    </tr>
+</xsl:template>
+
+
+<!--
+    Creates an html file that contains a link to all package-summary.html files on
+    each package existing on testsuites.
+    @bug there will be a problem here, I don't know yet how to handle unnamed package :(
+-->
+<xsl:template match="testsuites" mode="all.packages">
+    <html>
+        <head>
+            <title>All Unit Test Packages</title>
+            <xsl:call-template name="create.stylesheet.link">
+                <xsl:with-param name="package.name"/>
+            </xsl:call-template>
+        </head>
+        <body>
+            <h2><a href="overview-summary.html" target="classFrame">Home</a></h2>
+            <h2>Packages</h2>
+            <table width="100%">
+                <xsl:apply-templates select="testsuite[not(./@package = preceding-sibling::testsuite/@package)]" mode="all.packages">
+                    <xsl:sort select="@package"/>
+                </xsl:apply-templates>
+            </table>
+        </body>
+    </html>
+</xsl:template>
+
+<xsl:template match="testsuite" mode="all.packages">
+    <tr>
+        <td nowrap="nowrap">
+            <a href="./{translate(@package,'.','/')}/package-summary.html" target="classFrame">
+                <xsl:value-of select="@package"/>
+                <xsl:if test="@package = ''"><none></xsl:if>
+            </a>
+        </td>
+    </tr>
+</xsl:template>
+
+
+<xsl:template match="testsuites" mode="overview.packages">
+    <html>
+        <head>
+            <title>Unit Test Results: Summary</title>
+            <xsl:call-template name="create.stylesheet.link">
+                <xsl:with-param name="package.name"/>
+            </xsl:call-template>
+        </head>
+        <body>
+        <xsl:attribute name="onload">open('allclasses-frame.html','classListFrame')</xsl:attribute>
+        <xsl:call-template name="pageHeader"/>
+        <h2>Summary</h2>
+        <xsl:variable name="testCount" select="sum(testsuite/@tests)"/>
+        <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/>
+        <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/>
+        <xsl:variable name="timeCount" select="sum(testsuite/@time)"/>
+        <xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/>
+        <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+        <tr valign="top">
+            <th>Tests</th>
+            <th>Failures</th>
+            <th>Errors</th>
+            <th>Success rate</th>
+            <th>Time</th>
+        </tr>
+        <tr valign="top">
+            <xsl:attribute name="class">
+                <xsl:choose>
+                    <xsl:when test="$errorCount > 0">Error</xsl:when>
+                    <xsl:when test="$failureCount > 0">Failure</xsl:when>
+                    <xsl:otherwise>Pass</xsl:otherwise>
+                </xsl:choose>
+            </xsl:attribute>
+            <td><a title="Display all tests" href="all-tests.html"><xsl:value-of select="$testCount"/></a></td>
+            <td><a title="Display all failures" href="alltests-fails.html"><xsl:value-of select="$failureCount"/></a></td>
+            <td><a title="Display all errors" href="alltests-errors.html"><xsl:value-of select="$errorCount"/></a></td>
+            <td>
+                <xsl:call-template name="display-percent">
+                    <xsl:with-param name="value" select="$successRate"/>
+                </xsl:call-template>
+            </td>
+            <td>
+                <xsl:call-template name="display-time">
+                    <xsl:with-param name="value" select="$timeCount"/>
+                </xsl:call-template>
+            </td>
+        </tr>
+        </table>
+        <table border="0" width="95%">
+        <tr>
+        <td style="text-align: justify;">
+        Note: <em>failures</em> are anticipated and checked for with assertions while <em>errors</em> are unanticipated.
+        </td>
+        </tr>
+        </table>
+
+        <h2>Packages</h2>
+        <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+            <xsl:call-template name="testsuite.test.header"/>
+            <xsl:for-each select="testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
+                <xsl:sort select="@package" order="ascending"/>
+                <!-- get the node set containing all testsuites that have the same package -->
+                <xsl:variable name="insamepackage" select="/testsuites/testsuite[./@package = current()/@package]"/>
+                <tr valign="top">
+                    <!-- display a failure if there is any failure/error in the package -->
+                    <xsl:attribute name="class">
+                        <xsl:choose>
+                            <xsl:when test="sum($insamepackage/@errors) > 0">Error</xsl:when>
+                            <xsl:when test="sum($insamepackage/@failures) > 0">Failure</xsl:when>
+                            <xsl:otherwise>Pass</xsl:otherwise>
+                        </xsl:choose>
+                    </xsl:attribute>
+                    <td><a href="./{translate(@package,'.','/')}/package-summary.html">
+                        <xsl:value-of select="@package"/>
+                        <xsl:if test="@package = ''"><none></xsl:if>
+                    </a></td>
+                    <td><xsl:value-of select="sum($insamepackage/@tests)"/></td>
+                    <td><xsl:value-of select="sum($insamepackage/@errors)"/></td>
+                    <td><xsl:value-of select="sum($insamepackage/@failures)"/></td>
+                    <td>
+                    <xsl:call-template name="display-time">
+                        <xsl:with-param name="value" select="sum($insamepackage/@time)"/>
+                    </xsl:call-template>
+                    </td>
+                    <td><xsl:value-of select="$insamepackage/@timestamp"/></td>
+                    <td><xsl:value-of select="$insamepackage/@hostname"/></td>
+                </tr>
+            </xsl:for-each>
+        </table>
+        </body>
+        </html>
+</xsl:template>
+
+
+<xsl:template name="package.summary">
+    <xsl:param name="name"/>
+    <html>
+        <head>
+            <xsl:call-template name="create.stylesheet.link">
+                <xsl:with-param name="package.name" select="$name"/>
+            </xsl:call-template>
+        </head>
+        <body>
+            <xsl:attribute name="onload">open('package-frame.html','classListFrame')</xsl:attribute>
+            <xsl:call-template name="pageHeader"/>
+            <h3>Package <xsl:value-of select="$name"/></h3>
+
+            <!--table border="0" cellpadding="5" cellspacing="2" width="95%">
+                <xsl:call-template name="class.metrics.header"/>
+                <xsl:apply-templates select="." mode="print.metrics"/>
+            </table-->
+
+            <xsl:variable name="insamepackage" select="/testsuites/testsuite[./@package = $name]"/>
+            <xsl:if test="count($insamepackage) > 0">
+                <h2>Classes</h2>
+                <p>
+                <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+                    <xsl:call-template name="testsuite.test.header"/>
+                    <xsl:apply-templates select="$insamepackage" mode="print.test">
+                        <xsl:sort select="@name"/>
+                    </xsl:apply-templates>
+                </table>
+                </p>
+            </xsl:if>
+        </body>
+    </html>
+</xsl:template>
+
+
+<!--
+    transform string like a.b.c to ../../../
+    @param path the path to transform into a descending directory path
+-->
+<xsl:template name="path">
+    <xsl:param name="path"/>
+    <xsl:if test="contains($path,'.')">
+        <xsl:text>../</xsl:text>
+        <xsl:call-template name="path">
+            <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'.')"/></xsl:with-param>
+        </xsl:call-template>
+    </xsl:if>
+    <xsl:if test="not(contains($path,'.')) and not($path = '')">
+        <xsl:text>../</xsl:text>
+    </xsl:if>
+</xsl:template>
+
+
+<!-- create the link to the stylesheet based on the package name -->
+<xsl:template name="create.stylesheet.link">
+    <xsl:param name="package.name"/>
+    <link rel="stylesheet" type="text/css" title="Style"><xsl:attribute name="href"><xsl:if test="not($package.name = 'unnamed package')"><xsl:call-template name="path"><xsl:with-param name="path" select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></link>
+</xsl:template>
+
+
+<!-- Page HEADER -->
+<xsl:template name="pageHeader">
+    <h1><xsl:value-of select="$TITLE"/></h1>
+    <table width="100%">
+    <tr>
+        <td align="left"></td>
+        <td align="right">Designed for use with <a href="http://www.junit.org/">JUnit</a> and <a href="http://ant.apache.org/">Ant</a>.</td>
+    </tr>
+    </table>
+    <hr size="1"/>
+</xsl:template>
+
+<!-- class header -->
+<xsl:template name="testsuite.test.header">
+    <tr valign="top">
+        <th width="80%">Name</th>
+        <th>Tests</th>
+        <th>Errors</th>
+        <th>Failures</th>
+        <th nowrap="nowrap">Time(s)</th>
+        <th nowrap="nowrap">Time Stamp</th>
+        <th>Host</th>
+    </tr>
+</xsl:template>
+
+<!-- method header -->
+<xsl:template name="testcase.test.header">
+    <xsl:param name="show.class" select="''"/>
+    <tr valign="top">
+	<xsl:if test="boolean($show.class)">
+	    <th>Class</th>
+	</xsl:if>
+        <th>Name</th>
+        <th>Status</th>
+        <th width="80%">Type</th>
+        <th nowrap="nowrap">Time(s)</th>
+    </tr>
+</xsl:template>
+
+
+<!-- class information -->
+<xsl:template match="testsuite" mode="print.test">
+    <tr valign="top">
+        <xsl:attribute name="class">
+            <xsl:choose>
+                <xsl:when test="@errors[.> 0]">Error</xsl:when>
+                <xsl:when test="@failures[.> 0]">Failure</xsl:when>
+                <xsl:otherwise>Pass</xsl:otherwise>
+            </xsl:choose>
+        </xsl:attribute>
+        <td><a title="Display all tests" href="{@id}_{@name}.html"><xsl:value-of select="@name"/></a></td>
+        <td><a title="Display all tests" href="{@id}_{@name}.html"><xsl:apply-templates select="@tests"/></a></td>
+        <td>
+	    <xsl:choose>
+		<xsl:when test="@errors != 0">
+		    <a title="Display only errors" href="{@id}_{@name}-errors.html"><xsl:apply-templates select="@errors"/></a>
+		</xsl:when>
+		<xsl:otherwise>
+		    <xsl:apply-templates select="@errors"/>
+		</xsl:otherwise>
+	    </xsl:choose>
+	</td>
+        <td>
+	    <xsl:choose>
+		<xsl:when test="@failures != 0">
+		    <a title="Display only failures" href="{@id}_{@name}-fails.html"><xsl:apply-templates select="@failures"/></a>
+		</xsl:when>
+		<xsl:otherwise>
+		    <xsl:apply-templates select="@failures"/>
+		</xsl:otherwise>
+	    </xsl:choose>
+	</td>
+        <td><xsl:call-template name="display-time">
+                <xsl:with-param name="value" select="@time"/>
+            </xsl:call-template>
+        </td>
+        <td><xsl:apply-templates select="@timestamp"/></td>
+        <td><xsl:apply-templates select="@hostname"/></td>
+    </tr>
+</xsl:template>
+
+<xsl:template match="testcase" mode="print.test">
+    <xsl:param name="show.class" select="''"/>
+    <tr valign="top">
+        <xsl:attribute name="class">
+            <xsl:choose>
+                <xsl:when test="error">Error</xsl:when>
+                <xsl:when test="failure">Failure</xsl:when>
+                <xsl:otherwise>TableRowColor</xsl:otherwise>
+            </xsl:choose>
+        </xsl:attribute>
+	<xsl:variable name="class.href">
+	    <xsl:value-of select="concat(translate(../@package,'.','/'), '/', ../@id, '_', ../@name, '.html')"/>
+	</xsl:variable>
+	<xsl:if test="boolean($show.class)">
+	    <td><a href="{$class.href}"><xsl:value-of select="../@name"/></a></td>
+	</xsl:if>
+        <td>
+	    <a name="{@name}"/>
+	    <xsl:choose>
+		<xsl:when test="boolean($show.class)">
+		    <a href="{concat($class.href, '#', @name)}"><xsl:value-of select="@name"/></a>
+		</xsl:when>
+		<xsl:otherwise>
+		    <xsl:value-of select="@name"/>
+		</xsl:otherwise>
+	    </xsl:choose>
+	</td>
+        <xsl:choose>
+            <xsl:when test="failure">
+                <td>Failure</td>
+                <td><xsl:apply-templates select="failure"/></td>
+            </xsl:when>
+            <xsl:when test="error">
+                <td>Error</td>
+                <td><xsl:apply-templates select="error"/></td>
+            </xsl:when>
+            <xsl:otherwise>
+                <td>Success</td>
+                <td></td>
+            </xsl:otherwise>
+        </xsl:choose>
+        <td>
+            <xsl:call-template name="display-time">
+                <xsl:with-param name="value" select="@time"/>
+            </xsl:call-template>
+        </td>
+    </tr>
+</xsl:template>
+
+
+<!-- Note : the below template error and failure are the same style
+            so just call the same style store in the toolkit template -->
+<xsl:template match="failure">
+    <xsl:call-template name="display-failures"/>
+</xsl:template>
+
+<xsl:template match="error">
+    <xsl:call-template name="display-failures"/>
+</xsl:template>
+
+<!-- Style for the error and failure in the testcase template -->
+<xsl:template name="display-failures">
+    <xsl:choose>
+        <xsl:when test="not(@message)">N/A</xsl:when>
+        <xsl:otherwise>
+            <xsl:value-of select="@message"/>
+        </xsl:otherwise>
+    </xsl:choose>
+    <!-- display the stacktrace -->
+    <br/><br/>
+    <code>
+        <xsl:call-template name="br-replace">
+            <xsl:with-param name="word" select="."/>
+        </xsl:call-template>
+    </code>
+    <!-- the latter is better but might be problematic for non-21" monitors... -->
+    <!--pre><xsl:value-of select="."/></pre-->
+</xsl:template>
+
+<xsl:template name="JS-escape">
+    <xsl:param name="string"/>
+    <xsl:param name="tmp1" select="stringutils:replace(string($string),'\','\\')"/>
+    <xsl:param name="tmp2" select="stringutils:replace(string($tmp1),"'","\'")"/>
+    <xsl:value-of select="$tmp2"/>
+</xsl:template>
+
+
+<!--
+    template that will convert a carriage return into a br tag
+    @param word the text from which to convert CR to BR tag
+-->
+<xsl:template name="br-replace">
+    <xsl:param name="word"/>
+    <xsl:choose>
+      <xsl:when test="contains($word, '&#xa;')">
+        <xsl:value-of select="substring-before($word, '&#xa;')"/>
+        <br/>
+        <xsl:call-template name="br-replace">
+          <xsl:with-param name="word" select="substring-after($word, '&#xa;')"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+	<xsl:value-of select="$word"/>
+      </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+<xsl:template name="display-time">
+    <xsl:param name="value"/>
+    <xsl:value-of select="format-number($value,'0.000')"/>
+</xsl:template>
+
+<xsl:template name="display-percent">
+    <xsl:param name="value"/>
+    <xsl:value-of select="format-number($value,'0.00%')"/>
+</xsl:template>
+</xsl:stylesheet>
diff --git a/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/junit-noframes.xsl b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/junit-noframes.xsl
new file mode 100644
index 0000000..0da2a68
--- /dev/null
+++ b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/junit-noframes.xsl
@@ -0,0 +1,478 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+        xmlns:lxslt="http://xml.apache.org/xslt"
+        xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils">
+<xsl:output method="html" indent="yes" encoding="UTF-8"
+  doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
+<xsl:decimal-format decimal-separator="." grouping-separator="," />
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ -->
+
+<xsl:param name="TITLE">Unit Test Results.</xsl:param>
+
+<!--
+
+ Sample stylesheet to be used with Ant JUnitReport output.
+
+ It creates a non-framed report that can be useful to send via
+ e-mail or such.
+
+-->
+<xsl:template match="testsuites">
+    <html>
+        <head>
+            <title><xsl:value-of select="$TITLE"/></title>
+    <style type="text/css">
+      body {
+        font:normal 68% verdana,arial,helvetica;
+        color:#000000;
+      }
+      table tr td, table tr th {
+          font-size: 68%;
+      }
+      table.details tr th{
+        font-weight: bold;
+        text-align:left;
+        background:#a6caf0;
+      }
+      table.details tr td{
+        background:#eeeee0;
+      }
+
+      p {
+        line-height:1.5em;
+        margin-top:0.5em; margin-bottom:1.0em;
+      }
+      h1 {
+        margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
+      }
+      h2 {
+        margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica
+      }
+      h3 {
+        margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
+      }
+      h4 {
+        margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+      }
+      h5 {
+        margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+      }
+      h6 {
+        margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+      }
+      .Error {
+        font-weight:bold; color:red;
+      }
+      .Failure {
+        font-weight:bold; color:purple;
+      }
+      .Properties {
+        text-align:right;
+      }
+      </style>
+      <script type="text/javascript" language="JavaScript">
+        var TestCases = new Array();
+        var cur;
+        <xsl:for-each select="./testsuite">
+            <xsl:apply-templates select="properties"/>
+        </xsl:for-each>
+
+       </script>
+       <script type="text/javascript" language="JavaScript"><![CDATA[
+        function displayProperties (name) {
+          var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
+          var doc = win.document;
+          doc.open();
+          doc.write("<html><head><title>Properties of " + name + "</title>");
+          doc.write("<style>")
+          doc.write("body {font:normal 68% verdana,arial,helvetica; color:#000000; }");
+          doc.write("table tr td, table tr th { font-size: 68%; }");
+          doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
+          doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }");
+          doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }");
+          doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }");
+          doc.write("</style>");
+          doc.write("</head><body>");
+          doc.write("<h3>Properties of " + name + "</h3>");
+          doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>");
+          doc.write("<table class='properties'>");
+          doc.write("<tr><th>Name</th><th>Value</th></tr>");
+          for (prop in TestCases[name]) {
+            doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>");
+          }
+          doc.write("</table>");
+          doc.write("</body></html>");
+          doc.close();
+          win.focus();
+        }
+      ]]>
+      </script>
+        </head>
+        <body>
+            <a name="top"></a>
+            <xsl:call-template name="pageHeader"/>
+
+            <!-- Summary part -->
+            <xsl:call-template name="summary"/>
+            <hr size="1" width="95%" align="left"/>
+
+            <!-- Package List part -->
+            <xsl:call-template name="packagelist"/>
+            <hr size="1" width="95%" align="left"/>
+
+            <!-- For each package create its part -->
+            <xsl:call-template name="packages"/>
+            <hr size="1" width="95%" align="left"/>
+
+            <!-- For each class create the  part -->
+            <xsl:call-template name="classes"/>
+
+        </body>
+    </html>
+</xsl:template>
+
+
+
+    <!-- ================================================================== -->
+    <!-- Write a list of all packages with an hyperlink to the anchor of    -->
+    <!-- of the package name.                                               -->
+    <!-- ================================================================== -->
+    <xsl:template name="packagelist">
+        <h2>Packages</h2>
+        Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers.
+        <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+            <xsl:call-template name="testsuite.test.header"/>
+            <!-- list all packages recursively -->
+            <xsl:for-each select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
+                <xsl:sort select="@package"/>
+                <xsl:variable name="testsuites-in-package" select="/testsuites/testsuite[./@package = current()/@package]"/>
+                <xsl:variable name="testCount" select="sum($testsuites-in-package/@tests)"/>
+                <xsl:variable name="errorCount" select="sum($testsuites-in-package/@errors)"/>
+                <xsl:variable name="failureCount" select="sum($testsuites-in-package/@failures)"/>
+                <xsl:variable name="timeCount" select="sum($testsuites-in-package/@time)"/>
+
+                <!-- write a summary for the package -->
+                <tr valign="top">
+                    <!-- set a nice color depending if there is an error/failure -->
+                    <xsl:attribute name="class">
+                        <xsl:choose>
+                            <xsl:when test="$failureCount > 0">Failure</xsl:when>
+                            <xsl:when test="$errorCount > 0">Error</xsl:when>
+                        </xsl:choose>
+                    </xsl:attribute>
+                    <td><a href="#{@package}"><xsl:value-of select="@package"/></a></td>
+                    <td><xsl:value-of select="$testCount"/></td>
+                    <td><xsl:value-of select="$errorCount"/></td>
+                    <td><xsl:value-of select="$failureCount"/></td>
+                    <td>
+                    <xsl:call-template name="display-time">
+                        <xsl:with-param name="value" select="$timeCount"/>
+                    </xsl:call-template>
+                    </td>
+                    <td><xsl:value-of select="$testsuites-in-package/@timestamp"/></td>
+                    <td><xsl:value-of select="$testsuites-in-package/@hostname"/></td>
+                </tr>
+            </xsl:for-each>
+        </table>
+    </xsl:template>
+
+
+    <!-- ================================================================== -->
+    <!-- Write a package level report                                       -->
+    <!-- It creates a table with values from the document:                  -->
+    <!-- Name | Tests | Errors | Failures | Time                            -->
+    <!-- ================================================================== -->
+    <xsl:template name="packages">
+        <!-- create an anchor to this package name -->
+        <xsl:for-each select="/testsuites/testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
+            <xsl:sort select="@package"/>
+                <a name="{@package}"></a>
+                <h3>Package <xsl:value-of select="@package"/></h3>
+
+                <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+                    <xsl:call-template name="testsuite.test.header"/>
+
+                    <!-- match the testsuites of this package -->
+                    <xsl:apply-templates select="/testsuites/testsuite[./@package = current()/@package]" mode="print.test"/>
+                </table>
+                <a href="#top">Back to top</a>
+                <p/>
+                <p/>
+        </xsl:for-each>
+    </xsl:template>
+
+    <xsl:template name="classes">
+        <xsl:for-each select="testsuite">
+            <xsl:sort select="@name"/>
+            <!-- create an anchor to this class name -->
+            <a name="{@name}"></a>
+            <h3>TestCase <xsl:value-of select="@name"/></h3>
+
+            <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+              <xsl:call-template name="testcase.test.header"/>
+              <!--
+              test can even not be started at all (failure to load the class)
+              so report the error directly
+              -->
+                <xsl:if test="./error">
+                    <tr class="Error">
+                        <td colspan="4"><xsl:apply-templates select="./error"/></td>
+                    </tr>
+                </xsl:if>
+                <xsl:apply-templates select="./testcase" mode="print.test"/>
+            </table>
+            <div class="Properties">
+                <a>
+                    <xsl:attribute name="href">javascript:displayProperties('<xsl:value-of select="@package"/>.<xsl:value-of select="@name"/>');</xsl:attribute>
+                    Properties »
+                </a>
+            </div>
+            <p/>
+
+            <a href="#top">Back to top</a>
+        </xsl:for-each>
+    </xsl:template>
+
+    <xsl:template name="summary">
+        <h2>Summary</h2>
+        <xsl:variable name="testCount" select="sum(testsuite/@tests)"/>
+        <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/>
+        <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/>
+        <xsl:variable name="timeCount" select="sum(testsuite/@time)"/>
+        <xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/>
+        <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+        <tr valign="top">
+            <th>Tests</th>
+            <th>Failures</th>
+            <th>Errors</th>
+            <th>Success rate</th>
+            <th>Time</th>
+        </tr>
+        <tr valign="top">
+            <xsl:attribute name="class">
+                <xsl:choose>
+                    <xsl:when test="$failureCount > 0">Failure</xsl:when>
+                    <xsl:when test="$errorCount > 0">Error</xsl:when>
+                </xsl:choose>
+            </xsl:attribute>
+            <td><xsl:value-of select="$testCount"/></td>
+            <td><xsl:value-of select="$failureCount"/></td>
+            <td><xsl:value-of select="$errorCount"/></td>
+            <td>
+                <xsl:call-template name="display-percent">
+                    <xsl:with-param name="value" select="$successRate"/>
+                </xsl:call-template>
+            </td>
+            <td>
+                <xsl:call-template name="display-time">
+                    <xsl:with-param name="value" select="$timeCount"/>
+                </xsl:call-template>
+            </td>
+
+        </tr>
+        </table>
+        <table border="0" width="95%">
+        <tr>
+        <td style="text-align: justify;">
+        Note: <i>failures</i> are anticipated and checked for with assertions while <i>errors</i> are unanticipated.
+        </td>
+        </tr>
+        </table>
+    </xsl:template>
+
+  <!--
+   Write properties into a JavaScript data structure.
+   This is based on the original idea by Erik Hatcher (ehatcher at apache.org)
+   -->
+  <xsl:template match="properties">
+    cur = TestCases['<xsl:value-of select="../@package"/>.<xsl:value-of select="../@name"/>'] = new Array();
+    <xsl:for-each select="property">
+    <xsl:sort select="@name"/>
+        cur['<xsl:value-of select="@name"/>'] = '<xsl:call-template name="JS-escape"><xsl:with-param name="string" select="@value"/></xsl:call-template>';
+    </xsl:for-each>
+  </xsl:template>
+
+<!-- Page HEADER -->
+<xsl:template name="pageHeader">
+    <h1><xsl:value-of select="$TITLE"/></h1>
+    <table width="100%">
+    <tr>
+        <td align="left"></td>
+        <td align="right">Designed for use with <a href='http://www.junit.org'>JUnit</a> and <a href='http://ant.apache.org/ant'>Ant</a>.</td>
+    </tr>
+    </table>
+    <hr size="1"/>
+</xsl:template>
+
+<xsl:template match="testsuite" mode="header">
+    <tr valign="top">
+        <th width="80%">Name</th>
+        <th>Tests</th>
+        <th>Errors</th>
+        <th>Failures</th>
+        <th nowrap="nowrap">Time(s)</th>
+    </tr>
+</xsl:template>
+
+<!-- class header -->
+<xsl:template name="testsuite.test.header">
+    <tr valign="top">
+        <th width="80%">Name</th>
+        <th>Tests</th>
+        <th>Errors</th>
+        <th>Failures</th>
+        <th nowrap="nowrap">Time(s)</th>
+        <th nowrap="nowrap">Time Stamp</th>
+        <th>Host</th>
+    </tr>
+</xsl:template>
+
+<!-- method header -->
+<xsl:template name="testcase.test.header">
+    <tr valign="top">
+        <th>Name</th>
+        <th>Status</th>
+        <th width="80%">Type</th>
+        <th nowrap="nowrap">Time(s)</th>
+    </tr>
+</xsl:template>
+
+
+<!-- class information -->
+<xsl:template match="testsuite" mode="print.test">
+    <tr valign="top">
+        <!-- set a nice color depending if there is an error/failure -->
+        <xsl:attribute name="class">
+            <xsl:choose>
+                <xsl:when test="@failures[.> 0]">Failure</xsl:when>
+                <xsl:when test="@errors[.> 0]">Error</xsl:when>
+            </xsl:choose>
+        </xsl:attribute>
+
+        <!-- print testsuite information -->
+        <td><a href="#{@name}"><xsl:value-of select="@name"/></a></td>
+        <td><xsl:value-of select="@tests"/></td>
+        <td><xsl:value-of select="@errors"/></td>
+        <td><xsl:value-of select="@failures"/></td>
+        <td>
+            <xsl:call-template name="display-time">
+                <xsl:with-param name="value" select="@time"/>
+            </xsl:call-template>
+        </td>
+        <td><xsl:apply-templates select="@timestamp"/></td>
+        <td><xsl:apply-templates select="@hostname"/></td>
+    </tr>
+</xsl:template>
+
+<xsl:template match="testcase" mode="print.test">
+    <tr valign="top">
+        <xsl:attribute name="class">
+            <xsl:choose>
+                <xsl:when test="failure | error">Error</xsl:when>
+            </xsl:choose>
+        </xsl:attribute>
+        <td><xsl:value-of select="@name"/></td>
+        <xsl:choose>
+            <xsl:when test="failure">
+                <td>Failure</td>
+                <td><xsl:apply-templates select="failure"/></td>
+            </xsl:when>
+            <xsl:when test="error">
+                <td>Error</td>
+                <td><xsl:apply-templates select="error"/></td>
+            </xsl:when>
+            <xsl:otherwise>
+                <td>Success</td>
+                <td></td>
+            </xsl:otherwise>
+        </xsl:choose>
+        <td>
+            <xsl:call-template name="display-time">
+                <xsl:with-param name="value" select="@time"/>
+            </xsl:call-template>
+        </td>
+    </tr>
+</xsl:template>
+
+
+<xsl:template match="failure">
+    <xsl:call-template name="display-failures"/>
+</xsl:template>
+
+<xsl:template match="error">
+    <xsl:call-template name="display-failures"/>
+</xsl:template>
+
+<!-- Style for the error and failure in the tescase template -->
+<xsl:template name="display-failures">
+    <xsl:choose>
+        <xsl:when test="not(@message)">N/A</xsl:when>
+        <xsl:otherwise>
+            <xsl:value-of select="@message"/>
+        </xsl:otherwise>
+    </xsl:choose>
+    <!-- display the stacktrace -->
+    <code>
+        <br/><br/>
+        <xsl:call-template name="br-replace">
+            <xsl:with-param name="word" select="."/>
+        </xsl:call-template>
+    </code>
+    <!-- the later is better but might be problematic for non-21" monitors... -->
+    <!--pre><xsl:value-of select="."/></pre-->
+</xsl:template>
+
+<xsl:template name="JS-escape">
+    <xsl:param name="string"/>
+    <xsl:param name="tmp1" select="stringutils:replace(string($string),'\','\\')"/>
+    <xsl:param name="tmp2" select="stringutils:replace(string($tmp1),"'","\'")"/>
+    <xsl:value-of select="$tmp2"/>
+</xsl:template>
+
+
+<!--
+    template that will convert a carriage return into a br tag
+    @param word the text from which to convert CR to BR tag
+-->
+<xsl:template name="br-replace">
+    <xsl:param name="word"/>
+    <xsl:choose>
+      <xsl:when test="contains($word, '&#xa;')">
+        <xsl:value-of select="substring-before($word, '&#xa;')"/>
+        <br/>
+        <xsl:call-template name="br-replace">
+          <xsl:with-param name="word" select="substring-after($word, '&#xa;')"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+	<xsl:value-of select="$word"/>
+      </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+<xsl:template name="display-time">
+    <xsl:param name="value"/>
+    <xsl:value-of select="format-number($value,'0.000')"/>
+</xsl:template>
+
+<xsl:template name="display-percent">
+    <xsl:param name="value"/>
+    <xsl:value-of select="format-number($value,'0.00%')"/>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/log.xsl b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/log.xsl
new file mode 100644
index 0000000..26ad1fb
--- /dev/null
+++ b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/log.xsl
@@ -0,0 +1,203 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   
+-->
+ 
+<!--
+
+  The purpose have this XSL is to provide a nice way to look at the output
+  from the Ant XmlLogger (ie: ant -listener org.apache.tools.ant.XmlLogger )
+  
+  @author <a href="mailto:sbailliez at apache.org">Stephane Bailliez</a>
+  
+-->
+<xsl:decimal-format decimal-separator="." grouping-separator="," />
+
+<xsl:template match="/">
+<html>
+  <head>
+    <style type="text/css">
+    .bannercell {
+      border: 0px;
+      padding: 0px;
+    }
+    body {
+      margin: 0;
+      font:normal 100% arial,helvetica,sanserif;
+      background-color:#FFFFFF;
+      color:#000000;
+    }
+    table.status {
+      font:bold 80% arial,helvetica,sanserif;
+      background-color:#525D76;
+      color:#ffffff;
+    }
+    table.log tr td, tr th {
+      font-size: 80%;
+    }
+    .error {
+      color:red;
+    }
+    .warn {
+      color:brown;
+    }
+    .info {
+      color:gray;
+    }
+    .debug{
+      color:gray;
+    }
+    .failed {
+      font-size:80%;
+      background-color: red;
+      color:#FFFFFF;
+      font-weight: bold
+    }
+    .complete {
+      font-size:80%;
+      background-color: #525D76;
+      color:#FFFFFF;
+      font-weight: bold
+    }
+    .a td { 
+      background: #efefef;
+    }
+    .b td { 
+      background: #fff;
+    }
+    th, td {
+      text-align: left;
+      vertical-align: top;
+    }
+    th {
+      background: #ccc;
+      color: black;
+    }
+    table, th, td {
+      border: none
+    }
+    h3 {
+      font:bold 80% arial,helvetica,sanserif;
+      background: #525D76;
+      color: white;
+      text-decoration: none;
+      padding: 5px;
+      margin-right: 2px;
+      margin-left: 2px;
+      margin-bottom: 0;
+    }
+    </style>
+  </head>
+  <body>
+    <!-- jakarta logo -->
+    <table border="0" cellpadding="0" cellspacing="0" width="100%">
+    <tr>
+      <td valign="top" class="bannercell">
+        <a href="http://jakarta.apache.org/">
+        <img src="http://jakarta.apache.org/images/jakarta-logo.gif" alt="http://jakarta.apache.org" align="left" border="0"/>
+        </a>
+      </td>
+      <td style="text-align:right;vertical-align:bottom">
+        <a href="http://ant.apache.org/">Apache Ant</a>
+      </td>
+    </tr>
+    </table>
+      
+    <table border="0" width="100%">
+    <tr><td><hr noshade="yes" size="1"/></td></tr>
+    </table>
+
+    <xsl:apply-templates select="build"/>
+
+  </body>
+</html>
+</xsl:template>
+
+<xsl:template match="build">
+  <!-- build status -->
+  <table width="100%">
+    <xsl:attribute name="class">
+      <xsl:if test="@error">failed</xsl:if>
+      <xsl:if test="not(@error)">complete</xsl:if>
+    </xsl:attribute>
+    <tr>
+      <xsl:if test="@error">
+        <td nowrap="yes">Build Failed</td> 
+      </xsl:if>
+      <xsl:if test="not(@error)">
+        <td nowrap="yes">Build Complete</td>
+      </xsl:if>
+        <td style="text-align:right" nowrap="yes">Total Time: <xsl:value-of select="@time"/></td>
+    </tr>
+    <tr>
+      <td colspan="2">
+        <xsl:if test="@error">
+          <tt><xsl:value-of select="@error"/></tt><br/>
+          <i style="font-size:80%">See the <a href="#stacktrace" alt="Click for details">stacktrace</a>.</i>
+        </xsl:if>
+      </td>
+    </tr>
+  </table>
+  <table border="1" cellspacing="2" cellpadding="3" width="100%" style="font-size:80%">
+    <tr class="a"><td width="1">ant.file</td><td><xsl:value-of select="substring-after(//message[contains(text(),'ant.file')], '->')"/></td></tr>
+    <tr class="b"><td width="1">ant.version</td><td><xsl:value-of select="substring-after(//message[contains(text(),'ant.version')], '->')"/></td></tr>
+    <tr class="a"><td width="1">java.version</td><td><xsl:value-of select="substring-after(//message[contains(text(),'java.vm.version')], '->')"/></td></tr>
+    <tr class="b"><td width="1">os.name</td><td><xsl:value-of select="substring-after(//message[contains(text(),'os.name')], '->')"/></td></tr>
+  </table>
+  <!-- build information -->
+  <h3>Build events</h3>
+  <table class="log" border="1" cellspacing="2" cellpadding="3" width="100%">
+  <tr>
+    <th nowrap="yes" align="left" width="1%">target</th>
+    <th nowrap="yes" align="left" width="1%">task</th>
+    <th nowrap="yes" align="left">message</th>
+  </tr>
+  <xsl:apply-templates select=".//message[@priority != 'debug']"/>
+  </table>
+  <p>
+  <!-- stacktrace -->
+  <xsl:if test="stacktrace">
+  <a name="stacktrace"/>
+  <h3>Error details</h3>
+  <table width="100%">
+    <tr><td>
+      <pre><xsl:value-of select="stacktrace"/></pre>
+    </td></tr>
+  </table>
+  </xsl:if>
+  </p>
+</xsl:template>
+
+<!-- report every message but those with debug priority -->
+<xsl:template match="message[@priority!='debug']">
+  <tr valign="top">
+    <!-- alternated row style -->
+    <xsl:attribute name="class">
+      <xsl:if test="position() mod 2 = 1">a</xsl:if>
+      <xsl:if test="position() mod 2 = 0">b</xsl:if>
+    </xsl:attribute>
+    <td nowrap="yes" width="1%"><xsl:value-of select="../../@name"/></td>
+    <td nowrap="yes" style="text-align:right" width="1%">[ <xsl:value-of select="../@name"/> ]</td>
+    <td class="{@priority}" nowrap="yes">
+            <xsl:value-of select="text()"/>
+    </td>
+  </tr>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/maudit-frames.xsl b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/maudit-frames.xsl
new file mode 100644
index 0000000..883324d
--- /dev/null
+++ b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/maudit-frames.xsl
@@ -0,0 +1,503 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+    xmlns:lxslt="http://xml.apache.org/xslt"
+    xmlns:redirect="org.apache.xalan.lib.Redirect"
+    extension-element-prefixes="redirect">
+<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
+<xsl:decimal-format decimal-separator="." grouping-separator="," />
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<!--
+
+    Stylesheet to transform an XML file generated by the Ant MAudit task into
+    a set of JavaDoc-like HTML page to make pages more convenient to be browsed.
+
+    It use the Xalan redirect extension to write to multiple output files.
+
+    @author Stephane Bailliez <a href="mailto:sbailliez at apache.org"/>
+-->
+
+<xsl:param name="output.dir" select="'.'"/>
+
+
+<xsl:template match="classes">
+    <!-- create the index.html -->
+    <redirect:write file="{$output.dir}/index.html">
+        <xsl:call-template name="index.html"/>
+    </redirect:write>
+
+    <!-- create the stylesheet.css -->
+    <redirect:write file="{$output.dir}/stylesheet.css">
+        <xsl:call-template name="stylesheet.css"/>
+    </redirect:write>
+
+    <!-- create the overview-packages.html at the root -->
+    <redirect:write file="{$output.dir}/overview-summary.html">
+        <xsl:apply-templates select="." mode="overview.packages"/>
+    </redirect:write>
+
+    <!-- create the all-packages.html at the root -->
+    <redirect:write file="{$output.dir}/overview-frame.html">
+        <xsl:apply-templates select="." mode="all.packages"/>
+    </redirect:write>
+
+    <!-- create the all-classes.html at the root -->
+    <redirect:write file="{$output.dir}/allclasses-frame.html">
+        <xsl:apply-templates select="." mode="all.classes"/>
+    </redirect:write>
+
+    <!-- process all packages -->
+    <xsl:for-each select="./class[not(./@package = preceding-sibling::class/@package)]">
+        <xsl:call-template name="package">
+            <xsl:with-param name="name" select="@package"/>
+        </xsl:call-template>
+    </xsl:for-each>
+</xsl:template>
+
+
+<xsl:template name="package">
+    <xsl:param name="name"/>
+    <xsl:variable name="package.dir">
+        <xsl:if test="not($name = '')"><xsl:value-of select="translate($name,'.','/')"/></xsl:if>
+        <xsl:if test="$name = ''">.</xsl:if>
+    </xsl:variable>
+    <!--Processing package <xsl:value-of select="@name"/> in <xsl:value-of select="$output.dir"/> -->
+    <!-- create a classes-list.html in the package directory -->
+    <redirect:write file="{$output.dir}/{$package.dir}/package-frame.html">
+        <xsl:call-template name="classes.list">
+            <xsl:with-param name="name" select="$name"/>
+        </xsl:call-template>
+    </redirect:write>
+
+    <!-- create a package-summary.html in the package directory -->
+    <redirect:write file="{$output.dir}/{$package.dir}/package-summary.html">
+        <xsl:call-template name="package.summary">
+            <xsl:with-param name="name" select="$name"/>
+        </xsl:call-template>
+    </redirect:write>
+
+    <!-- for each class, creates a @name.html -->
+    <!-- @bug there will be a problem with inner classes having the same name, it will be overwritten -->
+    <xsl:for-each select="/classes/class[@package = $name]">
+        <redirect:write file="{$output.dir}/{$package.dir}/{@name}.html">
+            <xsl:apply-templates select="." mode="class.details"/>
+        </redirect:write>
+    </xsl:for-each>
+</xsl:template>
+
+<xsl:template name="index.html">
+<HTML>
+    <HEAD><TITLE>Audit Results.</TITLE></HEAD>
+    <FRAMESET cols="20%,80%">
+        <FRAMESET rows="30%,70%">
+            <FRAME src="overview-frame.html" name="packageListFrame"/>
+            <FRAME src="allclasses-frame.html" name="classListFrame"/>
+        </FRAMESET>
+        <FRAME src="overview-summary.html" name="classFrame"/>
+    </FRAMESET>
+    <noframes>
+        <H2>Frame Alert</H2>
+        <P>
+        This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
+        </P>
+    </noframes>
+</HTML>
+</xsl:template>
+
+
+<!-- this is the stylesheet css to use for nearly everything -->
+<xsl:template name="stylesheet.css">
+    .bannercell {
+      border: 0px;
+      padding: 0px;
+    }
+    body {
+      margin-left: 10;
+      margin-right: 10;
+      font:normal 80% arial,helvetica,sanserif;
+      background-color:#FFFFFF;
+      color:#000000;
+    }
+    .a td {
+      background: #efefef;
+    }
+    .b td {
+      background: #fff;
+    }
+    th, td {
+      text-align: left;
+      vertical-align: top;
+    }
+    th {
+      font-weight:bold;
+      background: #ccc;
+      color: black;
+    }
+    table, th, td {
+      font-size:100%;
+      border: none
+    }
+    table.log tr td, tr th {
+
+    }
+    h2 {
+      font-weight:bold;
+      font-size:140%;
+      margin-bottom: 5;
+    }
+    h3 {
+      font-size:100%;
+      font-weight:bold;
+      background: #525D76;
+      color: white;
+      text-decoration: none;
+      padding: 5px;
+      margin-right: 2px;
+      margin-left: 2px;
+      margin-bottom: 0;
+    }
+</xsl:template>
+
+
+<!-- print the violations of the class -->
+<xsl:template match="class" mode="class.details">
+    <xsl:variable name="package.name" select="@package"/>
+    <HTML>
+        <HEAD>
+            <xsl:call-template name="create.stylesheet.link">
+                <xsl:with-param name="package.name" select="$package.name"/>
+            </xsl:call-template>
+        </HEAD>
+        <BODY>
+            <xsl:call-template name="pageHeader"/>
+            <H3>Class <xsl:if test="not($package.name = '')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></H3>
+
+            <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
+                <xsl:call-template name="class.audit.header"/>
+                <xsl:apply-templates select="." mode="print.audit"/>
+            </table>
+
+            <H3>Violations</H3>
+            <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
+                <xsl:call-template name="violation.audit.header"/>
+                <xsl:apply-templates select="./violation" mode="print.audit">
+                    <xsl:sort data-type="number" select="@line"/>
+                </xsl:apply-templates>
+            </table>
+            <xsl:call-template name="pageFooter"/>
+        </BODY>
+    </HTML>
+</xsl:template>
+
+
+<!-- list of classes in a package -->
+<xsl:template name="classes.list">
+    <xsl:param name="name"/>
+    <HTML>
+        <HEAD>
+            <xsl:call-template name="create.stylesheet.link">
+                <xsl:with-param name="package.name" select="$name"/>
+            </xsl:call-template>
+        </HEAD>
+        <BODY>
+            <table width="100%">
+                <tr>
+                    <td nowrap="nowrap">
+                        <H2><a href="package-summary.html" target="classFrame"><xsl:value-of select="$name"/></a></H2>
+                    </td>
+                </tr>
+            </table>
+
+            <h2>Classes</h2>
+            <TABLE WIDTH="100%">
+                <xsl:apply-templates select="/classes/class[./@package = $name]" mode="classes.list">
+                    <xsl:sort select="@name"/>
+                </xsl:apply-templates>
+            </TABLE>
+        </BODY>
+    </HTML>
+</xsl:template>
+<!-- the class to list -->
+<xsl:template match="class" mode="classes.list">
+    <tr>
+        <td nowrap="nowrap">
+            <!-- @bug naming to fix for inner classes -->
+            <a href="{@name}.html" target="classFrame"><xsl:value-of select="@name"/></a>
+        </td>
+    </tr>
+</xsl:template>
+
+
+<!--
+    Creates an all-classes.html file that contains a link to all package-summary.html
+    on each class.
+-->
+<xsl:template match="classes" mode="all.classes">
+    <html>
+        <head>
+            <xsl:call-template name="create.stylesheet.link">
+                <xsl:with-param name="package.name"/>
+            </xsl:call-template>
+        </head>
+        <body>
+            <h2>Classes</h2>
+            <table width="100%">
+                <xsl:apply-templates select=".//class" mode="all.classes">
+                    <xsl:sort select="@name"/>
+                </xsl:apply-templates>
+            </table>
+        </body>
+    </html>
+</xsl:template>
+
+<xsl:template match="class" mode="all.classes">
+    <!-- (ancestor::package)[last()] is buggy in MSXML3 ? -->
+    <xsl:variable name="package.name" select="@package"/>
+    <tr>
+        <td nowrap="nowrap">
+            <a target="classFrame">
+                <xsl:attribute name="href">
+                    <xsl:if test="not($package.name='')">
+                        <xsl:value-of select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text>
+                    </xsl:if><xsl:value-of select="@name"/><xsl:text>.html</xsl:text>
+                </xsl:attribute>
+                <xsl:value-of select="@name"/>
+            </a>
+        </td>
+    </tr>
+</xsl:template>
+
+
+<!--
+    Creates an html file that contains a link to all package-summary.html files on
+    each package existing on testsuites.
+    @bug there will be a problem here, I don't know yet how to handle unnamed package :(
+-->
+<xsl:template match="classes" mode="all.packages">
+    <html>
+        <head>
+            <xsl:call-template name="create.stylesheet.link">
+                <xsl:with-param name="package.name"/>
+            </xsl:call-template>
+        </head>
+        <body>
+            <h2><a href="overview-summary.html" target="classFrame">Home</a></h2>
+            <h2>Packages</h2>
+                <table width="100%">
+                    <xsl:apply-templates select="class[not(./@package = preceding-sibling::class/@package)]" mode="all.packages">
+                        <xsl:sort select="@package" order="ascending"/>
+                    </xsl:apply-templates>
+                </table>
+        </body>
+    </html>
+</xsl:template>
+
+<xsl:template match="class" mode="all.packages">
+    <tr>
+        <td nowrap="nowrap">
+            <a href="{translate(@package,'.','/')}/package-summary.html" target="classFrame">
+                <xsl:value-of select="@package"/>
+            </a>
+        </td>
+    </tr>
+</xsl:template>
+
+
+<xsl:template match="classes" mode="overview.packages">
+    <html>
+        <head>
+            <xsl:call-template name="create.stylesheet.link">
+                <xsl:with-param name="package.name"/>
+            </xsl:call-template>
+        </head>
+        <body onload="open('allclasses-frame.html','classListFrame')">
+        <xsl:call-template name="pageHeader"/>
+        <h3>Summary</h3>
+        <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
+        <tr>
+            <th>Audited classes</th>
+            <th>Reported classes</th>
+            <th>Violations</th>
+        </tr>
+        <tr class="a">
+            <td><xsl:value-of select="@audited"/></td>
+            <td><xsl:value-of select="@reported"/></td>
+            <td><xsl:value-of select="@violations"/></td>
+        </tr>
+        </table>
+        <table border="0" width="100%">
+        <tr>
+        <td style="text-align: justify;">
+        Note: Rules checked have originated from style guidelines suggested by the language designers,
+        experience from the Java development community and insite experience. Violations are generally
+        reported with a reference to the <a href="http://java.sun.com/docs/books/jls/second_edition/html/jTOC.doc.html">Java Language Specifications</a> (JLS x.x.x)
+        and Metamata Audit rules (x.x).
+        Please consult these documents for additional information about violations.
+        <p/>
+        Rules checked also enforce adherence to <a href="http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html">Sun Java coding guidelines</a> in use at Jakarta.
+        <p/>
+        One should note that these violations do not necessary underline errors but should be used
+        as an indication for <i>possible</i> errors. As always, use your best judgment and review
+        them carefully, it might save you hours of debugging.
+        </td>
+        </tr>
+        </table>
+
+        <h3>Packages</h3>
+        <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
+            <xsl:call-template name="class.audit.header"/>
+            <xsl:for-each select="class[not(./@package = preceding-sibling::class/@package)]">
+                <xsl:sort select="@package" order="ascending"/>
+                <tr>
+          <xsl:call-template name="alternate-row"/>
+                    <td><a href="{translate(@package,'.','/')}/package-summary.html"><xsl:value-of select="@package"/></a></td>
+                    <td><xsl:value-of select="sum(/classes/class[./@package = current()/@package]/@violations)"/></td>
+                </tr>
+            </xsl:for-each>
+        </table>
+        <xsl:call-template name="pageFooter"/>
+        </body>
+        </html>
+</xsl:template>
+
+
+<xsl:template name="package.summary">
+    <xsl:param name="name"/>
+    <HTML>
+        <HEAD>
+            <xsl:call-template name="create.stylesheet.link">
+                <xsl:with-param name="package.name" select="$name"/>
+            </xsl:call-template>
+        </HEAD>
+        <BODY>
+            <xsl:attribute name="onload">open('package-frame.html','classListFrame')</xsl:attribute>
+            <xsl:call-template name="pageHeader"/>
+            <h3>Package <xsl:value-of select="$name"/></h3>
+
+            <!--table border="0" cellpadding="5" cellspacing="2" width="100%">
+                <xsl:call-template name="class.metrics.header"/>
+                <xsl:apply-templates select="." mode="print.metrics"/>
+            </table-->
+
+            <xsl:if test="count(/classes/class[./@package = $name]) > 0">
+                <H3>Classes</H3>
+                <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
+                    <xsl:call-template name="class.audit.header"/>
+                    <xsl:apply-templates select="/classes/class[./@package = $name]" mode="print.audit">
+                        <xsl:sort select="@name"/>
+                    </xsl:apply-templates>
+                </table>
+            </xsl:if>
+            <xsl:call-template name="pageFooter"/>
+        </BODY>
+    </HTML>
+</xsl:template>
+
+
+<!--
+    transform string like a.b.c to ../../../
+    @param path the path to transform into a descending directory path
+-->
+<xsl:template name="path">
+    <xsl:param name="path"/>
+    <xsl:if test="contains($path,'.')">
+        <xsl:text>../</xsl:text>
+        <xsl:call-template name="path">
+            <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'.')"/></xsl:with-param>
+        </xsl:call-template>
+    </xsl:if>
+    <xsl:if test="not(contains($path,'.')) and not($path = '')">
+        <xsl:text>../</xsl:text>
+    </xsl:if>
+</xsl:template>
+
+
+<!-- create the link to the stylesheet based on the package name -->
+<xsl:template name="create.stylesheet.link">
+    <xsl:param name="package.name"/>
+    <LINK REL ="stylesheet" TYPE="text/css" TITLE="Style"><xsl:attribute name="href"><xsl:if test="not($package.name = 'unnamed package')"><xsl:call-template name="path"><xsl:with-param name="path" select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></LINK>
+</xsl:template>
+
+<!-- Page HEADER -->
+<xsl:template name="pageHeader">
+
+  <!-- jakarta logo -->
+  <table border="0" cellpadding="0" cellspacing="0" width="100%">
+  <tr>
+    <td class="bannercell" rowspan="2">
+      <a href="http://jakarta.apache.org/">
+      <img src="http://jakarta.apache.org/images/jakarta-logo.gif" alt="http://jakarta.apache.org" align="left" border="0"/>
+      </a>
+    </td>
+        <td style="text-align:right"><h2>Source Code Audit</h2></td>
+        </tr>
+        <tr>
+        <td style="text-align:right">Designed for use with <a href='http://www.webgain.com/products/quality_analyzer/'>Webgain QA/Metamata Audit</a> and <a href='http://jakarta.apache.org'>Ant</a>.</td>
+        </tr>
+  </table>
+    <hr size="1"/>
+</xsl:template>
+
+<!-- Page HEADER -->
+<xsl:template name="pageFooter">
+</xsl:template>
+
+
+<!-- class header -->
+<xsl:template name="class.audit.header">
+    <tr>
+        <th width="80%">Name</th>
+        <th>Violations</th>
+    </tr>
+</xsl:template>
+
+<!-- method header -->
+<xsl:template name="violation.audit.header">
+    <tr>
+        <th>Line</th>
+        <th>Message</th>
+    </tr>
+</xsl:template>
+
+
+<!-- class information -->
+<xsl:template match="class" mode="print.audit">
+    <tr>
+    <xsl:call-template name="alternate-row"/>
+        <td><a href="{@name}.html"><xsl:value-of select="@name"/></a></td>
+        <td><xsl:apply-templates select="@violations"/></td>
+    </tr>
+</xsl:template>
+
+<xsl:template match="violation" mode="print.audit">
+    <tr>
+    <xsl:call-template name="alternate-row"/>
+        <td><xsl:value-of select="@line"/></td>
+        <td><xsl:apply-templates select="@message"/></td>
+    </tr>
+</xsl:template>
+
+<!-- alternated row style -->
+<xsl:template name="alternate-row">
+<xsl:attribute name="class">
+  <xsl:if test="position() mod 2 = 1">a</xsl:if>
+  <xsl:if test="position() mod 2 = 0">b</xsl:if>
+</xsl:attribute>
+</xsl:template>
+
+</xsl:stylesheet>
+
diff --git a/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/mmetrics-frames.xsl b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/mmetrics-frames.xsl
new file mode 100644
index 0000000..cd5afe7
--- /dev/null
+++ b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/mmetrics-frames.xsl
@@ -0,0 +1,1026 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+  xmlns:lxslt="http://xml.apache.org/xslt"
+  xmlns:xalan="http://xml.apache.org/xalan"
+  xmlns:redirect="org.apache.xalan.lib.Redirect"
+  exclude-result-prefixes="xalan"
+  extension-element-prefixes="redirect">
+<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
+<xsl:decimal-format decimal-separator="." grouping-separator="," />
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<!--
+  @author Stephane Bailliez <a href="mailto:sbailliez at apache.org"/>
+  -->
+<xsl:param name="output.dir" select="'.'"/>
+
+<!-- default max value for the metrics -->
+<xsl:param name="vg.max" select="10"/>
+<xsl:param name="loc.max" select="1000"/>
+<xsl:param name="dit.max" select="10"/>
+<xsl:param name="noa.max" select="250"/>
+<xsl:param name="nrm.max" select="50"/>
+<xsl:param name="nlm.max" select="250"/>
+<xsl:param name="wmc.max" select="250"/>
+<xsl:param name="rfc.max" select="50"/>
+<xsl:param name="dac.max" select="10"/>
+<xsl:param name="fanout.max" select="10"/>
+<xsl:param name="cbo.max" select="15"/>
+<xsl:param name="lcom.max" select="10"/>
+<xsl:param name="nocl.max" select="10"/>
+
+
+<!-- create a tree fragment to speed up processing -->
+<xsl:variable name="doctree.var">
+  <xsl:element name="classes">
+    <xsl:for-each select=".//class">
+      <xsl:element name="class">
+        <xsl:attribute name="package">
+          <xsl:value-of select="(ancestor::package)[last()]/@name"/>
+        </xsl:attribute>
+        <xsl:copy-of select="@*"/>
+        <xsl:attribute name="name">
+          <xsl:apply-templates select="." mode="class.name"/>
+        </xsl:attribute>
+        <xsl:copy-of select="method"/>
+      </xsl:element>
+    </xsl:for-each>
+  </xsl:element>
+</xsl:variable>
+
+<xsl:variable name="doctree" select="xalan:nodeset($doctree.var)"/>
+
+<xsl:template match="metrics">
+
+  <!-- create the index.html -->
+  <redirect:write file="{$output.dir}/index.html">
+    <xsl:call-template name="index.html"/>
+  </redirect:write>
+
+  <!-- create the stylesheet.css -->
+  <redirect:write file="{$output.dir}/stylesheet.css">
+    <xsl:call-template name="stylesheet.css"/>
+  </redirect:write>
+
+  <redirect:write file="{$output.dir}/metrics-reference.html">
+    <xsl:call-template name="metrics-reference.html"/>
+  </redirect:write>
+
+  <!-- create the overview-packages.html at the root -->
+  <redirect:write file="{$output.dir}/overview-summary.html">
+    <xsl:apply-templates select="." mode="overview.packages"/>
+  </redirect:write>
+
+  <!-- create the all-packages.html at the root -->
+  <redirect:write file="{$output.dir}/overview-frame.html">
+    <xsl:apply-templates select="." mode="all.packages"/>
+  </redirect:write>
+
+  <!-- create the all-classes.html at the root -->
+  <redirect:write file="{$output.dir}/allclasses-frame.html">
+    <xsl:apply-templates select="." mode="all.classes"/>
+  </redirect:write>
+
+  <!-- process all packages -->
+  <xsl:apply-templates select=".//package"/>
+</xsl:template>
+
+
+<xsl:template match="package">
+  <xsl:variable name="package.name" select="@name"/>
+  <xsl:variable name="package.dir">
+    <xsl:if test="not($package.name = 'unnamed package')"><xsl:value-of select="translate($package.name,'.','/')"/></xsl:if>
+    <xsl:if test="$package.name = 'unnamed package'">.</xsl:if>
+  </xsl:variable>
+  <!-- create a classes-list.html in the package directory -->
+  <redirect:write file="{$output.dir}/{$package.dir}/package-frame.html">
+    <xsl:apply-templates select="." mode="classes.list"/>
+  </redirect:write>
+
+  <!-- create a package-summary.html in the package directory -->
+  <redirect:write file="{$output.dir}/{$package.dir}/package-summary.html">
+    <xsl:apply-templates select="." mode="package.summary"/>
+  </redirect:write>
+
+  <!-- for each class, creates a @name.html -->
+  <!-- @bug there will be a problem with inner classes having the same name, it will be overwritten -->
+  <xsl:for-each select="$doctree/classes/class[@package = current()/@name]">
+      <!--Processing <xsl:value-of select="$class.name"/><xsl:text>
</xsl:text> -->
+    <redirect:write file="{$output.dir}/{$package.dir}/{@name}.html">
+      <xsl:apply-templates select="." mode="class.details"/>
+    </redirect:write>
+  </xsl:for-each>
+</xsl:template>
+
+<!-- little trick to compute the classname for inner and non inner classes -->
+<!-- this is all in one line to avoid CRLF in the name -->
+<xsl:template match="class" mode="class.name">
+    <xsl:if test="parent::class"><xsl:apply-templates select="parent::class" mode="class.name"/>.<xsl:value-of select="@name"/></xsl:if><xsl:if test="not(parent::class)"><xsl:value-of select="@name"/></xsl:if>
+</xsl:template>
+
+
+<xsl:template name="index.html">
+<HTML>
+  <HEAD><TITLE>Metrics Results.</TITLE></HEAD>
+  <FRAMESET cols="20%,80%">
+    <FRAMESET rows="30%,70%">
+      <FRAME src="overview-frame.html" name="packageListFrame"/>
+      <FRAME src="allclasses-frame.html" name="classListFrame"/>
+    </FRAMESET>
+    <FRAME src="overview-summary.html" name="classFrame"/>
+  </FRAMESET>
+  <noframes>
+    <H2>Frame Alert</H2>
+    <P>
+    This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
+    </P>
+  </noframes>
+</HTML>
+</xsl:template>
+
+<!-- this is the stylesheet css to use for nearly everything -->
+<xsl:template name="metrics-reference.html">
+<html>
+<head>
+<link title="Style" type="text/css" rel="stylesheet" href="stylesheet.css"/>
+</head>
+<body style="text-align:justify;">
+<h2>Metrics Reference</h2>
+<a href="#V(G)">V(G)</a> |
+<a href="#LOC">LOC</a> |
+<a href="#DIT">DIT</a> |
+<a href="#NOA">NOA</a> |
+<a href="#NRM">NRM</a> |
+<a href="#NLM">NLM</a> |
+<a href="#WMC">WMC</a> |
+<a href="#RFC">RFC</a> |
+<a href="#DAC">DAC</a> |
+<a href="#FANOUT">FANOUT</a> |
+<a href="#CBO">CBO</a> |
+<a href="#LCOM">LCOM</a> |
+<a href="#NOC">NOC</a>
+
+<a name="V(G)"/>
+<h3>Cyclomatic Complexity - V(G)</h3>
+This metric was introduced in the 1970s to measure the amount of control
+flow complexity or branching complexity in a module such as a
+subroutine. It gives the number of paths that may be taken through the
+code, and was initially developed to give some measure of the cost of
+producing a test case for the module by executing each path.
+<p/>
+Methods with a high cyclomatic complexity tend to be more difficult to
+understand and maintain. In general the more complex the methods of an
+application, the more difficult it will be to test it, and this will adversely
+affect its reliability.
+<p/>
+V(G) is a measure of the control flow complexity of a method or
+constructor.  It counts the number of branches in the body of the method,
+defined as:
+<ul>
+<li>while statements;</li>
+<li>if statements;</li>
+<li>for statements.</li>
+</ul>
+
+The metric can also be configured to count each case of a switch
+statement as well.
+
+<a name="LOC"/>
+<h3>Lines of Code - LOC</h3>
+
+This is perhaps the simplest of all the metrics to define and compute.
+Counting lines has a long history as a software metric dating from before
+the rise of structured programming, and it is still in widespread use today.
+The size of a method affects the ease with which it can be understood, its
+reusability and its maintainability. There are a variety of ways that the size
+can be calculated. These include counting all the lines of code, the number
+of statements, the blank lines of code, the lines of commentary, and the
+lines consisting only of syntax such as block delimiters.
+<p/>
+This metric can also be used for sizing other constructs as well, for
+example, the overall size of a Java class or package can be measured by
+counting the number of source lines it consists of.
+<p/>
+LOC can be used to determine the size of a compilation unit (source file),
+class or interface, method, constructor, or field.  It can be configured to
+ignore:
+<ul>
+<li>blank lines;</li>
+<li>lines consisting only of comments;</li>
+<li>lines consisting only of opening and closing braces.</li>
+</ul>
+
+<a name="DIT"/>
+<h3>Depth of Inheritance Hierarchy - DIT</h3>
+
+This metric calculates how far down the inheritance hierarchy a class is
+declared. In Java all classes have java.lang.Object as their ultimate
+superclass, which is defined to have a depth of 1. So a class that
+immediately extends java.lang.Object has a metric value of 2; any of its
+subclasses will have a value of 3, and so on.
+<p/>
+A class that is deep within the tree inherits more methods and state
+variables, thereby increasing its complexity and making it difficult to
+predict its behavior. It can be harder to understand a system with many
+inheritance layers.
+<p/>
+DIT is defined for classes and interfaces:
+<ul>
+<li>all interface types have a depth of 1;</li>
+<li>the class java.lang.Object has a depth of 1;</li>
+<li>all other classes have a depth of 1 + the depth of their super class.</li>
+</ul>
+
+<a name="NOA"/>
+<h3>Number of Attributes - NOA</h3>
+
+The number of distinct state variables in a class serves as one measure of
+its complexity. The more state a class represents the more difficult it is to
+maintain invariants for it. It also hinders comprehensibility and reuse.
+<p/>
+In Java, state can be exposed to subclasses through protected fields, which
+entails that the subclass also be aware of and maintain any invariants. This
+interference with the class's data encapsulation can be a source of defects
+and hidden dependencies between the state variables.
+<p/>
+NOA is defined for classes and interfaces.  It counts the number of fields
+declared in the class or interface.
+
+<a name="NRM"/>
+<h3>Number of Remote Methods - NRM</h3>
+
+NRM is defined for classes.  A remote method call is defined as an
+invocation of a method that is not declared in any of:
+<ul>
+<li>the class itself;</li>
+<li>a class or interface that the class extends or implements;</li>
+<li>a class or method that extends the class.</li>
+</ul>
+
+The value is the count of all the remote method calls in all of the methods
+and constructors of the class.
+
+<a name="NLM"/>
+<h3>Number of Local Methods - NLM</h3>
+
+NLM is defined for classes and interfaces.  A local method is defined as a
+method that is declared in the class or interface. NLM can be configured to
+include the local methods of all of the class's superclasses.  Methods with
+public, protected, package and private visibility can be independently
+counted by setting configuration parameters.
+
+<a name="WMC"/>
+<h3>Weighted Methods per Class - WMC</h3>
+
+If the number of methods in a class can be determined during the design
+and modeling phase of a project, it can be used as a predictor of how
+much time and effort is needed to develop, debug and maintain it. This
+metric can be further refined by incorporating a weighting for the
+complexity of each method. The usual weighting is given by the cyclomatic
+complexity of the method.
+<p/>
+The subclasses of a class inherit all of its public and protected methods,
+and possibly its package methods as well, so the number of methods a
+class has directly impacts the complexity of its subclasses. Classes with
+large numbers of methods are often specific to a particular application,
+reducing the ability to reuse them.
+<p/>
+The definition of WMC is based upon NLM, and it provides the same
+configuration parameters for counting inherited methods and of varying
+visibility. The main difference is that NLM always counts each method as 1,
+whereas WMC will weight each method. There are two weighting schemes:
+<ul>
+<li>V(G) the cyclomatic complexity of the method is used as its weight.
+   Methods from class files are given a V(G) of 1.</li>
+<li>the arity, or the number of parameters of the method are used to
+   determine the weight.</li>
+</ul>
+
+<a name="RFC"/>
+<h3>Response For Class - RFC</h3>
+
+The response set of a class is the set of all methods that can be invoked as
+a result of a message sent to an object of the class. This includes methods
+in the class's inheritance hierarchy and methods that can be invoked on
+other objects. The Response For Class metric is defined to be size of the
+response set for the class. A class which provides a larger response set is
+considered to be more complex than one with a smaller response set.
+<p/>
+One reason for this is that if a method call on a class can result in a large
+number of different method calls on the target and other classes, then it
+can be harder to test the behavior of the class and debug problems. It will
+typically require a deeper understanding of the potential interactions that
+objects of the class can have with the rest of the system.
+<p/>
+RFC is defined as the sum of NLM and NRM for the class.  The local methods
+include all of the public, protected, package and private methods, but not
+methods declared only in a superclass.
+
+<a name="DAC"/>
+<h3>Data Abstraction Coupling - DAC</h3>
+
+DAC is defined for classes and interfaces.  It counts the number of reference
+types that are used in the field declarations of the class or interface.  The
+component types of arrays are also counted.  Any field with a type that is
+either a supertype or a subtype of the class is not counted.
+
+<a name="FANOUT"/>
+<h3>Fan Out - FANOUT</h3>
+
+FANOUT is defined for classes and interfaces, constructors and methods. It
+counts the number of reference types that are used in:
+<ul>
+<li>field declarations;</li>
+<li>formal parameters and return types;</li>
+<li>throws declarations;</li>
+<li>local variables.</li>
+</ul>
+
+The component types of arrays are also counted. Any type that is either a
+supertype or a subtype of the class is not counted.
+
+<a name="CBO"/>
+<h3>Coupling Between Objects - CBO</h3>
+
+When one object or class uses another object or class they are said to be
+coupled. One major source of coupling is that between a superclass and a
+subclass. A coupling is also introduced when a method or field in another
+class is accessed, or when an object of another class is passed into or out
+of a method invocation. Coupling Between Objects is a measure of the
+non-inheritance coupling between two objects.
+<p/>
+A high value of coupling reduces the modularity of the class and makes
+reuse more difficult. The more independent a class is the more likely it is
+that it will be possible to reuse it in another part of the system. When a
+class is coupled to another class it becomes sensitive to changes in that
+class, thereby making maintenance for difficult. In addition, a class that is
+overly dependent on other classes can be difficult to understand and test in
+isolation.
+<p/>
+CBO is defined for classes and interfaces, constructors and methods. It
+counts the number of reference types that are used in:
+<ul>
+<li>field declarations</li>
+<li>formal parameters and return types</li>
+<li>throws declarations</li>
+<li>local variables</li>
+</ul>
+
+It also counts:
+<ul>
+<li>types from which field and method selections are made</li>
+</ul>
+
+The component types of arrays are also counted. Any type that is either a
+supertype or a subtype of the class is not counted.
+
+<a name="LCOM"/>
+<h3>Lack of Cohesion Of Methods - LCOM</h3>
+
+The cohesion of a class is the degree to which its methods are related to
+each other. It is determined by examining the pattern of state variable
+accesses within the set of methods. If all the methods access the same state
+variables then they have high cohesion; if they access disjoint sets of
+variables then the cohesion is low. An extreme example of low cohesion
+would be if none of the methods accessed any of the state variables.
+
+If a class exhibits low method cohesion it indicates that the design of the
+class has probably been partitioned incorrectly, and could benefit by being
+split into more classes with individually higher cohesion. On the other
+hand, a high value of cohesion (a low lack of cohesion) implies that the
+class is well designed. A cohesive class will tend to provide a high degree
+of encapsulation, whereas a lack of cohesion decreases encapsulation and
+increases complexity.
+<p/>
+Another form of cohesion that is useful for Java programs is cohesion
+between nested and enclosing classes. A nested class that has very low
+cohesion with its enclosing class would probably better designed as a peer
+class rather than a nested class.
+<p/>
+LCOM is defined for classes. Operationally, LCOM takes each pair of
+methods in the class and determines the set of fields they each access. If
+they have disjoint sets of field accesses increase the count P by one. If they
+share at least one field access then increase Q by one. After considering
+each pair of methods,
+LCOM = (P > Q) ? (P - Q) : 0
+<p/>
+Indirect access to fields via local methods can be considered by setting a
+metric configuration parameter.
+
+<a name="NOC"/>
+<h3>Number Of Classes - NOC</h3>
+
+The overall size of the system can be estimated by calculating the number
+of classes it contains. A large system with more classes is more complex
+than a smaller one because the number of potential interactions between
+objects is higher. This reduces the comprehensibility of the system which
+in turn makes it harder to test, debug and maintain.
+<p/>
+If the number of classes in the system can be projected during the initial
+design phase of the project it can serve as a base for estimating the total
+effort and cost of developing, debugging and maintaining the system.
+<p/>
+The NOC metric can also usefully be applied at the package and class level
+as well as the total system.
+<p/>
+NOCL is defined for class and interfaces. It counts the number of classes or
+interfaces that are declared. This is usually 1, but nested class declarations
+will increase this number.
+</body>
+</html>
+</xsl:template>
+
+<!-- this is the stylesheet css to use for nearly everything -->
+<xsl:template name="stylesheet.css">
+    .bannercell {
+      border: 0px;
+      padding: 0px;
+    }
+    body {
+      margin-left: 10;
+      margin-right: 10;
+      font:normal 80% arial,helvetica,sanserif;
+      background-color:#FFFFFF;
+      color:#000000;
+    }
+    .a td {
+      background: #efefef;
+    }
+    .b td {
+      background: #fff;
+    }
+    th, td {
+      text-align: left;
+      vertical-align: top;
+    }
+    th {
+      font-weight:bold;
+      background: #ccc;
+      color: black;
+    }
+    table, th, td {
+      font-size:100%;
+      border: none
+    }
+    table.log tr td, tr th {
+
+    }
+    h2 {
+      font-weight:bold;
+      font-size:140%;
+      margin-bottom: 5;
+    }
+    h3 {
+      font-size:100%;
+      font-weight:bold;
+      background: #525D76;
+      color: white;
+      text-decoration: none;
+      padding: 5px;
+      margin-right: 2px;
+      margin-left: 2px;
+      margin-bottom: 0;
+    }
+    .Error {
+      font-weight:bold; color:red;
+    }
+
+</xsl:template>
+
+<!-- print the metrics of the class -->
+<xsl:template match="class" mode="class.details">
+  <!--xsl:variable name="package.name" select="(ancestor::package)[last()]/@name"/-->
+  <xsl:variable name="package.name" select="@package"/>
+  <HTML>
+    <HEAD>
+      <xsl:call-template name="create.stylesheet.link">
+        <xsl:with-param name="package.name" select="$package.name"/>
+      </xsl:call-template>
+    </HEAD>
+    <BODY>
+      <xsl:call-template name="pageHeader"/>
+
+      <H3>Class <xsl:if test="not($package.name = 'unnamed package')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></H3>
+      <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
+        <xsl:call-template name="all.metrics.header"/>
+        <xsl:apply-templates select="." mode="print.metrics"/>
+      </table>
+
+      <H3>Methods</H3>
+      <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
+        <xsl:call-template name="method.metrics.header"/>
+        <xsl:apply-templates select="method" mode="print.metrics"/>
+      </table>
+
+      <xsl:call-template name="pageFooter"/>
+    </BODY>
+  </HTML>
+</xsl:template>
+
+
+<!-- list of classes in a package -->
+<xsl:template match="package" mode="classes.list">
+  <HTML>
+    <HEAD>
+      <xsl:call-template name="create.stylesheet.link">
+        <xsl:with-param name="package.name" select="@name"/>
+      </xsl:call-template>
+    </HEAD>
+    <BODY>
+      <table width="100%">
+        <tr>
+          <td nowrap="nowrap">
+            <H2><a href="package-summary.html" target="classFrame"><xsl:value-of select="@name"/></a></H2>
+          </td>
+        </tr>
+      </table>
+
+      <H2>Classes</H2>
+      <TABLE WIDTH="100%">
+        <!-- xalan-nodeset:nodeset for Xalan 1.2.2 -->
+            <xsl:for-each select="$doctree/classes/class[@package = current()/@name]">
+                <xsl:sort select="@name"/>
+          <tr>
+            <td nowrap="nowrap">
+              <a href="{@name}.html" target="classFrame"><xsl:value-of select="@name"/></a>
+            </td>
+          </tr>
+            </xsl:for-each>
+      </TABLE>
+    </BODY>
+  </HTML>
+</xsl:template>
+
+
+<!--
+  Creates an all-classes.html file that contains a link to all package-summary.html
+  on each class.
+-->
+<xsl:template match="metrics" mode="all.classes">
+  <html>
+    <head>
+      <xsl:call-template name="create.stylesheet.link">
+        <xsl:with-param name="package.name" select="''"/>
+      </xsl:call-template>
+    </head>
+    <body>
+      <h2>Classes</h2>
+      <table width="100%">
+          <xsl:for-each select="$doctree/classes/class">
+              <xsl:sort select="@name"/>
+              <xsl:apply-templates select="." mode="all.classes"/>
+          </xsl:for-each>
+      </table>
+    </body>
+  </html>
+</xsl:template>
+
+<xsl:template match="class" mode="all.classes">
+    <xsl:variable name="package.name" select="@package"/>
+    <xsl:variable name="class.name" select="@name"/>
+  <tr>
+    <td nowrap="nowrap">
+      <a target="classFrame">
+        <xsl:attribute name="href">
+          <xsl:if test="not($package.name='unnamed package')">
+            <xsl:value-of select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text>
+          </xsl:if>
+          <xsl:value-of select="$class.name"/><xsl:text>.html</xsl:text>
+        </xsl:attribute>
+        <xsl:value-of select="$class.name"/>
+      </a>
+    </td>
+  </tr>
+</xsl:template>
+
+<!--
+  Creates an html file that contains a link to all package-summary.html files on
+  each package existing on testsuites.
+  @bug there will be a problem here, I don't know yet how to handle unnamed package :(
+-->
+<xsl:template match="metrics" mode="all.packages">
+  <html>
+    <head>
+      <xsl:call-template name="create.stylesheet.link">
+        <xsl:with-param name="package.name" select="./package/@name"/>
+      </xsl:call-template>
+    </head>
+    <body>
+      <h2><a href="overview-summary.html" target="classFrame">Home</a></h2>
+      <h2>Packages</h2>
+        <table width="100%">
+          <xsl:apply-templates select=".//package[not(./@name = 'unnamed package')]" mode="all.packages">
+            <xsl:sort select="@name"/>
+          </xsl:apply-templates>
+        </table>
+    </body>
+  </html>
+</xsl:template>
+
+<xsl:template match="package" mode="all.packages">
+  <tr>
+    <td nowrap="nowrap">
+      <a href="{translate(@name,'.','/')}/package-summary.html" target="classFrame">
+        <xsl:value-of select="@name"/>
+      </a>
+    </td>
+  </tr>
+</xsl:template>
+
+
+<xsl:template match="metrics" mode="overview.packages">
+  <html>
+    <head>
+      <xsl:call-template name="create.stylesheet.link">
+        <xsl:with-param name="package.name" select="''"/>
+      </xsl:call-template>
+    </head>
+    <body onload="open('allclasses-frame.html','classListFrame')">
+    <xsl:call-template name="pageHeader"/>
+    <h3>Summary</h3>
+    <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
+    <tr>
+      <th><a href="metrics-reference.html#V(G)">V(G)</a></th>
+      <th><a href="metrics-reference.html#LOC">LOC</a></th>
+      <th><a href="metrics-reference.html#DIT">DIT</a></th>
+      <th><a href="metrics-reference.html#NOA">NOA</a></th>
+      <th><a href="metrics-reference.html#NRM">NRM</a></th>
+      <th><a href="metrics-reference.html#NLM">NLM</a></th>
+      <th><a href="metrics-reference.html#WMC">WMC</a></th>
+      <th><a href="metrics-reference.html#RFC">RFC</a></th>
+      <th><a href="metrics-reference.html#DAC">DAC</a></th>
+      <th><a href="metrics-reference.html#FANOUT">FANOUT</a></th>
+      <th><a href="metrics-reference.html#CBO">CBO</a></th>
+      <th><a href="metrics-reference.html#LCOM">LCOM</a></th>
+      <th><a href="metrics-reference.html#NOCL">NOCL</a></th>
+    </tr>
+    <xsl:apply-templates select="." mode="print.metrics"/>
+    </table>
+    <table border="0" width="100%">
+    <tr>
+    <td style="text-align: justify;">
+    Note: Metrics evaluate the quality of software by analyzing the program source and quantifying
+    various kind of complexity. Complexity is a common source of problems and defects in software.
+    High complexity makes it more difficult to develop, understand, maintain, extend, test and debug
+    a program.
+    <p/>
+    The primary use of metrics is to focus your attention on those parts of code that potentially are
+    complexity hot spots. Once the complex areas your program have been uncovered, you can take remedial
+    actions.
+    For additional information about metrics and their meaning, please consult
+    Metamata Metrics manual.
+    </td>
+    </tr>
+    </table>
+
+    <h3>Packages</h3>
+    <table border="0" cellpadding="5" cellspacing="2" width="100%">
+      <xsl:call-template name="all.metrics.header"/>
+      <xsl:for-each select=".//package[not(@name = 'unnamed package')]">
+        <xsl:sort select="@name" order="ascending"/>
+        <xsl:apply-templates select="." mode="print.metrics"/>
+      </xsl:for-each>
+    </table>
+    <!-- @bug there could some classes at this level (classes in unnamed package) -->
+    <xsl:call-template name="pageFooter"/>
+    </body>
+    </html>
+</xsl:template>
+
+<xsl:template match="package" mode="package.summary">
+  <HTML>
+    <HEAD>
+      <xsl:call-template name="create.stylesheet.link">
+        <xsl:with-param name="package.name" select="@name"/>
+      </xsl:call-template>
+    </HEAD>
+    <body onload="open('package-frame.html','classListFrame')">
+      <xsl:call-template name="pageHeader"/>
+      <!-- create an anchor to this package name -->
+      <h3>Package <xsl:value-of select="@name"/></h3>
+
+      <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
+        <xsl:call-template name="all.metrics.header"/>
+        <xsl:apply-templates select="." mode="print.metrics"/>
+      </table>
+
+      <table border="0" width="100%">
+      <tr>
+      <td style="text-align: justify;">
+      Note: Metrics evaluate the quality of software by analyzing the program source and quantifying
+      various kind of complexity. Complexity is a common source of problems and defects in software.
+      High complexity makes it more difficult to develop, understand, maintain, extend, test and debug
+      a program.
+      <p/>
+      The primary use of metrics is to focus your attention on those parts of code that potentially are
+      complexity hot spots. Once the complex areas your program have been uncovered, you can take remedial
+      actions.
+      For additional information about metrics and their meaning, please consult
+      Metamata Metrics manual.
+      </td>
+      </tr>
+      </table>
+
+      <xsl:variable name="classes-in-package" select="$doctree/classes/class[@package = current()/@name]"/>
+      <xsl:if test="count($classes-in-package) > 0">
+        <H3>Classes</H3>
+        <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
+          <xsl:call-template name="all.metrics.header"/>
+          <xsl:for-each select="$classes-in-package">
+                <xsl:sort select="@name"/>
+                <xsl:apply-templates select="." mode="print.metrics"/>
+          </xsl:for-each>
+        </table>
+      </xsl:if>
+
+      <xsl:call-template name="pageFooter"/>
+    </body>
+  </HTML>
+</xsl:template>
+
+
+<!--
+    transform string like a.b.c to ../../../
+    @param path the path to transform into a descending directory path
+-->
+<xsl:template name="path">
+  <xsl:param name="path"/>
+  <xsl:if test="contains($path,'.')">
+    <xsl:text>../</xsl:text>
+    <xsl:call-template name="path">
+      <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'.')"/></xsl:with-param>
+    </xsl:call-template>
+  </xsl:if>
+  <xsl:if test="not(contains($path,'.')) and not($path = '')">
+    <xsl:text>../</xsl:text>
+  </xsl:if>
+</xsl:template>
+
+
+<!-- create the link to the stylesheet based on the package name -->
+<xsl:template name="create.stylesheet.link">
+  <xsl:param name="package.name"/>
+  <LINK REL ="stylesheet" TYPE="text/css" TITLE="Style"><xsl:attribute name="href"><xsl:if test="not($package.name = 'unnamed package')"><xsl:call-template name="path"><xsl:with-param name="path" select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></LINK>
+</xsl:template>
+
+
+<!-- Page Header -->
+<xsl:template name="pageHeader">
+
+  <!-- jakarta logo -->
+  <table border="0" cellpadding="0" cellspacing="0" width="100%">
+  <tr>
+    <td class="bannercell" rowspan="2">
+      <a href="http://jakarta.apache.org/">
+      <img src="http://jakarta.apache.org/images/jakarta-logo.gif" alt="http://jakarta.apache.org" align="left" border="0"/>
+      </a>
+    </td>
+    <td style="text-align:right"><h2>Source Code Metrics</h2></td>
+    </tr>
+    <tr>
+    <td style="text-align:right">Designed for use with <a href='http://www.webgain.com/products/quality_analyzer/'>Webgain QA/Metamata Metrics</a> and <a href='http://jakarta.apache.org'>Ant</a>.</td>
+    </tr>
+  </table>
+  <hr size="1"/>
+</xsl:template>
+
+<!-- Page Footer -->
+<xsl:template name="pageFooter">
+</xsl:template>
+
+<!-- class header -->
+<xsl:template name="all.metrics.header">
+  <tr>
+    <th width="80%">Name</th>
+    <th nowrap="nowrap">V(G)</th>
+    <th>LOC</th>
+    <th>DIT</th>
+    <th>NOA</th>
+    <th>NRM</th>
+    <th>NLM</th>
+    <th>WMC</th>
+    <th>RFC</th>
+    <th>DAC</th>
+    <th>FANOUT</th>
+    <th>CBO</th>
+    <th>LCOM</th>
+    <th>NOCL</th>
+  </tr>
+</xsl:template>
+
+<!-- method header -->
+<xsl:template name="method.metrics.header">
+  <tr>
+    <th width="80%">Name</th>
+    <th nowrap="nowrap">V(G)</th>
+    <th>LOC</th>
+    <th>FANOUT</th>
+    <th>CBO</th>
+  </tr>
+</xsl:template>
+
+<!-- method information -->
+<xsl:template match="method" mode="print.metrics">
+  <tr>
+    <xsl:call-template name="alternate-row"/>
+    <td><xsl:apply-templates select="@name"/></td>
+    <td><xsl:apply-templates select="@vg"/></td>
+    <td><xsl:apply-templates select="@loc"/></td>
+    <td><xsl:apply-templates select="@fanout"/></td>
+    <td><xsl:apply-templates select="@cbo"/></td>
+  </tr>
+</xsl:template>
+
+<!-- class information -->
+<xsl:template match="class" mode="print.metrics">
+  <tr>
+    <xsl:call-template name="alternate-row"/>
+    <td><a href="{@name}.html"><xsl:value-of select="@name"/></a></td>
+    <td><xsl:apply-templates select="@vg"/></td>
+    <td><xsl:apply-templates select="@loc"/></td>
+    <td><xsl:apply-templates select="@dit"/></td>
+    <td><xsl:apply-templates select="@noa"/></td>
+    <td><xsl:apply-templates select="@nrm"/></td>
+    <td><xsl:apply-templates select="@nlm"/></td>
+    <td><xsl:apply-templates select="@wmc"/></td>
+    <td><xsl:apply-templates select="@rfc"/></td>
+    <td><xsl:apply-templates select="@dac"/></td>
+    <td><xsl:apply-templates select="@fanout"/></td>
+    <td><xsl:apply-templates select="@cbo"/></td>
+    <td><xsl:apply-templates select="@lcom"/></td>
+    <td><xsl:apply-templates select="@nocl"/></td>
+  </tr>
+</xsl:template>
+
+<xsl:template match="file|package" mode="print.metrics">
+  <tr>
+    <xsl:call-template name="alternate-row"/>
+    <td>
+    <a href="{translate(@name,'.','/')}/package-summary.html" target="classFrame">
+    <xsl:value-of select="@name"/>
+    </a>
+    </td>
+    <td><xsl:apply-templates select="@vg"/></td>
+    <td><xsl:apply-templates select="@loc"/></td>
+    <td><xsl:apply-templates select="@dit"/></td>
+    <td><xsl:apply-templates select="@noa"/></td>
+    <td><xsl:apply-templates select="@nrm"/></td>
+    <td><xsl:apply-templates select="@nlm"/></td>
+    <td><xsl:apply-templates select="@wmc"/></td>
+    <td><xsl:apply-templates select="@rfc"/></td>
+    <td><xsl:apply-templates select="@dac"/></td>
+    <td><xsl:apply-templates select="@fanout"/></td>
+    <td><xsl:apply-templates select="@cbo"/></td>
+    <td><xsl:apply-templates select="@lcom"/></td>
+    <td><xsl:apply-templates select="@nocl"/></td>
+  </tr>
+</xsl:template>
+
+<xsl:template match="metrics" mode="print.metrics">
+  <tr>
+    <xsl:call-template name="alternate-row"/>
+      <!-- the global metrics is the top package metrics -->
+    <td><xsl:apply-templates select="./package/@vg"/></td>
+    <td><xsl:apply-templates select="./package/@loc"/></td>
+    <td><xsl:apply-templates select="./package/@dit"/></td>
+    <td><xsl:apply-templates select="./package/@noa"/></td>
+    <td><xsl:apply-templates select="./package/@nrm"/></td>
+    <td><xsl:apply-templates select="./package/@nlm"/></td>
+    <td><xsl:apply-templates select="./package/@wmc"/></td>
+    <td><xsl:apply-templates select="./package/@rfc"/></td>
+    <td><xsl:apply-templates select="./package/@dac"/></td>
+    <td><xsl:apply-templates select="./package/@fanout"/></td>
+    <td><xsl:apply-templates select="./package/@cbo"/></td>
+    <td><xsl:apply-templates select="./package/@lcom"/></td>
+    <td><xsl:apply-templates select="./package/@nocl"/></td>
+  </tr>
+</xsl:template>
+
+<!-- alternated row style -->
+<xsl:template name="alternate-row">
+<xsl:attribute name="class">
+  <xsl:if test="position() mod 2 = 1">a</xsl:if>
+  <xsl:if test="position() mod 2 = 0">b</xsl:if>
+</xsl:attribute>
+</xsl:template>
+
+
+<!-- how to display the metrics with their max value -->
+<!-- @todo the max values must be external to the xsl -->
+
+  <xsl:template match="@vg">
+    <xsl:call-template name="display-value">
+      <xsl:with-param name="value" select="current()"/>
+      <xsl:with-param name="max" select="$vg.max"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template match="@loc">
+    <xsl:call-template name="display-value">
+      <xsl:with-param name="value" select="current()"/>
+      <xsl:with-param name="max" select="$loc.max"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template match="@dit">
+    <xsl:call-template name="display-value">
+      <xsl:with-param name="value" select="current()"/>
+      <xsl:with-param name="max" select="$dit.max"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template match="@noa">
+    <xsl:call-template name="display-value">
+      <xsl:with-param name="value" select="current()"/>
+      <xsl:with-param name="max" select="$noa.max"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template match="@nrm">
+    <xsl:call-template name="display-value">
+      <xsl:with-param name="value" select="current()"/>
+      <xsl:with-param name="max" select="$nrm.max"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template match="@nlm">
+    <xsl:call-template name="display-value">
+      <xsl:with-param name="value" select="current()"/>
+      <xsl:with-param name="max" select="$nlm.max"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template match="@wmc">
+    <xsl:call-template name="display-value">
+      <xsl:with-param name="value" select="current()"/>
+      <xsl:with-param name="max" select="$wmc.max"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template match="@rfc">
+    <xsl:call-template name="display-value">
+      <xsl:with-param name="value" select="current()"/>
+      <xsl:with-param name="max" select="$rfc.max"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template match="@dac">
+    <xsl:call-template name="display-value">
+      <xsl:with-param name="value" select="current()"/>
+      <xsl:with-param name="max" select="$dac.max"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template match="@fanout">
+    <xsl:call-template name="display-value">
+      <xsl:with-param name="value" select="current()"/>
+      <xsl:with-param name="max" select="$fanout.max"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template match="@cbo">
+    <xsl:call-template name="display-value">
+      <xsl:with-param name="value" select="current()"/>
+      <xsl:with-param name="max" select="$cbo.max"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template match="@lcom">
+    <xsl:call-template name="display-value">
+      <xsl:with-param name="value" select="current()"/>
+      <xsl:with-param name="max" select="$lcom.max"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template match="@nocl">
+    <xsl:call-template name="display-value">
+      <xsl:with-param name="value" select="current()"/>
+      <xsl:with-param name="max" select="$nocl.max"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template name="display-value">
+    <xsl:param name="value"/>
+    <xsl:param name="max"/>
+    <xsl:if test="$value > $max">
+      <xsl:attribute name="class">Error</xsl:attribute>
+    </xsl:if>
+    <xsl:value-of select="$value"/>
+  </xsl:template>
+
+</xsl:stylesheet>
+
diff --git a/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/tagdiff.xsl b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/tagdiff.xsl
new file mode 100644
index 0000000..49c4b17
--- /dev/null
+++ b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/etc/tagdiff.xsl
@@ -0,0 +1,179 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<!-- a stylesheet to display changelogs ala netbeans -->
+<xsl:stylesheet
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    version="1.0">
+  <xsl:param name="title"/>
+  <xsl:param name="module"/>
+  <xsl:param name="cvsweb"/>
+
+  <xsl:output method="html" indent="yes"/>
+
+  <!-- Copy standard document elements.  Elements that
+       should be ignored must be filtered by apply-templates
+       tags. -->
+  <xsl:template match="*">
+    <xsl:copy>
+      <xsl:copy-of select="attribute::*[. != '']"/>
+      <xsl:apply-templates/>
+    </xsl:copy>
+  </xsl:template>
+
+  <xsl:template match="tagdiff">
+    <html>
+      <head>
+        <title><xsl:value-of select="$title"/></title>
+        <style type="text/css">
+          body, p {
+          font-family: verdana,arial,helvetica;
+          font-size: 80%;
+          color:#000000;
+          }
+	  .dateAndAuthor {
+          font-family: verdana,arial,helvetica;
+          font-size: 80%;
+          font-weight: bold;
+          text-align:left;
+          background:#a6caf0;
+	  }
+          tr, td{
+          font-family: verdana,arial,helvetica;
+          font-size: 80%;
+          background:#eeeee0;
+          }	  
+	  </style> 
+      </head>
+      <body link="#000000" alink="#000000" vlink="#000000" text="#000000">       
+          <h1>
+            <a name="top"><xsl:value-of select="$title"/></a>
+          </h1>
+          Tagdiff between <xsl:value-of select="@startTag"/> <xsl:value-of select="@startDate"/> and
+			<xsl:value-of select="@endTag"/> <xsl:value-of select="@endDate"/>
+          <p align="right">Designed for use with <a href="http://ant.apache.org/">Ant</a>.</p>
+          <hr size="2"/>
+	<a name="TOP"/>
+	<table width="100%">
+		<tr>
+			<td align="right">
+				<a href="#New">New Files</a> |
+				<a href="#Modified">Modified Files</a> |
+				<a href="#Removed">Removed Files</a>
+			</td>
+		</tr>
+	</table>
+        <table border="0" width="100%" cellpadding="3" cellspacing="1">
+		<xsl:call-template name="show-entries">
+			<xsl:with-param name="title">New Files</xsl:with-param>
+			<xsl:with-param name="anchor">New</xsl:with-param>
+			<xsl:with-param name="entries" select=".//entry[file/revision][not(file/prevrevision)]"/>
+		</xsl:call-template>
+
+		<xsl:call-template name="show-entries">
+			<xsl:with-param name="title">Modified Files</xsl:with-param>
+			<xsl:with-param name="anchor">Modified</xsl:with-param>
+			<xsl:with-param name="entries" select=".//entry[file/revision][file/prevrevision]"/>
+		</xsl:call-template>
+
+		<!-- change to entries select to address bug #36827 -->
+		<xsl:call-template name="show-entries">
+			<xsl:with-param name="title">Removed Files</xsl:with-param>
+			<xsl:with-param name="anchor">Removed</xsl:with-param>
+			<xsl:with-param name="entries" select=".//entry[not(file/revision)][file/prevrevision]"/>
+		</xsl:call-template>
+        </table>
+        
+      </body>
+    </html>
+  </xsl:template>
+
+  <xsl:template name="show-entries">
+	<xsl:param name="title"/>
+	<xsl:param name="anchor"/>
+	<xsl:param name="entries"/>
+	<tr>
+		<td colspan="2" class="dateAndAuthor">
+			<a>
+				<xsl:attribute name="name"><xsl:value-of select="$anchor"/></xsl:attribute>
+				<xsl:value-of select="$title"/> - <xsl:value-of select="count($entries)"/> entries
+			</a>
+			<a href="#TOP">(back to top)</a>
+		</td>
+	</tr>
+	<tr>
+		<td width="20">
+			<xsl:text>    </xsl:text>
+		</td>
+		<td>
+		        <ul>
+				<xsl:apply-templates select="$entries"/>
+			</ul>
+		</td>
+	</tr>
+  </xsl:template>  
+
+  <xsl:template match="entry">
+	<xsl:apply-templates select="file"/>
+  </xsl:template>
+
+  <xsl:template match="date">
+    <i><xsl:value-of select="."/></i>
+  </xsl:template>
+
+  <xsl:template match="time">
+    <i><xsl:value-of select="."/></i>
+  </xsl:template>
+
+  <xsl:template match="author">
+    <i>
+      <a>
+        <xsl:attribute name="href">mailto:<xsl:value-of select="."/></xsl:attribute>
+        <xsl:value-of select="."/>
+      </a>
+    </i>
+  </xsl:template>
+
+  <xsl:template match="file">
+    <li>
+      <a target="_new">
+        <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" /></xsl:attribute>
+        <xsl:value-of select="name" />
+      </a>
+      <xsl:if test="string-length(prevrevision) > 0 or string-length(revision) > 0">
+      <xsl:text> </xsl:text>
+      <a target="_new">
+        <xsl:choose>
+          <xsl:when test="string-length(prevrevision) = 0 ">
+            <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?rev=<xsl:value-of select="revision" />&content-type=text/x-cvsweb-markup</xsl:attribute>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?r1=<xsl:value-of select="revision" />&r2=<xsl:value-of select="prevrevision"/>&diff_format=h</xsl:attribute>
+          </xsl:otherwise>
+        </xsl:choose> (<xsl:if test="count(prevrevision) > 0"> <xsl:value-of select="prevrevision"/> --> </xsl:if> <xsl:value-of select="revision"/>)
+      </a>
+      </xsl:if>
+    </li>
+  </xsl:template>
+
+  <!-- Any elements within a msg are processed,
+       so that we can preserve HTML tags. -->
+  <xsl:template match="msg">
+    <b><xsl:apply-templates/></b>
+  </xsl:template>
+  
+</xsl:stylesheet>
diff --git a/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/plugin.properties b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/plugin.properties
new file mode 100644
index 0000000..6652492
--- /dev/null
+++ b/eclipse/plugins/org.apache.ant_1.8.2.v20110505-1300/plugin.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2000, 2011 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials 
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+pluginName = Apache Ant
+providerName = Eclipse Orbit
diff --git a/eclipse/plugins/org.apache.lucene/.classpath b/eclipse/plugins/org.apache.lucene/.classpath
new file mode 100755
index 0000000..c7e80f5
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry exported="true" kind="lib" path="" sourcepath="source-bundle"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/.gitignore b/eclipse/plugins/org.apache.lucene/.cvsignore
old mode 100644
new mode 100755
similarity index 100%
copy from eclipse/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/.gitignore
copy to eclipse/plugins/org.apache.lucene/.cvsignore
diff --git a/eclipse/plugins/org.apache.lucene/.project b/eclipse/plugins/org.apache.lucene/.project
new file mode 100755
index 0000000..f02015b
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.apache.lucene</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/eclipse/plugins/org.apache.lucene/.settings/CVS/Entries b/eclipse/plugins/org.apache.lucene/.settings/CVS/Entries
new file mode 100644
index 0000000..d984568
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/.settings/CVS/Entries
@@ -0,0 +1,3 @@
+/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
new file mode 100644
index 0000000..6083047
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/.settings/CVS/Repository
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000..24126f4
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/.settings/CVS/Root
@@ -0,0 +1 @@
+: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
new file mode 100644
index 0000000..3114c57
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/.settings/CVS/Tag
@@ -0,0 +1 @@
+Tv2_9_1
diff --git a/eclipse/plugins/org.apache.lucene/.settings/org.eclipse.core.resources.prefs b/eclipse/plugins/org.apache.lucene/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..ac9048d
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+#Wed Jan 27 12:35:08 CET 2010
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
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
new file mode 100755
index 0000000..b5caa3a
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,4 @@
+#Sun Oct 15 08:46:29 EDT 2006
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/eclipse/plugins/org.apache.lucene/.settings/org.eclipse.pde.prefs b/eclipse/plugins/org.apache.lucene/.settings/org.eclipse.pde.prefs
new file mode 100755
index 0000000..fc301c4
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,25 @@
+#Mon Jan 05 16:18:42 CET 2009
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=2
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=2
+compilers.p.missing-version-require-bundle=2
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff --git a/eclipse/plugins/org.apache.lucene/CVS/Entries b/eclipse/plugins/org.apache.lucene/CVS/Entries
new file mode 100644
index 0000000..dc1d4c8
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/CVS/Entries
@@ -0,0 +1,12 @@
+/.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
new file mode 100644
index 0000000..50dfa9d
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/CVS/Repository
@@ -0,0 +1 @@
+org.eclipse.orbit/org.apache.lucene
diff --git a/eclipse/plugins/org.apache.lucene/CVS/Root b/eclipse/plugins/org.apache.lucene/CVS/Root
new file mode 100644
index 0000000..24126f4
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/CVS/Root
@@ -0,0 +1 @@
+: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
new file mode 100644
index 0000000..3114c57
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/CVS/Tag
@@ -0,0 +1 @@
+Tv2_9_1
diff --git a/eclipse/plugins/org.apache.lucene/CVS/Template b/eclipse/plugins/org.apache.lucene/CVS/Template
new file mode 100644
index 0000000..e69de29
diff --git a/eclipse/plugins/org.apache.lucene/META-INF/CVS/Entries b/eclipse/plugins/org.apache.lucene/META-INF/CVS/Entries
new file mode 100644
index 0000000..2a9629d
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/META-INF/CVS/Entries
@@ -0,0 +1 @@
+/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
new file mode 100644
index 0000000..e8696c5
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/META-INF/CVS/Repository
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000..24126f4
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/META-INF/CVS/Root
@@ -0,0 +1 @@
+: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
new file mode 100644
index 0000000..3114c57
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/META-INF/CVS/Tag
@@ -0,0 +1 @@
+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
new file mode 100755
index 0000000..ab03b4b
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/META-INF/MANIFEST.MF
@@ -0,0 +1,31 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.apache.lucene
+Bundle-Version: 2.9.1.qualifier
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Require-Bundle: org.apache.lucene.core;bundle-version="[2.9.1,3.0.0)";visibility:=reexport,
+ org.apache.lucene.analysis;bundle-version="[2.9.1,3.0.0)";resolution:=optional,
+ org.apache.lucene.highlighter;bundle-version="[2.9.1,3.0.0)";resolution:=optional,
+ org.apache.lucene.memory;bundle-version="[2.9.1,3.0.0)";resolution:=optional,
+ org.apache.lucene.queries;bundle-version="[2.9.1,3.0.0)";resolution:=optional,
+ org.apache.lucene.snowball;bundle-version="[2.9.1,3.0.0)";resolution:=optional,
+ org.apache.lucene.spellchecker;bundle-version="[2.9.1,3.0.0)";resolution:=optional,
+ org.apache.lucene.misc;bundle-version="[2.9.1,3.0.0)";resolution:=optional
+Export-Package: org.apache.lucene;version="2.9.1",
+ org.apache.lucene.analysis;version="2.9.1",
+ org.apache.lucene.analysis.standard;version="2.9.1",
+ org.apache.lucene.analysis.tokenattributes;version="2.9.1",
+ org.apache.lucene.document;version="2.9.1",
+ org.apache.lucene.index;version="2.9.1",
+ org.apache.lucene.messages;version="2.9.1",
+ org.apache.lucene.queryParser;version="2.9.1",
+ org.apache.lucene.search;version="2.9.1",
+ org.apache.lucene.search.function;version="2.9.1",
+ org.apache.lucene.search.payloads;version="2.9.1",
+ org.apache.lucene.search.spans;version="2.9.1",
+ org.apache.lucene.store;version="2.9.1",
+ org.apache.lucene.util;version="2.9.1",
+ org.apache.lucene.util.cache;version="2.9.1"
diff --git a/eclipse/plugins/org.apache.lucene/about.html b/eclipse/plugins/org.apache.lucene/about.html
new file mode 100755
index 0000000..2a13c34
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/about.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>May 30, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+<h3>Third Party Content</h3>
+
+<p>The Content includes items that have been sourced from third parties as set out below. If you 
+did not receive this Content directly from the Eclipse Foundation, the following is provided 
+for informational purposes only, and you should look to the Redistributor’s license for 
+terms and conditions of use.</p>
+
+<h4>Lucene 2.9.1</h4>
+
+<p>The plug-in includes software developed by The Apache Software Foundation as part of the Ant project.</p>
+
+<p>Your use of the Lucene code is subject to the terms and conditions of the Apache Software License 2.0.  A copy of the license is contained
+in the file <a href="about_files/LICENSE.txt">LICENSE.txt</a> and is also available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html">http://www.apache.org/licenses/LICENSE-2.0.html</a>.
+</p>
+<p>The names "Lucene" and  "Apache Software Foundation" must not be used to endorse or promote products derived from this 
+software without prior written permission.  For written permission, please contact <a href="mailto:apache at apache.org">apache at apache.org</a>.</p>
+
+<p>
+Original binaries and source are available from the <a href="http://lucene.apache.org/">Apache Lucene website</a>.
+</p>
+</body>
+</html>
diff --git a/eclipse/plugins/org.apache.lucene/about_files/CHANGES.txt b/eclipse/plugins/org.apache.lucene/about_files/CHANGES.txt
new file mode 100755
index 0000000..eb1ebd0
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/about_files/CHANGES.txt
@@ -0,0 +1,3858 @@
+Lucene Change Log
+$Id: CHANGES.txt 832363 2009-11-03 09:37:36Z mikemccand $
+
+======================= Release 2.9.1 2009-11-06 =======================
+
+Changes in backwards compatibility policy
+
+ * LUCENE-2002: Add required Version matchVersion argument when
+   constructing QueryParser or MultiFieldQueryParser and, default (as
+   of 2.9) enablePositionIncrements to true to match
+   StandardAnalyzer's 2.9 default (Uwe Schindler, Mike McCandless)
+
+Bug fixes
+
+ * LUCENE-1974: Fixed nasty bug in BooleanQuery (when it used
+   BooleanScorer for scoring), whereby some matching documents fail to
+   be collected.  (Fulin Tang via Mike McCandless)
+
+ * LUCENE-1124: Make sure FuzzyQuery always matches the precise term.
+   (stefatwork at gmail.com via Mike McCandless)
+
+ * LUCENE-1976: Fix IndexReader.isCurrent() to return the right thing
+   when the reader is a near real-time reader.  (Jake Mannix via Mike
+   McCandless)
+
+ * LUCENE-1986: Fix NPE when scoring PayloadNearQuery (Peter Keegan,
+   Mark Miller via Mike McCandless)
+
+ * LUCENE-1992: Fix thread hazard if a merge is committing just as an
+   exception occurs during sync (Uwe Schindler, Mike McCandless)
+
+ * LUCENE-1995: Note in javadocs that IndexWriter.setRAMBufferSizeMB
+   cannot exceed 2048 MB, and throw IllegalArgumentException if it
+   does.  (Aaron McKee, Yonik Seeley, Mike McCandless)
+
+ * LUCENE-2004: Fix Constants.LUCENE_MAIN_VERSION to not be inlined
+   by client code.  (Uwe Schindler)
+
+ * LUCENE-2016: Replace illegal U+FFFF character with the replacement
+   char (U+FFFD) during indexing, to prevent silent index corruption.
+   (Peter Keegan, Mike McCandless)
+
+API Changes
+
+ * Un-deprecate search(Weight weight, Filter filter, int n) from
+   Searchable interface (deprecated by accident).  (Uwe Schindler)
+
+ * Un-deprecate o.a.l.util.Version constants.  (Mike McCandless)
+
+ * LUCENE-1987: Un-deprecate some ctors of Token, as they will not
+   be removed in 3.0 and are still useful. Also add some missing
+   o.a.l.util.Version constants for enabling invalid acronym
+   settings in StandardAnalyzer to be compatible with the coming
+   Lucene 3.0.  (Uwe Schindler)
+
+ * LUCENE-1973: Un-deprecate IndexSearcher.setDefaultFieldSortScoring,
+   to allow controlling per-IndexSearcher whether scores are computed
+   when sorting by field.  (Uwe Schindler, Mike McCandless)
+   
+Documentation
+
+ * LUCENE-1955: Fix Hits deprecation notice to point users in right
+   direction. (Mike McCandless, Mark Miller)
+   
+ * Fix javadoc about score tracking done by search methods in Searcher 
+   and IndexSearcher.  (Mike McCandless)
+
+ * LUCENE-2008: Javadoc improvements for TokenStream/Tokenizer/Token
+   (Luke Nezda via Mike McCandless)
+
+======================= Release 2.9.0 2009-09-23 =======================
+
+Changes in backwards compatibility policy
+
+ * LUCENE-1575: Searchable.search(Weight, Filter, int, Sort) no
+    longer computes a document score for each hit by default.  If
+    document score tracking is still needed, you can call
+    IndexSearcher.setDefaultFieldSortScoring(true, true) to enable
+    both per-hit and maxScore tracking; however, this is deprecated
+    and will be removed in 3.0.
+
+    Alternatively, use Searchable.search(Weight, Filter, Collector)
+    and pass in a TopFieldCollector instance, using the following code
+    sample:
+ 
+    <code>
+      TopFieldCollector tfc = TopFieldCollector.create(sort, numHits, fillFields, 
+                                                       true /* trackDocScores */,
+                                                       true /* trackMaxScore */,
+                                                       false /* docsInOrder */);
+      searcher.search(query, tfc);
+      TopDocs results = tfc.topDocs();
+    </code>
+
+    Note that your Sort object cannot use SortField.AUTO when you
+    directly instantiate TopFieldCollector.
+
+    Also, the method search(Weight, Filter, Collector) was added to
+    the Searchable interface and the Searcher abstract class to
+    replace the deprecated HitCollector versions.  If you either
+    implement Searchable or extend Searcher, you should change your
+    code to implement this method.  If you already extend
+    IndexSearcher, no further changes are needed to use Collector.
+    
+    Finally, the values Float.NaN, Float.NEGATIVE_INFINITY and
+    Float.POSITIVE_INFINITY are not valid scores.  Lucene uses these
+    values internally in certain places, so if you have hits with such
+    scores, it will cause problems. (Shai Erera via Mike McCandless)
+
+ * LUCENE-1687: All methods and parsers from the interface ExtendedFieldCache
+    have been moved into FieldCache. ExtendedFieldCache is now deprecated and
+    contains only a few declarations for binary backwards compatibility. 
+    ExtendedFieldCache will be removed in version 3.0. Users of FieldCache and 
+    ExtendedFieldCache will be able to plug in Lucene 2.9 without recompilation.
+    The auto cache (FieldCache.getAuto) is now deprecated. Due to the merge of
+    ExtendedFieldCache and FieldCache, FieldCache can now additionally return
+    long[] and double[] arrays in addition to int[] and float[] and StringIndex.
+    
+    The interface changes are only notable for users implementing the interfaces,
+    which was unlikely done, because there is no possibility to change
+    Lucene's FieldCache implementation.  (Grant Ingersoll, Uwe Schindler)
+    
+ * LUCENE-1630, LUCENE-1771: Weight, previously an interface, is now an abstract 
+    class. Some of the method signatures have changed, but it should be fairly
+    easy to see what adjustments must be made to existing code to sync up
+    with the new API. You can find more detail in the API Changes section.
+    
+    Going forward Searchable will be kept for convenience only and may
+    be changed between minor releases without any deprecation
+    process. It is not recommended that you implement it, but rather extend
+    Searcher.  
+    (Shai Erera, Chris Hostetter, Martin Ruckli, Mark Miller via Mike McCandless)
+
+ * LUCENE-1422, LUCENE-1693: The new Attribute based TokenStream API (see below)
+    has some backwards breaks in rare cases. We did our best to make the 
+    transition as easy as possible and you are not likely to run into any problems. 
+    If your tokenizers still implement next(Token) or next(), the calls are 
+    automatically wrapped. The indexer and query parser use the new API 
+    (eg use incrementToken() calls). All core TokenStreams are implemented using 
+    the new API. You can mix old and new API style TokenFilters/TokenStream. 
+    Problems only occur when you have done the following:
+    You have overridden next(Token) or next() in one of the non-abstract core
+    TokenStreams/-Filters. These classes should normally be final, but some
+    of them are not. In this case, next(Token)/next() would never be called.
+    To fail early with a hard compile/runtime error, the next(Token)/next()
+    methods in these TokenStreams/-Filters were made final in this release.
+    (Michael Busch, Uwe Schindler)
+
+ * LUCENE-1763: MergePolicy now requires an IndexWriter instance to
+    be passed upon instantiation. As a result, IndexWriter was removed
+    as a method argument from all MergePolicy methods. (Shai Erera via
+    Mike McCandless)
+    
+ * LUCENE-1748: LUCENE-1001 introduced PayloadSpans, but this was a back
+    compat break and caused custom SpanQuery implementations to fail at runtime
+    in a variety of ways. This issue attempts to remedy things by causing
+    a compile time break on custom SpanQuery implementations and removing 
+    the PayloadSpans class, with its functionality now moved to Spans. To
+    help in alleviating future back compat pain, Spans has been changed from
+    an interface to an abstract class.
+    (Hugh Cayless, Mark Miller)
+    
+ * LUCENE-1808: Query.createWeight has been changed from protected to
+    public. This will be a back compat break if you have overridden this
+    method - but you are likely already affected by the LUCENE-1693 (make Weight 
+    abstract rather than an interface) back compat break if you have overridden 
+    Query.creatWeight, so we have taken the opportunity to make this change.
+    (Tim Smith, Shai Erera via Mark Miller)
+
+ * LUCENE-1708 - IndexReader.document() no longer checks if the document is 
+    deleted. You can call IndexReader.isDeleted(n) prior to calling document(n).
+    (Shai Erera via Mike McCandless)
+
+ 
+Changes in runtime behavior
+
+ * LUCENE-1424: QueryParser now by default uses constant score auto
+    rewriting when it generates a WildcardQuery and PrefixQuery (it
+    already does so for TermRangeQuery, as well).  Call
+    setMultiTermRewriteMethod(MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE)
+    to revert to slower BooleanQuery rewriting method.  (Mark Miller via Mike
+    McCandless)
+    
+ * LUCENE-1575: As of 2.9, the core collectors as well as
+    IndexSearcher's search methods that return top N results, no
+    longer filter out zero scoring documents. If you rely on this
+    functionality you can use PositiveScoresOnlyCollector like this:
+
+    <code>
+      TopDocsCollector tdc = new TopScoreDocCollector(10);
+      Collector c = new PositiveScoresOnlyCollector(tdc);
+      searcher.search(query, c);
+      TopDocs hits = tdc.topDocs();
+      ...
+    </code>
+
+ * LUCENE-1604: IndexReader.norms(String field) is now allowed to
+    return null if the field has no norms, as long as you've
+    previously called IndexReader.setDisableFakeNorms(true).  This
+    setting now defaults to false (to preserve the fake norms back
+    compatible behavior) but in 3.0 will be hardwired to true.  (Shon
+    Vella via Mike McCandless).
+
+ * LUCENE-1624: If you open IndexWriter with create=true and
+    autoCommit=false on an existing index, IndexWriter no longer
+    writes an empty commit when it's created.  (Paul Taylor via Mike
+    McCandless)
+
+ * LUCENE-1593: When you call Sort() or Sort.setSort(String field,
+    boolean reverse), the resulting SortField array no longer ends
+    with SortField.FIELD_DOC (it was unnecessary as Lucene breaks ties
+    internally by docID). (Shai Erera via Michael McCandless)
+
+ * LUCENE-1542: When the first token(s) have 0 position increment,
+    IndexWriter used to incorrectly record the position as -1, if no
+    payload is present, or Integer.MAX_VALUE if a payload is present.
+    This causes positional queries to fail to match.  The bug is now
+    fixed, but if your app relies on the buggy behavior then you must
+    call IndexWriter.setAllowMinus1Position().  That API is deprecated
+    so you must fix your application, and rebuild your index, to not
+    rely on this behavior by the 3.0 release of Lucene. (Jonathan
+    Mamou, Mark Miller via Mike McCandless)
+
+
+ * LUCENE-1715: Finalizers have been removed from the 4 core classes
+    that still had them, since they will cause GC to take longer, thus
+    tying up memory for longer, and at best they mask buggy app code.
+    DirectoryReader (returned from IndexReader.open) & IndexWriter
+    previously released the write lock during finalize.
+    SimpleFSDirectory.FSIndexInput closed the descriptor in its
+    finalizer, and NativeFSLock released the lock.  It's possible
+    applications will be affected by this, but only if the application
+    is failing to close reader/writers.  (Brian Groose via Mike
+    McCandless)
+
+ * LUCENE-1717: Fixed IndexWriter to account for RAM usage of
+    buffered deletions.  (Mike McCandless)
+
+ * LUCENE-1727: Ensure that fields are stored & retrieved in the
+    exact order in which they were added to the document.  This was
+    true in all Lucene releases before 2.3, but was broken in 2.3 and
+    2.4, and is now fixed in 2.9.  (Mike McCandless)
+
+ * LUCENE-1678: The addition of Analyzer.reusableTokenStream
+    accidentally broke back compatibility of external analyzers that
+    subclassed core analyzers that implemented tokenStream but not
+    reusableTokenStream.  This is now fixed, such that if
+    reusableTokenStream is invoked on such a subclass, that method
+    will forcefully fallback to tokenStream.  (Mike McCandless)
+    
+ * LUCENE-1801: Token.clear() and Token.clearNoTermBuffer() now also clear
+    startOffset, endOffset and type. This is not likely to affect any
+    Tokenizer chains, as Tokenizers normally always set these three values.
+    This change was made to be conform to the new AttributeImpl.clear() and
+    AttributeSource.clearAttributes() to work identical for Token as one for all
+    AttributeImpl and the 6 separate AttributeImpls. (Uwe Schindler, Michael Busch)
+
+ * LUCENE-1483: When searching over multiple segments, a new Scorer is now created 
+    for each segment. Searching has been telescoped out a level and IndexSearcher now
+    operates much like MultiSearcher does. The Weight is created only once for the top 
+    level Searcher, but each Scorer is passed a per-segment IndexReader. This will 
+    result in doc ids in the Scorer being internal to the per-segment IndexReader. It 
+    has always been outside of the API to count on a given IndexReader to contain every 
+    doc id in the index - and if you have been ignoring MultiSearcher in your custom code 
+    and counting on this fact, you will find your code no longer works correctly. If a 
+    custom Scorer implementation uses any caches/filters that rely on being based on the 
+    top level IndexReader, it will need to be updated to correctly use contextless 
+    caches/filters eg you can't count on the IndexReader to contain any given doc id or 
+    all of the doc ids. (Mark Miller, Mike McCandless)
+
+ * LUCENE-1846: DateTools now uses the US locale to format the numbers in its
+    date/time strings instead of the default locale. For most locales there will
+    be no change in the index format, as DateFormatSymbols is using ASCII digits.
+    The usage of the US locale is important to guarantee correct ordering of
+    generated terms.  (Uwe Schindler)
+
+ * LUCENE-1860: MultiTermQuery now defaults to
+    CONSTANT_SCORE_AUTO_REWRITE_DEFAULT rewrite method (previously it
+    was SCORING_BOOLEAN_QUERY_REWRITE).  This means that PrefixQuery
+    and WildcardQuery will now produce constant score for all matching
+    docs, equal to the boost of the query.  (Mike McCandless)
+
+API Changes
+
+ * LUCENE-1419: Add expert API to set custom indexing chain. This API is 
+   package-protected for now, so we don't have to officially support it.
+   Yet, it will give us the possibility to try out different consumers
+   in the chain. (Michael Busch)
+
+ * LUCENE-1427: DocIdSet.iterator() is now allowed to throw
+   IOException.  (Paul Elschot, Mike McCandless)
+
+ * LUCENE-1422, LUCENE-1693: New TokenStream API that uses a new class called 
+   AttributeSource instead of the Token class, which is now a utility class that
+   holds common Token attributes. All attributes that the Token class had have 
+   been moved into separate classes: TermAttribute, OffsetAttribute, 
+   PositionIncrementAttribute, PayloadAttribute, TypeAttribute and FlagsAttribute. 
+   The new API is much more flexible; it allows to combine the Attributes 
+   arbitrarily and also to define custom Attributes. The new API has the same 
+   performance as the old next(Token) approach. For conformance with this new 
+   API Tee-/SinkTokenizer was deprecated and replaced by a new TeeSinkTokenFilter. 
+   (Michael Busch, Uwe Schindler; additional contributions and bug fixes by 
+   Daniel Shane, Doron Cohen)
+
+ * LUCENE-1467: Add nextDoc() and next(int) methods to OpenBitSetIterator.
+   These methods can be used to avoid additional calls to doc(). 
+   (Michael Busch)
+
+ * LUCENE-1468: Deprecate Directory.list(), which sometimes (in
+   FSDirectory) filters out files that don't look like index files, in
+   favor of new Directory.listAll(), which does no filtering.  Also,
+   listAll() will never return null; instead, it throws an IOException
+   (or subclass).  Specifically, FSDirectory.listAll() will throw the
+   newly added NoSuchDirectoryException if the directory does not
+   exist.  (Marcel Reutegger, Mike McCandless)
+
+ * LUCENE-1546: Add IndexReader.flush(Map commitUserData), allowing
+   you to record an opaque commitUserData (maps String -> String) into
+   the commit written by IndexReader.  This matches IndexWriter's
+   commit methods.  (Jason Rutherglen via Mike McCandless)
+
+ * LUCENE-652: Added org.apache.lucene.document.CompressionTools, to
+   enable compressing & decompressing binary content, external to
+   Lucene's indexing.  Deprecated Field.Store.COMPRESS.
+
+ * LUCENE-1561: Renamed Field.omitTf to Field.omitTermFreqAndPositions
+    (Otis Gospodnetic via Mike McCandless)
+  
+ * LUCENE-1500: Added new InvalidTokenOffsetsException to Highlighter methods
+    to denote issues when offsets in TokenStream tokens exceed the length of the
+    provided text.  (Mark Harwood)
+    
+ * LUCENE-1575, LUCENE-1483: HitCollector is now deprecated in favor of 
+    a new Collector abstract class. For easy migration, people can use
+    HitCollectorWrapper which translates (wraps) HitCollector into
+    Collector. Note that this class is also deprecated and will be
+    removed when HitCollector is removed.  Also TimeLimitedCollector
+    is deprecated in favor of the new TimeLimitingCollector which
+    extends Collector.  (Shai Erera, Mark Miller, Mike McCandless)
+
+ * LUCENE-1592: The method TermsEnum.skipTo() was deprecated, because
+    it is used nowhere in core/contrib and there is only a very ineffective
+    default implementation available. If you want to position a TermEnum
+    to another Term, create a new one using IndexReader.terms(Term).
+    (Uwe Schindler)
+
+ * LUCENE-1621: MultiTermQuery.getTerm() has been deprecated as it does
+    not make sense for all subclasses of MultiTermQuery. Check individual
+    subclasses to see if they support getTerm().  (Mark Miller)
+
+ * LUCENE-1636: Make TokenFilter.input final so it's set only
+    once. (Wouter Heijke, Uwe Schindler via Mike McCandless).
+
+ * LUCENE-1658, LUCENE-1451: Renamed FSDirectory to SimpleFSDirectory
+    (but left an FSDirectory base class).  Added an FSDirectory.open
+    static method to pick a good default FSDirectory implementation
+    given the OS. FSDirectories should now be instantiated using
+    FSDirectory.open or with public constructors rather than
+    FSDirectory.getDirectory(), which has been deprecated.
+    (Michael McCandless, Uwe Schindler, yonik)
+
+ * LUCENE-1665: Deprecate SortField.AUTO, to be removed in 3.0.
+    Instead, when sorting by field, the application should explicitly
+    state the type of the field.  (Mike McCandless)
+
+ * LUCENE-1660: StopFilter, StandardAnalyzer, StopAnalyzer now
+    require up front specification of enablePositionIncrement (Mike
+    McCandless)
+
+ * LUCENE-1614: DocIdSetIterator's next() and skipTo() were deprecated in favor
+    of the new nextDoc() and advance(). The new methods return the doc Id they 
+    landed on, saving an extra call to doc() in most cases.
+    For easy migration of the code, you can change the calls to next() to 
+    nextDoc() != DocIdSetIterator.NO_MORE_DOCS and similarly for skipTo(). 
+    However it is advised that you take advantage of the returned doc ID and not 
+    call doc() following those two.
+    Also, doc() was deprecated in favor of docID(). docID() should return -1 or 
+    NO_MORE_DOCS if nextDoc/advance were not called yet, or NO_MORE_DOCS if the 
+    iterator has exhausted. Otherwise it should return the current doc ID.
+    (Shai Erera via Mike McCandless)
+
+ * LUCENE-1672: All ctors/opens and other methods using String/File to
+    specify the directory in IndexReader, IndexWriter, and IndexSearcher
+    were deprecated. You should instantiate the Directory manually before
+    and pass it to these classes (LUCENE-1451, LUCENE-1658).
+    (Uwe Schindler)
+
+ * LUCENE-1407: Move RemoteSearchable, RemoteCachingWrapperFilter out
+    of Lucene's core into new contrib/remote package.  Searchable no
+    longer extends java.rmi.Remote (Simon Willnauer via Mike
+    McCandless)
+
+ * LUCENE-1677: The global property
+    org.apache.lucene.SegmentReader.class, and
+    ReadOnlySegmentReader.class are now deprecated, to be removed in
+    3.0.  src/gcj/* has been removed. (Earwin Burrfoot via Mike
+    McCandless)
+
+ * LUCENE-1673: Deprecated NumberTools in favour of the new
+    NumericRangeQuery and its new indexing format for numeric or
+    date values.  (Uwe Schindler)
+    
+ * LUCENE-1630, LUCENE-1771: Weight is now an abstract class, and adds
+    a scorer(IndexReader, boolean /* scoreDocsInOrder */, boolean /*
+    topScorer */) method instead of scorer(IndexReader). IndexSearcher uses 
+    this method to obtain a scorer matching the capabilities of the Collector 
+    wrt orderedness of docIDs. Some Scorers (like BooleanScorer) are much more
+    efficient if out-of-order documents scoring is allowed by a Collector.  
+    Collector must now implement acceptsDocsOutOfOrder. If you write a 
+    Collector which does not care about doc ID orderness, it is recommended 
+    that you return true.  Weight has a scoresDocsOutOfOrder method, which by 
+    default returns false.  If you create a Weight which will score documents 
+    out of order if requested, you should override that method to return true. 
+    BooleanQuery's setAllowDocsOutOfOrder and getAllowDocsOutOfOrder have been 
+    deprecated as they are not needed anymore. BooleanQuery will now score docs 
+    out of order when used with a Collector that can accept docs out of order.
+    Finally, Weight#explain now takes a sub-reader and sub-docID, rather than
+    a top level reader and docID.
+    (Shai Erera, Chris Hostetter, Martin Ruckli, Mark Miller via Mike McCandless)
+ 	
+ * LUCENE-1466, LUCENE-1906: Added CharFilter and MappingCharFilter, which allows
+    chaining & mapping of characters before tokenizers run. CharStream (subclass of
+    Reader) is the base class for custom java.io.Reader's, that support offset
+    correction. Tokenizers got an additional method correctOffset() that is passed
+    down to the underlying CharStream if input is a subclass of CharStream/-Filter.
+    (Koji Sekiguchi via Mike McCandless, Uwe Schindler)
+
+ * LUCENE-1703: Add IndexWriter.waitForMerges.  (Tim Smith via Mike
+    McCandless)
+
+ * LUCENE-1625: CheckIndex's programmatic API now returns separate
+    classes detailing the status of each component in the index, and
+    includes more detailed status than previously.  (Tim Smith via
+    Mike McCandless)
+
+ * LUCENE-1713: Deprecated RangeQuery and RangeFilter and renamed to
+    TermRangeQuery and TermRangeFilter. TermRangeQuery is in constant
+    score auto rewrite mode by default. The new classes also have new
+    ctors taking field and term ranges as Strings (see also
+    LUCENE-1424).  (Uwe Schindler)
+
+ * LUCENE-1609: The termInfosIndexDivisor must now be specified
+    up-front when opening the IndexReader.  Attempts to call
+    IndexReader.setTermInfosIndexDivisor will hit an
+    UnsupportedOperationException.  This was done to enable removal of
+    all synchronization in TermInfosReader, which previously could
+    cause threads to pile up in certain cases. (Dan Rosher via Mike
+    McCandless)
+    
+ * LUCENE-1688: Deprecate static final String stop word array in and 
+    StopAnalzyer and replace it with an immutable implementation of 
+    CharArraySet.  (Simon Willnauer via Mark Miller)
+
+ * LUCENE-1742: SegmentInfos, SegmentInfo and SegmentReader have been
+    made public as expert, experimental APIs.  These APIs may suddenly
+    change from release to release (Jason Rutherglen via Mike
+    McCandless).
+    
+ * LUCENE-1754: QueryWeight.scorer() can return null if no documents
+    are going to be matched by the query. Similarly,
+    Filter.getDocIdSet() can return null if no documents are going to
+    be accepted by the Filter. Note that these 'can' return null,
+    however they don't have to and can return a Scorer/DocIdSet which
+    does not match / reject all documents.  This is already the
+    behavior of some QueryWeight/Filter implementations, and is
+    documented here just for emphasis. (Shai Erera via Mike
+    McCandless)
+
+ * LUCENE-1705: Added IndexWriter.deleteAllDocuments.  (Tim Smith via
+    Mike McCandless)
+
+ * LUCENE-1460: Changed TokenStreams/TokenFilters in contrib to
+    use the new TokenStream API. (Robert Muir, Michael Busch)
+
+ * LUCENE-1748: LUCENE-1001 introduced PayloadSpans, but this was a back
+    compat break and caused custom SpanQuery implementations to fail at runtime
+    in a variety of ways. This issue attempts to remedy things by causing
+    a compile time break on custom SpanQuery implementations and removing 
+    the PayloadSpans class, with its functionality now moved to Spans. To
+    help in alleviating future back compat pain, Spans has been changed from
+    an interface to an abstract class.
+    (Hugh Cayless, Mark Miller)
+    
+ * LUCENE-1808: Query.createWeight has been changed from protected to
+    public. (Tim Smith, Shai Erera via Mark Miller)
+
+ * LUCENE-1826: Add constructors that take AttributeSource and
+    AttributeFactory to all Tokenizer implementations.
+    (Michael Busch)
+    
+ * LUCENE-1847: Similarity#idf for both a Term and Term Collection have
+    been deprecated. New versions that return an IDFExplanation have been
+    added.  (Yasoja Seneviratne, Mike McCandless, Mark Miller)
+    
+ * LUCENE-1877: Made NativeFSLockFactory the default for
+    the new FSDirectory API (open(), FSDirectory subclass ctors).
+    All FSDirectory system properties were deprecated and all lock
+    implementations use no lock prefix if the locks are stored inside
+    the index directory. Because the deprecated String/File ctors of
+    IndexWriter and IndexReader (LUCENE-1672) and FSDirectory.getDirectory()
+    still use the old SimpleFSLockFactory and the new API
+    NativeFSLockFactory, we strongly recommend not to mix deprecated
+    and new API. (Uwe Schindler, Mike McCandless)
+
+ * LUCENE-1911: Added a new method isCacheable() to DocIdSet. This method
+    should return true, if the underlying implementation does not use disk
+    I/O and is fast enough to be directly cached by CachingWrapperFilter.
+    OpenBitSet, SortedVIntList, and DocIdBitSet are such candidates.
+    The default implementation of the abstract DocIdSet class returns false.
+    In this case, CachingWrapperFilter copies the DocIdSetIterator into an
+    OpenBitSet for caching.  (Uwe Schindler, Thomas Becker)
+
+Bug fixes
+
+ * LUCENE-1415: MultiPhraseQuery has incorrect hashCode() and equals()
+   implementation - Leads to Solr Cache misses. 
+   (Todd Feak, Mark Miller via yonik)
+
+ * LUCENE-1327: Fix TermSpans#skipTo() to behave as specified in javadocs
+   of Terms#skipTo(). (Michael Busch)
+
+ * LUCENE-1573: Do not ignore InterruptedException (caused by
+   Thread.interrupt()) nor enter deadlock/spin loop. Now, an interrupt
+   will cause a RuntimeException to be thrown.  In 3.0 we will change
+   public APIs to throw InterruptedException.  (Jeremy Volkman via
+   Mike McCandless)
+
+ * LUCENE-1590: Fixed stored-only Field instances do not change the
+   value of omitNorms, omitTermFreqAndPositions in FieldInfo; when you
+   retrieve such fields they will now have omitNorms=true and
+   omitTermFreqAndPositions=false (though these values are unused).
+   (Uwe Schindler via Mike McCandless)
+
+ * LUCENE-1587: RangeQuery#equals() could consider a RangeQuery
+   without a collator equal to one with a collator.
+   (Mark Platvoet via Mark Miller) 
+
+ * LUCENE-1600: Don't call String.intern unnecessarily in some cases
+   when loading documents from the index.  (P Eger via Mike
+   McCandless)
+
+ * LUCENE-1611: Fix case where OutOfMemoryException in IndexWriter
+   could cause "infinite merging" to happen.  (Christiaan Fluit via
+   Mike McCandless)
+
+ * LUCENE-1623: Properly handle back-compatibility of 2.3.x indexes that
+   contain field names with non-ascii characters.  (Mike Streeton via
+   Mike McCandless)
+
+ * LUCENE-1593: MultiSearcher and ParallelMultiSearcher did not break ties (in 
+   sort) by doc Id in a consistent manner (i.e., if Sort.FIELD_DOC was used vs. 
+   when it wasn't). (Shai Erera via Michael McCandless)
+
+ * LUCENE-1647: Fix case where IndexReader.undeleteAll would cause
+    the segment's deletion count to be incorrect. (Mike McCandless)
+
+ * LUCENE-1542: When the first token(s) have 0 position increment,
+    IndexWriter used to incorrectly record the position as -1, if no
+    payload is present, or Integer.MAX_VALUE if a payload is present.
+    This causes positional queries to fail to match.  The bug is now
+    fixed, but if your app relies on the buggy behavior then you must
+    call IndexWriter.setAllowMinus1Position().  That API is deprecated
+    so you must fix your application, and rebuild your index, to not
+    rely on this behavior by the 3.0 release of Lucene. (Jonathan
+    Mamou, Mark Miller via Mike McCandless)
+
+ * LUCENE-1658: Fixed MMapDirectory to correctly throw IOExceptions
+    on EOF, removed numeric overflow possibilities and added support
+    for a hack to unmap the buffers on closing IndexInput.
+    (Uwe Schindler)
+    
+ * LUCENE-1681: Fix infinite loop caused by a call to DocValues methods 
+    getMinValue, getMaxValue, getAverageValue. (Simon Willnauer via Mark Miller)
+
+ * LUCENE-1599: Add clone support for SpanQuerys. SpanRegexQuery counts
+    on this functionality and does not work correctly without it.
+    (Billow Gao, Mark Miller)
+
+ * LUCENE-1718: Fix termInfosIndexDivisor to carry over to reopened
+    readers (Mike McCandless)
+    
+ * LUCENE-1583: SpanOrQuery skipTo() doesn't always move forwards as Spans
+	documentation indicates it should.  (Moti Nisenson via Mark Miller)
+
+ * LUCENE-1566: Sun JVM Bug
+    http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6478546 causes
+    invalid OutOfMemoryError when reading too many bytes at once from
+    a file on 32bit JVMs that have a large maximum heap size.  This
+    fix adds set/getReadChunkSize to FSDirectory so that large reads
+    are broken into chunks, to work around this JVM bug.  On 32bit
+    JVMs the default chunk size is 100 MB; on 64bit JVMs, which don't
+    show the bug, the default is Integer.MAX_VALUE. (Simon Willnauer
+    via Mike McCandless)
+    
+ * LUCENE-1448: Added TokenStream.end() to perform end-of-stream
+    operations (ie to return the end offset of the tokenization).  
+    This is important when multiple fields with the same name are added
+    to a document, to ensure offsets recorded in term vectors for all 
+    of the instances are correct.  
+    (Mike McCandless, Mark Miller, Michael Busch)
+
+ * LUCENE-1805: CloseableThreadLocal did not allow a null Object in get(), 
+    although it does allow it in set(Object). Fix get() to not assert the object
+    is not null. (Shai Erera via Mike McCandless)
+    
+ * LUCENE-1801: Changed all Tokenizers or TokenStreams in core/contrib)
+    that are the source of Tokens to always call
+    AttributeSource.clearAttributes() first. (Uwe Schindler)
+    
+ * LUCENE-1819: MatchAllDocsQuery.toString(field) should produce output
+    that is parsable by the QueryParser.  (John Wang, Mark Miller)
+
+ * LUCENE-1836: Fix localization bug in the new query parser and add 
+    new LocalizedTestCase as base class for localization junit tests.
+    (Robert Muir, Uwe Schindler via Michael Busch)
+
+ * LUCENE-1847: PhraseQuery/TermQuery/SpanQuery use IndexReader specific stats 
+    in their Weight#explain methods - these stats should be corpus wide.
+    (Yasoja Seneviratne, Mike McCandless, Mark Miller)
+
+ * LUCENE-1885: Fix the bug that NativeFSLock.isLocked() did not work,
+    if the lock was obtained by another NativeFSLock(Factory) instance.
+    Because of this IndexReader.isLocked() and IndexWriter.isLocked() did
+    not work correctly.  (Uwe Schindler)
+
+ * LUCENE-1899: Fix O(N^2) CPU cost when setting docIDs in order in an
+    OpenBitSet, due to an inefficiency in how the underlying storage is
+    reallocated.  (Nadav Har'El via Mike McCandless)
+
+ * LUCENE-1918: Fixed cases where a ParallelReader would
+   generate exceptions on being passed to
+   IndexWriter.addIndexes(IndexReader[]).  First case was when the
+   ParallelReader was empty.  Second case was when the ParallelReader
+   used to contain documents with TermVectors, but all such documents
+   have been deleted. (Christian Kohlschütter via Mike McCandless)
+
+New features
+
+ * LUCENE-1411: Added expert API to open an IndexWriter on a prior
+    commit, obtained from IndexReader.listCommits.  This makes it
+    possible to rollback changes to an index even after you've closed
+    the IndexWriter that made the changes, assuming you are using an
+    IndexDeletionPolicy that keeps past commits around.  This is useful
+    when building transactional support on top of Lucene.  (Mike
+    McCandless)
+
+ * LUCENE-1382: Add an optional arbitrary Map (String -> String)
+    "commitUserData" to IndexWriter.commit(), which is stored in the
+    segments file and is then retrievable via
+    IndexReader.getCommitUserData instance and static methods.
+    (Shalin Shekhar Mangar via Mike McCandless)
+
+ * LUCENE-1420: Similarity now has a computeNorm method that allows
+    custom Similarity classes to override how norm is computed.  It's
+    provided a FieldInvertState instance that contains details from
+    inverting the field.  The default impl is boost *
+    lengthNorm(numTerms), to be backwards compatible.  Also added
+    {set/get}DiscountOverlaps to DefaultSimilarity, to control whether
+    overlapping tokens (tokens with 0 position increment) should be
+    counted in lengthNorm.  (Andrzej Bialecki via Mike McCandless)
+
+ * LUCENE-1424: Moved constant score query rewrite capability into
+    MultiTermQuery, allowing TermRangeQuery, PrefixQuery and WildcardQuery
+    to switch between constant-score rewriting or BooleanQuery
+    expansion rewriting via a new setRewriteMethod method.
+    Deprecated ConstantScoreRangeQuery (Mark Miller via Mike
+    McCandless)
+
+ * LUCENE-1461: Added FieldCacheRangeFilter, a RangeFilter for
+    single-term fields that uses FieldCache to compute the filter.  If
+    your documents all have a single term for a given field, and you
+    need to create many RangeFilters with varying lower/upper bounds,
+    then this is likely a much faster way to create the filters than
+    RangeFilter.  FieldCacheRangeFilter allows ranges on all data types,
+    FieldCache supports (term ranges, byte, short, int, long, float, double).
+    However, it comes at the expense of added RAM consumption and slower
+    first-time usage due to populating the FieldCache.  It also does not
+    support collation  (Tim Sturge, Matt Ericson via Mike McCandless and
+    Uwe Schindler)
+
+ * LUCENE-1296: add protected method CachingWrapperFilter.docIdSetToCache 
+    to allow subclasses to choose which DocIdSet implementation to use
+    (Paul Elschot via Mike McCandless)
+    
+ * LUCENE-1390: Added ASCIIFoldingFilter, a Filter that converts 
+    alphabetic, numeric, and symbolic Unicode characters which are not in 
+    the first 127 ASCII characters (the "Basic Latin" Unicode block) into 
+    their ASCII equivalents, if one exists. ISOLatin1AccentFilter, which
+    handles a subset of this filter, has been deprecated.
+    (Andi Vajda, Steven Rowe via Mark Miller)
+
+ * LUCENE-1478: Added new SortField constructor allowing you to
+    specify a custom FieldCache parser to generate numeric values from
+    terms for a field.  (Uwe Schindler via Mike McCandless)
+
+ * LUCENE-1528: Add support for Ideographic Space to the queryparser.
+    (Luis Alves via Michael Busch)
+
+ * LUCENE-1487: Added FieldCacheTermsFilter, to filter by multiple
+    terms on single-valued fields.  The filter loads the FieldCache
+    for the field the first time it's called, and subsequent usage of
+    that field, even with different Terms in the filter, are fast.
+    (Tim Sturge, Shalin Shekhar Mangar via Mike McCandless).
+
+ * LUCENE-1314: Add clone(), clone(boolean readOnly) and
+    reopen(boolean readOnly) to IndexReader.  Cloning an IndexReader
+    gives you a new reader which you can make changes to (deletions,
+    norms) without affecting the original reader.  Now, with clone or
+    reopen you can change the readOnly of the original reader.  (Jason
+    Rutherglen, Mike McCandless)
+
+ * LUCENE-1506: Added FilteredDocIdSet, an abstract class which you
+    subclass to implement the "match" method to accept or reject each
+    docID.  Unlike ChainedFilter (under contrib/misc),
+    FilteredDocIdSet never requires you to materialize the full
+    bitset.  Instead, match() is called on demand per docID.  (John
+    Wang via Mike McCandless)
+
+ * LUCENE-1398: Add ReverseStringFilter to contrib/analyzers, a filter
+    to reverse the characters in each token.  (Koji Sekiguchi via yonik)
+
+ * LUCENE-1551: Add expert IndexReader.reopen(IndexCommit) to allow
+    efficiently opening a new reader on a specific commit, sharing
+    resources with the original reader.  (Torin Danil via Mike
+    McCandless)
+
+ * LUCENE-1434: Added org.apache.lucene.util.IndexableBinaryStringTools,
+    to encode byte[] as String values that are valid terms, and
+    maintain sort order of the original byte[] when the bytes are
+    interpreted as unsigned.  (Steven Rowe via Mike McCandless)
+
+ * LUCENE-1543: Allow MatchAllDocsQuery to optionally use norms from
+    a specific fields to set the score for a document.  (Karl Wettin
+    via Mike McCandless)
+
+ * LUCENE-1586: Add IndexReader.getUniqueTermCount().  (Mike
+    McCandless via Derek)
+
+ * LUCENE-1516: Added "near real-time search" to IndexWriter, via a
+    new expert getReader() method.  This method returns a reader that
+    searches the full index, including any uncommitted changes in the
+    current IndexWriter session.  This should result in a faster
+    turnaround than the normal approach of commiting the changes and
+    then reopening a reader.  (Jason Rutherglen via Mike McCandless)
+
+ * LUCENE-1603: Added new MultiTermQueryWrapperFilter, to wrap any
+    MultiTermQuery as a Filter.  Also made some improvements to
+    MultiTermQuery: return DocIdSet.EMPTY_DOCIDSET if there are no
+    terms in the enum; track the total number of terms it visited
+    during rewrite (getTotalNumberOfTerms).  FilteredTermEnum is also
+    more friendly to subclassing.  (Uwe Schindler via Mike McCandless)
+
+ * LUCENE-1605: Added BitVector.subset().  (Jeremy Volkman via Mike
+    McCandless)
+    
+ * LUCENE-1618: Added FileSwitchDirectory that enables files with
+    specified extensions to be stored in a primary directory and the
+    rest of the files to be stored in the secondary directory.  For
+    example, this can be useful for the large doc-store (stored
+    fields, term vectors) files in FSDirectory and the rest of the
+    index files in a RAMDirectory. (Jason Rutherglen via Mike
+    McCandless)
+
+ * LUCENE-1494: Added FieldMaskingSpanQuery which can be used to
+    cross-correlate Spans from different fields.
+    (Paul Cowan and Chris Hostetter)
+
+ * LUCENE-1634: Add calibrateSizeByDeletes to LogMergePolicy, to take
+    deletions into account when considering merges.  (Yasuhiro Matsuda
+    via Mike McCandless)
+
+ * LUCENE-1550: Added new n-gram based String distance measure for spell checking.
+    See the Javadocs for NGramDistance.java for a reference paper on why
+    this is helpful (Tom Morton via Grant Ingersoll)
+
+ * LUCENE-1470, LUCENE-1582, LUCENE-1602, LUCENE-1673, LUCENE-1701, LUCENE-1712:
+    Added NumericRangeQuery and NumericRangeFilter, a fast alternative to
+    RangeQuery/RangeFilter for numeric searches. They depend on a specific
+    structure of terms in the index that can be created by indexing
+    using the new NumericField or NumericTokenStream classes. NumericField
+    can only be used for indexing and optionally stores the values as
+    string representation in the doc store. Documents returned from
+    IndexReader/IndexSearcher will return only the String value using
+    the standard Fieldable interface. NumericFields can be sorted on
+    and loaded into the FieldCache.  (Uwe Schindler, Yonik Seeley,
+    Mike McCandless)
+
+ * LUCENE-1405: Added support for Ant resource collections in contrib/ant
+    <index> task.  (Przemyslaw Sztoch via Erik Hatcher)
+
+ * LUCENE-1699: Allow setting a TokenStream on Field/Fieldable for indexing
+    in conjunction with any other ways to specify stored field values,
+    currently binary or string values.  (yonik)
+    
+ * LUCENE-1701: Made the standard FieldCache.Parsers public and added
+    parsers for fields generated using NumericField/NumericTokenStream.
+    All standard parsers now also implement Serializable and enforce
+    their singleton status.  (Uwe Schindler, Mike McCandless)
+    
+ * LUCENE-1741: User configurable maximum chunk size in MMapDirectory.
+    On 32 bit platforms, the address space can be very fragmented, so
+    one big ByteBuffer for the whole file may not fit into address space.
+    (Eks Dev via Uwe Schindler)
+
+ * LUCENE-1644: Enable 4 rewrite modes for queries deriving from
+    MultiTermQuery (WildcardQuery, PrefixQuery, TermRangeQuery,
+    NumericRangeQuery): CONSTANT_SCORE_FILTER_REWRITE first creates a
+    filter and then assigns constant score (boost) to docs;
+    CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE create a BooleanQuery but
+    uses a constant score (boost); SCORING_BOOLEAN_QUERY_REWRITE also
+    creates a BooleanQuery but keeps the BooleanQuery's scores;
+    CONSTANT_SCORE_AUTO_REWRITE tries to pick the most performant
+    constant-score rewrite method.  (Mike McCandless)
+    
+ * LUCENE-1448: Added TokenStream.end(), to perform end-of-stream
+    operations.  This is currently used to fix offset problems when 
+    multiple fields with the same name are added to a document.
+    (Mike McCandless, Mark Miller, Michael Busch)
+ 
+ * LUCENE-1776: Add an option to not collect payloads for an ordered
+    SpanNearQuery. Payloads were not lazily loaded in this case as
+    the javadocs implied. If you have payloads and want to use an ordered
+    SpanNearQuery that does not need to use the payloads, you can
+    disable loading them with a new constructor switch.  (Mark Miller)
+
+ * LUCENE-1341: Added PayloadNearQuery to enable SpanNearQuery functionality
+    with payloads (Peter Keegan, Grant Ingersoll, Mark Miller)
+
+ * LUCENE-1790: Added PayloadTermQuery to enable scoring of payloads
+    based on the maximum payload seen for a document.
+    Slight refactoring of Similarity and other payload queries (Grant Ingersoll, Mark Miller)
+
+ * LUCENE-1749: Addition of FieldCacheSanityChecker utility, and
+    hooks to use it in all existing Lucene Tests.  This class can
+    be used by any application to inspect the FieldCache and provide
+    diagnostic information about the possibility of inconsistent
+    FieldCache usage.  Namely: FieldCache entries for the same field
+    with different datatypes or parsers; and FieldCache entries for
+    the same field in both a reader, and one of it's (descendant) sub
+    readers. 
+    (Chris Hostetter, Mark Miller)
+
+ * LUCENE-1789: Added utility class
+    oal.search.function.MultiValueSource to ease the transition to
+    segment based searching for any apps that directly call
+    oal.search.function.* APIs.  This class wraps any other
+    ValueSource, but takes care when composite (multi-segment) are
+    passed to not double RAM usage in the FieldCache.  (Chris
+    Hostetter, Mark Miller, Mike McCandless)
+   
+Optimizations
+
+ * LUCENE-1427: Fixed QueryWrapperFilter to not waste time computing
+    scores of the query, since they are just discarded.  Also, made it
+    more efficient (single pass) by not creating & populating an
+    intermediate OpenBitSet (Paul Elschot, Mike McCandless)
+
+ * LUCENE-1443: Performance improvement for OpenBitSetDISI.inPlaceAnd()
+    (Paul Elschot via yonik)
+
+ * LUCENE-1484: Remove synchronization of IndexReader.document() by
+    using CloseableThreadLocal internally.  (Jason Rutherglen via Mike
+    McCandless).
+    
+ * LUCENE-1124: Short circuit FuzzyQuery.rewrite when input token length 
+    is small compared to minSimilarity. (Timo Nentwig, Mark Miller)
+
+ * LUCENE-1316: MatchAllDocsQuery now avoids the synchronized
+    IndexReader.isDeleted() call per document, by directly accessing
+    the underlying deleteDocs BitVector.  This improves performance
+    with non-readOnly readers, especially in a multi-threaded
+    environment.  (Todd Feak, Yonik Seeley, Jason Rutherglen via Mike
+    McCandless)
+
+ * LUCENE-1483: When searching over multiple segments we now visit
+    each sub-reader one at a time.  This speeds up warming, since
+    FieldCache entries (if required) can be shared across reopens for
+    those segments that did not change, and also speeds up searches
+    that sort by relevance or by field values.  (Mark Miller, Mike
+    McCandless)
+    
+ * LUCENE-1575: The new Collector class decouples collect() from
+    score computation.  Collector.setScorer is called to establish the
+    current Scorer in-use per segment.  Collectors that require the
+    score should then call Scorer.score() per hit inside
+    collect(). (Shai Erera via Mike McCandless)
+
+ * LUCENE-1596: MultiTermDocs speedup when set with
+    MultiTermDocs.seek(MultiTermEnum) (yonik)
+    
+ * LUCENE-1653: Avoid creating a Calendar in every call to 
+    DateTools#dateToString, DateTools#timeToString and
+    DateTools#round.  (Shai Erera via Mark Miller)
+    
+ * LUCENE-1688: Deprecate static final String stop word array and 
+    replace it with an immutable implementation of CharArraySet.
+    Removes conversions between Set and array.
+    (Simon Willnauer via Mark Miller)
+
+ * LUCENE-1754: BooleanQuery.queryWeight.scorer() will return null if
+    it won't match any documents (e.g. if there are no required and
+    optional scorers, or not enough optional scorers to satisfy
+    minShouldMatch).  (Shai Erera via Mike McCandless)
+
+ * LUCENE-1607: To speed up string interning for commonly used
+    strings, the StringHelper.intern() interface was added with a
+    default implementation that uses a lockless cache.
+    (Earwin Burrfoot, yonik)
+
+ * LUCENE-1800: QueryParser should use reusable TokenStreams. (yonik)
+    
+
+Documentation
+
+ * LUCENE-1908: Scoring documentation imrovements in Similarity javadocs. 
+   (Mark Miller, Shai Erera, Ted Dunning, Jiri Kuhn, Marvin Humphrey, Doron Cohen)
+    
+ * LUCENE-1872: NumericField javadoc improvements
+    (Michael McCandless, Uwe Schindler)
+ 
+ * LUCENE-1875: Make TokenStream.end javadoc less confusing.
+    (Uwe Schindler)
+
+ * LUCENE-1862: Rectified duplicate package level javadocs for
+    o.a.l.queryParser and o.a.l.analysis.cn.
+    (Chris Hostetter)
+
+ * LUCENE-1886: Improved hyperlinking in key Analysis javadocs
+    (Bernd Fondermann via Chris Hostetter)
+
+ * LUCENE-1884: massive javadoc and comment cleanup, primarily dealing with
+    typos.
+    (Robert Muir via Chris Hostetter)
+    
+ * LUCENE-1898: Switch changes to use bullets rather than numbers and 
+    update changes-to-html script to handle the new format. 
+    (Steven Rowe, Mark Miller)
+    
+ * LUCENE-1900: Improve Searchable Javadoc.
+    (Nadav Har'El, Doron Cohen, Marvin Humphrey, Mark Miller)
+    
+ * LUCENE-1896: Improve Similarity#queryNorm javadocs.
+    (Jiri Kuhn, Mark Miller)
+
+Build
+
+ * LUCENE-1440: Add new targets to build.xml that allow downloading
+    and executing the junit testcases from an older release for
+    backwards-compatibility testing. (Michael Busch)
+
+ * LUCENE-1446: Add compatibility tag to common-build.xml and run 
+    backwards-compatibility tests in the nightly build. (Michael Busch)
+
+ * LUCENE-1529: Properly test "drop-in" replacement of jar with 
+    backwards-compatibility tests. (Mike McCandless, Michael Busch)
+
+ * LUCENE-1851: Change 'javacc' and 'clean-javacc' targets to build
+    and clean contrib/surround files. (Luis Alves via Michael Busch)
+
+ * LUCENE-1854: tar task should use longfile="gnu" to avoid false file
+    name length warnings.  (Mark Miller)
+
+Test Cases
+
+ * LUCENE-1791: Enhancements to the QueryUtils and CheckHits utility 
+    classes to wrap IndexReaders and Searchers in MultiReaders or 
+    MultiSearcher when possible to help exercise more edge cases.
+    (Chris Hostetter, Mark Miller)
+
+ * LUCENE-1852: Fix localization test failures. 
+    (Robert Muir via Michael Busch)
+    
+ * LUCENE-1843: Refactored all tests that use assertAnalyzesTo() & others
+    in core and contrib to use a new BaseTokenStreamTestCase
+    base class. Also rewrote some tests to use this general analysis assert
+    functions instead of own ones (e.g. TestMappingCharFilter).
+    The new base class also tests tokenization with the TokenStream.next()
+    backwards layer enabled (using Token/TokenWrapper as attribute
+    implementation) and disabled (default for Lucene 3.0)
+    (Uwe Schindler, Robert Muir)
+    
+ * LUCENE-1836: Added a new LocalizedTestCase as base class for localization
+    junit tests.  (Robert Muir, Uwe Schindler via Michael Busch)
+
+======================= Release 2.4.1 2009-03-09 =======================
+
+API Changes
+
+1. LUCENE-1186: Add Analyzer.close() to free internal ThreadLocal
+   resources.  (Christian Kohlschütter via Mike McCandless)
+
+Bug fixes
+
+1. LUCENE-1452: Fixed silent data-loss case whereby binary fields are
+   truncated to 0 bytes during merging if the segments being merged
+   are non-congruent (same field name maps to different field
+   numbers).  This bug was introduced with LUCENE-1219.  (Andrzej
+   Bialecki via Mike McCandless).
+
+2. LUCENE-1429: Don't throw incorrect IllegalStateException from
+   IndexWriter.close() if you've hit an OOM when autoCommit is true.
+   (Mike McCandless)
+
+3. LUCENE-1474: If IndexReader.flush() is called twice when there were
+   pending deletions, it could lead to later false AssertionError
+   during IndexReader.open.  (Mike McCandless)
+
+4. LUCENE-1430: Fix false AlreadyClosedException from IndexReader.open
+   (masking an actual IOException) that takes String or File path.
+   (Mike McCandless)
+
+5. LUCENE-1442: Multiple-valued NOT_ANALYZED fields can double-count
+   token offsets.  (Mike McCandless)
+
+6. LUCENE-1453: Ensure IndexReader.reopen()/clone() does not result in
+   incorrectly closing the shared FSDirectory. This bug would only
+   happen if you use IndexReader.open() with a File or String argument.
+   The returned readers are wrapped by a FilterIndexReader that
+   correctly handles closing of directory after reopen()/clone(). 
+   (Mark Miller, Uwe Schindler, Mike McCandless)
+
+7. LUCENE-1457: Fix possible overflow bugs during binary
+   searches. (Mark Miller via Mike McCandless)
+
+8. LUCENE-1459: Fix CachingWrapperFilter to not throw exception if
+   both bits() and getDocIdSet() methods are called. (Matt Jones via
+   Mike McCandless)
+
+9. LUCENE-1519: Fix int overflow bug during segment merging.  (Deepak
+   via Mike McCandless)
+
+10. LUCENE-1521: Fix int overflow bug when flushing segment.
+    (Shon Vella via Mike McCandless).
+
+11. LUCENE-1544: Fix deadlock in IndexWriter.addIndexes(IndexReader[]).
+    (Mike McCandless via Doug Sale)
+
+12. LUCENE-1547: Fix rare thread safety issue if two threads call
+    IndexWriter commit() at the same time.  (Mike McCandless)
+
+13. LUCENE-1465: NearSpansOrdered returns payloads from first possible match 
+    rather than the correct, shortest match; Payloads could be returned even
+    if the max slop was exceeded; The wrong payload could be returned in 
+    certain situations. (Jonathan Mamou, Greg Shackles, Mark Miller)
+
+14. LUCENE-1186: Add Analyzer.close() to free internal ThreadLocal
+    resources.  (Christian Kohlschütter via Mike McCandless)
+
+15. LUCENE-1552: Fix IndexWriter.addIndexes(IndexReader[]) to properly
+    rollback IndexWriter's internal state on hitting an
+    exception. (Scott Garland via Mike McCandless)
+
+======================= Release 2.4.0 2008-10-06 =======================
+
+Changes in backwards compatibility policy
+
+1. LUCENE-1340: In a minor change to Lucene's backward compatibility
+   policy, we are now allowing the Fieldable interface to have
+   changes, within reason, and made on a case-by-case basis.  If an
+   application implements it's own Fieldable, please be aware of
+   this.  Otherwise, no need to be concerned.  This is in effect for
+   all 2.X releases, starting with 2.4.  Also note, that in all
+   likelihood, Fieldable will be changed in 3.0.
+
+
+Changes in runtime behavior
+
+ 1. LUCENE-1151: Fix StandardAnalyzer to not mis-identify host names
+    (eg lucene.apache.org) as an ACRONYM.  To get back to the pre-2.4
+    backwards compatible, but buggy, behavior, you can either call
+    StandardAnalyzer.setDefaultReplaceInvalidAcronym(false) (static
+    method), or, set system property
+    org.apache.lucene.analysis.standard.StandardAnalyzer.replaceInvalidAcronym
+    to "false" on JVM startup.  All StandardAnalyzer instances created
+    after that will then show the pre-2.4 behavior.  Alternatively,
+    you can call setReplaceInvalidAcronym(false) to change the
+    behavior per instance of StandardAnalyzer.  This backwards
+    compatibility will be removed in 3.0 (hardwiring the value to
+    true).  (Mike McCandless)
+
+ 2. LUCENE-1044: IndexWriter with autoCommit=true now commits (such
+    that a reader can see the changes) far less often than it used to.
+    Previously, every flush was also a commit.  You can always force a
+    commit by calling IndexWriter.commit().  Furthermore, in 3.0,
+    autoCommit will be hardwired to false (IndexWriter constructors
+    that take an autoCommit argument have been deprecated) (Mike
+    McCandless)
+
+ 3. LUCENE-1335: IndexWriter.addIndexes(Directory[]) and
+    addIndexesNoOptimize no longer allow the same Directory instance
+    to be passed in more than once.  Internally, IndexWriter uses
+    Directory and segment name to uniquely identify segments, so
+    adding the same Directory more than once was causing duplicates
+    which led to problems (Mike McCandless)
+
+ 4. LUCENE-1396: Improve PhraseQuery.toString() so that gaps in the
+    positions are indicated with a ? and multiple terms at the same
+    position are joined with a |.  (Andrzej Bialecki via Mike
+    McCandless)
+
+API Changes
+
+ 1. LUCENE-1084: Changed all IndexWriter constructors to take an
+    explicit parameter for maximum field size.  Deprecated all the
+    pre-existing constructors; these will be removed in release 3.0.
+    NOTE: these new constructors set autoCommit to false.  (Steven
+    Rowe via Mike McCandless)
+
+ 2. LUCENE-584: Changed Filter API to return a DocIdSet instead of a
+    java.util.BitSet. This allows using more efficient data structures
+    for Filters and makes them more flexible. This deprecates
+    Filter.bits(), so all filters that implement this outside
+    the Lucene code base will need to be adapted. See also the javadocs
+    of the Filter class. (Paul Elschot, Michael Busch)
+
+ 3. LUCENE-1044: Added IndexWriter.commit() which flushes any buffered
+    adds/deletes and then commits a new segments file so readers will
+    see the changes.  Deprecate IndexWriter.flush() in favor of
+    IndexWriter.commit().  (Mike McCandless)
+
+ 4. LUCENE-325: Added IndexWriter.expungeDeletes methods, which
+    consult the MergePolicy to find merges necessary to merge away all
+    deletes from the index.  This should be a somewhat lower cost
+    operation than optimize.  (John Wang via Mike McCandless)
+
+ 5. LUCENE-1233: Return empty array instead of null when no fields
+    match the specified name in these methods in Document:
+    getFieldables, getFields, getValues, getBinaryValues.  (Stefan
+    Trcek vai Mike McCandless)
+
+ 6. LUCENE-1234: Make BoostingSpanScorer protected.  (Andi Vajda via Grant Ingersoll)
+
+ 7. LUCENE-510: The index now stores strings as true UTF-8 bytes
+    (previously it was Java's modified UTF-8).  If any text, either
+    stored fields or a token, has illegal UTF-16 surrogate characters,
+    these characters are now silently replaced with the Unicode
+    replacement character U+FFFD.  This is a change to the index file
+    format.  (Marvin Humphrey via Mike McCandless)
+
+ 8. LUCENE-852: Let the SpellChecker caller specify IndexWriter mergeFactor
+    and RAM buffer size.  (Otis Gospodnetic)
+	
+ 9. LUCENE-1290: Deprecate org.apache.lucene.search.Hits, Hit and HitIterator
+    and remove all references to these classes from the core. Also update demos
+    and tutorials. (Michael Busch)
+
+10. LUCENE-1288: Add getVersion() and getGeneration() to IndexCommit.
+    getVersion() returns the same value that IndexReader.getVersion()
+    returns when the reader is opened on the same commit.  (Jason
+    Rutherglen via Mike McCandless)
+
+11. LUCENE-1311: Added IndexReader.listCommits(Directory) static
+    method to list all commits in a Directory, plus IndexReader.open
+    methods that accept an IndexCommit and open the index as of that
+    commit.  These methods are only useful if you implement a custom
+    DeletionPolicy that keeps more than the last commit around.
+    (Jason Rutherglen via Mike McCandless)
+
+12. LUCENE-1325: Added IndexCommit.isOptimized().  (Shalin Shekhar
+    Mangar via Mike McCandless)
+
+13. LUCENE-1324: Added TokenFilter.reset(). (Shai Erera via Mike
+    McCandless)
+
+14. LUCENE-1340: Added Fieldable.omitTf() method to skip indexing term
+    frequency, positions and payloads.  This saves index space, and
+    indexing/searching time.  (Eks Dev via Mike McCandless)
+
+15. LUCENE-1219: Add basic reuse API to Fieldable for binary fields:
+    getBinaryValue/Offset/Length(); currently only lazy fields reuse
+    the provided byte[] result to getBinaryValue.  (Eks Dev via Mike
+    McCandless)
+
+16. LUCENE-1334: Add new constructor for Term: Term(String fieldName)
+    which defaults term text to "".  (DM Smith via Mike McCandless)
+
+17. LUCENE-1333: Added Token.reinit(*) APIs to re-initialize (reuse) a
+    Token.  Also added term() method to return a String, with a
+    performance penalty clearly documented.  Also implemented
+    hashCode() and equals() in Token, and fixed all core and contrib
+    analyzers to use the re-use APIs.  (DM Smith via Mike McCandless)
+
+18. LUCENE-1329: Add optional readOnly boolean when opening an
+    IndexReader.  A readOnly reader is not allowed to make changes
+    (deletions, norms) to the index; in exchanged, the isDeleted
+    method, often a bottleneck when searching with many threads, is
+    not synchronized.  The default for readOnly is still false, but in
+    3.0 the default will become true.  (Jason Rutherglen via Mike
+    McCandless)
+
+19. LUCENE-1367: Add IndexCommit.isDeleted().  (Shalin Shekhar Mangar
+    via Mike McCandless)
+
+20. LUCENE-1061: Factored out all "new XXXQuery(...)" in
+    QueryParser.java into protected methods newXXXQuery(...) so that
+    subclasses can create their own subclasses of each Query type.
+    (John Wang via Mike McCandless)
+
+21. LUCENE-753: Added new Directory implementation
+    org.apache.lucene.store.NIOFSDirectory, which uses java.nio's
+    FileChannel to do file reads.  On most non-Windows platforms, with
+    many threads sharing a single searcher, this may yield sizable
+    improvement to query throughput when compared to FSDirectory,
+    which only allows a single thread to read from an open file at a
+    time.  (Jason Rutherglen via Mike McCandless)
+
+22. LUCENE-1371: Added convenience method TopDocs Searcher.search(Query query, int n).
+    (Mike McCandless)
+    
+23. LUCENE-1356: Allow easy extensions of TopDocCollector by turning
+    constructor and fields from package to protected. (Shai Erera
+    via Doron Cohen) 
+
+24. LUCENE-1375: Added convenience method IndexCommit.getTimestamp,
+    which is equivalent to
+    getDirectory().fileModified(getSegmentsFileName()).  (Mike McCandless)
+
+23. LUCENE-1366: Rename Field.Index options to be more accurate:
+    TOKENIZED becomes ANALYZED;  UN_TOKENIZED becomes NOT_ANALYZED;
+    NO_NORMS becomes NOT_ANALYZED_NO_NORMS and a new ANALYZED_NO_NORMS
+    is added.  (Mike McCandless)
+
+24. LUCENE-1131: Added numDeletedDocs method to IndexReader (Otis Gospodnetic)
+
+Bug fixes
+    
+ 1. LUCENE-1134: Fixed BooleanQuery.rewrite to only optimize a single 
+    clause query if minNumShouldMatch<=0. (Shai Erera via Michael Busch)
+
+ 2. LUCENE-1169: Fixed bug in IndexSearcher.search(): searching with
+    a filter might miss some hits because scorer.skipTo() is called
+    without checking if the scorer is already at the right position.
+    scorer.skipTo(scorer.doc()) is not a NOOP, it behaves as 
+    scorer.next(). (Eks Dev, Michael Busch)
+
+ 3. LUCENE-1182: Added scorePayload to SimilarityDelegator (Andi Vajda via Grant Ingersoll)
+ 
+ 4. LUCENE-1213: MultiFieldQueryParser was ignoring slop in case
+    of a single field phrase. (Trejkaz via Doron Cohen)
+
+ 5. LUCENE-1228: IndexWriter.commit() was not updating the index version and as
+    result IndexReader.reopen() failed to sense index changes. (Doron Cohen)
+
+ 6. LUCENE-1267: Added numDocs() and maxDoc() to IndexWriter;
+    deprecated docCount().  (Mike McCandless)
+
+ 7. LUCENE-1274: Added new prepareCommit() method to IndexWriter,
+    which does phase 1 of a 2-phase commit (commit() does phase 2).
+    This is needed when you want to update an index as part of a
+    transaction involving external resources (eg a database).  Also
+    deprecated abort(), renaming it to rollback().  (Mike McCandless)
+
+ 8. LUCENE-1003: Stop RussianAnalyzer from removing numbers.
+    (TUSUR OpenTeam, Dmitry Lihachev via Otis Gospodnetic)
+
+ 9. LUCENE-1152: SpellChecker fix around clearIndex and indexDictionary
+    methods, plus removal of IndexReader reference.
+    (Naveen Belkale via Otis Gospodnetic)
+
+10. LUCENE-1046: Removed dead code in SpellChecker
+    (Daniel Naber via Otis Gospodnetic)
+	
+11. LUCENE-1189: Fixed the QueryParser to handle escaped characters within 
+    quoted terms correctly. (Tomer Gabel via Michael Busch)
+
+12. LUCENE-1299: Fixed NPE in SpellChecker when IndexReader is not null and field is (Grant Ingersoll)
+
+13. LUCENE-1303: Fixed BoostingTermQuery's explanation to be marked as a Match 
+    depending only upon the non-payload score part, regardless of the effect of 
+    the payload on the score. Prior to this, score of a query containing a BTQ 
+    differed from its explanation. (Doron Cohen)
+    
+14. LUCENE-1310: Fixed SloppyPhraseScorer to work also for terms repeating more 
+    than twice in the query. (Doron Cohen)
+
+15. LUCENE-1351: ISOLatin1AccentFilter now cleans additional ligatures (Cedrik Lime via Grant Ingersoll)
+
+16. LUCENE-1383: Workaround a nasty "leak" in Java's builtin
+    ThreadLocal, to prevent Lucene from causing unexpected
+    OutOfMemoryError in certain situations (notably J2EE
+    applications).  (Chris Lu via Mike McCandless)
+
+New features
+
+ 1. LUCENE-1137: Added Token.set/getFlags() accessors for passing more information about a Token through the analysis
+    process.  The flag is not indexed/stored and is thus only used by analysis.
+
+ 2. LUCENE-1147: Add -segment option to CheckIndex tool so you can
+    check only a specific segment or segments in your index.  (Mike
+    McCandless)
+
+ 3. LUCENE-1045: Reopened this issue to add support for short and bytes. 
+ 
+ 4. LUCENE-584: Added new data structures to o.a.l.util, such as 
+    OpenBitSet and SortedVIntList. These extend DocIdSet and can 
+    directly be used for Filters with the new Filter API. Also changed
+    the core Filters to use OpenBitSet instead of java.util.BitSet.
+    (Paul Elschot, Michael Busch)
+
+ 5. LUCENE-494: Added QueryAutoStopWordAnalyzer to allow for the automatic removal, from a query of frequently occurring terms.
+    This Analyzer is not intended for use during indexing. (Mark Harwood via Grant Ingersoll)
+
+ 6. LUCENE-1044: Change Lucene to properly "sync" files after
+    committing, to ensure on a machine or OS crash or power cut, even
+    with cached writes, the index remains consistent.  Also added
+    explicit commit() method to IndexWriter to force a commit without
+    having to close.  (Mike McCandless)
+    
+ 7. LUCENE-997: Add search timeout (partial) support.
+    A TimeLimitedCollector was added to allow limiting search time.
+    It is a partial solution since timeout is checked only when 
+    collecting a hit, and therefore a search for rare words in a 
+    huge index might not stop within the specified time.
+    (Sean Timm via Doron Cohen) 
+
+ 8. LUCENE-1184: Allow SnapshotDeletionPolicy to be re-used across
+    close/re-open of IndexWriter while still protecting an open
+    snapshot (Tim Brennan via Mike McCandless)
+
+ 9. LUCENE-1194: Added IndexWriter.deleteDocuments(Query) to delete
+    documents matching the specified query.  Also added static unlock
+    and isLocked methods (deprecating the ones in IndexReader).  (Mike
+    McCandless)
+
+10. LUCENE-1201: Add IndexReader.getIndexCommit() method. (Tim Brennan
+    via Mike McCandless)
+
+11. LUCENE-550:  Added InstantiatedIndex implementation.  Experimental 
+    Index store similar to MemoryIndex but allows for multiple documents 
+    in memory.  (Karl Wettin via Grant Ingersoll)
+
+12. LUCENE-400: Added word based n-gram filter (in contrib/analyzers) called ShingleFilter and an Analyzer wrapper
+    that wraps another Analyzer's token stream with a ShingleFilter (Sebastian Kirsch, Steve Rowe via Grant Ingersoll) 
+
+13. LUCENE-1166: Decomposition tokenfilter for languages like German and Swedish (Thomas Peuss via Grant Ingersoll)
+
+14. LUCENE-1187: ChainedFilter and BooleanFilter now work with new Filter API
+    and DocIdSetIterator-based filters. Backwards-compatibility with old 
+    BitSet-based filters is ensured. (Paul Elschot via Michael Busch)
+
+15. LUCENE-1295: Added new method to MoreLikeThis for retrieving interesting terms and made retrieveTerms(int) public. (Grant Ingersoll)
+
+16. LUCENE-1298: MoreLikeThis can now accept a custom Similarity (Grant Ingersoll)
+
+17. LUCENE-1297: Allow other string distance measures for the SpellChecker
+    (Thomas Morton via Otis Gospodnetic)
+
+18. LUCENE-1001: Provide access to Payloads via Spans.  All existing Span Query implementations in Lucene implement. (Mark Miller, Grant Ingersoll)
+
+19. LUCENE-1354: Provide programmatic access to CheckIndex (Grant Ingersoll, Mike McCandless)
+
+20. LUCENE-1279: Add support for Collators to RangeFilter/Query and Query Parser.  (Steve Rowe via Grant Ingersoll) 
+
+Optimizations
+
+ 1. LUCENE-705: When building a compound file, use
+    RandomAccessFile.setLength() to tell the OS/filesystem to
+    pre-allocate space for the file.  This may improve fragmentation
+    in how the CFS file is stored, and allows us to detect an upcoming
+    disk full situation before actually filling up the disk.  (Mike
+    McCandless)
+
+ 2. LUCENE-1120: Speed up merging of term vectors by bulk-copying the
+    raw bytes for each contiguous range of non-deleted documents.
+    (Mike McCandless)
+	
+ 3. LUCENE-1185: Avoid checking if the TermBuffer 'scratch' in 
+    SegmentTermEnum is null for every call of scanTo().
+    (Christian Kohlschuetter via Michael Busch)
+
+ 4. LUCENE-1217: Internal to Field.java, use isBinary instead of
+    runtime type checking for possible speedup of binaryValue().
+    (Eks Dev via Mike McCandless)
+
+ 5. LUCENE-1183: Optimized TRStringDistance class (in contrib/spell) that uses
+    less memory than the previous version.  (Cédrik LIME via Otis Gospodnetic)
+
+ 6. LUCENE-1195: Improve term lookup performance by adding a LRU cache to the
+    TermInfosReader. In performance experiments the speedup was about 25% on 
+    average on mid-size indexes with ~500,000 documents for queries with 3 
+    terms and about 7% on larger indexes with ~4.3M documents. (Michael Busch)
+
+Documentation
+
+  1. LUCENE-1236:  Added some clarifying remarks to EdgeNGram*.java (Hiroaki Kawai via Grant Ingersoll)
+  
+  2. LUCENE-1157 and LUCENE-1256: HTML changes log, created automatically 
+     from CHANGES.txt. This HTML file is currently visible only via developers page.     
+     (Steven Rowe via Doron Cohen)
+
+  3. LUCENE-1349: Fieldable can now be changed without breaking backward compatibility rules (within reason.  See the note at
+  the top of this file and also on Fieldable.java).  (Grant Ingersoll)
+  
+  4. LUCENE-1873: Update documentation to reflect current Contrib area status.
+     (Steven Rowe, Mark Miller)
+
+Build
+
+  1. LUCENE-1153: Added JUnit JAR to new lib directory.  Updated build to rely on local JUnit instead of ANT/lib.
+  
+  2. LUCENE-1202: Small fixes to the way Clover is used to work better
+     with contribs.  Of particular note: a single clover db is used
+     regardless of whether tests are run globally or in the specific
+     contrib directories. 
+     
+  3. LUCENE-1353: Javacc target in contrib/miscellaneous for 
+     generating the precedence query parser. 
+
+Test Cases
+
+ 1. LUCENE-1238: Fixed intermittent failures of TestTimeLimitedCollector.testTimeoutMultiThreaded.
+    Within this fix, "greedy" flag was added to TimeLimitedCollector, to allow the wrapped 
+    collector to collect also the last doc, after allowed-tTime passed. (Doron Cohen)   
+	
+ 2. LUCENE-1348: relax TestTimeLimitedCollector to not fail due to 
+    timeout exceeded (just because test machine is very busy).
+	
+======================= Release 2.3.2 2008-05-05 =======================
+
+Bug fixes
+
+ 1. LUCENE-1191: On hitting OutOfMemoryError in any index-modifying
+    methods in IndexWriter, do not commit any further changes to the
+    index to prevent risk of possible corruption.  (Mike McCandless)
+
+ 2. LUCENE-1197: Fixed issue whereby IndexWriter would flush by RAM
+    too early when TermVectors were in use.  (Mike McCandless)
+
+ 3. LUCENE-1198: Don't corrupt index if an exception happens inside
+    DocumentsWriter.init (Mike McCandless)
+
+ 4. LUCENE-1199: Added defensive check for null indexReader before
+    calling close in IndexModifier.close() (Mike McCandless)
+
+ 5. LUCENE-1200: Fix rare deadlock case in addIndexes* when
+    ConcurrentMergeScheduler is in use (Mike McCandless)
+
+ 6. LUCENE-1208: Fix deadlock case on hitting an exception while
+    processing a document that had triggered a flush (Mike McCandless)
+
+ 7. LUCENE-1210: Fix deadlock case on hitting an exception while
+    starting a merge when using ConcurrentMergeScheduler (Mike McCandless)
+
+ 8. LUCENE-1222: Fix IndexWriter.doAfterFlush to always be called on
+    flush (Mark Ferguson via Mike McCandless)
+	
+ 9. LUCENE-1226: Fixed IndexWriter.addIndexes(IndexReader[]) to commit
+    successfully created compound files. (Michael Busch)
+
+10. LUCENE-1150: Re-expose StandardTokenizer's constants publicly;
+    this was accidentally lost with LUCENE-966.  (Nicolas Lalevée via
+    Mike McCandless)
+
+11. LUCENE-1262: Fixed bug in BufferedIndexReader.refill whereby on
+    hitting an exception in readInternal, the buffer is incorrectly
+    filled with stale bytes such that subsequent calls to readByte()
+    return incorrect results.  (Trejkaz via Mike McCandless)
+
+12. LUCENE-1270: Fixed intermittent case where IndexWriter.close()
+    would hang after IndexWriter.addIndexesNoOptimize had been
+    called.  (Stu Hood via Mike McCandless)
+	
+Build
+
+ 1. LUCENE-1230: Include *pom.xml* in source release files. (Michael Busch)
+
+ 
+======================= Release 2.3.1 2008-02-22 =======================
+
+Bug fixes
+    
+ 1. LUCENE-1168: Fixed corruption cases when autoCommit=false and
+    documents have mixed term vectors (Suresh Guvvala via Mike
+    McCandless).
+
+ 2. LUCENE-1171: Fixed some cases where OOM errors could cause
+    deadlock in IndexWriter (Mike McCandless).
+
+ 3. LUCENE-1173: Fixed corruption case when autoCommit=false and bulk
+    merging of stored fields is used (Yonik via Mike McCandless).
+
+ 4. LUCENE-1163: Fixed bug in CharArraySet.contains(char[] buffer, int
+    offset, int len) that was ignoring offset and thus giving the
+    wrong answer.  (Thomas Peuss via Mike McCandless)
+	
+ 5. LUCENE-1177: Fix rare case where IndexWriter.optimize might do too
+    many merges at the end.  (Mike McCandless)
+	
+ 6. LUCENE-1176: Fix corruption case when documents with no term
+    vector fields are added before documents with term vector fields.
+    (Mike McCandless)
+	
+ 7. LUCENE-1179: Fixed assert statement that was incorrectly
+    preventing Fields with empty-string field name from working.
+    (Sergey Kabashnyuk via Mike McCandless)
+
+======================= Release 2.3.0 2008-01-21 =======================
+
+Changes in runtime behavior
+
+ 1. LUCENE-994: Defaults for IndexWriter have been changed to maximize
+    out-of-the-box indexing speed.  First, IndexWriter now flushes by
+    RAM usage (16 MB by default) instead of a fixed doc count (call
+    IndexWriter.setMaxBufferedDocs to get backwards compatible
+    behavior).  Second, ConcurrentMergeScheduler is used to run merges
+    using background threads (call IndexWriter.setMergeScheduler(new
+    SerialMergeScheduler()) to get backwards compatible behavior).
+    Third, merges are chosen based on size in bytes of each segment
+    rather than document count of each segment (call
+    IndexWriter.setMergePolicy(new LogDocMergePolicy()) to get
+    backwards compatible behavior).
+
+    NOTE: users of ParallelReader must change back all of these
+    defaults in order to ensure the docIDs "align" across all parallel
+    indices.
+
+    (Mike McCandless)
+
+ 2. LUCENE-1045: SortField.AUTO didn't work with long. When detecting
+    the field type for sorting automatically, numbers used to be
+    interpreted as int, then as float, if parsing the number as an int
+    failed. Now the detection checks for int, then for long,
+    then for float. (Daniel Naber)
+
+API Changes
+
+ 1. LUCENE-843: Added IndexWriter.setRAMBufferSizeMB(...) to have
+    IndexWriter flush whenever the buffered documents are using more
+    than the specified amount of RAM.  Also added new APIs to Token
+    that allow one to set a char[] plus offset and length to specify a
+    token (to avoid creating a new String() for each Token).  (Mike
+    McCandless)
+
+ 2. LUCENE-963: Add setters to Field to allow for re-using a single
+    Field instance during indexing.  This is a sizable performance
+    gain, especially for small documents.  (Mike McCandless)
+
+ 3. LUCENE-969: Add new APIs to Token, TokenStream and Analyzer to
+    permit re-using of Token and TokenStream instances during
+    indexing.  Changed Token to use a char[] as the store for the
+    termText instead of String.  This gives faster tokenization
+    performance (~10-15%).  (Mike McCandless)
+
+ 4. LUCENE-847: Factored MergePolicy, which determines which merges
+    should take place and when, as well as MergeScheduler, which
+    determines when the selected merges should actually run, out of
+    IndexWriter.  The default merge policy is now
+    LogByteSizeMergePolicy (see LUCENE-845) and the default merge
+    scheduler is now ConcurrentMergeScheduler (see
+    LUCENE-870). (Steven Parkes via Mike McCandless)
+
+ 5. LUCENE-1052: Add IndexReader.setTermInfosIndexDivisor(int) method
+    that allows you to reduce memory usage of the termInfos by further
+    sub-sampling (over the termIndexInterval that was used during
+    indexing) which terms are loaded into memory.  (Chuck Williams,
+    Doug Cutting via Mike McCandless)
+    
+ 6. LUCENE-743: Add IndexReader.reopen() method that re-opens an
+    existing IndexReader (see New features -> 8.) (Michael Busch)
+
+ 7. LUCENE-1062: Add setData(byte[] data), 
+    setData(byte[] data, int offset, int length), getData(), getOffset()
+    and clone() methods to o.a.l.index.Payload. Also add the field name 
+    as arg to Similarity.scorePayload(). (Michael Busch)
+
+ 8. LUCENE-982: Add IndexWriter.optimize(int maxNumSegments) method to
+    "partially optimize" an index down to maxNumSegments segments.
+    (Mike McCandless)
+
+ 9. LUCENE-1080: Changed Token.DEFAULT_TYPE to be public.
+
+10. LUCENE-1064: Changed TopDocs constructor to be public. 
+     (Shai Erera via Michael Busch)
+
+11. LUCENE-1079: DocValues cleanup: constructor now has no params,
+    and getInnerArray() now throws UnsupportedOperationException (Doron Cohen)
+
+12. LUCENE-1089: Added PriorityQueue.insertWithOverflow, which returns
+    the Object (if any) that was bumped from the queue to allow
+    re-use.  (Shai Erera via Mike McCandless)
+    
+13. LUCENE-1101: Token reuse 'contract' (defined LUCENE-969)
+    modified so it is token producer's responsibility
+    to call Token.clear(). (Doron Cohen)   
+
+14. LUCENE-1118: Changed StandardAnalyzer to skip too-long (default >
+    255 characters) tokens.  You can increase this limit by calling
+    StandardAnalyzer.setMaxTokenLength(...).  (Michael McCandless)
+
+
+Bug fixes
+
+ 1. LUCENE-933: QueryParser fixed to not produce empty sub 
+    BooleanQueries "()" even if the Analyzer produced no 
+    tokens for input. (Doron Cohen)
+
+ 2. LUCENE-955: Fixed SegmentTermPositions to work correctly with the
+    first term in the dictionary. (Michael Busch)
+
+ 3. LUCENE-951: Fixed NullPointerException in MultiLevelSkipListReader
+    that was thrown after a call of TermPositions.seek(). 
+    (Rich Johnson via Michael Busch)
+    
+ 4. LUCENE-938: Fixed cases where an unhandled exception in
+    IndexWriter's methods could cause deletes to be lost.
+    (Steven Parkes via Mike McCandless)
+      
+ 5. LUCENE-962: Fixed case where an unhandled exception in
+    IndexWriter.addDocument or IndexWriter.updateDocument could cause
+    unreferenced files in the index to not be deleted
+    (Steven Parkes via Mike McCandless)
+  
+ 6. LUCENE-957: RAMDirectory fixed to properly handle directories
+    larger than Integer.MAX_VALUE. (Doron Cohen)
+
+ 7. LUCENE-781: MultiReader fixed to not throw NPE if isCurrent(),
+    isOptimized() or getVersion() is called. Separated MultiReader
+    into two classes: MultiSegmentReader extends IndexReader, is
+    package-protected and is created automatically by IndexReader.open()
+    in case the index has multiple segments. The public MultiReader 
+    now extends MultiSegmentReader and is intended to be used by users
+    who want to add their own subreaders. (Daniel Naber, Michael Busch)
+
+ 8. LUCENE-970: FilterIndexReader now implements isOptimized(). Before
+    a call of isOptimized() would throw a NPE. (Michael Busch)
+
+ 9. LUCENE-832: ParallelReader fixed to not throw NPE if isCurrent(),
+    isOptimized() or getVersion() is called. (Michael Busch)
+      
+10. LUCENE-948: Fix FNFE exception caused by stale NFS client
+    directory listing caches when writers on different machines are
+    sharing an index over NFS and using a custom deletion policy (Mike
+    McCandless)
+
+11. LUCENE-978: Ensure TermInfosReader, FieldsReader, and FieldsReader
+    close any streams they had opened if an exception is hit in the
+    constructor.  (Ning Li via Mike McCandless)
+
+12. LUCENE-985: If an extremely long term is in a doc (> 16383 chars),
+    we now throw an IllegalArgumentException saying the term is too
+    long, instead of cryptic ArrayIndexOutOfBoundsException.  (Karl
+    Wettin via Mike McCandless)
+
+13. LUCENE-991: The explain() method of BoostingTermQuery had errors
+    when no payloads were present on a document.  (Peter Keegan via
+    Grant Ingersoll)
+
+14. LUCENE-992: Fixed IndexWriter.updateDocument to be atomic again
+    (this was broken by LUCENE-843).  (Ning Li via Mike McCandless)
+
+15. LUCENE-1008: Fixed corruption case when document with no term
+    vector fields is added after documents with term vector fields.
+    This bug was introduced with LUCENE-843.  (Grant Ingersoll via
+    Mike McCandless)
+
+16. LUCENE-1006: Fixed QueryParser to accept a "" field value (zero
+    length quoted string.)  (yonik)
+
+17. LUCENE-1010: Fixed corruption case when document with no term
+    vector fields is added after documents with term vector fields.
+    This case is hit during merge and would cause an EOFException.
+    This bug was introduced with LUCENE-984.  (Andi Vajda via Mike
+    McCandless)
+
+19. LUCENE-1009: Fix merge slowdown with LogByteSizeMergePolicy when
+    autoCommit=false and documents are using stored fields and/or term
+    vectors.  (Mark Miller via Mike McCandless)
+
+20. LUCENE-1011: Fixed corruption case when two or more machines,
+    sharing an index over NFS, can be writers in quick succession.
+    (Patrick Kimber via Mike McCandless)
+
+21. LUCENE-1028: Fixed Weight serialization for few queries:
+    DisjunctionMaxQuery, ValueSourceQuery, CustomScoreQuery.
+    Serialization check added for all queries.
+    (Kyle Maxwell via Doron Cohen)
+
+22. LUCENE-1048: Fixed incorrect behavior in Lock.obtain(...) when the
+    timeout argument is very large (eg Long.MAX_VALUE).  Also added
+    Lock.LOCK_OBTAIN_WAIT_FOREVER constant to never timeout.  (Nikolay
+    Diakov via Mike McCandless)
+
+23. LUCENE-1050: Throw LockReleaseFailedException in
+    Simple/NativeFSLockFactory if we fail to delete the lock file when
+    releasing the lock.  (Nikolay Diakov via Mike McCandless)
+
+24. LUCENE-1071: Fixed SegmentMerger to correctly set payload bit in 
+    the merged segment. (Michael Busch)
+
+25. LUCENE-1042: Remove throwing of IOException in getTermFreqVector(int, String, TermVectorMapper) to be consistent
+    with other getTermFreqVector calls.  Also removed the throwing of the other IOException in that method to be consistent.  (Karl Wettin via Grant Ingersoll)
+    
+26. LUCENE-1096: Fixed Hits behavior when hits' docs are deleted 
+    along with iterating the hits. Deleting docs already retrieved 
+    now works seamlessly. If docs not yet retrieved are deleted 
+    (e.g. from another thread), and then, relying on the initial 
+    Hits.length(), an application attempts to retrieve more hits 
+    than actually exist , a ConcurrentMidificationException 
+    is thrown.  (Doron Cohen)
+
+27. LUCENE-1068: Changed StandardTokenizer to fix an issue with it marking
+  the type of some tokens incorrectly.  This is done by adding a new flag named
+  replaceInvalidAcronym which defaults to false, the current, incorrect behavior.  Setting
+  this flag to true fixes the problem.  This flag is a temporary fix and is already
+  marked as being deprecated.  3.x will implement the correct approach.  (Shai Erera via Grant Ingersoll)
+  LUCENE-1140: Fixed NPE caused by 1068 (Alexei Dets via Grant Ingersoll)
+    
+28. LUCENE-749: ChainedFilter behavior fixed when logic of 
+    first filter is ANDNOT.  (Antonio Bruno via Doron Cohen)
+
+29. LUCENE-508: Make sure SegmentTermEnum.prev() is accurate (= last
+    term) after next() returns false.  (Steven Tamm via Mike
+    McCandless)
+
+    
+New features
+
+ 1. LUCENE-906: Elision filter for French.
+    (Mathieu Lecarme via Otis Gospodnetic)
+
+ 2. LUCENE-960: Added a SpanQueryFilter and related classes to allow for
+    not only filtering, but knowing where in a Document a Filter matches
+    (Grant Ingersoll)
+
+ 3. LUCENE-868: Added new Term Vector access features.  New callback
+    mechanism allows application to define how and where to read Term
+    Vectors from disk. This implementation contains several extensions
+    of the new abstract TermVectorMapper class.  The new API should be
+    back-compatible.  No changes in the actual storage of Term Vectors
+    has taken place.
+ 3.1 LUCENE-1038: Added setDocumentNumber() method to TermVectorMapper
+     to provide information about what document is being accessed.
+     (Karl Wettin via Grant Ingersoll)
+
+ 4. LUCENE-975: Added PositionBasedTermVectorMapper that allows for
+    position based lookup of term vector information.
+    See item #3 above (LUCENE-868).
+
+ 5. LUCENE-1011: Added simple tools (all in org.apache.lucene.store)
+    to verify that locking is working properly.  LockVerifyServer runs
+    a separate server to verify locks.  LockStressTest runs a simple
+    tool that rapidly obtains and releases locks.
+    VerifyingLockFactory is a LockFactory that wraps any other
+    LockFactory and consults the LockVerifyServer whenever a lock is
+    obtained or released, throwing an exception if an illegal lock
+    obtain occurred.  (Patrick Kimber via Mike McCandless)
+
+ 6. LUCENE-1015: Added FieldCache extension (ExtendedFieldCache) to
+    support doubles and longs.  Added support into SortField for sorting
+    on doubles and longs as well.  (Grant Ingersoll)
+
+ 7. LUCENE-1020: Created basic index checking & repair tool
+    (o.a.l.index.CheckIndex).  When run without -fix it does a
+    detailed test of all segments in the index and reports summary
+    information and any errors it hit.  With -fix it will remove
+    segments that had errors.  (Mike McCandless)
+
+ 8. LUCENE-743: Add IndexReader.reopen() method that re-opens an
+    existing IndexReader by only loading those portions of an index
+    that have changed since the reader was (re)opened. reopen() can
+    be significantly faster than open(), depending on the amount of
+    index changes. SegmentReader, MultiSegmentReader, MultiReader,
+    and ParallelReader implement reopen(). (Michael Busch) 
+
+ 9. LUCENE-1040: CharArraySet useful for efficiently checking
+    set membership of text specified by char[]. (yonik)
+
+10. LUCENE-1073: Created SnapshotDeletionPolicy to facilitate taking a
+    live backup of an index without pausing indexing.  (Mike
+    McCandless)
+    
+11. LUCENE-1019: CustomScoreQuery enhanced to support multiple 
+    ValueSource queries. (Kyle Maxwell via Doron Cohen)
+    
+12. LUCENE-1095: Added an option to StopFilter to increase 
+    positionIncrement of the token succeeding a stopped token.
+    Disabled by default. Similar option added to QueryParser 
+    to consider token positions when creating PhraseQuery 
+    and MultiPhraseQuery. Disabled by default (so by default
+    the query parser ignores position increments).
+    (Doron Cohen)
+
+13. LUCENE-1380: Added TokenFilter for setting position increment in special cases related to the ShingleFilter (Mck SembWever, Steve Rowe, Karl Wettin via Grant Ingersoll)
+
+
+
+Optimizations
+
+ 1. LUCENE-937: CachingTokenFilter now uses an iterator to access the 
+    Tokens that are cached in the LinkedList. This increases performance 
+    significantly, especially when the number of Tokens is large. 
+    (Mark Miller via Michael Busch)
+
+ 2. LUCENE-843: Substantial optimizations to improve how IndexWriter
+    uses RAM for buffering documents and to speed up indexing (2X-8X
+    faster).  A single shared hash table now records the in-memory
+    postings per unique term and is directly flushed into a single
+    segment.  (Mike McCandless)
+ 
+ 3. LUCENE-892: Fixed extra "buffer to buffer copy" that sometimes
+    takes place when using compound files.  (Mike McCandless)
+
+ 4. LUCENE-959: Remove synchronization in Document (yonik)
+
+ 5. LUCENE-963: Add setters to Field to allow for re-using a single
+    Field instance during indexing.  This is a sizable performance
+    gain, especially for small documents.  (Mike McCandless)
+
+ 6. LUCENE-939: Check explicitly for boundary conditions in FieldInfos
+    and don't rely on exceptions. (Michael Busch)
+
+ 7. LUCENE-966: Very substantial speedups (~6X faster) for
+    StandardTokenizer (StandardAnalyzer) by using JFlex instead of
+    JavaCC to generate the tokenizer.
+    (Stanislaw Osinski via Mike McCandless)
+
+ 8. LUCENE-969: Changed core tokenizers & filters to re-use Token and
+    TokenStream instances when possible to improve tokenization
+    performance (~10-15%). (Mike McCandless)
+
+ 9. LUCENE-871: Speedup ISOLatin1AccentFilter (Ian Boston via Mike
+    McCandless)
+
+10. LUCENE-986: Refactored SegmentInfos from IndexReader into the new
+    subclass DirectoryIndexReader. SegmentReader and MultiSegmentReader
+    now extend DirectoryIndexReader and are the only IndexReader 
+    implementations that use SegmentInfos to access an index and 
+    acquire a write lock for index modifications. (Michael Busch)
+
+11. LUCENE-1007: Allow flushing in IndexWriter to be triggered by
+    either RAM usage or document count or both (whichever comes
+    first), by adding symbolic constant DISABLE_AUTO_FLUSH to disable
+    one of the flush triggers.  (Ning Li via Mike McCandless)
+
+12. LUCENE-1043: Speed up merging of stored fields by bulk-copying the
+    raw bytes for each contiguous range of non-deleted documents.
+    (Robert Engels via Mike McCandless)
+
+13. LUCENE-693: Speed up nested conjunctions (~2x) that match many
+    documents, and a slight performance increase for top level
+    conjunctions.  (yonik)
+
+14. LUCENE-1098: Make inner class StandardAnalyzer.SavedStreams static 
+    and final. (Nathan Beyer via Michael Busch)
+
+Documentation
+
+ 1. LUCENE-1051: Generate separate javadocs for core, demo and contrib
+    classes, as well as an unified view. Also add an appropriate menu 
+    structure to the website. (Michael Busch)
+
+ 2. LUCENE-746: Fix error message in AnalyzingQueryParser.getPrefixQuery.
+    (Ronnie Kolehmainen via Michael Busch)
+
+Build
+
+ 1. LUCENE-908: Improvements and simplifications for how the MANIFEST
+    file and the META-INF dir are created. (Michael Busch)
+
+ 2. LUCENE-935: Various improvements for the maven artifacts. Now the
+    artifacts also include the sources as .jar files. (Michael Busch)
+
+ 3. Added apply-patch target to top-level build.  Defaults to looking for
+    a patch in ${basedir}/../patches with name specified by -Dpatch.name.
+    Can also specify any location by -Dpatch.file property on the command
+    line.  This should be helpful for easy application of patches, but it
+    is also a step towards integrating automatic patch application with
+    JIRA and Hudson, and is thus subject to change.  (Grant Ingersoll)
+ 
+ 4. LUCENE-935: Defined property "m2.repository.url" to allow setting
+    the url to a maven remote repository to deploy to. (Michael Busch)
+
+ 5. LUCENE-1051: Include javadocs in the maven artifacts. (Michael Busch)
+
+ 6. LUCENE-1055: Remove gdata-server from build files and its sources 
+    from trunk. (Michael Busch)
+
+ 7. LUCENE-935: Allow to deploy maven artifacts to a remote m2 repository
+    via scp and ssh authentication. (Michael Busch)
+	
+ 8. LUCENE-1123: Allow overriding the specification version for 
+    MANIFEST.MF (Michael Busch)
+
+Test Cases
+
+ 1. LUCENE-766: Test adding two fields with the same name but different 
+    term vector setting.  (Nicolas Lalevée via Doron Cohen)  
+    
+======================= Release 2.2.0 2007-06-19 =======================
+
+Changes in runtime behavior
+
+API Changes
+
+ 1. LUCENE-793: created new exceptions and added them to throws clause
+    for many methods (all subclasses of IOException for backwards
+    compatibility): index.StaleReaderException,
+    index.CorruptIndexException, store.LockObtainFailedException.
+    This was done to better call out the possible root causes of an
+    IOException from these methods.  (Mike McCandless)
+
+ 2. LUCENE-811: make SegmentInfos class, plus a few methods from related
+    classes, package-private again (they were unnecessarily made public
+    as part of LUCENE-701).  (Mike McCandless)
+
+ 3. LUCENE-710: added optional autoCommit boolean to IndexWriter
+    constructors.  When this is false, index changes are not committed
+    until the writer is closed.  This gives explicit control over when
+    a reader will see the changes.  Also added optional custom
+    deletion policy to explicitly control when prior commits are
+    removed from the index.  This is intended to allow applications to
+    share an index over NFS by customizing when prior commits are
+    deleted. (Mike McCandless)
+
+ 4. LUCENE-818: changed most public methods of IndexWriter,
+    IndexReader (and its subclasses), FieldsReader and RAMDirectory to
+    throw AlreadyClosedException if they are accessed after being
+    closed.  (Mike McCandless)
+
+ 5. LUCENE-834: Changed some access levels for certain Span classes to allow them
+    to be overridden.  They have been marked expert only and not for public
+    consumption. (Grant Ingersoll) 
+
+ 6. LUCENE-796: Removed calls to super.* from various get*Query methods in
+    MultiFieldQueryParser, in order to allow sub-classes to override them.
+    (Steven Parkes via Otis Gospodnetic)
+
+ 7. LUCENE-857: Removed caching from QueryFilter and deprecated QueryFilter
+    in favour of QueryWrapperFilter or QueryWrapperFilter + CachingWrapperFilter
+    combination when caching is desired.
+    (Chris Hostetter, Otis Gospodnetic)
+
+ 8. LUCENE-869: Changed FSIndexInput and FSIndexOutput to inner classes of FSDirectory
+    to enable extensibility of these classes. (Michael Busch)
+
+ 9. LUCENE-580: Added the public method reset() to TokenStream. This method does
+    nothing by default, but may be overwritten by subclasses to support consuming
+    the TokenStream more than once. (Michael Busch)
+
+10. LUCENE-580: Added a new constructor to Field that takes a TokenStream as
+    argument, available as tokenStreamValue(). This is useful to avoid the need of 
+    "dummy analyzers" for pre-analyzed fields. (Karl Wettin, Michael Busch)
+
+11. LUCENE-730: Added the new methods to BooleanQuery setAllowDocsOutOfOrder() and
+    getAllowDocsOutOfOrder(). Deprecated the methods setUseScorer14() and 
+    getUseScorer14(). The optimization patch LUCENE-730 (see Optimizations->3.) 
+    improves performance for certain queries but results in scoring out of docid 
+    order. This patch reverse this change, so now by default hit docs are scored
+    in docid order if not setAllowDocsOutOfOrder(true) is explicitly called.
+    This patch also enables the tests in QueryUtils again that check for docid
+    order. (Paul Elschot, Doron Cohen, Michael Busch)
+
+12. LUCENE-888: Added Directory.openInput(File path, int bufferSize)
+    to optionally specify the size of the read buffer.  Also added
+    BufferedIndexInput.setBufferSize(int) to change the buffer size.
+    (Mike McCandless)
+
+13. LUCENE-923: Make SegmentTermPositionVector package-private. It does not need
+    to be public because it implements the public interface TermPositionVector.
+    (Michael Busch)
+
+Bug fixes
+
+ 1. LUCENE-804: Fixed build.xml to pack a fully compilable src dist.  (Doron Cohen)
+
+ 2. LUCENE-813: Leading wildcard fixed to work with trailing wildcard.
+    Query parser modified to create a prefix query only for the case 
+    that there is a single trailing wildcard (and no additional wildcard 
+    or '?' in the query text).  (Doron Cohen)
+
+ 3. LUCENE-812: Add no-argument constructors to NativeFSLockFactory
+    and SimpleFSLockFactory.  This enables all 4 builtin LockFactory
+    implementations to be specified via the System property
+    org.apache.lucene.store.FSDirectoryLockFactoryClass.  (Mike McCandless)
+
+ 4. LUCENE-821: The new single-norm-file introduced by LUCENE-756
+    failed to reduce the number of open descriptors since it was still
+    opened once per field with norms. (yonik)
+
+ 5. LUCENE-823: Make sure internal file handles are closed when
+    hitting an exception (eg disk full) while flushing deletes in
+    IndexWriter's mergeSegments, and also during
+    IndexWriter.addIndexes.  (Mike McCandless)
+
+ 6. LUCENE-825: If directory is removed after
+    FSDirectory.getDirectory() but before IndexReader.open you now get
+    a FileNotFoundException like Lucene pre-2.1 (before this fix you
+    got an NPE).  (Mike McCandless)
+
+ 7. LUCENE-800: Removed backslash from the TERM_CHAR list in the queryparser, 
+    because the backslash is the escape character. Also changed the ESCAPED_CHAR
+    list to contain all possible characters, because every character that 
+    follows a backslash should be considered as escaped. (Michael Busch)
+
+ 8. LUCENE-372: QueryParser.parse() now ensures that the entire input string 
+    is consumed. Now a ParseException is thrown if a query contains too many
+    closing parentheses. (Andreas Neumann via Michael Busch)
+
+ 9. LUCENE-814: javacc build targets now fix line-end-style of generated files.
+    Now also deleting all javacc generated files before calling javacc.
+    (Steven Parkes, Doron Cohen)
+    
+10. LUCENE-829: close readers in contrib/benchmark. (Karl Wettin, Doron Cohen)
+
+11. LUCENE-828: Minor fix for Term's equal().
+    (Paul Cowan via Otis Gospodnetic)
+
+12. LUCENE-846: Fixed: if IndexWriter is opened with autoCommit=false,
+    and you call addIndexes, and hit an exception (eg disk full) then
+    when IndexWriter rolls back its internal state this could corrupt
+    the instance of IndexWriter (but, not the index itself) by
+    referencing already deleted segments.  This bug was only present
+    in 2.2 (trunk), ie was never released.  (Mike McCandless)
+    
+13. LUCENE-736: Sloppy phrase query with repeating terms matches wrong docs.
+    For example query "B C B"~2 matches the doc "A B C D E". (Doron Cohen)
+    
+14. LUCENE-789: Fixed: custom similarity is ignored when using MultiSearcher (problem reported 
+    by Alexey Lef). Now the similarity applied by MultiSearcer.setSimilarity(sim) is being used. 
+    Note that as before this fix, creating a multiSearcher from Searchers for whom custom similarity 
+    was set has no effect - it is masked by the similarity of the MultiSearcher. This is as 
+    designed, because MultiSearcher operates on Searchables (not Searchers). (Doron Cohen)
+
+15. LUCENE-880: Fixed DocumentWriter to close the TokenStreams after it
+    has written the postings. Then the resources associated with the 
+    TokenStreams can safely be released. (Michael Busch)
+
+16. LUCENE-883: consecutive calls to Spellchecker.indexDictionary()
+    won't insert terms twice anymore. (Daniel Naber)
+
+17. LUCENE-881: QueryParser.escape() now also escapes the characters
+    '|' and '&' which are part of the queryparser syntax. (Michael Busch)
+
+18. LUCENE-886: Spellchecker clean up: exceptions aren't printed to STDERR
+    anymore and ignored, but re-thrown. Some javadoc improvements.
+    (Daniel Naber)
+
+19. LUCENE-698: FilteredQuery now takes the query boost into account for 
+    scoring. (Michael Busch)
+
+20. LUCENE-763: Spellchecker: LuceneDictionary used to skip first word in 
+    enumeration. (Christian Mallwitz via Daniel Naber)
+    
+21. LUCENE-903: FilteredQuery explanation inaccuracy with boost.
+    Explanation tests now "deep" check the explanation details.
+    (Chris Hostetter, Doron Cohen)
+    
+22. LUCENE-912: DisjunctionMaxScorer first skipTo(target) call ignores the 
+    skip target param and ends up at the first match.
+    (Sudaakeran B. via Chris Hostetter & Doron Cohen)
+    
+23. LUCENE-913: Two consecutive score() calls return different 
+    scores for Boolean Queries. (Michael Busch, Doron Cohen)
+
+24. LUCENE-1013: Fix IndexWriter.setMaxMergeDocs to work "out of the
+    box", again, by moving set/getMaxMergeDocs up from
+    LogDocMergePolicy into LogMergePolicy.  This fixes the API
+    breakage (non backwards compatible change) caused by LUCENE-994.
+    (Yonik Seeley via Mike McCandless)
+
+New features
+
+ 1. LUCENE-759: Added two n-gram-producing TokenFilters.
+    (Otis Gospodnetic)
+
+ 2. LUCENE-822: Added FieldSelector capabilities to Searchable for use with
+    RemoteSearcher, and other Searchable implementations. (Mark Miller, Grant Ingersoll)
+
+ 3. LUCENE-755: Added the ability to store arbitrary binary metadata in the posting list.
+    These metadata are called Payloads. For every position of a Token one Payload in the form
+    of a variable length byte array can be stored in the prox file.
+    Remark: The APIs introduced with this feature are in experimental state and thus
+            contain appropriate warnings in the javadocs.
+    (Michael Busch)
+
+ 4. LUCENE-834: Added BoostingTermQuery which can boost scores based on the
+    values of a payload (see #3 above.) (Grant Ingersoll)
+
+ 5. LUCENE-834: Similarity has a new method for scoring payloads called
+    scorePayloads that can be overridden to take advantage of payload
+    storage (see #3 above)
+
+ 6. LUCENE-834: Added isPayloadAvailable() onto TermPositions interface and
+    implemented it in the appropriate places (Grant Ingersoll)
+
+ 7. LUCENE-853: Added RemoteCachingWrapperFilter to enable caching of Filters
+    on the remote side of the RMI connection.
+    (Matt Ericson via Otis Gospodnetic)
+
+ 8. LUCENE-446: Added Solr's search.function for scores based on field 
+    values, plus CustomScoreQuery for simple score (post) customization.
+    (Yonik Seeley, Doron Cohen)
+
+ 9. LUCENE-1058: Added new TeeTokenFilter (like the UNIX 'tee' command) and SinkTokenizer which can be used to share tokens between two or more
+    Fields such that the other Fields do not have to go through the whole Analysis process over again.  For instance, if you have two
+    Fields that share all the same analysis steps except one lowercases tokens and the other does not, you can coordinate the operations
+    between the two using the TeeTokenFilter and the SinkTokenizer.  See TeeSinkTokenTest.java for examples.
+    (Grant Ingersoll, Michael Busch, Yonik Seeley)
+ 
+Optimizations
+
+ 1. LUCENE-761: The proxStream is now cloned lazily in SegmentTermPositions
+    when nextPosition() is called for the first time. This allows using instances
+    of SegmentTermPositions instead of SegmentTermDocs without additional costs.
+    (Michael Busch)
+
+ 2. LUCENE-431: RAMInputStream and RAMOutputStream extend IndexInput and
+    IndexOutput directly now. This avoids further buffering and thus avoids 
+    unnecessary array copies. (Michael Busch)
+
+ 3. LUCENE-730: Updated BooleanScorer2 to make use of BooleanScorer in some
+    cases and possibly improve scoring performance.  Documents can now be
+    delivered out-of-order as they are scored (e.g. to HitCollector).
+    N.B. A bit of code had to be disabled in QueryUtils in order for
+    TestBoolean2 test to keep passing.
+    (Paul Elschot via Otis Gospodnetic)
+
+ 4. LUCENE-882: Spellchecker doesn't store the ngrams anymore but only indexes
+    them to keep the spell index small. (Daniel Naber)
+
+ 5. LUCENE-430: Delay allocation of the buffer after a clone of BufferedIndexInput.
+    Together with LUCENE-888 this will allow to adjust the buffer size
+    dynamically. (Paul Elschot, Michael Busch)
+ 
+ 6. LUCENE-888: Increase buffer sizes inside CompoundFileWriter and
+    BufferedIndexOutput.  Also increase buffer size in
+    BufferedIndexInput, but only when used during merging.  Together,
+    these increases yield 10-18% overall performance gain vs the
+    previous 1K defaults.  (Mike McCandless)
+
+ 7. LUCENE-866: Adds multi-level skip lists to the posting lists. This speeds 
+    up most queries that use skipTo(), especially on big indexes with large posting 
+    lists. For average AND queries the speedup is about 20%, for queries that 
+    contain very frequent and very unique terms the speedup can be over 80%.
+    (Michael Busch)
+
+Documentation
+
+ 1. LUCENE 791 && INFRA-1173: Infrastructure moved the Wiki to
+    http://wiki.apache.org/lucene-java/   Updated the links in the docs and
+    wherever else I found references.  (Grant Ingersoll, Joe Schaefer)
+
+ 2. LUCENE-807: Fixed the javadoc for ScoreDocComparator.compare() to be 
+    consistent with java.util.Comparator.compare(): Any integer is allowed to 
+    be returned instead of only -1/0/1.
+    (Paul Cowan via Michael Busch)
+ 
+ 3. LUCENE-875: Solved javadoc warnings & errors under jdk1.4. 
+    Solved javadoc errors under jdk5 (jars in path for gdata).
+    Made "javadocs" target depend on "build-contrib" for first downloading
+    contrib jars configured for dynamic downloaded. (Note: when running
+    behind firewall, a firewall prompt might pop up) (Doron Cohen)
+
+ 4. LUCENE-740: Added SNOWBALL-LICENSE.txt to the snowball package and a
+    remark about the license to NOTICE.TXT. (Steven Parkes via Michael Busch)
+
+ 5. LUCENE-925: Added analysis package javadocs. (Grant Ingersoll and Doron Cohen)
+
+ 6. LUCENE-926: Added document package javadocs. (Grant Ingersoll)
+
+Build
+
+ 1. LUCENE-802: Added LICENSE.TXT and NOTICE.TXT to Lucene jars.
+    (Steven Parkes via Michael Busch)
+
+ 2. LUCENE-885: "ant test" now includes all contrib tests.  The new
+    "ant test-core" target can be used to run only the Core (non
+    contrib) tests. 
+    (Chris Hostetter)
+    
+ 3. LUCENE-900: "ant test" now enables Java assertions (in Lucene packages).
+    (Doron Cohen)
+
+ 4. LUCENE-894: Add custom build file for binary distributions that includes
+    targets to build the demos. (Chris Hostetter, Michael Busch)
+
+ 5. LUCENE-904: The "package" targets in build.xml now also generate .md5
+    checksum files. (Chris Hostetter, Michael Busch)
+
+ 6. LUCENE-907: Include LICENSE.TXT and NOTICE.TXT in the META-INF dirs of
+    demo war, demo jar, and the contrib jars. (Michael Busch)
+    
+ 7. LUCENE-909: Demo targets for running the demo. (Doron Cohen)
+
+ 8. LUCENE-908: Improves content of MANIFEST file and makes it customizable
+    for the contribs. Adds SNOWBALL-LICENSE.txt to META-INF of the snowball
+    jar and makes sure that the lucli jar contains LICENSE.txt and NOTICE.txt.
+    (Chris Hostetter, Michael Busch)
+
+ 9. LUCENE-930: Various contrib building improvements to ensure contrib
+    dependencies are met, and test compilation errors fail the build.
+    (Steven Parkes, Chris Hostetter)
+
+10. LUCENE-622: Add ant target and pom.xml files for building maven artifacts 
+    of the Lucene core and the contrib modules. 
+    (Sami Siren, Karl Wettin, Michael Busch)
+
+======================= Release 2.1.0 2007-02-14 =======================
+
+Changes in runtime behavior
+
+ 1. 's' and 't' have been removed from the list of default stopwords
+    in StopAnalyzer (also used in by StandardAnalyzer). Having e.g. 's'
+    as a stopword meant that 's-class' led to the same results as 'class'.
+    Note that this problem still exists for 'a', e.g. in 'a-class' as
+    'a' continues to be a stopword.
+    (Daniel Naber)
+
+ 2. LUCENE-478: Updated the list of Unicode code point ranges for CJK
+    (now split into CJ and K) in StandardAnalyzer.  (John Wang and
+    Steven Rowe via Otis Gospodnetic)
+
+ 3. Modified some CJK Unicode code point ranges in StandardTokenizer.jj,
+    and added a few more of them to increase CJK character coverage.
+    Also documented some of the ranges.
+    (Otis Gospodnetic)
+
+ 4. LUCENE-489: Add support for leading wildcard characters (*, ?) to
+    QueryParser.  Default is to disallow them, as before.
+    (Steven Parkes via Otis Gospodnetic)
+
+ 5. LUCENE-703: QueryParser changed to default to use of ConstantScoreRangeQuery
+    for range queries. Added useOldRangeQuery property to QueryParser to allow
+    selection of old RangeQuery class if required.
+    (Mark Harwood)
+
+ 6. LUCENE-543: WildcardQuery now performs a TermQuery if the provided term
+    does not contain a wildcard character (? or *), when previously a
+    StringIndexOutOfBoundsException was thrown.
+    (Michael Busch via Erik Hatcher)
+
+ 7. LUCENE-726: Removed the use of deprecated doc.fields() method and
+    Enumeration.
+    (Michael Busch via Otis Gospodnetic)
+
+ 8. LUCENE-436: Removed finalize() in TermInfosReader and SegmentReader,
+    and added a call to enumerators.remove() in TermInfosReader.close().
+    The finalize() overrides were added to help with a pre-1.4.2 JVM bug
+    that has since been fixed, plus we no longer support pre-1.4.2 JVMs.
+    (Otis Gospodnetic)
+
+ 9. LUCENE-771: The default location of the write lock is now the
+    index directory, and is named simply "write.lock" (without a big
+    digest prefix).  The system properties "org.apache.lucene.lockDir"
+    nor "java.io.tmpdir" are no longer used as the global directory
+    for storing lock files, and the LOCK_DIR field of FSDirectory is
+    now deprecated.  (Mike McCandless)
+
+New features
+
+ 1. LUCENE-503: New ThaiAnalyzer and ThaiWordFilter in contrib/analyzers
+    (Samphan Raruenrom via Chris Hostetter)
+
+ 2. LUCENE-545: New FieldSelector API and associated changes to
+    IndexReader and implementations.  New Fieldable interface for use
+    with the lazy field loading mechanism.  (Grant Ingersoll and Chuck
+    Williams via Grant Ingersoll)
+
+ 3. LUCENE-676: Move Solr's PrefixFilter to Lucene core. (Yura
+    Smolsky, Yonik Seeley)
+
+ 4. LUCENE-678: Added NativeFSLockFactory, which implements locking
+    using OS native locking (via java.nio.*).  (Michael McCandless via
+    Yonik Seeley)
+
+ 5. LUCENE-544: Added the ability to specify different boosts for
+    different fields when using MultiFieldQueryParser (Matt Ericson
+    via Otis Gospodnetic)
+
+ 6. LUCENE-528: New IndexWriter.addIndexesNoOptimize() that doesn't
+    optimize the index when adding new segments, only performing
+    merges as needed.  (Ning Li via Yonik Seeley)
+
+ 7. LUCENE-573: QueryParser now allows backslash escaping in
+    quoted terms and phrases. (Michael Busch via Yonik Seeley)
+
+ 8. LUCENE-716: QueryParser now allows specification of Unicode
+    characters in terms via a unicode escape of the form \uXXXX
+    (Michael Busch via Yonik Seeley)
+
+ 9. LUCENE-709: Added RAMDirectory.sizeInBytes(), IndexWriter.ramSizeInBytes()
+    and IndexWriter.flushRamSegments(), allowing applications to
+    control the amount of memory used to buffer documents.
+    (Chuck Williams via Yonik Seeley)
+
+10. LUCENE-723: QueryParser now parses *:* as MatchAllDocsQuery
+    (Yonik Seeley)
+
+11. LUCENE-741: Command-line utility for modifying or removing norms
+    on fields in an existing index.  This is mostly based on LUCENE-496
+    and lives in contrib/miscellaneous.
+    (Chris Hostetter, Otis Gospodnetic)
+
+12. LUCENE-759: Added NGramTokenizer and EdgeNGramTokenizer classes and
+    their passing unit tests.
+    (Otis Gospodnetic)
+
+13. LUCENE-565: Added methods to IndexWriter to more efficiently
+    handle updating documents (the "delete then add" use case).  This
+    is intended to be an eventual replacement for the existing
+    IndexModifier.  Added IndexWriter.flush() (renamed from
+    flushRamSegments()) to flush all pending updates (held in RAM), to
+    the Directory.  (Ning Li via Mike McCandless)
+
+14. LUCENE-762: Added in SIZE and SIZE_AND_BREAK FieldSelectorResult options
+    which allow one to retrieve the size of a field without retrieving the
+    actual field. (Chuck Williams via Grant Ingersoll)
+
+15. LUCENE-799: Properly handle lazy, compressed fields.
+    (Mike Klaas via Grant Ingersoll)
+
+API Changes
+
+ 1. LUCENE-438: Remove "final" from Token, implement Cloneable, allow
+    changing of termText via setTermText().  (Yonik Seeley)
+
+ 2. org.apache.lucene.analysis.nl.WordlistLoader has been deprecated
+    and is supposed to be replaced with the WordlistLoader class in
+    package org.apache.lucene.analysis (Daniel Naber)
+
+ 3. LUCENE-609: Revert return type of Document.getField(s) to Field
+    for backward compatibility, added new Document.getFieldable(s)
+    for access to new lazy loaded fields. (Yonik Seeley)
+
+ 4. LUCENE-608: Document.fields() has been deprecated and a new method
+    Document.getFields() has been added that returns a List instead of
+    an Enumeration (Daniel Naber)
+
+ 5. LUCENE-605: New Explanation.isMatch() method and new ComplexExplanation
+    subclass allows explain methods to produce Explanations which model
+    "matching" independent of having a positive value.
+    (Chris Hostetter)
+
+ 6. LUCENE-621: New static methods IndexWriter.setDefaultWriteLockTimeout
+    and IndexWriter.setDefaultCommitLockTimeout for overriding default
+    timeout values for all future instances of IndexWriter (as well
+    as for any other classes that may reference the static values,
+    ie: IndexReader).
+    (Michael McCandless via Chris Hostetter)
+
+ 7. LUCENE-638: FSDirectory.list() now only returns the directory's
+    Lucene-related files. Thanks to this change one can now construct
+    a RAMDirectory from a file system directory that contains files
+    not related to Lucene.
+    (Simon Willnauer via Daniel Naber)
+
+ 8. LUCENE-635: Decoupling locking implementation from Directory
+    implementation.  Added set/getLockFactory to Directory and moved
+    all locking code into subclasses of abstract class LockFactory.
+    FSDirectory and RAMDirectory still default to their prior locking
+    implementations, but now you can mix & match, for example using
+    SingleInstanceLockFactory (ie, in memory locking) locking with an
+    FSDirectory.  Note that now you must call setDisableLocks before
+    the instantiation a FSDirectory if you wish to disable locking
+    for that Directory.
+    (Michael McCandless, Jeff Patterson via Yonik Seeley)
+
+ 9. LUCENE-657: Made FuzzyQuery non-final and inner ScoreTerm protected.
+    (Steven Parkes via Otis Gospodnetic)
+
+10. LUCENE-701: Lockless commits: a commit lock is no longer required
+    when a writer commits and a reader opens the index.  This includes
+    a change to the index file format (see docs/fileformats.html for
+    details).  It also removes all APIs associated with the commit
+    lock & its timeout.  Readers are now truly read-only and do not
+    block one another on startup.  This is the first step to getting
+    Lucene to work correctly over NFS (second step is
+    LUCENE-710). (Mike McCandless)
+
+11. LUCENE-722: DEFAULT_MIN_DOC_FREQ was misspelled DEFALT_MIN_DOC_FREQ
+    in Similarity's MoreLikeThis class. The misspelling has been
+    replaced by the correct spelling.
+    (Andi Vajda via Daniel Naber)
+
+12. LUCENE-738: Reduce the size of the file that keeps track of which
+    documents are deleted when the number of deleted documents is
+    small.  This changes the index file format and cannot be
+    read by previous versions of Lucene.  (Doron Cohen via Yonik Seeley)
+
+13. LUCENE-756: Maintain all norms in a single .nrm file to reduce the
+    number of open files and file descriptors for the non-compound index
+    format.  This changes the index file format, but maintains the
+    ability to read and update older indices. The first segment merge
+    on an older format index will create a single .nrm file for the new
+    segment.  (Doron Cohen via Yonik Seeley)
+
+14. LUCENE-732: DateTools support has been added to QueryParser, with
+    setters for both the default Resolution, and per-field Resolution.
+    For backwards compatibility, DateField is still used if no Resolutions
+    are specified. (Michael Busch via Chris Hostetter)
+
+15. Added isOptimized() method to IndexReader.
+    (Otis Gospodnetic)
+
+16. LUCENE-773: Deprecate the FSDirectory.getDirectory(*) methods that
+    take a boolean "create" argument.  Instead you should use
+    IndexWriter's "create" argument to create a new index.
+    (Mike McCandless)
+
+17. LUCENE-780: Add a static Directory.copy() method to copy files
+    from one Directory to another.  (Jiri Kuhn via Mike McCandless)
+
+18. LUCENE-773: Added Directory.clearLock(String name) to forcefully
+    remove an old lock.  The default implementation is to ask the
+    lockFactory (if non null) to clear the lock.  (Mike McCandless)
+
+19. LUCENE-795: Directory.renameFile() has been deprecated as it is
+    not used anymore inside Lucene.  (Daniel Naber)
+
+Bug fixes
+
+ 1. Fixed the web application demo (built with "ant war-demo") which
+    didn't work because it used a QueryParser method that had
+    been removed (Daniel Naber)
+
+ 2. LUCENE-583: ISOLatin1AccentFilter fails to preserve positionIncrement
+    (Yonik Seeley)
+
+ 3. LUCENE-575: SpellChecker min score is incorrectly changed by suggestSimilar
+    (Karl Wettin via Yonik Seeley)
+
+ 4. LUCENE-587: Explanation.toHtml was producing malformed HTML
+    (Chris Hostetter)
+
+ 5. Fix to allow MatchAllDocsQuery to be used with RemoteSearcher (Yonik Seeley)
+
+ 6. LUCENE-601: RAMDirectory and RAMFile made Serializable
+    (Karl Wettin via Otis Gospodnetic)
+
+ 7. LUCENE-557: Fixes to BooleanQuery and FilteredQuery so that the score
+    Explanations match up with the real scores.
+    (Chris Hostetter)
+
+ 8. LUCENE-607: ParallelReader's TermEnum fails to advance properly to
+    new fields (Chuck Williams, Christian Kohlschuetter via Yonik Seeley)
+
+ 9. LUCENE-610,LUCENE-611: Simple syntax changes to allow compilation with ecj:
+    disambiguate inner class scorer's use of doc() in BooleanScorer2,
+    other test code changes.  (DM Smith via Yonik Seeley)
+
+10. LUCENE-451: All core query types now use ComplexExplanations so that
+    boosts of zero don't confuse the BooleanWeight explain method.
+    (Chris Hostetter)
+
+11. LUCENE-593: Fixed LuceneDictionary's inner Iterator
+    (KÃ¥re Fiedler Christiansen via Otis Gospodnetic)
+
+12. LUCENE-641: fixed an off-by-one bug with IndexWriter.setMaxFieldLength()
+    (Daniel Naber)
+
+13. LUCENE-659: Make PerFieldAnalyzerWrapper delegate getPositionIncrementGap()
+    to the correct analyzer for the field. (Chuck Williams via Yonik Seeley)
+
+14. LUCENE-650: Fixed NPE in Locale specific String Sort when Document
+    has no value.
+    (Oliver Hutchison via Chris Hostetter)
+
+15. LUCENE-683: Fixed data corruption when reading lazy loaded fields.
+    (Yonik Seeley)
+
+16. LUCENE-678: Fixed bug in NativeFSLockFactory which caused the same
+    lock to be shared between different directories.
+    (Michael McCandless via Yonik Seeley)
+
+17. LUCENE-690: Fixed thread unsafe use of IndexInput by lazy loaded fields.
+    (Yonik Seeley)
+
+18. LUCENE-696: Fix bug when scorer for DisjunctionMaxQuery has skipTo()
+    called on it before next().  (Yonik Seeley)
+
+19. LUCENE-569: Fixed SpanNearQuery bug, for 'inOrder' queries it would fail
+    to recognize ordered spans if they overlapped with unordered spans.
+    (Paul Elschot via Chris Hostetter)
+
+20. LUCENE-706: Updated fileformats.xml|html concerning the docdelta value
+    in the frequency file. (Johan Stuyts, Doron Cohen via Grant Ingersoll)
+
+21. LUCENE-715: Fixed private constructor in IndexWriter.java to
+    properly release the acquired write lock if there is an
+    IOException after acquiring the write lock but before finishing
+    instantiation. (Matthew Bogosian via Mike McCandless)
+
+22. LUCENE-651: Multiple different threads requesting the same
+    FieldCache entry (often for Sorting by a field) at the same
+    time caused multiple generations of that entry, which was
+    detrimental to performance and memory use.
+    (Oliver Hutchison via Otis Gospodnetic)
+
+23. LUCENE-717: Fixed build.xml not to fail when there is no lib dir.
+    (Doron Cohen via Otis Gospodnetic)
+
+24. LUCENE-728: Removed duplicate/old MoreLikeThis and SimilarityQueries
+    classes from contrib/similarity, as their new home is under
+    contrib/queries.
+    (Otis Gospodnetic)
+
+25. LUCENE-669: Do not double-close the RandomAccessFile in
+    FSIndexInput/Output during finalize().  Besides sending an
+    IOException up to the GC, this may also be the cause intermittent
+    "The handle is invalid" IOExceptions on Windows when trying to
+    close readers or writers. (Michael Busch via Mike McCandless)
+
+26. LUCENE-702: Fix IndexWriter.addIndexes(*) to not corrupt the index
+    on any exceptions (eg disk full).  The semantics of these methods
+    is now transactional: either all indices are merged or none are.
+    Also fixed IndexWriter.mergeSegments (called outside of
+    addIndexes(*) by addDocument, optimize, flushRamSegments) and
+    IndexReader.commit() (called by close) to clean up and keep the
+    instance state consistent to what's actually in the index (Mike
+    McCandless).
+
+27. LUCENE-129: Change finalizers to do "try {...} finally
+    {super.finalize();}" to make sure we don't miss finalizers in
+    classes above us. (Esmond Pitt via Mike McCandless)
+
+28. LUCENE-754: Fix a problem introduced by LUCENE-651, causing
+    IndexReaders to hang around forever, in addition to not
+    fixing the original FieldCache performance problem.
+    (Chris Hostetter, Yonik Seeley)
+
+29. LUCENE-140: Fix IndexReader.deleteDocument(int docNum) to
+    correctly raise ArrayIndexOutOfBoundsException when docNum is too
+    large.  Previously, if docNum was only slightly too large (within
+    the same multiple of 8, ie, up to 7 ints beyond maxDoc), no
+    exception would be raised and instead the index would become
+    silently corrupted.  The corruption then only appears much later,
+    in mergeSegments, when the corrupted segment is merged with
+    segment(s) after it. (Mike McCandless)
+
+30. LUCENE-768: Fix case where an Exception during deleteDocument,
+    undeleteAll or setNorm in IndexReader could leave the reader in a
+    state where close() fails to release the write lock.
+    (Mike McCandless)
+
+31. Remove "tvp" from known index file extensions because it is
+    never used. (Nicolas Lalevée via Bernhard Messer)
+    
+32. LUCENE-767: Change how SegmentReader.maxDoc() is computed to not
+    rely on file length check and instead use the SegmentInfo's
+    docCount that's already stored explicitly in the index.  This is a
+    defensive bug fix (ie, there is no known problem seen "in real
+    life" due to this, just a possible future problem).  (Chuck
+    Williams via Mike McCandless)
+
+Optimizations
+
+  1. LUCENE-586: TermDocs.skipTo() is now more efficient for
+     multi-segment indexes.  This will improve the performance of many
+     types of queries against a non-optimized index. (Andrew Hudson
+     via Yonik Seeley)
+
+  2. LUCENE-623: RAMDirectory.close now nulls out its reference to all
+     internal "files", allowing them to be GCed even if references to the
+     RAMDirectory itself still exist. (Nadav Har'El via Chris Hostetter)
+
+  3. LUCENE-629: Compressed fields are no longer uncompressed and
+     recompressed during segment merges (e.g. during indexing or
+     optimizing), thus improving performance . (Michael Busch via Otis
+     Gospodnetic)
+
+  4. LUCENE-388: Improve indexing performance when maxBufferedDocs is
+     large by keeping a count of buffered documents rather than
+     counting after each document addition.  (Doron Cohen, Paul Smith,
+     Yonik Seeley)
+
+  5. Modified TermScorer.explain to use TermDocs.skipTo() instead of
+     looping through docs. (Grant Ingersoll)
+
+  6. LUCENE-672: New indexing segment merge policy flushes all
+     buffered docs to their own segment and delays a merge until
+     mergeFactor segments of a certain level have been accumulated.
+     This increases indexing performance in the presence of deleted
+     docs or partially full segments as well as enabling future
+     optimizations.
+
+     NOTE: this also fixes an "under-merging" bug whereby it is
+     possible to get far too many segments in your index (which will
+     drastically slow down search, risks exhausting file descriptor
+     limit, etc.).  This can happen when the number of buffered docs
+     at close, plus the number of docs in the last non-ram segment is
+     greater than mergeFactor. (Ning Li, Yonik Seeley)
+
+  7. Lazy loaded fields unnecessarily retained an extra copy of loaded
+     String data.  (Yonik Seeley)
+
+  8. LUCENE-443: ConjunctionScorer performance increase.  Speed up
+     any BooleanQuery with more than one mandatory clause.
+     (Abdul Chaudhry, Paul Elschot via Yonik Seeley)
+
+  9. LUCENE-365: DisjunctionSumScorer performance increase of
+     ~30%. Speeds up queries with optional clauses. (Paul Elschot via
+     Yonik Seeley)
+
+ 10. LUCENE-695: Optimized BufferedIndexInput.readBytes() for medium
+     size buffers, which will speed up merging and retrieving binary
+     and compressed fields.  (Nadav Har'El via Yonik Seeley)
+
+ 11. LUCENE-687: Lazy skipping on proximity file speeds up most
+     queries involving term positions, including phrase queries.
+     (Michael Busch via Yonik Seeley)
+
+ 12. LUCENE-714: Replaced 2 cases of manual for-loop array copying
+     with calls to System.arraycopy instead, in DocumentWriter.java.
+     (Nicolas Lalevee via Mike McCandless)
+
+ 13. LUCENE-729: Non-recursive skipTo and next implementation of
+     TermDocs for a MultiReader.  The old implementation could
+     recurse up to the number of segments in the index. (Yonik Seeley)
+
+ 14. LUCENE-739: Improve segment merging performance by reusing
+     the norm array across different fields and doing bulk writes
+     of norms of segments with no deleted docs.
+    (Michael Busch via Yonik Seeley)
+
+ 15. LUCENE-745: Add BooleanQuery.clauses(), allowing direct access
+     to the List of clauses and replaced the internal synchronized Vector
+     with an unsynchronized List. (Yonik Seeley)
+
+ 16. LUCENE-750: Remove finalizers from FSIndexOutput and move the
+     FSIndexInput finalizer to the actual file so all clones don't
+     register a new finalizer. (Yonik Seeley)
+
+Test Cases
+
+  1. Added TestTermScorer.java (Grant Ingersoll)
+
+  2. Added TestWindowsMMap.java (Benson Margulies via Mike McCandless)
+
+  3. LUCENE-744 Append the user.name property onto the temporary directory 
+     that is created so it doesn't interfere with other users. (Grant Ingersoll)
+
+Documentation
+
+  1. Added style sheet to xdocs named lucene.css and included in the
+     Anakia VSL descriptor.  (Grant Ingersoll)
+
+  2. Added scoring.xml document into xdocs.  Updated Similarity.java
+     scoring formula.(Grant Ingersoll and Steve Rowe.  Updates from:
+     Michael McCandless, Doron Cohen, Chris Hostetter, Doug Cutting).
+     Issue 664.
+
+  3. Added javadocs for FieldSelectorResult.java. (Grant Ingersoll)
+
+  4. Moved xdocs directory to src/site/src/documentation/content/xdocs per
+     Issue 707.  Site now builds using Forrest, just like the other Lucene
+     siblings.  See http://wiki.apache.org/jakarta-lucene/HowToUpdateTheWebsite
+     for info on updating the website. (Grant Ingersoll with help from Steve Rowe,
+     Chris Hostetter, Doug Cutting, Otis Gospodnetic, Yonik Seeley)
+
+  5. Added in Developer and System Requirements sections under Resources (Grant Ingersoll)
+
+  6. LUCENE-713 Updated the Term Vector section of File Formats to include
+     documentation on how Offset and Position info are stored in the TVF file.
+     (Grant Ingersoll, Samir Abdou)
+
+  7. Added in link to Clover Test Code Coverage Reports under the Develop
+     section in Resources (Grant Ingersoll)
+
+  8. LUCENE-748: Added details for semantics of IndexWriter.close on
+     hitting an Exception.  (Jed Wesley-Smith via Mike McCandless)
+
+  9. Added some text about what is contained in releases.
+     (Eric Haszlakiewicz via Grant Ingersoll)
+
+  10. LUCENE-758: Fix javadoc to clarify that RAMDirectory(Directory)
+      makes a full copy of the starting Directory.  (Mike McCandless)
+
+  11. LUCENE-764: Fix javadocs to detail temporary space requirements
+      for IndexWriter's optimize(), addIndexes(*) and addDocument(...)
+      methods.  (Mike McCandless)
+
+Build
+
+  1. Added in clover test code coverage per http://issues.apache.org/jira/browse/LUCENE-721
+     To enable clover code coverage, you must have clover.jar in the ANT
+     classpath and specify -Drun.clover=true on the command line.
+     (Michael Busch and Grant Ingersoll)
+
+  2. Added a sysproperty in common-build.xml per Lucene 752 to map java.io.tmpdir to
+     ${build.dir}/test just like the tempDir sysproperty.
+
+  3. LUCENE-757 Added new target named init-dist that does setup for
+     distribution of both binary and source distributions.  Called by package 
+     and package-*-src
+
+======================= Release 2.0.0 2006-05-26 =======================
+
+API Changes
+
+ 1. All deprecated methods and fields have been removed, except
+    DateField, which will still be supported for some time
+    so Lucene can read its date fields from old indexes
+    (Yonik Seeley & Grant Ingersoll)
+
+ 2. DisjunctionSumScorer is no longer public.
+    (Paul Elschot via Otis Gospodnetic)
+
+ 3. Creating a Field with both an empty name and an empty value
+    now throws an IllegalArgumentException
+    (Daniel Naber)
+
+ 4. LUCENE-301: Added new IndexWriter({String,File,Directory},
+    Analyzer) constructors that do not take a boolean "create"
+    argument.  These new constructors will create a new index if
+    necessary, else append to the existing one.  (Dan Armbrust via
+    Mike McCandless)
+
+New features
+
+ 1. LUCENE-496: Command line tool for modifying the field norms of an
+    existing index; added to contrib/miscellaneous.  (Chris Hostetter)
+
+ 2. LUCENE-577: SweetSpotSimilarity added to contrib/miscellaneous.
+    (Chris Hostetter)
+    
+Bug fixes
+
+ 1. LUCENE-330: Fix issue of FilteredQuery not working properly within
+    BooleanQuery.  (Paul Elschot via Erik Hatcher)
+
+ 2. LUCENE-515: Make ConstantScoreRangeQuery and ConstantScoreQuery work
+    with RemoteSearchable.  (Philippe Laflamme via Yonik Seeley)
+
+ 3. Added methods to get/set writeLockTimeout and commitLockTimeout in
+    IndexWriter. These could be set in Lucene 1.4 using a system property.
+    This feature had been removed without adding the corresponding
+    getter/setter methods.  (Daniel Naber)
+
+ 4. LUCENE-413: Fixed ArrayIndexOutOfBoundsException exceptions
+    when using SpanQueries. (Paul Elschot via Yonik Seeley)
+
+ 5. Implemented FilterIndexReader.getVersion() and isCurrent()
+    (Yonik Seeley)
+
+ 6. LUCENE-540: Fixed a bug with IndexWriter.addIndexes(Directory[])
+    that sometimes caused the index order of documents to change.
+    (Yonik Seeley)
+
+ 7. LUCENE-526: Fixed a bug in FieldSortedHitQueue that caused
+    subsequent String sorts with different locales to sort identically.
+    (Paul Cowan via Yonik Seeley)
+
+ 8. LUCENE-541: Add missing extractTerms() to DisjunctionMaxQuery
+    (Stefan Will via Yonik Seeley)
+
+ 9. LUCENE-514: Added getTermArrays() and extractTerms() to
+    MultiPhraseQuery (Eric Jain & Yonik Seeley)
+
+10. LUCENE-512: Fixed ClassCastException in ParallelReader.getTermFreqVectors
+    (frederic via Yonik)
+
+11. LUCENE-352: Fixed bug in SpanNotQuery that manifested as
+    NullPointerException when "exclude" query was not a SpanTermQuery.
+    (Chris Hostetter)
+
+12. LUCENE-572: Fixed bug in SpanNotQuery hashCode, was ignoring exclude clause
+    (Chris Hostetter)
+
+13. LUCENE-561: Fixed some ParallelReader bugs. NullPointerException if the reader
+    didn't know about the field yet, reader didn't keep track if it had deletions,
+    and deleteDocument calls could circumvent synchronization on the subreaders.
+    (Chuck Williams via Yonik Seeley)
+
+14. LUCENE-556: Added empty extractTerms() implementation to MatchAllDocsQuery and
+    ConstantScoreQuery in order to allow their use with a MultiSearcher.
+    (Yonik Seeley)
+
+15. LUCENE-546: Removed 2GB file size limitations for RAMDirectory.
+    (Peter Royal, Michael Chan, Yonik Seeley)
+
+16. LUCENE-485: Don't hold commit lock while removing obsolete index
+    files.  (Luc Vanlerberghe via cutting)
+
+
+1.9.1
+
+Bug fixes
+
+ 1. LUCENE-511: Fix a bug in the BufferedIndexOutput optimization
+    introduced in 1.9-final.  (Shay Banon & Steven Tamm via cutting)
+
+1.9 final
+
+Note that this release is mostly but not 100% source compatible with
+the previous release of Lucene (1.4.3). In other words, you should
+make sure your application compiles with this version of Lucene before
+you replace the old Lucene JAR with the new one.  Many methods have
+been deprecated in anticipation of release 2.0, so deprecation
+warnings are to be expected when upgrading from 1.4.3 to 1.9.
+
+Bug fixes
+ 
+ 1. The fix that made IndexWriter.setMaxBufferedDocs(1) work had negative 
+    effects on indexing performance and has thus been reverted. The 
+    argument for setMaxBufferedDocs(int) must now at least be 2, otherwise
+    an exception is thrown. (Daniel Naber)
+ 
+Optimizations
+     
+ 1. Optimized BufferedIndexOutput.writeBytes() to use
+    System.arraycopy() in more cases, rather than copying byte-by-byte.
+    (Lukas Zapletal via Cutting)
+
+1.9 RC1
+
+Requirements
+
+ 1. To compile and use Lucene you now need Java 1.4 or later.
+
+Changes in runtime behavior
+
+ 1. FuzzyQuery can no longer throw a TooManyClauses exception. If a
+    FuzzyQuery expands to more than BooleanQuery.maxClauseCount
+    terms only the BooleanQuery.maxClauseCount most similar terms
+    go into the rewritten query and thus the exception is avoided.
+    (Christoph)
+
+ 2. Changed system property from "org.apache.lucene.lockdir" to
+    "org.apache.lucene.lockDir", so that its casing follows the existing
+    pattern used in other Lucene system properties. (Bernhard)
+
+ 3. The terms of RangeQueries and FuzzyQueries are now converted to
+    lowercase by default (as it has been the case for PrefixQueries
+    and WildcardQueries before). Use setLowercaseExpandedTerms(false)
+    to disable that behavior but note that this also affects
+    PrefixQueries and WildcardQueries. (Daniel Naber)
+
+ 4. Document frequency that is computed when MultiSearcher is used is now
+    computed correctly and "globally" across subsearchers and indices, while
+    before it used to be computed locally to each index, which caused
+    ranking across multiple indices not to be equivalent.
+    (Chuck Williams, Wolf Siberski via Otis, bug #31841)
+
+ 5. When opening an IndexWriter with create=true, Lucene now only deletes
+    its own files from the index directory (looking at the file name suffixes
+    to decide if a file belongs to Lucene). The old behavior was to delete
+    all files. (Daniel Naber and Bernhard Messer, bug #34695)
+
+ 6. The version of an IndexReader, as returned by getCurrentVersion()
+    and getVersion() doesn't start at 0 anymore for new indexes. Instead, it
+    is now initialized by the system time in milliseconds.
+    (Bernhard Messer via Daniel Naber)
+
+ 7. Several default values cannot be set via system properties anymore, as
+    this has been considered inappropriate for a library like Lucene. For
+    most properties there are set/get methods available in IndexWriter which
+    you should use instead. This affects the following properties:
+    See IndexWriter for getter/setter methods:
+      org.apache.lucene.writeLockTimeout, org.apache.lucene.commitLockTimeout,
+      org.apache.lucene.minMergeDocs, org.apache.lucene.maxMergeDocs,
+      org.apache.lucene.maxFieldLength, org.apache.lucene.termIndexInterval,
+      org.apache.lucene.mergeFactor,
+    See BooleanQuery for getter/setter methods:
+      org.apache.lucene.maxClauseCount
+    See FSDirectory for getter/setter methods:
+      disableLuceneLocks
+    (Daniel Naber)
+
+ 8. Fixed FieldCacheImpl to use user-provided IntParser and FloatParser,
+    instead of using Integer and Float classes for parsing.
+    (Yonik Seeley via Otis Gospodnetic)
+
+ 9. Expert level search routines returning TopDocs and TopFieldDocs
+    no longer normalize scores.  This also fixes bugs related to
+    MultiSearchers and score sorting/normalization.
+    (Luc Vanlerberghe via Yonik Seeley, LUCENE-469)
+
+New features
+
+ 1. Added support for stored compressed fields (patch #31149)
+    (Bernhard Messer via Christoph)
+
+ 2. Added support for binary stored fields (patch #29370)
+    (Drew Farris and Bernhard Messer via Christoph)
+
+ 3. Added support for position and offset information in term vectors
+    (patch #18927). (Grant Ingersoll & Christoph)
+
+ 4. A new class DateTools has been added. It allows you to format dates
+    in a readable format adequate for indexing. Unlike the existing
+    DateField class DateTools can cope with dates before 1970 and it
+    forces you to specify the desired date resolution (e.g. month, day,
+    second, ...) which can make RangeQuerys on those fields more efficient.
+    (Daniel Naber)
+
+ 5. QueryParser now correctly works with Analyzers that can return more
+    than one token per position. For example, a query "+fast +car"
+    would be parsed as "+fast +(car automobile)" if the Analyzer
+    returns "car" and "automobile" at the same position whenever it
+    finds "car" (Patch #23307).
+    (Pierrick Brihaye, Daniel Naber)
+
+ 6. Permit unbuffered Directory implementations (e.g., using mmap).
+    InputStream is replaced by the new classes IndexInput and
+    BufferedIndexInput.  OutputStream is replaced by the new classes
+    IndexOutput and BufferedIndexOutput.  InputStream and OutputStream
+    are now deprecated and FSDirectory is now subclassable. (cutting)
+
+ 7. Add native Directory and TermDocs implementations that work under
+    GCJ.  These require GCC 3.4.0 or later and have only been tested
+    on Linux.  Use 'ant gcj' to build demo applications. (cutting)
+
+ 8. Add MMapDirectory, which uses nio to mmap input files.  This is
+    still somewhat slower than FSDirectory.  However it uses less
+    memory per query term, since a new buffer is not allocated per
+    term, which may help applications which use, e.g., wildcard
+    queries.  It may also someday be faster. (cutting & Paul Elschot)
+
+ 9. Added javadocs-internal to build.xml - bug #30360
+    (Paul Elschot via Otis)
+
+10. Added RangeFilter, a more generically useful filter than DateFilter.
+    (Chris M Hostetter via Erik)
+
+11. Added NumberTools, a utility class indexing numeric fields.
+    (adapted from code contributed by Matt Quail; committed by Erik)
+
+12. Added public static IndexReader.main(String[] args) method.
+    IndexReader can now be used directly at command line level
+    to list and optionally extract the individual files from an existing
+    compound index file.
+    (adapted from code contributed by Garrett Rooney; committed by Bernhard)
+
+13. Add IndexWriter.setTermIndexInterval() method.  See javadocs.
+    (Doug Cutting)
+
+14. Added LucenePackage, whose static get() method returns java.util.Package,
+    which lets the caller get the Lucene version information specified in
+    the Lucene Jar.
+    (Doug Cutting via Otis)
+
+15. Added Hits.iterator() method and corresponding HitIterator and Hit objects.
+    This provides standard java.util.Iterator iteration over Hits.
+    Each call to the iterator's next() method returns a Hit object.
+    (Jeremy Rayner via Erik)
+
+16. Add ParallelReader, an IndexReader that combines separate indexes
+    over different fields into a single virtual index.  (Doug Cutting)
+
+17. Add IntParser and FloatParser interfaces to FieldCache, so that
+    fields in arbitrarily formats can be cached as ints and floats.
+    (Doug Cutting)
+
+18. Added class org.apache.lucene.index.IndexModifier which combines
+    IndexWriter and IndexReader, so you can add and delete documents without
+    worrying about synchronization/locking issues.
+    (Daniel Naber)
+
+19. Lucene can now be used inside an unsigned applet, as Lucene's access
+    to system properties will not cause a SecurityException anymore.
+    (Jon Schuster via Daniel Naber, bug #34359)
+
+20. Added a new class MatchAllDocsQuery that matches all documents.
+    (John Wang via Daniel Naber, bug #34946)
+
+21. Added ability to omit norms on a per field basis to decrease
+    index size and memory consumption when there are many indexed fields.
+    See Field.setOmitNorms()
+    (Yonik Seeley, LUCENE-448)
+
+22. Added NullFragmenter to contrib/highlighter, which is useful for
+    highlighting entire documents or fields.
+    (Erik Hatcher)
+
+23. Added regular expression queries, RegexQuery and SpanRegexQuery.
+    Note the same term enumeration caveats apply with these queries as
+    apply to WildcardQuery and other term expanding queries.
+    These two new queries are not currently supported via QueryParser.
+    (Erik Hatcher)
+
+24. Added ConstantScoreQuery which wraps a filter and produces a score
+    equal to the query boost for every matching document.
+    (Yonik Seeley, LUCENE-383)
+
+25. Added ConstantScoreRangeQuery which produces a constant score for
+    every document in the range.  One advantage over a normal RangeQuery
+    is that it doesn't expand to a BooleanQuery and thus doesn't have a maximum
+    number of terms the range can cover.  Both endpoints may also be open.
+    (Yonik Seeley, LUCENE-383)
+
+26. Added ability to specify a minimum number of optional clauses that
+    must match in a BooleanQuery.  See BooleanQuery.setMinimumNumberShouldMatch().
+    (Paul Elschot, Chris Hostetter via Yonik Seeley, LUCENE-395)
+
+27. Added DisjunctionMaxQuery which provides the maximum score across its clauses.
+    It's very useful for searching across multiple fields.
+    (Chuck Williams via Yonik Seeley, LUCENE-323)
+
+28. New class ISOLatin1AccentFilter that replaces accented characters in the ISO
+    Latin 1 character set by their unaccented equivalent.
+    (Sven Duzont via Erik Hatcher)
+
+29. New class KeywordAnalyzer. "Tokenizes" the entire stream as a single token.
+    This is useful for data like zip codes, ids, and some product names.
+    (Erik Hatcher)
+
+30. Copied LengthFilter from contrib area to core. Removes words that are too
+    long and too short from the stream.
+    (David Spencer via Otis and Daniel)
+
+31. Added getPositionIncrementGap(String fieldName) to Analyzer.  This allows
+    custom analyzers to put gaps between Field instances with the same field
+    name, preventing phrase or span queries crossing these boundaries.  The
+    default implementation issues a gap of 0, allowing the default token
+    position increment of 1 to put the next field's first token into a
+    successive position.
+    (Erik Hatcher, with advice from Yonik)
+
+32. StopFilter can now ignore case when checking for stop words.
+    (Grant Ingersoll via Yonik, LUCENE-248)
+
+33. Add TopDocCollector and TopFieldDocCollector.  These simplify the
+    implementation of hit collectors that collect only the
+    top-scoring or top-sorting hits.
+
+API Changes
+
+ 1. Several methods and fields have been deprecated. The API documentation
+    contains information about the recommended replacements. It is planned
+    that most of the deprecated methods and fields will be removed in
+    Lucene 2.0. (Daniel Naber)
+
+ 2. The Russian and the German analyzers have been moved to contrib/analyzers.
+    Also, the WordlistLoader class has been moved one level up in the
+    hierarchy and is now org.apache.lucene.analysis.WordlistLoader
+    (Daniel Naber)
+
+ 3. The API contained methods that declared to throw an IOException
+    but that never did this. These declarations have been removed. If
+    your code tries to catch these exceptions you might need to remove
+    those catch clauses to avoid compile errors. (Daniel Naber)
+
+ 4. Add a serializable Parameter Class to standardize parameter enum
+    classes in BooleanClause and Field. (Christoph)
+
+ 5. Added rewrite methods to all SpanQuery subclasses that nest other SpanQuerys.
+    This allows custom SpanQuery subclasses that rewrite (for term expansion, for
+    example) to nest within the built-in SpanQuery classes successfully.
+
+Bug fixes
+
+ 1. The JSP demo page (src/jsp/results.jsp) now properly closes the
+    IndexSearcher it opens. (Daniel Naber)
+
+ 2. Fixed a bug in IndexWriter.addIndexes(IndexReader[] readers) that
+    prevented deletion of obsolete segments. (Christoph Goller)
+
+ 3. Fix in FieldInfos to avoid the return of an extra blank field in
+    IndexReader.getFieldNames() (Patch #19058). (Mark Harwood via Bernhard)
+
+ 4. Some combinations of BooleanQuery and MultiPhraseQuery (formerly
+    PhrasePrefixQuery) could provoke UnsupportedOperationException
+    (bug #33161). (Rhett Sutphin via Daniel Naber)
+
+ 5. Small bug in skipTo of ConjunctionScorer that caused NullPointerException
+    if skipTo() was called without prior call to next() fixed. (Christoph)
+
+ 6. Disable Similiarty.coord() in the scoring of most automatically
+    generated boolean queries.  The coord() score factor is
+    appropriate when clauses are independently specified by a user,
+    but is usually not appropriate when clauses are generated
+    automatically, e.g., by a fuzzy, wildcard or range query.  Matches
+    on such automatically generated queries are no longer penalized
+    for not matching all terms.  (Doug Cutting, Patch #33472)
+
+ 7. Getting a lock file with Lock.obtain(long) was supposed to wait for
+    a given amount of milliseconds, but this didn't work.
+    (John Wang via Daniel Naber, Bug #33799)
+
+ 8. Fix FSDirectory.createOutput() to always create new files.
+    Previously, existing files were overwritten, and an index could be
+    corrupted when the old version of a file was longer than the new.
+    Now any existing file is first removed.  (Doug Cutting)
+
+ 9. Fix BooleanQuery containing nested SpanTermQuery's, which previously
+    could return an incorrect number of hits.
+    (Reece Wilton via Erik Hatcher, Bug #35157)
+
+10. Fix NullPointerException that could occur with a MultiPhraseQuery
+    inside a BooleanQuery.
+    (Hans Hjelm and Scotty Allen via Daniel Naber, Bug #35626)
+
+11. Fixed SnowballFilter to pass through the position increment from
+    the original token.
+    (Yonik Seeley via Erik Hatcher, LUCENE-437)
+
+12. Added Unicode range of Korean characters to StandardTokenizer,
+    grouping contiguous characters into a token rather than one token
+    per character.  This change also changes the token type to "<CJ>"
+    for Chinese and Japanese character tokens (previously it was "<CJK>").
+    (Cheolgoo Kang via Otis and Erik, LUCENE-444 and LUCENE-461)
+
+13. FieldsReader now looks at FieldInfo.storeOffsetWithTermVector and
+    FieldInfo.storePositionWithTermVector and creates the Field with
+    correct TermVector parameter.
+    (Frank Steinmann via Bernhard, LUCENE-455)
+
+14. Fixed WildcardQuery to prevent "cat" matching "ca??".
+    (Xiaozheng Ma via Bernhard, LUCENE-306)
+
+15. Fixed a bug where MultiSearcher and ParallelMultiSearcher could
+    change the sort order when sorting by string for documents without
+    a value for the sort field.
+    (Luc Vanlerberghe via Yonik, LUCENE-453)
+
+16. Fixed a sorting problem with MultiSearchers that can lead to
+    missing or duplicate docs due to equal docs sorting in an arbitrary order.
+    (Yonik Seeley, LUCENE-456)
+
+17. A single hit using the expert level sorted search methods
+    resulted in the score not being normalized.
+    (Yonik Seeley, LUCENE-462)
+
+18. Fixed inefficient memory usage when loading an index into RAMDirectory.
+    (Volodymyr Bychkoviak via Bernhard, LUCENE-475)
+
+19. Corrected term offsets returned by ChineseTokenizer.
+    (Ray Tsang via Erik Hatcher, LUCENE-324)
+
+20. Fixed MultiReader.undeleteAll() to correctly update numDocs.
+    (Robert Kirchgessner via Doug Cutting, LUCENE-479)
+
+21. Race condition in IndexReader.getCurrentVersion() and isCurrent()
+    fixed by acquiring the commit lock.
+    (Luc Vanlerberghe via Yonik Seeley, LUCENE-481)
+
+22. IndexWriter.setMaxBufferedDocs(1) didn't have the expected effect,
+    this has now been fixed. (Daniel Naber)
+
+23. Fixed QueryParser when called with a date in local form like 
+    "[1/16/2000 TO 1/18/2000]". This query did not include the documents
+    of 1/18/2000, i.e. the last day was not included. (Daniel Naber)
+
+24. Removed sorting constraint that threw an exception if there were
+    not yet any values for the sort field (Yonik Seeley, LUCENE-374)
+
+Optimizations
+     
+ 1. Disk usage (peak requirements during indexing and optimization)
+    in case of compound file format has been improved. 
+    (Bernhard, Dmitry, and Christoph)
+
+ 2. Optimize the performance of certain uses of BooleanScorer,
+    TermScorer and IndexSearcher.  In particular, a BooleanQuery
+    composed of TermQuery, with not all terms required, that returns a
+    TopDocs (e.g., through a Hits with no Sort specified) runs much
+    faster.  (cutting)
+    
+ 3. Removed synchronization from reading of term vectors with an
+    IndexReader (Patch #30736). (Bernhard Messer via Christoph)
+
+ 4. Optimize term-dictionary lookup to allocate far fewer terms when
+    scanning for the matching term.  This speeds searches involving
+    low-frequency terms, where the cost of dictionary lookup can be
+    significant. (cutting)
+
+ 5. Optimize fuzzy queries so the standard fuzzy queries with a prefix 
+    of 0 now run 20-50% faster (Patch #31882).
+    (Jonathan Hager via Daniel Naber)
+    
+ 6. A Version of BooleanScorer (BooleanScorer2) added that delivers
+    documents in increasing order and implements skipTo. For queries
+    with required or forbidden clauses it may be faster than the old
+    BooleanScorer, for BooleanQueries consisting only of optional
+    clauses it is probably slower. The new BooleanScorer is now the
+    default. (Patch 31785 by Paul Elschot via Christoph)
+
+ 7. Use uncached access to norms when merging to reduce RAM usage.
+    (Bug #32847).  (Doug Cutting)
+
+ 8. Don't read term index when random-access is not required.  This
+    reduces time to open IndexReaders and they use less memory when
+    random access is not required, e.g., when merging segments.  The
+    term index is now read into memory lazily at the first
+    random-access.  (Doug Cutting)
+
+ 9. Optimize IndexWriter.addIndexes(Directory[]) when the number of
+    added indexes is larger than mergeFactor.  Previously this could
+    result in quadratic performance.  Now performance is n log(n).
+    (Doug Cutting)
+
+10. Speed up the creation of TermEnum for indices with multiple
+    segments and deleted documents, and thus speed up PrefixQuery,
+    RangeQuery, WildcardQuery, FuzzyQuery, RangeFilter, DateFilter,
+    and sorting the first time on a field.
+    (Yonik Seeley, LUCENE-454)
+
+11. Optimized and generalized 32 bit floating point to byte
+    (custom 8 bit floating point) conversions.  Increased the speed of
+    Similarity.encodeNorm() anywhere from 10% to 250%, depending on the JVM.
+    (Yonik Seeley, LUCENE-467)
+
+Infrastructure
+
+ 1. Lucene's source code repository has converted from CVS to
+    Subversion.  The new repository is at
+    http://svn.apache.org/repos/asf/lucene/java/trunk
+
+ 2. Lucene's issue tracker has migrated from Bugzilla to JIRA.
+    Lucene's JIRA is at http://issues.apache.org/jira/browse/LUCENE
+    The old issues are still available at
+    http://issues.apache.org/bugzilla/show_bug.cgi?id=xxxx
+    (use the bug number instead of xxxx)
+
+
+1.4.3
+
+ 1. The JSP demo page (src/jsp/results.jsp) now properly escapes error
+    messages which might contain user input (e.g. error messages about 
+    query parsing). If you used that page as a starting point for your
+    own code please make sure your code also properly escapes HTML
+    characters from user input in order to avoid so-called cross site
+    scripting attacks. (Daniel Naber)
+  
+  2. QueryParser changes in 1.4.2 broke the QueryParser API. Now the old 
+     API is supported again. (Christoph)
+
+
+1.4.2
+
+ 1. Fixed bug #31241: Sorting could lead to incorrect results (documents
+    missing, others duplicated) if the sort keys were not unique and there
+    were more than 100 matches. (Daniel Naber)
+
+ 2. Memory leak in Sort code (bug #31240) eliminated.
+    (Rafal Krzewski via Christoph and Daniel)
+    
+ 3. FuzzyQuery now takes an additional parameter that specifies the
+    minimum similarity that is required for a term to match the query.
+    The QueryParser syntax for this is term~x, where x is a floating 
+    point number >= 0 and < 1 (a bigger number means that a higher
+    similarity is required). Furthermore, a prefix can be specified
+    for FuzzyQuerys so that only those terms are considered similar that 
+    start with this prefix. This can speed up FuzzyQuery greatly.
+    (Daniel Naber, Christoph Goller)
+    
+ 4. PhraseQuery and PhrasePrefixQuery now allow the explicit specification
+    of relative positions. (Christoph Goller)
+    
+ 5. QueryParser changes: Fix for ArrayIndexOutOfBoundsExceptions 
+    (patch #9110); some unused method parameters removed; The ability
+    to specify a minimum similarity for FuzzyQuery has been added.
+    (Christoph Goller)
+
+ 6. IndexSearcher optimization: a new ScoreDoc is no longer allocated
+    for every non-zero-scoring hit.  This makes 'OR' queries that
+    contain common terms substantially faster.  (cutting)
+
+
+1.4.1
+
+ 1. Fixed a performance bug in hit sorting code, where values were not
+    correctly cached.  (Aviran via cutting)
+
+ 2. Fixed errors in file format documentation. (Daniel Naber)
+
+
+1.4 final
+
+ 1. Added "an" to the list of stop words in StopAnalyzer, to complement
+    the existing "a" there.  Fix for bug 28960
+     (http://issues.apache.org/bugzilla/show_bug.cgi?id=28960). (Otis)
+
+ 2. Added new class FieldCache to manage in-memory caches of field term
+    values.  (Tim Jones)
+
+ 3. Added overloaded getFieldQuery method to QueryParser which
+    accepts the slop factor specified for the phrase (or the default
+    phrase slop for the QueryParser instance).  This allows overriding
+    methods to replace a PhraseQuery with a SpanNearQuery instead,
+    keeping the proper slop factor. (Erik Hatcher)
+
+ 4. Changed the encoding of GermanAnalyzer.java and GermanStemmer.java to
+    UTF-8 and changed the build encoding to UTF-8, to make changed files
+    compile. (Otis Gospodnetic)
+
+ 5. Removed synchronization from term lookup under IndexReader methods
+    termFreq(), termDocs() or termPositions() to improve
+    multi-threaded performance.  (cutting)
+
+ 6. Fix a bug where obsolete segment files were not deleted on Win32.
+
+
+1.4 RC3
+
+ 1. Fixed several search bugs introduced by the skipTo() changes in
+    release 1.4RC1.  The index file format was changed a bit, so
+    collections must be re-indexed to take advantage of the skipTo()
+    optimizations.  (Christoph Goller)
+
+ 2. Added new Document methods, removeField() and removeFields().
+    (Christoph Goller)
+
+ 3. Fixed inconsistencies with index closing.  Indexes and directories
+    are now only closed automatically by Lucene when Lucene opened
+    them automatically.  (Christoph Goller)
+
+ 4. Added new class: FilteredQuery.  (Tim Jones)
+
+ 5. Added a new SortField type for custom comparators.  (Tim Jones)
+
+ 6. Lock obtain timed out message now displays the full path to the lock
+    file. (Daniel Naber via Erik)
+
+ 7. Fixed a bug in SpanNearQuery when ordered. (Paul Elschot via cutting)
+
+ 8. Fixed so that FSDirectory's locks still work when the
+    java.io.tmpdir system property is null.  (cutting)
+
+ 9. Changed FilteredTermEnum's constructor to take no parameters,
+    as the parameters were ignored anyway (bug #28858)
+
+1.4 RC2
+
+ 1. GermanAnalyzer now throws an exception if the stopword file
+    cannot be found (bug #27987). It now uses LowerCaseFilter
+    (bug #18410) (Daniel Naber via Otis, Erik)
+
+ 2. Fixed a few bugs in the file format documentation. (cutting)
+
+
+1.4 RC1
+
+ 1. Changed the format of the .tis file, so that:
+
+    - it has a format version number, which makes it easier to
+      back-compatibly change file formats in the future.
+
+    - the term count is now stored as a long.  This was the one aspect
+      of the Lucene's file formats which limited index size.
+
+    - a few internal index parameters are now stored in the index, so
+      that they can (in theory) now be changed from index to index,
+      although there is not yet an API to do so.
+
+    These changes are back compatible.  The new code can read old
+    indexes.  But old code will not be able read new indexes. (cutting)
+
+ 2. Added an optimized implementation of TermDocs.skipTo().  A skip
+    table is now stored for each term in the .frq file.  This only
+    adds a percent or two to overall index size, but can substantially
+    speedup many searches.  (cutting)
+
+ 3. Restructured the Scorer API and all Scorer implementations to take
+    advantage of an optimized TermDocs.skipTo() implementation.  In
+    particular, PhraseQuerys and conjunctive BooleanQuerys are
+    faster when one clause has substantially fewer matches than the
+    others.  (A conjunctive BooleanQuery is a BooleanQuery where all
+    clauses are required.)  (cutting)
+
+ 4. Added new class ParallelMultiSearcher.  Combined with
+    RemoteSearchable this makes it easy to implement distributed
+    search systems.  (Jean-Francois Halleux via cutting)
+
+ 5. Added support for hit sorting.  Results may now be sorted by any
+    indexed field.  For details see the javadoc for
+    Searcher#search(Query, Sort).  (Tim Jones via Cutting)
+
+ 6. Changed FSDirectory to auto-create a full directory tree that it
+    needs by using mkdirs() instead of mkdir().  (Mladen Turk via Otis)
+
+ 7. Added a new span-based query API.  This implements, among other
+    things, nested phrases.  See javadocs for details.  (Doug Cutting)
+
+ 8. Added new method Query.getSimilarity(Searcher), and changed
+    scorers to use it.  This permits one to subclass a Query class so
+    that it can specify its own Similarity implementation, perhaps
+    one that delegates through that of the Searcher.  (Julien Nioche
+    via Cutting)
+
+ 9. Added MultiReader, an IndexReader that combines multiple other
+    IndexReaders.  (Cutting)
+
+10. Added support for term vectors.  See Field#isTermVectorStored().
+    (Grant Ingersoll, Cutting & Dmitry)
+
+11. Fixed the old bug with escaping of special characters in query
+    strings: http://issues.apache.org/bugzilla/show_bug.cgi?id=24665
+    (Jean-Francois Halleux via Otis)
+
+12. Added support for overriding default values for the following,
+    using system properties:
+      - default commit lock timeout
+      - default maxFieldLength
+      - default maxMergeDocs
+      - default mergeFactor
+      - default minMergeDocs
+      - default write lock timeout
+    (Otis)
+
+13. Changed QueryParser.jj to allow '-' and '+' within tokens:
+    http://issues.apache.org/bugzilla/show_bug.cgi?id=27491
+    (Morus Walter via Otis)
+
+14. Changed so that the compound index format is used by default.
+    This makes indexing a bit slower, but vastly reduces the chances
+    of file handle problems.  (Cutting)
+
+
+1.3 final
+
+ 1. Added catch of BooleanQuery$TooManyClauses in QueryParser to
+    throw ParseException instead. (Erik Hatcher)
+
+ 2. Fixed a NullPointerException in Query.explain(). (Doug Cutting)
+
+ 3. Added a new method IndexReader.setNorm(), that permits one to
+    alter the boosting of fields after an index is created.
+
+ 4. Distinguish between the final position and length when indexing a
+    field.  The length is now defined as the total number of tokens,
+    instead of the final position, as it was previously.  Length is
+    used for score normalization (Similarity.lengthNorm()) and for
+    controlling memory usage (IndexWriter.maxFieldLength).  In both of
+    these cases, the total number of tokens is a better value to use
+    than the final token position.  Position is used in phrase
+    searching (see PhraseQuery and Token.setPositionIncrement()).
+
+ 5. Fix StandardTokenizer's handling of CJK characters (Chinese,
+    Japanese and Korean ideograms).  Previously contiguous sequences
+    were combined in a single token, which is not very useful.  Now
+    each ideogram generates a separate token, which is more useful.
+
+
+1.3 RC3
+
+ 1. Added minMergeDocs in IndexWriter.  This can be raised to speed
+    indexing without altering the number of files, but only using more
+    memory.  (Julien Nioche via Otis)
+
+ 2. Fix bug #24786, in query rewriting. (bschneeman via Cutting)
+
+ 3. Fix bug #16952, in demo HTML parser, skip comments in
+    javascript. (Christoph Goller)
+
+ 4. Fix bug #19253, in demo HTML parser, add whitespace as needed to
+    output (Daniel Naber via Christoph Goller)
+
+ 5. Fix bug #24301, in demo HTML parser, long titles no longer
+    hang things. (Christoph Goller)
+
+ 6. Fix bug #23534, Replace use of file timestamp of segments file
+    with an index version number stored in the segments file.  This
+    resolves problems when running on file systems with low-resolution
+    timestamps, e.g., HFS under MacOS X.  (Christoph Goller)
+
+ 7. Fix QueryParser so that TokenMgrError is not thrown, only
+    ParseException.  (Erik Hatcher)
+
+ 8. Fix some bugs introduced by change 11 of RC2.  (Christoph Goller)
+
+ 9. Fixed a problem compiling TestRussianStem.  (Christoph Goller)
+
+10. Cleaned up some build stuff.  (Erik Hatcher)
+
+
+1.3 RC2
+
+ 1. Added getFieldNames(boolean) to IndexReader, SegmentReader, and
+    SegmentsReader. (Julien Nioche via otis)
+
+ 2. Changed file locking to place lock files in
+    System.getProperty("java.io.tmpdir"), where all users are
+    permitted to write files.  This way folks can open and correctly
+    lock indexes which are read-only to them.
+
+ 3. IndexWriter: added a new method, addDocument(Document, Analyzer),
+    permitting one to easily use different analyzers for different
+    documents in the same index.
+
+ 4. Minor enhancements to FuzzyTermEnum.
+    (Christoph Goller via Otis)
+
+ 5. PriorityQueue: added insert(Object) method and adjusted IndexSearcher
+    and MultiIndexSearcher to use it.
+    (Christoph Goller via Otis)
+
+ 6. Fixed a bug in IndexWriter that returned incorrect docCount().
+    (Christoph Goller via Otis)
+
+ 7. Fixed SegmentsReader to eliminate the confusing and slightly different
+    behaviour of TermEnum when dealing with an enumeration of all terms,
+    versus an enumeration starting from a specific term.
+    This patch also fixes incorrect term document frequencies when the same term
+    is present in multiple segments.
+    (Christoph Goller via Otis)
+
+ 8. Added CachingWrapperFilter and PerFieldAnalyzerWrapper. (Erik Hatcher)
+
+ 9. Added support for the new "compound file" index format (Dmitry
+    Serebrennikov)
+
+10. Added Locale setting to QueryParser, for use by date range parsing.
+
+11. Changed IndexReader so that it can be subclassed by classes
+    outside of its package.  Previously it had package-private
+    abstract methods.  Also modified the index merging code so that it
+    can work on an arbitrary IndexReader implementation, and added a
+    new method, IndexWriter.addIndexes(IndexReader[]), to take
+    advantage of this. (cutting)
+
+12. Added a limit to the number of clauses which may be added to a
+    BooleanQuery.  The default limit is 1024 clauses.  This should
+    stop most OutOfMemoryExceptions by prefix, wildcard and fuzzy
+    queries which run amok. (cutting)
+
+13. Add new method: IndexReader.undeleteAll().  This undeletes all
+    deleted documents which still remain in the index. (cutting)
+
+
+1.3 RC1
+
+ 1. Fixed PriorityQueue's clear() method.
+    Fix for bug 9454, http://nagoya.apache.org/bugzilla/show_bug.cgi?id=9454
+    (Matthijs Bomhoff via otis)
+
+ 2. Changed StandardTokenizer.jj grammar for EMAIL tokens.
+    Fix for bug 9015, http://nagoya.apache.org/bugzilla/show_bug.cgi?id=9015
+    (Dale Anson via otis)
+
+ 3. Added the ability to disable lock creation by using disableLuceneLocks
+    system property.  This is useful for read-only media, such as CD-ROMs.
+    (otis)
+
+ 4. Added id method to Hits to be able to access the index global id.
+    Required for sorting options.
+    (carlson)
+
+ 5. Added support for new range query syntax to QueryParser.jj.
+    (briangoetz)
+
+ 6. Added the ability to retrieve HTML documents' META tag values to
+    HTMLParser.jj.
+    (Mark Harwood via otis)
+
+ 7. Modified QueryParser to make it possible to programmatically specify the
+    default Boolean operator (OR or AND).
+    (Péter Halácsy via otis)
+
+ 8. Made many search methods and classes non-final, per requests.
+    This includes IndexWriter and IndexSearcher, among others.
+    (cutting)
+
+ 9. Added class RemoteSearchable, providing support for remote
+    searching via RMI.  The test class RemoteSearchableTest.java
+    provides an example of how this can be used.  (cutting)
+
+ 10. Added PhrasePrefixQuery (and supporting MultipleTermPositions).  The
+     test class TestPhrasePrefixQuery provides the usage example.
+     (Anders Nielsen via otis)
+
+ 11. Changed the German stemming algorithm to ignore case while
+     stripping. The new algorithm is faster and produces more equal
+     stems from nouns and verbs derived from the same word.
+     (gschwarz)
+
+ 12. Added support for boosting the score of documents and fields via
+     the new methods Document.setBoost(float) and Field.setBoost(float).
+
+     Note: This changes the encoding of an indexed value.  Indexes
+     should be re-created from scratch in order for search scores to
+     be correct.  With the new code and an old index, searches will
+     yield very large scores for shorter fields, and very small scores
+     for longer fields.  Once the index is re-created, scores will be
+     as before. (cutting)
+
+ 13. Added new method Token.setPositionIncrement().
+
+     This permits, for the purpose of phrase searching, placing
+     multiple terms in a single position.  This is useful with
+     stemmers that produce multiple possible stems for a word.
+
+     This also permits the introduction of gaps between terms, so that
+     terms which are adjacent in a token stream will not be matched by
+     and exact phrase query.  This makes it possible, e.g., to build
+     an analyzer where phrases are not matched over stop words which
+     have been removed.
+
+     Finally, repeating a token with an increment of zero can also be
+     used to boost scores of matches on that token.  (cutting)
+
+ 14. Added new Filter class, QueryFilter.  This constrains search
+     results to only match those which also match a provided query.
+     Results are cached, so that searches after the first on the same
+     index using this filter are very fast.
+
+     This could be used, for example, with a RangeQuery on a formatted
+     date field to implement date filtering.  One could re-use a
+     single QueryFilter that matches, e.g., only documents modified
+     within the last week.  The QueryFilter and RangeQuery would only
+     need to be reconstructed once per day. (cutting)
+
+ 15. Added a new IndexWriter method, getAnalyzer().  This returns the
+     analyzer used when adding documents to this index. (cutting)
+
+ 16. Fixed a bug with IndexReader.lastModified().  Before, document
+     deletion did not update this.  Now it does.  (cutting)
+
+ 17. Added Russian Analyzer.
+     (Boris Okner via otis)
+
+ 18. Added a public, extensible scoring API.  For details, see the
+     javadoc for org.apache.lucene.search.Similarity.
+
+ 19. Fixed return of Hits.id() from float to int. (Terry Steichen via Peter).
+
+ 20. Added getFieldNames() to IndexReader and Segment(s)Reader classes.
+     (Peter Mularien via otis)
+
+ 21. Added getFields(String) and getValues(String) methods.
+     Contributed by Rasik Pandey on 2002-10-09
+     (Rasik Pandey via otis)
+
+ 22. Revised internal search APIs.  Changes include:
+
+       a. Queries are no longer modified during a search.  This makes
+       it possible, e.g., to reuse the same query instance with
+       multiple indexes from multiple threads.
+
+       b. Term-expanding queries (e.g. PrefixQuery, WildcardQuery,
+       etc.)  now work correctly with MultiSearcher, fixing bugs 12619
+       and 12667.
+
+       c. Boosting BooleanQuery's now works, and is supported by the
+       query parser (problem reported by Lee Mallabone).  Thus a query
+       like "(+foo +bar)^2 +baz" is now supported and equivalent to
+       "(+foo^2 +bar^2) +baz".
+
+       d. New method: Query.rewrite(IndexReader).  This permits a
+       query to re-write itself as an alternate, more primitive query.
+       Most of the term-expanding query classes (PrefixQuery,
+       WildcardQuery, etc.) are now implemented using this method.
+
+       e. New method: Searchable.explain(Query q, int doc).  This
+       returns an Explanation instance that describes how a particular
+       document is scored against a query.  An explanation can be
+       displayed as either plain text, with the toString() method, or
+       as HTML, with the toHtml() method.  Note that computing an
+       explanation is as expensive as executing the query over the
+       entire index.  This is intended to be used in developing
+       Similarity implementations, and, for good performance, should
+       not be displayed with every hit.
+
+       f. Scorer and Weight are public, not package protected.  It now
+       possible for someone to write a Scorer implementation that is
+       not in the org.apache.lucene.search package.  This is still
+       fairly advanced programming, and I don't expect anyone to do
+       this anytime soon, but at least now it is possible.
+
+       g. Added public accessors to the primitive query classes
+       (TermQuery, PhraseQuery and BooleanQuery), permitting access to
+       their terms and clauses.
+
+     Caution: These are extensive changes and they have not yet been
+     tested extensively.  Bug reports are appreciated.
+     (cutting)
+
+ 23. Added convenience RAMDirectory constructors taking File and String
+     arguments, for easy FSDirectory to RAMDirectory conversion.
+     (otis)
+
+ 24. Added code for manual renaming of files in FSDirectory, since it
+     has been reported that java.io.File's renameTo(File) method sometimes
+     fails on Windows JVMs.
+     (Matt Tucker via otis)
+
+ 25. Refactored QueryParser to make it easier for people to extend it.
+     Added the ability to automatically lower-case Wildcard terms in
+     the QueryParser.
+     (Tatu Saloranta via otis)
+
+
+1.2 RC6
+
+ 1. Changed QueryParser.jj to have "?" be a special character which
+    allowed it to be used as a wildcard term. Updated TestWildcard
+    unit test also. (Ralf Hettesheimer via carlson)
+
+1.2 RC5
+
+ 1. Renamed build.properties to default.properties and updated
+    the BUILD.txt document to describe how to override the
+    default.property settings without having to edit the file. This
+    brings the build process closer to Scarab's build process.
+    (jon)
+
+ 2. Added MultiFieldQueryParser class. (Kelvin Tan, via otis)
+
+ 3. Updated "powered by" links. (otis)
+
+ 4. Fixed instruction for setting up JavaCC - Bug #7017 (otis)
+
+ 5. Added throwing exception if FSDirectory could not create directory
+    - Bug #6914 (Eugene Gluzberg via otis)
+
+ 6. Update MultiSearcher, MultiFieldParse, Constants, DateFilter,
+    LowerCaseTokenizer javadoc (otis)
+
+ 7. Added fix to avoid NullPointerException in results.jsp
+    (Mark Hayes via otis)
+
+ 8. Changed Wildcard search to find 0 or more char instead of 1 or more
+    (Lee Mallobone, via otis)
+
+ 9. Fixed error in offset issue in GermanStemFilter - Bug #7412
+    (Rodrigo Reyes, via otis)
+
+ 10. Added unit tests for wildcard search and DateFilter (otis)
+
+ 11. Allow co-existence of indexed and non-indexed fields with the same name
+     (cutting/casper, via otis)
+
+ 12. Add escape character to query parser.
+     (briangoetz)
+
+ 13. Applied a patch that ensures that searches that use DateFilter
+     don't throw an exception when no matches are found. (David Smiley, via
+     otis)
+
+ 14. Fixed bugs in DateFilter and wildcardquery unit tests. (cutting, otis, carlson)
+
+
+1.2 RC4
+
+ 1. Updated contributions section of website.
+    Add XML Document #3 implementation to Document Section.
+    Also added Term Highlighting to Misc Section. (carlson)
+
+ 2. Fixed NullPointerException for phrase searches containing
+    unindexed terms, introduced in 1.2RC3.  (cutting)
+
+ 3. Changed document deletion code to obtain the index write lock,
+    enforcing the fact that document addition and deletion cannot be
+    performed concurrently.  (cutting)
+
+ 4. Various documentation cleanups.  (otis, acoliver)
+
+ 5. Updated "powered by" links.  (cutting, jon)
+
+ 6. Fixed a bug in the GermanStemmer.  (Bernhard Messer, via otis)
+
+ 7. Changed Term and Query to implement Serializable.  (scottganyo)
+
+ 8. Fixed to never delete indexes added with IndexWriter.addIndexes().
+    (cutting)
+
+ 9. Upgraded to JUnit 3.7. (otis)
+
+1.2 RC3
+
+ 1. IndexWriter: fixed a bug where adding an optimized index to an
+    empty index failed.  This was encountered using addIndexes to copy
+    a RAMDirectory index to an FSDirectory.
+
+ 2. RAMDirectory: fixed a bug where RAMInputStream could not read
+    across more than across a single buffer boundary.
+
+ 3. Fix query parser so it accepts queries with unicode characters.
+    (briangoetz)
+
+ 4. Fix query parser so that PrefixQuery is used in preference to
+    WildcardQuery when there's only an asterisk at the end of the
+    term.  Previously PrefixQuery would never be used.
+
+ 5. Fix tests so they compile; fix ant file so it compiles tests
+    properly.  Added test cases for Analyzers and PriorityQueue.
+
+ 6. Updated demos, added Getting Started documentation. (acoliver)
+
+ 7. Added 'contributions' section to website & docs. (carlson)
+
+ 8. Removed JavaCC from source distribution for copyright reasons.
+    Folks must now download this separately from metamata in order to
+    compile Lucene.  (cutting)
+
+ 9. Substantially improved the performance of DateFilter by adding the
+    ability to reuse TermDocs objects.  (cutting)
+
+10. Added IndexReader methods:
+      public static boolean indexExists(String directory);
+      public static boolean indexExists(File directory);
+      public static boolean indexExists(Directory directory);
+      public static boolean isLocked(Directory directory);
+      public static void unlock(Directory directory);
+    (cutting, otis)
+
+11. Fixed bugs in GermanAnalyzer (gschwarz)
+
+
+1.2 RC2, 19 October 2001:
+ - added sources to distribution
+ - removed broken build scripts and libraries from distribution
+ - SegmentsReader: fixed potential race condition
+ - FSDirectory: fixed so that getDirectory(xxx,true) correctly
+   erases the directory contents, even when the directory
+   has already been accessed in this JVM.
+ - RangeQuery: Fix issue where an inclusive range query would
+   include the nearest term in the index above a non-existant
+   specified upper term.
+ - SegmentTermEnum: Fix NullPointerException in clone() method
+   when the Term is null.
+ - JDK 1.1 compatibility fix: disabled lock files for JDK 1.1,
+   since they rely on a feature added in JDK 1.2.
+
+1.2 RC1 (first Apache release), 2 October 2001:
+  - packages renamed from com.lucene to org.apache.lucene
+  - license switched from LGPL to Apache
+  - ant-only build -- no more makefiles
+  - addition of lock files--now fully thread & process safe
+  - addition of German stemmer
+  - MultiSearcher now supports low-level search API
+  - added RangeQuery, for term-range searching
+  - Analyzers can choose tokenizer based on field name
+  - misc bug fixes.
+
+1.01b (last Sourceforge release), 2 July 2001
+ . a few bug fixes
+ . new Query Parser
+ . new prefix query (search for "foo*" matches "food")
+
+1.0, 2000-10-04
+
+This release fixes a few serious bugs and also includes some
+performance optimizations, a stemmer, and a few other minor
+enhancements.
+
+0.04 2000-04-19
+
+Lucene now includes a grammar-based tokenizer, StandardTokenizer.
+
+The only tokenizer included in the previous release (LetterTokenizer)
+identified terms consisting entirely of alphabetic characters.  The
+new tokenizer uses a regular-expression grammar to identify more
+complex classes of terms, including numbers, acronyms, email
+addresses, etc.
+
+StandardTokenizer serves two purposes:
+
+ 1. It is a much better, general purpose tokenizer for use by
+    applications as is.
+
+    The easiest way for applications to start using
+    StandardTokenizer is to use StandardAnalyzer.
+
+ 2. It provides a good example of grammar-based tokenization.
+
+    If an application has special tokenization requirements, it can
+    implement a custom tokenizer by copying the directory containing
+    the new tokenizer into the application and modifying it
+    accordingly.
+
+0.01, 2000-03-30
+
+First open source release.
+
+The code has been re-organized into a new package and directory
+structure for this release.  It builds OK, but has not been tested
+beyond that since the re-organization.
diff --git a/eclipse/plugins/org.apache.lucene/about_files/CVS/Entries b/eclipse/plugins/org.apache.lucene/about_files/CVS/Entries
new file mode 100644
index 0000000..7685cf6
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/about_files/CVS/Entries
@@ -0,0 +1,4 @@
+/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
new file mode 100644
index 0000000..be58ee4
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/about_files/CVS/Repository
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000..24126f4
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/about_files/CVS/Root
@@ -0,0 +1 @@
+: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
new file mode 100644
index 0000000..3114c57
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/about_files/CVS/Tag
@@ -0,0 +1 @@
+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
new file mode 100755
index 0000000..dfd5693
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/about_files/LICENSE.txt
@@ -0,0 +1,240 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+
+Some code in src/java/org/apache/lucene/util/UnicodeUtil.java was
+derived from unicode conversion examples available at
+http://www.unicode.org/Public/PROGRAMS/CVTUTF.  Here is the copyright
+from those sources:
+
+/*
+ * Copyright 2001-2004 Unicode, Inc.
+ * 
+ * Disclaimer
+ * 
+ * This source code is provided as is by Unicode, Inc. No claims are
+ * made as to fitness for any particular purpose. No warranties of any
+ * kind are expressed or implied. The recipient agrees to determine
+ * applicability of information provided. If this file has been
+ * purchased on magnetic or optical media from Unicode, Inc., the
+ * sole remedy for any claim will be exchange of defective media
+ * within 90 days of receipt.
+ * 
+ * Limitations on Rights to Redistribute This Code
+ * 
+ * Unicode, Inc. hereby grants the right to freely use the information
+ * supplied in this file in the creation of products supporting the
+ * Unicode Standard, and to make copies of this file in any form
+ * for internal or external distribution as long as this notice
+ * remains attached.
+ */
+
+
+Some code in src/java/org/apache/lucene/util/ArrayUtil.java was
+derived from Python 2.4.2 sources available at
+http://www.python.org. Full license is here:
+
+  http://www.python.org/download/releases/2.4.2/license/
+
+
diff --git a/eclipse/plugins/org.apache.lucene/about_files/NOTICE.txt b/eclipse/plugins/org.apache.lucene/about_files/NOTICE.txt
new file mode 100755
index 0000000..8ae6c9b
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/about_files/NOTICE.txt
@@ -0,0 +1,30 @@
+Apache Lucene
+Copyright 2006 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+The snowball stemmers in
+  contrib/snowball/src/java/net/sf/snowball
+were developed by Martin Porter and Richard Boulton.
+The full snowball package is available from
+  http://snowball.tartarus.org/
+
+The Arabic stemmer (contrib/analyzers) comes with a default
+stopword list that is BSD-licensed created by Jacques Savoy.  The file resides in 
+contrib/analyzers/common/src/resources/org/apache/lucene/analysis/ar/stopwords.txt.
+See http://members.unine.ch/jacques.savoy/clef/index.html.
+
+The Persian analyzer (contrib/analyzers) comes with a default
+stopword list that is BSD-licensed created by Jacques Savoy.  The file resides in
+contrib/analyzers/common/src/resources/org/apache/lucene/analysis/fa/stopwords.txt.
+See http://members.unine.ch/jacques.savoy/clef/index.html.
+
+Includes lib/servlet-api-2.4.jar from  Apache Tomcat
+
+The SmartChineseAnalyzer source code (under contrib/analyzers) was
+provided by Xiaoping Gao and copyright 2009 by www.imdict.net.
+
+ICU4J, (under contrib/collation) is licensed under an MIT styles license
+(contrib/collation/lib/ICU-LICENSE.txt) and Copyright (c) 1995-2008 
+International Business Machines Corporation and others
diff --git a/eclipse/plugins/org.apache.lucene/about_files/README.txt b/eclipse/plugins/org.apache.lucene/about_files/README.txt
new file mode 100755
index 0000000..ad1315c
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/about_files/README.txt
@@ -0,0 +1,46 @@
+Lucene README file
+
+$Id: README.txt 490368 2006-12-26 20:44:29Z gsingers $
+
+INTRODUCTION
+
+Lucene is a Java full-text search engine.  Lucene is not a complete
+application, but rather a code library and API that can easily be used
+to add search capabilities to applications.
+
+The Lucene web site is at:
+  http://lucene.apache.org/
+
+Please join the Lucene-User mailing list by sending a message to:
+  java-user-subscribe at lucene.apache.org
+
+FILES
+
+lucene-core-XX.jar
+  The compiled lucene library.
+
+lucene-demos-XX.jar
+  The compiled simple example code.
+
+luceneweb.war
+  The compiled simple example Web Application.
+
+contrib/*
+  Contributed code which extends and enhances Lucene, but is not
+  part of the core library.  Of special note are the JAR files in the analyzers and snowball directory which
+  contain various analyzers that people may find useful in place of the StandardAnalyzer.
+
+
+
+docs/index.html
+  The contents of the Lucene website.
+
+docs/api/index.html
+  The Javadoc Lucene API documentation.  This includes the core
+  library, the demo, as well as all of the contrib modules.
+
+src/java
+  The Lucene source code.
+
+src/demo
+  Some example code.
diff --git a/eclipse/plugins/org.apache.lucene/build.properties b/eclipse/plugins/org.apache.lucene/build.properties
new file mode 100755
index 0000000..604f3c8
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/build.properties
@@ -0,0 +1,15 @@
+###############################################################################
+# Copyright (c) 2000, 2008 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+bin.includes = META-INF/,\
+               plugin.properties,\
+               about.html,\
+               about_files/
+output.. = .
diff --git a/eclipse/plugins/org.apache.lucene/plugin.properties b/eclipse/plugins/org.apache.lucene/plugin.properties
new file mode 100755
index 0000000..409f6c4
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/plugin.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2000, 2005 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+pluginName=Apache Lucene
+providerName=Eclipse.org
diff --git a/eclipse/plugins/org.apache.lucene/readme-bundles.txt b/eclipse/plugins/org.apache.lucene/readme-bundles.txt
new file mode 100755
index 0000000..1c4ef61
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/readme-bundles.txt
@@ -0,0 +1,42 @@
+Apache Lucene OSGi Bundles
+==========================
+
+Apache Lucene is available as a set of OSGi bundles in the Orbit repository.
+However, the packaging as some special requirements because of split-
+packages between Lucene Core and some contrib libs. Therefore, the following
+bundle layout was created.
+
+
+org.apache.lucene
+-----------------
+ 
+This is the master bundle. It depends on the core bundle (using 
+Require-Bundle) and re-exports it for backwards compatibility reasons. 
+
+It also exports all core packages as single packages (without split 
+attributes) for backwards compatibility reasons AND to resolve split-
+packages. It has optional dependencies on the contrib bundles to properly 
+resolve split-packages (Require-Bundle). But it does not re-export the 
+contrib bundles.
+
+
+org.apache.lucene.core
+----------------------
+
+This is the core bundle. It's created from the Lucene core jar and only
+contains Lucene core. It exports all its packages using split-package
+attributes ("..;core=split;mandatory:=core;.."). This allows packages
+split across Lucene core and Lucene contrib libs.
+
+
+org.apache.lucene.<contrib-name>
+--------------------------------
+
+This defines a bundle for a Lucene contrib library. Usually, a contrib
+bundle has a Require-Bundle dependency on the core bundle. It may have 
+additional dependencies to other contrib libs. 
+
+A contrib bundles exports shared/split packages with split-packages
+attributes ("..;<contrib-name>=split;mandatory:=<contrib-name>;..") 
+but non-split packages without split-packages attributes.
+
diff --git a/eclipse/plugins/org.apache.lucene/source-bundle/CVS/Entries b/eclipse/plugins/org.apache.lucene/source-bundle/CVS/Entries
new file mode 100644
index 0000000..8918c6a
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/source-bundle/CVS/Entries
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 0000000..a2685b9
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/source-bundle/CVS/Repository
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000..24126f4
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/source-bundle/CVS/Root
@@ -0,0 +1 @@
+: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
new file mode 100644
index 0000000..3114c57
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/source-bundle/CVS/Tag
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000..b46ddd8
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/source-bundle/META-INF/CVS/Entries
@@ -0,0 +1 @@
+/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
new file mode 100644
index 0000000..8d5c782
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/source-bundle/META-INF/CVS/Repository
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000..24126f4
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/source-bundle/META-INF/CVS/Root
@@ -0,0 +1 @@
+: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
new file mode 100644
index 0000000..3114c57
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/source-bundle/META-INF/CVS/Tag
@@ -0,0 +1 @@
+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
new file mode 100755
index 0000000..394002c
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/source-bundle/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
+Bundle-ManifestVersion: 2
+Bundle-Localization: plugin
+Bundle-SymbolicName: org.apache.lucene.source
+Bundle-Version: 2.9.1.qualifier
+Eclipse-SourceBundle: org.apache.lucene;version="2.9.1.qualifier"
+
diff --git a/eclipse/plugins/org.apache.lucene/source-bundle/about.html b/eclipse/plugins/org.apache.lucene/source-bundle/about.html
new file mode 100755
index 0000000..2a13c34
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/source-bundle/about.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>May 30, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+<h3>Third Party Content</h3>
+
+<p>The Content includes items that have been sourced from third parties as set out below. If you 
+did not receive this Content directly from the Eclipse Foundation, the following is provided 
+for informational purposes only, and you should look to the Redistributor’s license for 
+terms and conditions of use.</p>
+
+<h4>Lucene 2.9.1</h4>
+
+<p>The plug-in includes software developed by The Apache Software Foundation as part of the Ant project.</p>
+
+<p>Your use of the Lucene code is subject to the terms and conditions of the Apache Software License 2.0.  A copy of the license is contained
+in the file <a href="about_files/LICENSE.txt">LICENSE.txt</a> and is also available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html">http://www.apache.org/licenses/LICENSE-2.0.html</a>.
+</p>
+<p>The names "Lucene" and  "Apache Software Foundation" must not be used to endorse or promote products derived from this 
+software without prior written permission.  For written permission, please contact <a href="mailto:apache at apache.org">apache at apache.org</a>.</p>
+
+<p>
+Original binaries and source are available from the <a href="http://lucene.apache.org/">Apache Lucene website</a>.
+</p>
+</body>
+</html>
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
new file mode 100755
index 0000000..2553afd
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/source-bundle/about_files/CHANGES.txt
@@ -0,0 +1,2803 @@
+Lucene Change Log
+$Id: CHANGES.txt 700741 2008-10-01 11:20:42Z mikemccand $
+
+======================= Release 2.4.0 2008-10-06 =======================
+
+Changes in backwards compatibility policy
+
+1. LUCENE-1340: In a minor change to Lucene's backward compatibility
+   policy, we are now allowing the Fieldable interface to have
+   changes, within reason, and made on a case-by-case basis.  If an
+   application implements it's own Fieldable, please be aware of
+   this.  Otherwise, no need to be concerned.  This is in effect for
+   all 2.X releases, starting with 2.4.  Also note, that in all
+   likelihood, Fieldable will be changed in 3.0.
+
+Changes in runtime behavior
+
+ 1. LUCENE-1151: Fix StandardAnalyzer to not mis-identify host names
+    (eg lucene.apache.org) as an ACRONYM.  To get back to the pre-2.4
+    backwards compatible, but buggy, behavior, you can either call
+    StandardAnalyzer.setDefaultReplaceInvalidAcronym(false) (static
+    method), or, set system property
+    org.apache.lucene.analysis.standard.StandardAnalyzer.replaceInvalidAcronym
+    to "false" on JVM startup.  All StandardAnalyzer instances created
+    after that will then show the pre-2.4 behavior.  Alternatively,
+    you can call setReplaceInvalidAcronym(false) to change the
+    behavior per instance of StandardAnalyzer.  This backwards
+    compatibility will be removed in 3.0 (hardwiring the value to
+    true).  (Mike McCandless)
+
+ 2. LUCENE-1044: IndexWriter with autoCommit=true now commits (such
+    that a reader can see the changes) far less often than it used to.
+    Previously, every flush was also a commit.  You can always force a
+    commit by calling IndexWriter.commit().  Furthermore, in 3.0,
+    autoCommit will be hardwired to false (IndexWriter constructors
+    that take an autoCommit argument have been deprecated) (Mike
+    McCandless)
+
+ 3. LUCENE-1335: IndexWriter.addIndexes(Directory[]) and
+    addIndexesNoOptimize no longer allow the same Directory instance
+    to be passed in more than once.  Internally, IndexWriter uses
+    Directory and segment name to uniquely identify segments, so
+    adding the same Directory more than once was causing duplicates
+    which led to problems (Mike McCandless)
+
+ 4. LUCENE-1396: Improve PhraseQuery.toString() so that gaps in the
+    positions are indicated with a ? and multiple terms at the same
+    position are joined with a |.  (Andrzej Bialecki via Mike
+    McCandless)
+
+API Changes
+
+ 1. LUCENE-1084: Changed all IndexWriter constructors to take an
+    explicit parameter for maximum field size.  Deprecated all the
+    pre-existing constructors; these will be removed in release 3.0.
+    NOTE: these new constructors set autoCommit to false.  (Steven
+    Rowe via Mike McCandless)
+
+ 2. LUCENE-584: Changed Filter API to return a DocIdSet instead of a
+    java.util.BitSet. This allows using more efficient data structures
+    for Filters and makes them more flexible. This deprecates
+    Filter.bits(), so all filters that implement this outside
+    the Lucene code base will need to be adapted. See also the javadocs
+    of the Filter class. (Paul Elschot, Michael Busch)
+
+ 3. LUCENE-1044: Added IndexWriter.commit() which flushes any buffered
+    adds/deletes and then commits a new segments file so readers will
+    see the changes.  Deprecate IndexWriter.flush() in favor of
+    IndexWriter.commit().  (Mike McCandless)
+
+ 4. LUCENE-325: Added IndexWriter.expungeDeletes methods, which
+    consult the MergePolicy to find merges necessary to merge away all
+    deletes from the index.  This should be a somewhat lower cost
+    operation than optimize.  (John Wang via Mike McCandless)
+
+ 5. LUCENE-1233: Return empty array instead of null when no fields
+    match the specified name in these methods in Document:
+    getFieldables, getFields, getValues, getBinaryValues.  (Stefan
+    Trcek vai Mike McCandless)
+
+ 6. LUCENE-1234: Make BoostingSpanScorer protected.  (Andi Vajda via Grant Ingersoll)
+
+ 7. LUCENE-510: The index now stores strings as true UTF-8 bytes
+    (previously it was Java's modified UTF-8).  If any text, either
+    stored fields or a token, has illegal UTF-16 surrogate characters,
+    these characters are now silently replaced with the Unicode
+    replacement character U+FFFD.  This is a change to the index file
+    format.  (Marvin Humphrey via Mike McCandless)
+
+ 8. LUCENE-852: Let the SpellChecker caller specify IndexWriter mergeFactor
+    and RAM buffer size.  (Otis Gospodnetic)
+	
+ 9. LUCENE-1290: Deprecate org.apache.lucene.search.Hits, Hit and HitIterator
+    and remove all references to these classes from the core. Also update demos
+    and tutorials. (Michael Busch)
+
+10. LUCENE-1288: Add getVersion() and getGeneration() to IndexCommit.
+    getVersion() returns the same value that IndexReader.getVersion()
+    returns when the reader is opened on the same commit.  (Jason
+    Rutherglen via Mike McCandless)
+
+11. LUCENE-1311: Added IndexReader.listCommits(Directory) static
+    method to list all commits in a Directory, plus IndexReader.open
+    methods that accept an IndexCommit and open the index as of that
+    commit.  These methods are only useful if you implement a custom
+    DeletionPolicy that keeps more than the last commit around.
+    (Jason Rutherglen via Mike McCandless)
+
+12. LUCENE-1325: Added IndexCommit.isOptimized().  (Shalin Shekhar
+    Mangar via Mike McCandless)
+
+13. LUCENE-1324: Added TokenFilter.reset(). (Shai Erera via Mike
+    McCandless)
+
+14. LUCENE-1340: Added Fieldable.omitTf() method to skip indexing term
+    frequency, positions and payloads.  This saves index space, and
+    indexing/searching time.  (Eks Dev via Mike McCandless)
+
+15. LUCENE-1219: Add basic reuse API to Fieldable for binary fields:
+    getBinaryValue/Offset/Length(); currently only lazy fields reuse
+    the provided byte[] result to getBinaryValue.  (Eks Dev via Mike
+    McCandless)
+
+16. LUCENE-1334: Add new constructor for Term: Term(String fieldName)
+    which defaults term text to "".  (DM Smith via Mike McCandless)
+
+17. LUCENE-1333: Added Token.reinit(*) APIs to re-initialize (reuse) a
+    Token.  Also added term() method to return a String, with a
+    performance penalty clearly documented.  Also implemented
+    hashCode() and equals() in Token, and fixed all core and contrib
+    analyzers to use the re-use APIs.  (DM Smith via Mike McCandless)
+
+18. LUCENE-1329: Add optional readOnly boolean when opening an
+    IndexReader.  A readOnly reader is not allowed to make changes
+    (deletions, norms) to the index; in exchanged, the isDeleted
+    method, often a bottleneck when searching with many threads, is
+    not synchronized.  The default for readOnly is still false, but in
+    3.0 the default will become true.  (Jason Rutherglen via Mike
+    McCandless)
+
+19. LUCENE-1367: Add IndexCommit.isDeleted().  (Shalin Shekhar Mangar
+    via Mike McCandless)
+
+20. LUCENE-1061: Factored out all "new XXXQuery(...)" in
+    QueryParser.java into protected methods newXXXQuery(...) so that
+    subclasses can create their own subclasses of each Query type.
+    (John Wang via Mike McCandless)
+
+21. LUCENE-753: Added new Directory implementation
+    org.apache.lucene.store.NIOFSDirectory, which uses java.nio's
+    FileChannel to do file reads.  On most non-Windows platforms, with
+    many threads sharing a single searcher, this may yield sizable
+    improvement to query throughput when compared to FSDirectory,
+    which only allows a single thread to read from an open file at a
+    time.  (Jason Rutherglen via Mike McCandless)
+
+22. LUCENE-1371: Added convenience method TopDocs Searcher.search(Query query, int n).
+    (Mike McCandless)
+    
+23. LUCENE-1356: Allow easy extensions of TopDocCollector by turning
+    constructor and fields from package to protected. (Shai Erera
+    via Doron Cohen) 
+
+24. LUCENE-1375: Added convencience method IndexCommit.getTimestamp,
+    which is equivalent to
+    getDirectory().fileModified(getSegmentsFileName()).  (Mike McCandless)
+
+23. LUCENE-1366: Rename Field.Index options to be more accurate:
+    TOKENIZED becomes ANALYZED;  UN_TOKENIZED becomes NOT_ANALYZED;
+    NO_NORMS becomes NOT_ANALYZED_NO_NORMS and a new ANALYZED_NO_NORMS
+    is added.  (Mike McCandless)
+
+24. LUCENE-1131: Added numDeletedDocs method to IndexReader (Otis Gospodnetic)
+
+Bug fixes
+    
+ 1. LUCENE-1134: Fixed BooleanQuery.rewrite to only optimize a single 
+    clause query if minNumShouldMatch<=0. (Shai Erera via Michael Busch)
+
+ 2. LUCENE-1169: Fixed bug in IndexSearcher.search(): searching with
+    a filter might miss some hits because scorer.skipTo() is called
+    without checking if the scorer is already at the right position.
+    scorer.skipTo(scorer.doc()) is not a NOOP, it behaves as 
+    scorer.next(). (Eks Dev, Michael Busch)
+
+ 3. LUCENE-1182: Added scorePayload to SimilarityDelegator (Andi Vajda via Grant Ingersoll)
+ 
+ 4. LUCENE-1213: MultiFieldQueryParser was ignoring slop in case
+    of a single field phrase. (Trejkaz via Doron Cohen)
+
+ 5. LUCENE-1228: IndexWriter.commit() was not updating the index version and as
+    result IndexReader.reopen() failed to sense index changes. (Doron Cohen)
+
+ 6. LUCENE-1267: Added numDocs() and maxDoc() to IndexWriter;
+    deprecated docCount().  (Mike McCandless)
+
+ 7. LUCENE-1274: Added new prepareCommit() method to IndexWriter,
+    which does phase 1 of a 2-phase commit (commit() does phase 2).
+    This is needed when you want to update an index as part of a
+    transaction involving external resources (eg a database).  Also
+    deprecated abort(), renaming it to rollback().  (Mike McCandless)
+
+ 8. LUCENE-1003: Stop RussianAnalyzer from removing numbers.
+    (TUSUR OpenTeam, Dmitry Lihachev via Otis Gospodnetic)
+
+ 9. LUCENE-1152: SpellChecker fix around clearIndex and indexDictionary
+    methods, plus removal of IndexReader reference.
+    (Naveen Belkale via Otis Gospodnetic)
+
+10. LUCENE-1046: Removed dead code in SpellChecker
+    (Daniel Naber via Otis Gospodnetic)
+	
+11. LUCENE-1189: Fixed the QueryParser to handle escaped characters within 
+    quoted terms correctly. (Tomer Gabel via Michael Busch)
+
+12. LUCENE-1299: Fixed NPE in SpellChecker when IndexReader is not null and field is (Grant Ingersoll)
+
+13. LUCENE-1303: Fixed BoostingTermQuery's explanation to be marked as a Match 
+    depending only upon the non-payload score part, regardless of the effect of 
+    the payload on the score. Prior to this, score of a query containing a BTQ 
+    differed from its explanation. (Doron Cohen)
+    
+14. LUCENE-1310: Fixed SloppyPhraseScorer to work also for terms repeating more 
+    than twice in the query. (Doron Cohen)
+
+15. LUCENE-1351: ISOLatin1AccentFilter now cleans additional ligatures (Cedrik Lime via Grant Ingersoll)
+
+16. LUCENE-1383: Workaround a nasty "leak" in Java's builtin
+    ThreadLocal, to prevent Lucene from causing unexpected
+    OutOfMemoryError in certain situations (notably J2EE
+    applications).  (Chris Lu via Mike McCandless)
+
+New features
+
+ 1. LUCENE-1137: Added Token.set/getFlags() accessors for passing more information about a Token through the analysis
+    process.  The flag is not indexed/stored and is thus only used by analysis.
+
+ 2. LUCENE-1147: Add -segment option to CheckIndex tool so you can
+    check only a specific segment or segments in your index.  (Mike
+    McCandless)
+
+ 3. LUCENE-1045: Reopened this issue to add support for short and bytes. 
+ 
+ 4. LUCENE-584: Added new data structures to o.a.l.util, such as 
+    OpenBitSet and SortedVIntList. These extend DocIdSet and can 
+    directly be used for Filters with the new Filter API. Also changed
+    the core Filters to use OpenBitSet instead of java.util.BitSet.
+    (Paul Elschot, Michael Busch)
+
+ 5. LUCENE-494: Added QueryAutoStopWordAnalyzer to allow for the automatic removal, from a query of frequently occurring terms.
+    This Analyzer is not intended for use during indexing. (Mark Harwood via Grant Ingersoll)
+
+ 6. LUCENE-1044: Change Lucene to properly "sync" files after
+    committing, to ensure on a machine or OS crash or power cut, even
+    with cached writes, the index remains consistent.  Also added
+    explicit commit() method to IndexWriter to force a commit without
+    having to close.  (Mike McCandless)
+    
+ 7. LUCENE-997: Add search timeout (partial) support.
+    A TimeLimitedCollector was added to allow limiting search time.
+    It is a partial solution since timeout is checked only when 
+    collecting a hit, and therefore a search for rare words in a 
+    huge index might not stop within the specified time.
+    (Sean Timm via Doron Cohen) 
+
+ 8. LUCENE-1184: Allow SnapshotDeletionPolicy to be re-used across
+    close/re-open of IndexWriter while still protecting an open
+    snapshot (Tim Brennan via Mike McCandless)
+
+ 9. LUCENE-1194: Added IndexWriter.deleteDocuments(Query) to delete
+    documents matching the specified query.  Also added static unlock
+    and isLocked methods (deprecating the ones in IndexReader).  (Mike
+    McCandless)
+
+10. LUCENE-1201: Add IndexReader.getIndexCommit() method. (Tim Brennan
+    via Mike McCandless)
+
+11. LUCENE-550:  Added InstantiatedIndex implementation.  Experimental 
+    Index store similar to MemoryIndex but allows for multiple documents 
+    in memory.  (Karl Wettin via Grant Ingersoll)
+
+12. LUCENE-400: Added word based n-gram filter (in contrib/analyzers) called ShingleFilter and an Analyzer wrapper
+    that wraps another Analyzer's token stream with a ShingleFilter (Sebastian Kirsch, Steve Rowe via Grant Ingersoll) 
+
+13. LUCENE-1166: Decomposition tokenfilter for languages like German and Swedish (Thomas Peuss via Grant Ingersoll)
+
+14. LUCENE-1187: ChainedFilter and BooleanFilter now work with new Filter API
+    and DocIdSetIterator-based filters. Backwards-compatibility with old 
+    BitSet-based filters is ensured. (Paul Elschot via Michael Busch)
+
+15. LUCENE-1295: Added new method to MoreLikeThis for retrieving interesting terms and made retrieveTerms(int) public. (Grant Ingersoll)
+
+16. LUCENE-1298: MoreLikeThis can now accept a custom Similarity (Grant Ingersoll)
+
+17. LUCENE-1297: Allow other string distance measures for the SpellChecker
+    (Thomas Morton via Otis Gospodnetic)
+
+18. LUCENE-1001: Provide access to Payloads via Spans.  All existing Span Query implementations in Lucene implement. (Mark Miller, Grant Ingersoll)
+
+19. LUCENE-1354: Provide programmatic access to CheckIndex (Grant Ingersoll, Mike McCandless)
+
+20. LUCENE-1279: Add support for Collators to RangeFilter/Query and Query Parser.  (Steve Rowe via Grant Ingersoll) 
+
+Optimizations
+
+ 1. LUCENE-705: When building a compound file, use
+    RandomAccessFile.setLength() to tell the OS/filesystem to
+    pre-allocate space for the file.  This may improve fragmentation
+    in how the CFS file is stored, and allows us to detect an upcoming
+    disk full situation before actually filling up the disk.  (Mike
+    McCandless)
+
+ 2. LUCENE-1120: Speed up merging of term vectors by bulk-copying the
+    raw bytes for each contiguous range of non-deleted documents.
+    (Mike McCandless)
+	
+ 3. LUCENE-1185: Avoid checking if the TermBuffer 'scratch' in 
+    SegmentTermEnum is null for every call of scanTo().
+    (Christian Kohlschuetter via Michael Busch)
+
+ 4. LUCENE-1217: Internal to Field.java, use isBinary instead of
+    runtime type checking for possible speedup of binaryValue().
+    (Eks Dev via Mike McCandless)
+
+ 5. LUCENE-1183: Optimized TRStringDistance class (in contrib/spell) that uses
+    less memory than the previous version.  (Cédrik LIME via Otis Gospodnetic)
+
+ 6. LUCENE-1195: Improve term lookup performance by adding a LRU cache to the
+    TermInfosReader. In performance experiments the speedup was about 25% on 
+    average on mid-size indexes with ~500,000 documents for queries with 3 
+    terms and about 7% on larger indexes with ~4.3M documents. (Michael Busch)
+
+Documentation
+
+  1. LUCENE-1236:  Added some clarifying remarks to EdgeNGram*.java (Hiroaki Kawai via Grant Ingersoll)
+  
+  2. LUCENE-1157 and LUCENE-1256: HTML changes log, created automatically 
+     from CHANGES.txt. This HTML file is currently visible only via developers page.     
+     (Steven Rowe via Doron Cohen)
+
+  3. LUCENE-1349: Fieldable can now be changed without breaking backward compatibility rules (within reason.  See the note at
+  the top of this file and also on Fieldable.java).  (Grant Ingersoll)
+
+Build
+
+  1. LUCENE-1153: Added JUnit JAR to new lib directory.  Updated build to rely on local JUnit instead of ANT/lib.
+  
+  2. LUCENE-1202: Small fixes to the way Clover is used to work better
+     with contribs.  Of particular note: a single clover db is used
+     regardless of whether tests are run globally or in the specific
+     contrib directories. 
+     
+  3. LUCENE-1353: Javacc target in contrib/miscellaneous for 
+     generating the precedence query parser. 
+
+Test Cases
+
+ 1. LUCENE-1238: Fixed intermittent failures of TestTimeLimitedCollector.testTimeoutMultiThreaded.
+    Within this fix, "greedy" flag was added to TimeLimitedCollector, to allow the wrapped 
+    collector to collect also the last doc, after allowed-tTime passed. (Doron Cohen)   
+	
+ 2. LUCENE-1348: relax TestTimeLimitedCollector to not fail due to 
+    timeout exceeded (just because test machine is very busy).
+	
+======================= Release 2.3.2 2008-05-05 =======================
+
+Bug fixes
+
+ 1. LUCENE-1191: On hitting OutOfMemoryError in any index-modifying
+    methods in IndexWriter, do not commit any further changes to the
+    index to prevent risk of possible corruption.  (Mike McCandless)
+
+ 2. LUCENE-1197: Fixed issue whereby IndexWriter would flush by RAM
+    too early when TermVectors were in use.  (Mike McCandless)
+
+ 3. LUCENE-1198: Don't corrupt index if an exception happens inside
+    DocumentsWriter.init (Mike McCandless)
+
+ 4. LUCENE-1199: Added defensive check for null indexReader before
+    calling close in IndexModifier.close() (Mike McCandless)
+
+ 5. LUCENE-1200: Fix rare deadlock case in addIndexes* when
+    ConcurrentMergeScheduler is in use (Mike McCandless)
+
+ 6. LUCENE-1208: Fix deadlock case on hitting an exception while
+    processing a document that had triggered a flush (Mike McCandless)
+
+ 7. LUCENE-1210: Fix deadlock case on hitting an exception while
+    starting a merge when using ConcurrentMergeScheduler (Mike McCandless)
+
+ 8. LUCENE-1222: Fix IndexWriter.doAfterFlush to always be called on
+    flush (Mark Ferguson via Mike McCandless)
+	
+ 9. LUCENE-1226: Fixed IndexWriter.addIndexes(IndexReader[]) to commit
+    successfully created compound files. (Michael Busch)
+
+10. LUCENE-1150: Re-expose StandardTokenizer's constants publicly;
+    this was accidentally lost with LUCENE-966.  (Nicolas Lalevée via
+    Mike McCandless)
+
+11. LUCENE-1262: Fixed bug in BufferedIndexReader.refill whereby on
+    hitting an exception in readInternal, the buffer is incorrectly
+    filled with stale bytes such that subsequent calls to readByte()
+    return incorrect results.  (Trejkaz via Mike McCandless)
+
+12. LUCENE-1270: Fixed intermittant case where IndexWriter.close()
+    would hang after IndexWriter.addIndexesNoOptimize had been
+    called.  (Stu Hood via Mike McCandless)
+	
+Build
+
+ 1. LUCENE-1230: Include *pom.xml* in source release files. (Michael Busch)
+
+ 
+======================= Release 2.3.1 2008-02-22 =======================
+
+Bug fixes
+    
+ 1. LUCENE-1168: Fixed corruption cases when autoCommit=false and
+    documents have mixed term vectors (Suresh Guvvala via Mike
+    McCandless).
+
+ 2. LUCENE-1171: Fixed some cases where OOM errors could cause
+    deadlock in IndexWriter (Mike McCandless).
+
+ 3. LUCENE-1173: Fixed corruption case when autoCommit=false and bulk
+    merging of stored fields is used (Yonik via Mike McCandless).
+
+ 4. LUCENE-1163: Fixed bug in CharArraySet.contains(char[] buffer, int
+    offset, int len) that was ignoring offset and thus giving the
+    wrong answer.  (Thomas Peuss via Mike McCandless)
+	
+ 5. LUCENE-1177: Fix rare case where IndexWriter.optimize might do too
+    many merges at the end.  (Mike McCandless)
+	
+ 6. LUCENE-1176: Fix corruption case when documents with no term
+    vector fields are added before documents with term vector fields.
+    (Mike McCandless)
+	
+ 7. LUCENE-1179: Fixed assert statement that was incorrectly
+    preventing Fields with empty-string field name from working.
+    (Sergey Kabashnyuk via Mike McCandless)
+
+======================= Release 2.3.0 2008-01-21 =======================
+
+Changes in runtime behavior
+
+ 1. LUCENE-994: Defaults for IndexWriter have been changed to maximize
+    out-of-the-box indexing speed.  First, IndexWriter now flushes by
+    RAM usage (16 MB by default) instead of a fixed doc count (call
+    IndexWriter.setMaxBufferedDocs to get backwards compatible
+    behavior).  Second, ConcurrentMergeScheduler is used to run merges
+    using background threads (call IndexWriter.setMergeScheduler(new
+    SerialMergeScheduler()) to get backwards compatible behavior).
+    Third, merges are chosen based on size in bytes of each segment
+    rather than document count of each segment (call
+    IndexWriter.setMergePolicy(new LogDocMergePolicy()) to get
+    backwards compatible behavior).
+
+    NOTE: users of ParallelReader must change back all of these
+    defaults in order to ensure the docIDs "align" across all parallel
+    indices.
+
+    (Mike McCandless)
+
+ 2. LUCENE-1045: SortField.AUTO didn't work with long. When detecting
+    the field type for sorting automatically, numbers used to be
+    interpreted as int, then as float, if parsing the number as an int
+    failed. Now the detection checks for int, then for long,
+    then for float. (Daniel Naber)
+
+API Changes
+
+ 1. LUCENE-843: Added IndexWriter.setRAMBufferSizeMB(...) to have
+    IndexWriter flush whenever the buffered documents are using more
+    than the specified amount of RAM.  Also added new APIs to Token
+    that allow one to set a char[] plus offset and length to specify a
+    token (to avoid creating a new String() for each Token).  (Mike
+    McCandless)
+
+ 2. LUCENE-963: Add setters to Field to allow for re-using a single
+    Field instance during indexing.  This is a sizable performance
+    gain, especially for small documents.  (Mike McCandless)
+
+ 3. LUCENE-969: Add new APIs to Token, TokenStream and Analyzer to
+    permit re-using of Token and TokenStream instances during
+    indexing.  Changed Token to use a char[] as the store for the
+    termText instead of String.  This gives faster tokenization
+    performance (~10-15%).  (Mike McCandless)
+
+ 4. LUCENE-847: Factored MergePolicy, which determines which merges
+    should take place and when, as well as MergeScheduler, which
+    determines when the selected merges should actually run, out of
+    IndexWriter.  The default merge policy is now
+    LogByteSizeMergePolicy (see LUCENE-845) and the default merge
+    scheduler is now ConcurrentMergeScheduler (see
+    LUCENE-870). (Steven Parkes via Mike McCandless)
+
+ 5. LUCENE-1052: Add IndexReader.setTermInfosIndexDivisor(int) method
+    that allows you to reduce memory usage of the termInfos by further
+    sub-sampling (over the termIndexInterval that was used during
+    indexing) which terms are loaded into memory.  (Chuck Williams,
+    Doug Cutting via Mike McCandless)
+    
+ 6. LUCENE-743: Add IndexReader.reopen() method that re-opens an
+    existing IndexReader (see New features -> 8.) (Michael Busch)
+
+ 7. LUCENE-1062: Add setData(byte[] data), 
+    setData(byte[] data, int offset, int length), getData(), getOffset()
+    and clone() methods to o.a.l.index.Payload. Also add the field name 
+    as arg to Similarity.scorePayload(). (Michael Busch)
+
+ 8. LUCENE-982: Add IndexWriter.optimize(int maxNumSegments) method to
+    "partially optimize" an index down to maxNumSegments segments.
+    (Mike McCandless)
+
+ 9. LUCENE-1080: Changed Token.DEFAULT_TYPE to be public.
+
+10. LUCENE-1064: Changed TopDocs constructor to be public. 
+     (Shai Erera via Michael Busch)
+
+11. LUCENE-1079: DocValues cleanup: constructor now has no params,
+    and getInnerArray() now throws UnsupportedOperationException (Doron Cohen)
+
+12. LUCENE-1089: Added PriorityQueue.insertWithOverflow, which returns
+    the Object (if any) that was bumped from the queue to allow
+    re-use.  (Shai Erera via Mike McCandless)
+    
+13. LUCENE-1101: Token reuse 'contract' (defined LUCENE-969)
+    modified so it is token producer's responsibility
+    to call Token.clear(). (Doron Cohen)   
+
+14. LUCENE-1118: Changed StandardAnalyzer to skip too-long (default >
+    255 characters) tokens.  You can increase this limit by calling
+    StandardAnalyzer.setMaxTokenLength(...).  (Michael McCandless)
+
+
+Bug fixes
+
+ 1. LUCENE-933: QueryParser fixed to not produce empty sub 
+    BooleanQueries "()" even if the Analyzer produced no 
+    tokens for input. (Doron Cohen)
+
+ 2. LUCENE-955: Fixed SegmentTermPositions to work correctly with the
+    first term in the dictionary. (Michael Busch)
+
+ 3. LUCENE-951: Fixed NullPointerException in MultiLevelSkipListReader
+    that was thrown after a call of TermPositions.seek(). 
+    (Rich Johnson via Michael Busch)
+    
+ 4. LUCENE-938: Fixed cases where an unhandled exception in
+    IndexWriter's methods could cause deletes to be lost.
+    (Steven Parkes via Mike McCandless)
+      
+ 5. LUCENE-962: Fixed case where an unhandled exception in
+    IndexWriter.addDocument or IndexWriter.updateDocument could cause
+    unreferenced files in the index to not be deleted
+    (Steven Parkes via Mike McCandless)
+  
+ 6. LUCENE-957: RAMDirectory fixed to properly handle directories
+    larger than Integer.MAX_VALUE. (Doron Cohen)
+
+ 7. LUCENE-781: MultiReader fixed to not throw NPE if isCurrent(),
+    isOptimized() or getVersion() is called. Separated MultiReader
+    into two classes: MultiSegmentReader extends IndexReader, is
+    package-protected and is created automatically by IndexReader.open()
+    in case the index has multiple segments. The public MultiReader 
+    now extends MultiSegmentReader and is intended to be used by users
+    who want to add their own subreaders. (Daniel Naber, Michael Busch)
+
+ 8. LUCENE-970: FilterIndexReader now implements isOptimized(). Before
+    a call of isOptimized() would throw a NPE. (Michael Busch)
+
+ 9. LUCENE-832: ParallelReader fixed to not throw NPE if isCurrent(),
+    isOptimized() or getVersion() is called. (Michael Busch)
+      
+10. LUCENE-948: Fix FNFE exception caused by stale NFS client
+    directory listing caches when writers on different machines are
+    sharing an index over NFS and using a custom deletion policy (Mike
+    McCandless)
+
+11. LUCENE-978: Ensure TermInfosReader, FieldsReader, and FieldsReader
+    close any streams they had opened if an exception is hit in the
+    constructor.  (Ning Li via Mike McCandless)
+
+12. LUCENE-985: If an extremely long term is in a doc (> 16383 chars),
+    we now throw an IllegalArgumentException saying the term is too
+    long, instead of cryptic ArrayIndexOutOfBoundsException.  (Karl
+    Wettin via Mike McCandless)
+
+13. LUCENE-991: The explain() method of BoostingTermQuery had errors
+    when no payloads were present on a document.  (Peter Keegan via
+    Grant Ingersoll)
+
+14. LUCENE-992: Fixed IndexWriter.updateDocument to be atomic again
+    (this was broken by LUCENE-843).  (Ning Li via Mike McCandless)
+
+15. LUCENE-1008: Fixed corruption case when document with no term
+    vector fields is added after documents with term vector fields.
+    This bug was introduced with LUCENE-843.  (Grant Ingersoll via
+    Mike McCandless)
+
+16. LUCENE-1006: Fixed QueryParser to accept a "" field value (zero
+    length quoted string.)  (yonik)
+
+17. LUCENE-1010: Fixed corruption case when document with no term
+    vector fields is added after documents with term vector fields.
+    This case is hit during merge and would cause an EOFException.
+    This bug was introduced with LUCENE-984.  (Andi Vajda via Mike
+    McCandless)
+
+19. LUCENE-1009: Fix merge slowdown with LogByteSizeMergePolicy when
+    autoCommit=false and documents are using stored fields and/or term
+    vectors.  (Mark Miller via Mike McCandless)
+
+20. LUCENE-1011: Fixed corruption case when two or more machines,
+    sharing an index over NFS, can be writers in quick succession.
+    (Patrick Kimber via Mike McCandless)
+
+21. LUCENE-1028: Fixed Weight serialization for few queries:
+    DisjunctionMaxQuery, ValueSourceQuery, CustomScoreQuery.
+    Serialization check added for all queries.
+    (Kyle Maxwell via Doron Cohen)
+
+22. LUCENE-1048: Fixed incorrect behavior in Lock.obtain(...) when the
+    timeout argument is very large (eg Long.MAX_VALUE).  Also added
+    Lock.LOCK_OBTAIN_WAIT_FOREVER constant to never timeout.  (Nikolay
+    Diakov via Mike McCandless)
+
+23. LUCENE-1050: Throw LockReleaseFailedException in
+    Simple/NativeFSLockFactory if we fail to delete the lock file when
+    releasing the lock.  (Nikolay Diakov via Mike McCandless)
+
+24. LUCENE-1071: Fixed SegmentMerger to correctly set payload bit in 
+    the merged segment. (Michael Busch)
+
+25. LUCENE-1042: Remove throwing of IOException in getTermFreqVector(int, String, TermVectorMapper) to be consistent
+    with other getTermFreqVector calls.  Also removed the throwing of the other IOException in that method to be consistent.  (Karl Wettin via Grant Ingersoll)
+    
+26. LUCENE-1096: Fixed Hits behavior when hits' docs are deleted 
+    along with iterating the hits. Deleting docs already retrieved 
+    now works seamlessly. If docs not yet retrieved are deleted 
+    (e.g. from another thread), and then, relying on the initial 
+    Hits.length(), an application attempts to retrieve more hits 
+    than actually exist , a ConcurrentMidificationException 
+    is thrown.  (Doron Cohen)
+
+27. LUCENE-1068: Changed StandardTokenizer to fix an issue with it marking
+  the type of some tokens incorrectly.  This is done by adding a new flag named
+  replaceInvalidAcronym which defaults to false, the current, incorrect behavior.  Setting
+  this flag to true fixes the problem.  This flag is a temporary fix and is already
+  marked as being deprecated.  3.x will implement the correct approach.  (Shai Erera via Grant Ingersoll)
+  LUCENE-1140: Fixed NPE caused by 1068 (Alexei Dets via Grant Ingersoll)
+    
+28. LUCENE-749: ChainedFilter behavior fixed when logic of 
+    first filter is ANDNOT.  (Antonio Bruno via Doron Cohen)
+
+29. LUCENE-508: Make sure SegmentTermEnum.prev() is accurate (= last
+    term) after next() returns false.  (Steven Tamm via Mike
+    McCandless)
+
+    
+New features
+
+ 1. LUCENE-906: Elision filter for French.
+    (Mathieu Lecarme via Otis Gospodnetic)
+
+ 2. LUCENE-960: Added a SpanQueryFilter and related classes to allow for
+    not only filtering, but knowing where in a Document a Filter matches
+    (Grant Ingersoll)
+
+ 3. LUCENE-868: Added new Term Vector access features.  New callback
+    mechanism allows application to define how and where to read Term
+    Vectors from disk. This implementation contains several extensions
+    of the new abstract TermVectorMapper class.  The new API should be
+    back-compatible.  No changes in the actual storage of Term Vectors
+    has taken place.
+ 3.1 LUCENE-1038: Added setDocumentNumber() method to TermVectorMapper
+     to provide information about what document is being accessed.
+     (Karl Wettin via Grant Ingersoll)
+
+ 4. LUCENE-975: Added PositionBasedTermVectorMapper that allows for
+    position based lookup of term vector information.
+    See item #3 above (LUCENE-868).
+
+ 5. LUCENE-1011: Added simple tools (all in org.apache.lucene.store)
+    to verify that locking is working properly.  LockVerifyServer runs
+    a separate server to verify locks.  LockStressTest runs a simple
+    tool that rapidly obtains and releases locks.
+    VerifyingLockFactory is a LockFactory that wraps any other
+    LockFactory and consults the LockVerifyServer whenever a lock is
+    obtained or released, throwing an exception if an illegal lock
+    obtain occurred.  (Patrick Kimber via Mike McCandless)
+
+ 6. LUCENE-1015: Added FieldCache extension (ExtendedFieldCache) to
+    support doubles and longs.  Added support into SortField for sorting
+    on doubles and longs as well.  (Grant Ingersoll)
+
+ 7. LUCENE-1020: Created basic index checking & repair tool
+    (o.a.l.index.CheckIndex).  When run without -fix it does a
+    detailed test of all segments in the index and reports summary
+    information and any errors it hit.  With -fix it will remove
+    segments that had errors.  (Mike McCandless)
+
+ 8. LUCENE-743: Add IndexReader.reopen() method that re-opens an
+    existing IndexReader by only loading those portions of an index
+    that have changed since the reader was (re)opened. reopen() can
+    be significantly faster than open(), depending on the amount of
+    index changes. SegmentReader, MultiSegmentReader, MultiReader,
+    and ParallelReader implement reopen(). (Michael Busch) 
+
+ 9. LUCENE-1040: CharArraySet useful for efficiently checking
+    set membership of text specified by char[]. (yonik)
+
+10. LUCENE-1073: Created SnapshotDeletionPolicy to facilitate taking a
+    live backup of an index without pausing indexing.  (Mike
+    McCandless)
+    
+11. LUCENE-1019: CustomScoreQuery enhanced to support multiple 
+    ValueSource queries. (Kyle Maxwell via Doron Cohen)
+    
+12. LUCENE-1095: Added an option to StopFilter to increase 
+    positionIncrement of the token succeeding a stopped token.
+    Disabled by default. Similar option added to QueryParser 
+    to consider token positions when creating PhraseQuery 
+    and MultiPhraseQuery. Disabled by default (so by default
+    the query parser ignores position increments).
+    (Doron Cohen)
+
+
+
+Optimizations
+
+ 1. LUCENE-937: CachingTokenFilter now uses an iterator to access the 
+    Tokens that are cached in the LinkedList. This increases performance 
+    significantly, especially when the number of Tokens is large. 
+    (Mark Miller via Michael Busch)
+
+ 2. LUCENE-843: Substantial optimizations to improve how IndexWriter
+    uses RAM for buffering documents and to speed up indexing (2X-8X
+    faster).  A single shared hash table now records the in-memory
+    postings per unique term and is directly flushed into a single
+    segment.  (Mike McCandless)
+ 
+ 3. LUCENE-892: Fixed extra "buffer to buffer copy" that sometimes
+    takes place when using compound files.  (Mike McCandless)
+
+ 4. LUCENE-959: Remove synchronization in Document (yonik)
+
+ 5. LUCENE-963: Add setters to Field to allow for re-using a single
+    Field instance during indexing.  This is a sizable performance
+    gain, especially for small documents.  (Mike McCandless)
+
+ 6. LUCENE-939: Check explicitly for boundary conditions in FieldInfos
+    and don't rely on exceptions. (Michael Busch)
+
+ 7. LUCENE-966: Very substantial speedups (~6X faster) for
+    StandardTokenizer (StandardAnalyzer) by using JFlex instead of
+    JavaCC to generate the tokenizer.
+    (Stanislaw Osinski via Mike McCandless)
+
+ 8. LUCENE-969: Changed core tokenizers & filters to re-use Token and
+    TokenStream instances when possible to improve tokenization
+    performance (~10-15%). (Mike McCandless)
+
+ 9. LUCENE-871: Speedup ISOLatin1AccentFilter (Ian Boston via Mike
+    McCandless)
+
+10. LUCENE-986: Refactored SegmentInfos from IndexReader into the new
+    subclass DirectoryIndexReader. SegmentReader and MultiSegmentReader
+    now extend DirectoryIndexReader and are the only IndexReader 
+    implementations that use SegmentInfos to access an index and 
+    acquire a write lock for index modifications. (Michael Busch)
+
+11. LUCENE-1007: Allow flushing in IndexWriter to be triggered by
+    either RAM usage or document count or both (whichever comes
+    first), by adding symbolic constant DISABLE_AUTO_FLUSH to disable
+    one of the flush triggers.  (Ning Li via Mike McCandless)
+
+12. LUCENE-1043: Speed up merging of stored fields by bulk-copying the
+    raw bytes for each contiguous range of non-deleted documents.
+    (Robert Engels via Mike McCandless)
+
+13. LUCENE-693: Speed up nested conjunctions (~2x) that match many
+    documents, and a slight performance increase for top level
+    conjunctions.  (yonik)
+
+14. LUCENE-1098: Make inner class StandardAnalyzer.SavedStreams static 
+    and final. (Nathan Beyer via Michael Busch)
+
+Documentation
+
+ 1. LUCENE-1051: Generate separate javadocs for core, demo and contrib
+    classes, as well as an unified view. Also add an appropriate menu 
+    structure to the website. (Michael Busch)
+
+ 2. LUCENE-746: Fix error message in AnalyzingQueryParser.getPrefixQuery.
+    (Ronnie Kolehmainen via Michael Busch)
+
+Build
+
+ 1. LUCENE-908: Improvements and simplifications for how the MANIFEST
+    file and the META-INF dir are created. (Michael Busch)
+
+ 2. LUCENE-935: Various improvements for the maven artifacts. Now the
+    artifacts also include the sources as .jar files. (Michael Busch)
+
+ 3. Added apply-patch target to top-level build.  Defaults to looking for
+    a patch in ${basedir}/../patches with name specified by -Dpatch.name.
+    Can also specify any location by -Dpatch.file property on the command
+    line.  This should be helpful for easy application of patches, but it
+    is also a step towards integrating automatic patch application with
+    JIRA and Hudson, and is thus subject to change.  (Grant Ingersoll)
+ 
+ 4. LUCENE-935: Defined property "m2.repository.url" to allow setting
+    the url to a maven remote repository to deploy to. (Michael Busch)
+
+ 5. LUCENE-1051: Include javadocs in the maven artifacts. (Michael Busch)
+
+ 6. LUCENE-1055: Remove gdata-server from build files and its sources 
+    from trunk. (Michael Busch)
+
+ 7. LUCENE-935: Allow to deploy maven artifacts to a remote m2 repository
+    via scp and ssh authentication. (Michael Busch)
+	
+ 8. LUCENE-1123: Allow overriding the specification version for 
+    MANIFEST.MF (Michael Busch)
+
+Test Cases
+
+ 1. LUCENE-766: Test adding two fields with the same name but different 
+    term vector setting.  (Nicolas Lalevée via Doron Cohen)  
+    
+======================= Release 2.2.0 2007-06-19 =======================
+
+Changes in runtime behavior
+
+API Changes
+
+ 1. LUCENE-793: created new exceptions and added them to throws clause
+    for many methods (all subclasses of IOException for backwards
+    compatibility): index.StaleReaderException,
+    index.CorruptIndexException, store.LockObtainFailedException.
+    This was done to better call out the possible root causes of an
+    IOException from these methods.  (Mike McCandless)
+
+ 2. LUCENE-811: make SegmentInfos class, plus a few methods from related
+    classes, package-private again (they were unnecessarily made public
+    as part of LUCENE-701).  (Mike McCandless)
+
+ 3. LUCENE-710: added optional autoCommit boolean to IndexWriter
+    constructors.  When this is false, index changes are not committed
+    until the writer is closed.  This gives explicit control over when
+    a reader will see the changes.  Also added optional custom
+    deletion policy to explicitly control when prior commits are
+    removed from the index.  This is intended to allow applications to
+    share an index over NFS by customizing when prior commits are
+    deleted. (Mike McCandless)
+
+ 4. LUCENE-818: changed most public methods of IndexWriter,
+    IndexReader (and its subclasses), FieldsReader and RAMDirectory to
+    throw AlreadyClosedException if they are accessed after being
+    closed.  (Mike McCandless)
+
+ 5. LUCENE-834: Changed some access levels for certain Span classes to allow them
+    to be overridden.  They have been marked expert only and not for public
+    consumption. (Grant Ingersoll) 
+
+ 6. LUCENE-796: Removed calls to super.* from various get*Query methods in
+    MultiFieldQueryParser, in order to allow sub-classes to override them.
+    (Steven Parkes via Otis Gospodnetic)
+
+ 7. LUCENE-857: Removed caching from QueryFilter and deprecated QueryFilter
+    in favour of QueryWrapperFilter or QueryWrapperFilter + CachingWrapperFilter
+    combination when caching is desired.
+    (Chris Hostetter, Otis Gospodnetic)
+
+ 8. LUCENE-869: Changed FSIndexInput and FSIndexOutput to inner classes of FSDirectory
+    to enable extensibility of these classes. (Michael Busch)
+
+ 9. LUCENE-580: Added the public method reset() to TokenStream. This method does
+    nothing by default, but may be overwritten by subclasses to support consuming
+    the TokenStream more than once. (Michael Busch)
+
+10. LUCENE-580: Added a new constructor to Field that takes a TokenStream as
+    argument, available as tokenStreamValue(). This is useful to avoid the need of 
+    "dummy analyzers" for pre-analyzed fields. (Karl Wettin, Michael Busch)
+
+11. LUCENE-730: Added the new methods to BooleanQuery setAllowDocsOutOfOrder() and
+    getAllowDocsOutOfOrder(). Deprecated the methods setUseScorer14() and 
+    getUseScorer14(). The optimization patch LUCENE-730 (see Optimizations->3.) 
+    improves performance for certain queries but results in scoring out of docid 
+    order. This patch reverse this change, so now by default hit docs are scored
+    in docid order if not setAllowDocsOutOfOrder(true) is explicitly called.
+    This patch also enables the tests in QueryUtils again that check for docid
+    order. (Paul Elschot, Doron Cohen, Michael Busch)
+
+12. LUCENE-888: Added Directory.openInput(File path, int bufferSize)
+    to optionally specify the size of the read buffer.  Also added
+    BufferedIndexInput.setBufferSize(int) to change the buffer size.
+    (Mike McCandless)
+
+13. LUCENE-923: Make SegmentTermPositionVector package-private. It does not need
+    to be public because it implements the public interface TermPositionVector.
+    (Michael Busch)
+
+Bug fixes
+
+ 1. LUCENE-804: Fixed build.xml to pack a fully compilable src dist.  (Doron Cohen)
+
+ 2. LUCENE-813: Leading wildcard fixed to work with trailing wildcard.
+    Query parser modified to create a prefix query only for the case 
+    that there is a single trailing wildcard (and no additional wildcard 
+    or '?' in the query text).  (Doron Cohen)
+
+ 3. LUCENE-812: Add no-argument constructors to NativeFSLockFactory
+    and SimpleFSLockFactory.  This enables all 4 builtin LockFactory
+    implementations to be specified via the System property
+    org.apache.lucene.store.FSDirectoryLockFactoryClass.  (Mike McCandless)
+
+ 4. LUCENE-821: The new single-norm-file introduced by LUCENE-756
+    failed to reduce the number of open descriptors since it was still
+    opened once per field with norms. (yonik)
+
+ 5. LUCENE-823: Make sure internal file handles are closed when
+    hitting an exception (eg disk full) while flushing deletes in
+    IndexWriter's mergeSegments, and also during
+    IndexWriter.addIndexes.  (Mike McCandless)
+
+ 6. LUCENE-825: If directory is removed after
+    FSDirectory.getDirectory() but before IndexReader.open you now get
+    a FileNotFoundException like Lucene pre-2.1 (before this fix you
+    got an NPE).  (Mike McCandless)
+
+ 7. LUCENE-800: Removed backslash from the TERM_CHAR list in the queryparser, 
+    because the backslash is the escape character. Also changed the ESCAPED_CHAR
+    list to contain all possible characters, because every character that 
+    follows a backslash should be considered as escaped. (Michael Busch)
+
+ 8. LUCENE-372: QueryParser.parse() now ensures that the entire input string 
+    is consumed. Now a ParseException is thrown if a query contains too many
+    closing parentheses. (Andreas Neumann via Michael Busch)
+
+ 9. LUCENE-814: javacc build targets now fix line-end-style of generated files.
+    Now also deleting all javacc generated files before calling javacc.
+    (Steven Parkes, Doron Cohen)
+    
+10. LUCENE-829: close readers in contrib/benchmark. (Karl Wettin, Doron Cohen)
+
+11. LUCENE-828: Minor fix for Term's equal().
+    (Paul Cowan via Otis Gospodnetic)
+
+12. LUCENE-846: Fixed: if IndexWriter is opened with autoCommit=false,
+    and you call addIndexes, and hit an exception (eg disk full) then
+    when IndexWriter rolls back its internal state this could corrupt
+    the instance of IndexWriter (but, not the index itself) by
+    referencing already deleted segments.  This bug was only present
+    in 2.2 (trunk), ie was never released.  (Mike McCandless)
+    
+13. LUCENE-736: Sloppy phrase query with repeating terms matches wrong docs.
+    For example query "B C B"~2 matches the doc "A B C D E". (Doron Cohen)
+    
+14. LUCENE-789: Fixed: custom similarity is ignored when using MultiSearcher (problem reported 
+    by Alexey Lef). Now the similarity applied by MultiSearcer.setSimilarity(sim) is being used. 
+    Note that as before this fix, creating a multiSearcher from Searchers for whom custom similarity 
+    was set has no effect - it is masked by the similarity of the MultiSearcher. This is as 
+    designed, because MultiSearcher operates on Searchables (not Searchers). (Doron Cohen)
+
+15. LUCENE-880: Fixed DocumentWriter to close the TokenStreams after it
+    has written the postings. Then the resources associated with the 
+    TokenStreams can safely be released. (Michael Busch)
+
+16. LUCENE-883: consecutive calls to Spellchecker.indexDictionary()
+    won't insert terms twice anymore. (Daniel Naber)
+
+17. LUCENE-881: QueryParser.escape() now also escapes the characters
+    '|' and '&' which are part of the queryparser syntax. (Michael Busch)
+
+18. LUCENE-886: Spellchecker clean up: exceptions aren't printed to STDERR
+    anymore and ignored, but re-thrown. Some javadoc improvements.
+    (Daniel Naber)
+
+19. LUCENE-698: FilteredQuery now takes the query boost into account for 
+    scoring. (Michael Busch)
+
+20. LUCENE-763: Spellchecker: LuceneDictionary used to skip first word in 
+    enumeration. (Christian Mallwitz via Daniel Naber)
+    
+21. LUCENE-903: FilteredQuery explanation inaccuracy with boost.
+    Explanation tests now "deep" check the explanation details.
+    (Chris Hostetter, Doron Cohen)
+    
+22. LUCENE-912: DisjunctionMaxScorer first skipTo(target) call ignores the 
+    skip target param and ends up at the first match.
+    (Sudaakeran B. via Chris Hostetter & Doron Cohen)
+    
+23. LUCENE-913: Two consecutive score() calls return different 
+    scores for Boolean Queries. (Michael Busch, Doron Cohen)
+
+24. LUCENE-1013: Fix IndexWriter.setMaxMergeDocs to work "out of the
+    box", again, by moving set/getMaxMergeDocs up from
+    LogDocMergePolicy into LogMergePolicy.  This fixes the API
+    breakage (non backwards compatible change) caused by LUCENE-994.
+    (Yonik Seeley via Mike McCandless)
+
+New features
+
+ 1. LUCENE-759: Added two n-gram-producing TokenFilters.
+    (Otis Gospodnetic)
+
+ 2. LUCENE-822: Added FieldSelector capabilities to Searchable for use with
+    RemoteSearcher, and other Searchable implementations. (Mark Miller, Grant Ingersoll)
+
+ 3. LUCENE-755: Added the ability to store arbitrary binary metadata in the posting list.
+    These metadata are called Payloads. For every position of a Token one Payload in the form
+    of a variable length byte array can be stored in the prox file.
+    Remark: The APIs introduced with this feature are in experimental state and thus
+            contain appropriate warnings in the javadocs.
+    (Michael Busch)
+
+ 4. LUCENE-834: Added BoostingTermQuery which can boost scores based on the
+    values of a payload (see #3 above.) (Grant Ingersoll)
+
+ 5. LUCENE-834: Similarity has a new method for scoring payloads called
+    scorePayloads that can be overridden to take advantage of payload
+    storage (see #3 above)
+
+ 6. LUCENE-834: Added isPayloadAvailable() onto TermPositions interface and
+    implemented it in the appropriate places (Grant Ingersoll)
+
+ 7. LUCENE-853: Added RemoteCachingWrapperFilter to enable caching of Filters
+    on the remote side of the RMI connection.
+    (Matt Ericson via Otis Gospodnetic)
+
+ 8. LUCENE-446: Added Solr's search.function for scores based on field 
+    values, plus CustomScoreQuery for simple score (post) customization.
+    (Yonik Seeley, Doron Cohen)
+
+ 9. LUCENE-1058: Added new TeeTokenFilter (like the UNIX 'tee' command) and SinkTokenizer which can be used to share tokens between two or more
+    Fields such that the other Fields do not have to go through the whole Analysis process over again.  For instance, if you have two
+    Fields that share all the same analysis steps except one lowercases tokens and the other does not, you can coordinate the operations
+    between the two using the TeeTokenFilter and the SinkTokenizer.  See TeeSinkTokenTest.java for examples.
+    (Grant Ingersoll, Michael Busch, Yonik Seeley)
+ 
+Optimizations
+
+ 1. LUCENE-761: The proxStream is now cloned lazily in SegmentTermPositions
+    when nextPosition() is called for the first time. This allows using instances
+    of SegmentTermPositions instead of SegmentTermDocs without additional costs.
+    (Michael Busch)
+
+ 2. LUCENE-431: RAMInputStream and RAMOutputStream extend IndexInput and
+    IndexOutput directly now. This avoids further buffering and thus avoids 
+    unnecessary array copies. (Michael Busch)
+
+ 3. LUCENE-730: Updated BooleanScorer2 to make use of BooleanScorer in some
+    cases and possibly improve scoring performance.  Documents can now be
+    delivered out-of-order as they are scored (e.g. to HitCollector).
+    N.B. A bit of code had to be disabled in QueryUtils in order for
+    TestBoolean2 test to keep passing.
+    (Paul Elschot via Otis Gospodnetic)
+
+ 4. LUCENE-882: Spellchecker doesn't store the ngrams anymore but only indexes
+    them to keep the spell index small. (Daniel Naber)
+
+ 5. LUCENE-430: Delay allocation of the buffer after a clone of BufferedIndexInput.
+    Together with LUCENE-888 this will allow to adjust the buffer size
+    dynamically. (Paul Elschot, Michael Busch)
+ 
+ 6. LUCENE-888: Increase buffer sizes inside CompoundFileWriter and
+    BufferedIndexOutput.  Also increase buffer size in
+    BufferedIndexInput, but only when used during merging.  Together,
+    these increases yield 10-18% overall performance gain vs the
+    previous 1K defaults.  (Mike McCandless)
+
+ 7. LUCENE-866: Adds multi-level skip lists to the posting lists. This speeds 
+    up most queries that use skipTo(), especially on big indexes with large posting 
+    lists. For average AND queries the speedup is about 20%, for queries that 
+    contain very frequent and very unique terms the speedup can be over 80%.
+    (Michael Busch)
+
+Documentation
+
+ 1. LUCENE 791 && INFRA-1173: Infrastructure moved the Wiki to
+    http://wiki.apache.org/lucene-java/   Updated the links in the docs and
+    wherever else I found references.  (Grant Ingersoll, Joe Schaefer)
+
+ 2. LUCENE-807: Fixed the javadoc for ScoreDocComparator.compare() to be 
+    consistent with java.util.Comparator.compare(): Any integer is allowed to 
+    be returned instead of only -1/0/1.
+    (Paul Cowan via Michael Busch)
+ 
+ 3. LUCENE-875: Solved javadoc warnings & errors under jdk1.4. 
+    Solved javadoc errors under jdk5 (jars in path for gdata).
+    Made "javadocs" target depend on "build-contrib" for first downloading
+    contrib jars configured for dynamic downloaded. (Note: when running
+    behind firewall, a firewall prompt might pop up) (Doron Cohen)
+
+ 4. LUCENE-740: Added SNOWBALL-LICENSE.txt to the snowball package and a
+    remark about the license to NOTICE.TXT. (Steven Parkes via Michael Busch)
+
+ 5. LUCENE-925: Added analysis package javadocs. (Grant Ingersoll and Doron Cohen)
+
+ 6. LUCENE-926: Added document package javadocs. (Grant Ingersoll)
+
+Build
+
+ 1. LUCENE-802: Added LICENSE.TXT and NOTICE.TXT to Lucene jars.
+    (Steven Parkes via Michael Busch)
+
+ 2. LUCENE-885: "ant test" now includes all contrib tests.  The new
+    "ant test-core" target can be used to run only the Core (non
+    contrib) tests. 
+    (Chris Hostetter)
+    
+ 3. LUCENE-900: "ant test" now enables Java assertions (in Lucene packages).
+    (Doron Cohen)
+
+ 4. LUCENE-894: Add custom build file for binary distributions that includes
+    targets to build the demos. (Chris Hostetter, Michael Busch)
+
+ 5. LUCENE-904: The "package" targets in build.xml now also generate .md5
+    checksum files. (Chris Hostetter, Michael Busch)
+
+ 6. LUCENE-907: Include LICENSE.TXT and NOTICE.TXT in the META-INF dirs of
+    demo war, demo jar, and the contrib jars. (Michael Busch)
+    
+ 7. LUCENE-909: Demo targets for running the demo. (Doron Cohen)
+
+ 8. LUCENE-908: Improves content of MANIFEST file and makes it customizable
+    for the contribs. Adds SNOWBALL-LICENSE.txt to META-INF of the snowball
+    jar and makes sure that the lucli jar contains LICENSE.txt and NOTICE.txt.
+    (Chris Hostetter, Michael Busch)
+
+ 9. LUCENE-930: Various contrib building improvements to ensure contrib
+    dependencies are met, and test compilation errors fail the build.
+    (Steven Parkes, Chris Hostetter)
+
+10. LUCENE-622: Add ant target and pom.xml files for building maven artifacts 
+    of the Lucene core and the contrib modules. 
+    (Sami Siren, Karl Wettin, Michael Busch)
+
+======================= Release 2.1.0 2007-02-14 =======================
+
+Changes in runtime behavior
+
+ 1. 's' and 't' have been removed from the list of default stopwords
+    in StopAnalyzer (also used in by StandardAnalyzer). Having e.g. 's'
+    as a stopword meant that 's-class' led to the same results as 'class'.
+    Note that this problem still exists for 'a', e.g. in 'a-class' as
+    'a' continues to be a stopword.
+    (Daniel Naber)
+
+ 2. LUCENE-478: Updated the list of Unicode code point ranges for CJK
+    (now split into CJ and K) in StandardAnalyzer.  (John Wang and
+    Steven Rowe via Otis Gospodnetic)
+
+ 3. Modified some CJK Unicode code point ranges in StandardTokenizer.jj,
+    and added a few more of them to increase CJK character coverage.
+    Also documented some of the ranges.
+    (Otis Gospodnetic)
+
+ 4. LUCENE-489: Add support for leading wildcard characters (*, ?) to
+    QueryParser.  Default is to disallow them, as before.
+    (Steven Parkes via Otis Gospodnetic)
+
+ 5. LUCENE-703: QueryParser changed to default to use of ConstantScoreRangeQuery
+    for range queries. Added useOldRangeQuery property to QueryParser to allow
+    selection of old RangeQuery class if required.
+    (Mark Harwood)
+
+ 6. LUCENE-543: WildcardQuery now performs a TermQuery if the provided term
+    does not contain a wildcard character (? or *), when previously a
+    StringIndexOutOfBoundsException was thrown.
+    (Michael Busch via Erik Hatcher)
+
+ 7. LUCENE-726: Removed the use of deprecated doc.fields() method and
+    Enumeration.
+    (Michael Busch via Otis Gospodnetic)
+
+ 8. LUCENE-436: Removed finalize() in TermInfosReader and SegmentReader,
+    and added a call to enumerators.remove() in TermInfosReader.close().
+    The finalize() overrides were added to help with a pre-1.4.2 JVM bug
+    that has since been fixed, plus we no longer support pre-1.4.2 JVMs.
+    (Otis Gospodnetic)
+
+ 9. LUCENE-771: The default location of the write lock is now the
+    index directory, and is named simply "write.lock" (without a big
+    digest prefix).  The system properties "org.apache.lucene.lockDir"
+    nor "java.io.tmpdir" are no longer used as the global directory
+    for storing lock files, and the LOCK_DIR field of FSDirectory is
+    now deprecated.  (Mike McCandless)
+
+New features
+
+ 1. LUCENE-503: New ThaiAnalyzer and ThaiWordFilter in contrib/analyzers
+    (Samphan Raruenrom via Chris Hostetter)
+
+ 2. LUCENE-545: New FieldSelector API and associated changes to
+    IndexReader and implementations.  New Fieldable interface for use
+    with the lazy field loading mechanism.  (Grant Ingersoll and Chuck
+    Williams via Grant Ingersoll)
+
+ 3. LUCENE-676: Move Solr's PrefixFilter to Lucene core. (Yura
+    Smolsky, Yonik Seeley)
+
+ 4. LUCENE-678: Added NativeFSLockFactory, which implements locking
+    using OS native locking (via java.nio.*).  (Michael McCandless via
+    Yonik Seeley)
+
+ 5. LUCENE-544: Added the ability to specify different boosts for
+    different fields when using MultiFieldQueryParser (Matt Ericson
+    via Otis Gospodnetic)
+
+ 6. LUCENE-528: New IndexWriter.addIndexesNoOptimize() that doesn't
+    optimize the index when adding new segments, only performing
+    merges as needed.  (Ning Li via Yonik Seeley)
+
+ 7. LUCENE-573: QueryParser now allows backslash escaping in
+    quoted terms and phrases. (Michael Busch via Yonik Seeley)
+
+ 8. LUCENE-716: QueryParser now allows specification of Unicode
+    characters in terms via a unicode escape of the form \uXXXX
+    (Michael Busch via Yonik Seeley)
+
+ 9. LUCENE-709: Added RAMDirectory.sizeInBytes(), IndexWriter.ramSizeInBytes()
+    and IndexWriter.flushRamSegments(), allowing applications to
+    control the amount of memory used to buffer documents.
+    (Chuck Williams via Yonik Seeley)
+
+10. LUCENE-723: QueryParser now parses *:* as MatchAllDocsQuery
+    (Yonik Seeley)
+
+11. LUCENE-741: Command-line utility for modifying or removing norms
+    on fields in an existing index.  This is mostly based on LUCENE-496
+    and lives in contrib/miscellaneous.
+    (Chris Hostetter, Otis Gospodnetic)
+
+12. LUCENE-759: Added NGramTokenizer and EdgeNGramTokenizer classes and
+    their passing unit tests.
+    (Otis Gospodnetic)
+
+13. LUCENE-565: Added methods to IndexWriter to more efficiently
+    handle updating documents (the "delete then add" use case).  This
+    is intended to be an eventual replacement for the existing
+    IndexModifier.  Added IndexWriter.flush() (renamed from
+    flushRamSegments()) to flush all pending updates (held in RAM), to
+    the Directory.  (Ning Li via Mike McCandless)
+
+14. LUCENE-762: Added in SIZE and SIZE_AND_BREAK FieldSelectorResult options
+    which allow one to retrieve the size of a field without retrieving the
+    actual field. (Chuck Williams via Grant Ingersoll)
+
+15. LUCENE-799: Properly handle lazy, compressed fields.
+    (Mike Klaas via Grant Ingersoll)
+
+API Changes
+
+ 1. LUCENE-438: Remove "final" from Token, implement Cloneable, allow
+    changing of termText via setTermText().  (Yonik Seeley)
+
+ 2. org.apache.lucene.analysis.nl.WordlistLoader has been deprecated
+    and is supposed to be replaced with the WordlistLoader class in
+    package org.apache.lucene.analysis (Daniel Naber)
+
+ 3. LUCENE-609: Revert return type of Document.getField(s) to Field
+    for backward compatibility, added new Document.getFieldable(s)
+    for access to new lazy loaded fields. (Yonik Seeley)
+
+ 4. LUCENE-608: Document.fields() has been deprecated and a new method
+    Document.getFields() has been added that returns a List instead of
+    an Enumeration (Daniel Naber)
+
+ 5. LUCENE-605: New Explanation.isMatch() method and new ComplexExplanation
+    subclass allows explain methods to produce Explanations which model
+    "matching" independent of having a positive value.
+    (Chris Hostetter)
+
+ 6. LUCENE-621: New static methods IndexWriter.setDefaultWriteLockTimeout
+    and IndexWriter.setDefaultCommitLockTimeout for overriding default
+    timeout values for all future instances of IndexWriter (as well
+    as for any other classes that may reference the static values,
+    ie: IndexReader).
+    (Michael McCandless via Chris Hostetter)
+
+ 7. LUCENE-638: FSDirectory.list() now only returns the directory's
+    Lucene-related files. Thanks to this change one can now construct
+    a RAMDirectory from a file system directory that contains files
+    not related to Lucene.
+    (Simon Willnauer via Daniel Naber)
+
+ 8. LUCENE-635: Decoupling locking implementation from Directory
+    implementation.  Added set/getLockFactory to Directory and moved
+    all locking code into subclasses of abstract class LockFactory.
+    FSDirectory and RAMDirectory still default to their prior locking
+    implementations, but now you can mix & match, for example using
+    SingleInstanceLockFactory (ie, in memory locking) locking with an
+    FSDirectory.  Note that now you must call setDisableLocks before
+    the instantiation a FSDirectory if you wish to disable locking
+    for that Directory.
+    (Michael McCandless, Jeff Patterson via Yonik Seeley)
+
+ 9. LUCENE-657: Made FuzzyQuery non-final and inner ScoreTerm protected.
+    (Steven Parkes via Otis Gospodnetic)
+
+10. LUCENE-701: Lockless commits: a commit lock is no longer required
+    when a writer commits and a reader opens the index.  This includes
+    a change to the index file format (see docs/fileformats.html for
+    details).  It also removes all APIs associated with the commit
+    lock & its timeout.  Readers are now truly read-only and do not
+    block one another on startup.  This is the first step to getting
+    Lucene to work correctly over NFS (second step is
+    LUCENE-710). (Mike McCandless)
+
+11. LUCENE-722: DEFAULT_MIN_DOC_FREQ was misspelled DEFALT_MIN_DOC_FREQ
+    in Similarity's MoreLikeThis class. The misspelling has been
+    replaced by the correct spelling.
+    (Andi Vajda via Daniel Naber)
+
+12. LUCENE-738: Reduce the size of the file that keeps track of which
+    documents are deleted when the number of deleted documents is
+    small.  This changes the index file format and cannot be
+    read by previous versions of Lucene.  (Doron Cohen via Yonik Seeley)
+
+13. LUCENE-756: Maintain all norms in a single .nrm file to reduce the
+    number of open files and file descriptors for the non-compound index
+    format.  This changes the index file format, but maintains the
+    ability to read and update older indices. The first segment merge
+    on an older format index will create a single .nrm file for the new
+    segment.  (Doron Cohen via Yonik Seeley)
+
+14. LUCENE-732: DateTools support has been added to QueryParser, with
+    setters for both the default Resolution, and per-field Resolution.
+    For backwards compatibility, DateField is still used if no Resolutions
+    are specified. (Michael Busch via Chris Hostetter)
+
+15. Added isOptimized() method to IndexReader.
+    (Otis Gospodnetic)
+
+16. LUCENE-773: Deprecate the FSDirectory.getDirectory(*) methods that
+    take a boolean "create" argument.  Instead you should use
+    IndexWriter's "create" argument to create a new index.
+    (Mike McCandless)
+
+17. LUCENE-780: Add a static Directory.copy() method to copy files
+    from one Directory to another.  (Jiri Kuhn via Mike McCandless)
+
+18. LUCENE-773: Added Directory.clearLock(String name) to forcefully
+    remove an old lock.  The default implementation is to ask the
+    lockFactory (if non null) to clear the lock.  (Mike McCandless)
+
+19. LUCENE-795: Directory.renameFile() has been deprecated as it is
+    not used anymore inside Lucene.  (Daniel Naber)
+
+Bug fixes
+
+ 1. Fixed the web application demo (built with "ant war-demo") which
+    didn't work because it used a QueryParser method that had
+    been removed (Daniel Naber)
+
+ 2. LUCENE-583: ISOLatin1AccentFilter fails to preserve positionIncrement
+    (Yonik Seeley)
+
+ 3. LUCENE-575: SpellChecker min score is incorrectly changed by suggestSimilar
+    (Karl Wettin via Yonik Seeley)
+
+ 4. LUCENE-587: Explanation.toHtml was producing malformed HTML
+    (Chris Hostetter)
+
+ 5. Fix to allow MatchAllDocsQuery to be used with RemoteSearcher (Yonik Seeley)
+
+ 6. LUCENE-601: RAMDirectory and RAMFile made Serializable
+    (Karl Wettin via Otis Gospodnetic)
+
+ 7. LUCENE-557: Fixes to BooleanQuery and FilteredQuery so that the score
+    Explanations match up with the real scores.
+    (Chris Hostetter)
+
+ 8. LUCENE-607: ParallelReader's TermEnum fails to advance properly to
+    new fields (Chuck Williams, Christian Kohlschuetter via Yonik Seeley)
+
+ 9. LUCENE-610,LUCENE-611: Simple syntax changes to allow compilation with ecj:
+    disambiguate inner class scorer's use of doc() in BooleanScorer2,
+    other test code changes.  (DM Smith via Yonik Seeley)
+
+10. LUCENE-451: All core query types now use ComplexExplanations so that
+    boosts of zero don't confuse the BooleanWeight explain method.
+    (Chris Hostetter)
+
+11. LUCENE-593: Fixed LuceneDictionary's inner Iterator
+    (KÃ¥re Fiedler Christiansen via Otis Gospodnetic)
+
+12. LUCENE-641: fixed an off-by-one bug with IndexWriter.setMaxFieldLength()
+    (Daniel Naber)
+
+13. LUCENE-659: Make PerFieldAnalyzerWrapper delegate getPositionIncrementGap()
+    to the correct analyzer for the field. (Chuck Williams via Yonik Seeley)
+
+14. LUCENE-650: Fixed NPE in Locale specific String Sort when Document
+    has no value.
+    (Oliver Hutchison via Chris Hostetter)
+
+15. LUCENE-683: Fixed data corruption when reading lazy loaded fields.
+    (Yonik Seeley)
+
+16. LUCENE-678: Fixed bug in NativeFSLockFactory which caused the same
+    lock to be shared between different directories.
+    (Michael McCandless via Yonik Seeley)
+
+17. LUCENE-690: Fixed thread unsafe use of IndexInput by lazy loaded fields.
+    (Yonik Seeley)
+
+18. LUCENE-696: Fix bug when scorer for DisjunctionMaxQuery has skipTo()
+    called on it before next().  (Yonik Seeley)
+
+19. LUCENE-569: Fixed SpanNearQuery bug, for 'inOrder' queries it would fail
+    to recognize ordered spans if they overlapped with unordered spans.
+    (Paul Elschot via Chris Hostetter)
+
+20. LUCENE-706: Updated fileformats.xml|html concerning the docdelta value
+    in the frequency file. (Johan Stuyts, Doron Cohen via Grant Ingersoll)
+
+21. LUCENE-715: Fixed private constructor in IndexWriter.java to
+    properly release the acquired write lock if there is an
+    IOException after acquiring the write lock but before finishing
+    instantiation. (Matthew Bogosian via Mike McCandless)
+
+22. LUCENE-651: Multiple different threads requesting the same
+    FieldCache entry (often for Sorting by a field) at the same
+    time caused multiple generations of that entry, which was
+    detrimental to performance and memory use.
+    (Oliver Hutchison via Otis Gospodnetic)
+
+23. LUCENE-717: Fixed build.xml not to fail when there is no lib dir.
+    (Doron Cohen via Otis Gospodnetic)
+
+24. LUCENE-728: Removed duplicate/old MoreLikeThis and SimilarityQueries
+    classes from contrib/similarity, as their new home is under
+    contrib/queries.
+    (Otis Gospodnetic)
+
+25. LUCENE-669: Do not double-close the RandomAccessFile in
+    FSIndexInput/Output during finalize().  Besides sending an
+    IOException up to the GC, this may also be the cause intermittent
+    "The handle is invalid" IOExceptions on Windows when trying to
+    close readers or writers. (Michael Busch via Mike McCandless)
+
+26. LUCENE-702: Fix IndexWriter.addIndexes(*) to not corrupt the index
+    on any exceptions (eg disk full).  The semantics of these methods
+    is now transactional: either all indices are merged or none are.
+    Also fixed IndexWriter.mergeSegments (called outside of
+    addIndexes(*) by addDocument, optimize, flushRamSegments) and
+    IndexReader.commit() (called by close) to clean up and keep the
+    instance state consistent to what's actually in the index (Mike
+    McCandless).
+
+27. LUCENE-129: Change finalizers to do "try {...} finally
+    {super.finalize();}" to make sure we don't miss finalizers in
+    classes above us. (Esmond Pitt via Mike McCandless)
+
+28. LUCENE-754: Fix a problem introduced by LUCENE-651, causing
+    IndexReaders to hang around forever, in addition to not
+    fixing the original FieldCache performance problem.
+    (Chris Hostetter, Yonik Seeley)
+
+29. LUCENE-140: Fix IndexReader.deleteDocument(int docNum) to
+    correctly raise ArrayIndexOutOfBoundsException when docNum is too
+    large.  Previously, if docNum was only slightly too large (within
+    the same multiple of 8, ie, up to 7 ints beyond maxDoc), no
+    exception would be raised and instead the index would become
+    silently corrupted.  The corruption then only appears much later,
+    in mergeSegments, when the corrupted segment is merged with
+    segment(s) after it. (Mike McCandless)
+
+30. LUCENE-768: Fix case where an Exception during deleteDocument,
+    undeleteAll or setNorm in IndexReader could leave the reader in a
+    state where close() fails to release the write lock.
+    (Mike McCandless)
+
+31. Remove "tvp" from known index file extensions because it is
+    never used. (Nicolas Lalevée via Bernhard Messer)
+    
+32. LUCENE-767: Change how SegmentReader.maxDoc() is computed to not
+    rely on file length check and instead use the SegmentInfo's
+    docCount that's already stored explicitly in the index.  This is a
+    defensive bug fix (ie, there is no known problem seen "in real
+    life" due to this, just a possible future problem).  (Chuck
+    Williams via Mike McCandless)
+
+Optimizations
+
+  1. LUCENE-586: TermDocs.skipTo() is now more efficient for
+     multi-segment indexes.  This will improve the performance of many
+     types of queries against a non-optimized index. (Andrew Hudson
+     via Yonik Seeley)
+
+  2. LUCENE-623: RAMDirectory.close now nulls out its reference to all
+     internal "files", allowing them to be GCed even if references to the
+     RAMDirectory itself still exist. (Nadav Har'El via Chris Hostetter)
+
+  3. LUCENE-629: Compressed fields are no longer uncompressed and
+     recompressed during segment merges (e.g. during indexing or
+     optimizing), thus improving performance . (Michael Busch via Otis
+     Gospodnetic)
+
+  4. LUCENE-388: Improve indexing performance when maxBufferedDocs is
+     large by keeping a count of buffered documents rather than
+     counting after each document addition.  (Doron Cohen, Paul Smith,
+     Yonik Seeley)
+
+  5. Modified TermScorer.explain to use TermDocs.skipTo() instead of
+     looping through docs. (Grant Ingersoll)
+
+  6. LUCENE-672: New indexing segment merge policy flushes all
+     buffered docs to their own segment and delays a merge until
+     mergeFactor segments of a certain level have been accumulated.
+     This increases indexing performance in the presence of deleted
+     docs or partially full segments as well as enabling future
+     optimizations.
+
+     NOTE: this also fixes an "under-merging" bug whereby it is
+     possible to get far too many segments in your index (which will
+     drastically slow down search, risks exhausting file descriptor
+     limit, etc.).  This can happen when the number of buffered docs
+     at close, plus the number of docs in the last non-ram segment is
+     greater than mergeFactor. (Ning Li, Yonik Seeley)
+
+  7. Lazy loaded fields unnecessarily retained an extra copy of loaded
+     String data.  (Yonik Seeley)
+
+  8. LUCENE-443: ConjunctionScorer performance increase.  Speed up
+     any BooleanQuery with more than one mandatory clause.
+     (Abdul Chaudhry, Paul Elschot via Yonik Seeley)
+
+  9. LUCENE-365: DisjunctionSumScorer performance increase of
+     ~30%. Speeds up queries with optional clauses. (Paul Elschot via
+     Yonik Seeley)
+
+ 10. LUCENE-695: Optimized BufferedIndexInput.readBytes() for medium
+     size buffers, which will speed up merging and retrieving binary
+     and compressed fields.  (Nadav Har'El via Yonik Seeley)
+
+ 11. LUCENE-687: Lazy skipping on proximity file speeds up most
+     queries involving term positions, including phrase queries.
+     (Michael Busch via Yonik Seeley)
+
+ 12. LUCENE-714: Replaced 2 cases of manual for-loop array copying
+     with calls to System.arraycopy instead, in DocumentWriter.java.
+     (Nicolas Lalevee via Mike McCandless)
+
+ 13. LUCENE-729: Non-recursive skipTo and next implementation of
+     TermDocs for a MultiReader.  The old implementation could
+     recurse up to the number of segments in the index. (Yonik Seeley)
+
+ 14. LUCENE-739: Improve segment merging performance by reusing
+     the norm array across different fields and doing bulk writes
+     of norms of segments with no deleted docs.
+    (Michael Busch via Yonik Seeley)
+
+ 15. LUCENE-745: Add BooleanQuery.clauses(), allowing direct access
+     to the List of clauses and replaced the internal synchronized Vector
+     with an unsynchronized List. (Yonik Seeley)
+
+ 16. LUCENE-750: Remove finalizers from FSIndexOutput and move the
+     FSIndexInput finalizer to the actual file so all clones don't
+     register a new finalizer. (Yonik Seeley)
+
+Test Cases
+
+  1. Added TestTermScorer.java (Grant Ingersoll)
+
+  2. Added TestWindowsMMap.java (Benson Margulies via Mike McCandless)
+
+  3. LUCENE-744 Append the user.name property onto the temporary directory 
+     that is created so it doesn't interfere with other users. (Grant Ingersoll)
+
+Documentation
+
+  1. Added style sheet to xdocs named lucene.css and included in the
+     Anakia VSL descriptor.  (Grant Ingersoll)
+
+  2. Added scoring.xml document into xdocs.  Updated Similarity.java
+     scoring formula.(Grant Ingersoll and Steve Rowe.  Updates from:
+     Michael McCandless, Doron Cohen, Chris Hostetter, Doug Cutting).
+     Issue 664.
+
+  3. Added javadocs for FieldSelectorResult.java. (Grant Ingersoll)
+
+  4. Moved xdocs directory to src/site/src/documentation/content/xdocs per
+     Issue 707.  Site now builds using Forrest, just like the other Lucene
+     siblings.  See http://wiki.apache.org/jakarta-lucene/HowToUpdateTheWebsite
+     for info on updating the website. (Grant Ingersoll with help from Steve Rowe,
+     Chris Hostetter, Doug Cutting, Otis Gospodnetic, Yonik Seeley)
+
+  5. Added in Developer and System Requirements sections under Resources (Grant Ingersoll)
+
+  6. LUCENE-713 Updated the Term Vector section of File Formats to include
+     documentation on how Offset and Position info are stored in the TVF file.
+     (Grant Ingersoll, Samir Abdou)
+
+  7. Added in link to Clover Test Code Coverage Reports under the Develop
+     section in Resources (Grant Ingersoll)
+
+  8. LUCENE-748: Added details for semantics of IndexWriter.close on
+     hitting an Exception.  (Jed Wesley-Smith via Mike McCandless)
+
+  9. Added some text about what is contained in releases.
+     (Eric Haszlakiewicz via Grant Ingersoll)
+
+  10. LUCENE-758: Fix javadoc to clarify that RAMDirectory(Directory)
+      makes a full copy of the starting Directory.  (Mike McCandless)
+
+  11. LUCENE-764: Fix javadocs to detail temporary space requirements
+      for IndexWriter's optimize(), addIndexes(*) and addDocument(...)
+      methods.  (Mike McCandless)
+
+Build
+
+  1. Added in clover test code coverage per http://issues.apache.org/jira/browse/LUCENE-721
+     To enable clover code coverage, you must have clover.jar in the ANT
+     classpath and specify -Drun.clover=true on the command line.
+     (Michael Busch and Grant Ingersoll)
+
+  2. Added a sysproperty in common-build.xml per Lucene 752 to map java.io.tmpdir to
+     ${build.dir}/test just like the tempDir sysproperty.
+
+  3. LUCENE-757 Added new target named init-dist that does setup for
+     distribution of both binary and source distributions.  Called by package 
+     and package-*-src
+
+======================= Release 2.0.0 2006-05-26 =======================
+
+API Changes
+
+ 1. All deprecated methods and fields have been removed, except
+    DateField, which will still be supported for some time
+    so Lucene can read its date fields from old indexes
+    (Yonik Seeley & Grant Ingersoll)
+
+ 2. DisjunctionSumScorer is no longer public.
+    (Paul Elschot via Otis Gospodnetic)
+
+ 3. Creating a Field with both an empty name and an empty value
+    now throws an IllegalArgumentException
+    (Daniel Naber)
+
+ 4. LUCENE-301: Added new IndexWriter({String,File,Directory},
+    Analyzer) constructors that do not take a boolean "create"
+    argument.  These new constructors will create a new index if
+    necessary, else append to the existing one.  (Dan Armbrust via
+    Mike McCandless)
+
+New features
+
+ 1. LUCENE-496: Command line tool for modifying the field norms of an
+    existing index; added to contrib/miscellaneous.  (Chris Hostetter)
+
+ 2. LUCENE-577: SweetSpotSimilarity added to contrib/miscellaneous.
+    (Chris Hostetter)
+    
+Bug fixes
+
+ 1. LUCENE-330: Fix issue of FilteredQuery not working properly within
+    BooleanQuery.  (Paul Elschot via Erik Hatcher)
+
+ 2. LUCENE-515: Make ConstantScoreRangeQuery and ConstantScoreQuery work
+    with RemoteSearchable.  (Philippe Laflamme via Yonik Seeley)
+
+ 3. Added methods to get/set writeLockTimeout and commitLockTimeout in
+    IndexWriter. These could be set in Lucene 1.4 using a system property.
+    This feature had been removed without adding the corresponding
+    getter/setter methods.  (Daniel Naber)
+
+ 4. LUCENE-413: Fixed ArrayIndexOutOfBoundsException exceptions
+    when using SpanQueries. (Paul Elschot via Yonik Seeley)
+
+ 5. Implemented FilterIndexReader.getVersion() and isCurrent()
+    (Yonik Seeley)
+
+ 6. LUCENE-540: Fixed a bug with IndexWriter.addIndexes(Directory[])
+    that sometimes caused the index order of documents to change.
+    (Yonik Seeley)
+
+ 7. LUCENE-526: Fixed a bug in FieldSortedHitQueue that caused
+    subsequent String sorts with different locales to sort identically.
+    (Paul Cowan via Yonik Seeley)
+
+ 8. LUCENE-541: Add missing extractTerms() to DisjunctionMaxQuery
+    (Stefan Will via Yonik Seeley)
+
+ 9. LUCENE-514: Added getTermArrays() and extractTerms() to
+    MultiPhraseQuery (Eric Jain & Yonik Seeley)
+
+10. LUCENE-512: Fixed ClassCastException in ParallelReader.getTermFreqVectors
+    (frederic via Yonik)
+
+11. LUCENE-352: Fixed bug in SpanNotQuery that manifested as
+    NullPointerException when "exclude" query was not a SpanTermQuery.
+    (Chris Hostetter)
+
+12. LUCENE-572: Fixed bug in SpanNotQuery hashCode, was ignoring exclude clause
+    (Chris Hostetter)
+
+13. LUCENE-561: Fixed some ParallelReader bugs. NullPointerException if the reader
+    didn't know about the field yet, reader didn't keep track if it had deletions,
+    and deleteDocument calls could circumvent synchronization on the subreaders.
+    (Chuck Williams via Yonik Seeley)
+
+14. LUCENE-556: Added empty extractTerms() implementation to MatchAllDocsQuery and
+    ConstantScoreQuery in order to allow their use with a MultiSearcher.
+    (Yonik Seeley)
+
+15. LUCENE-546: Removed 2GB file size limitations for RAMDirectory.
+    (Peter Royal, Michael Chan, Yonik Seeley)
+
+16. LUCENE-485: Don't hold commit lock while removing obsolete index
+    files.  (Luc Vanlerberghe via cutting)
+
+
+1.9.1
+
+Bug fixes
+
+ 1. LUCENE-511: Fix a bug in the BufferedIndexOutput optimization
+    introduced in 1.9-final.  (Shay Banon & Steven Tamm via cutting)
+
+1.9 final
+
+Note that this release is mostly but not 100% source compatible with
+the previous release of Lucene (1.4.3). In other words, you should
+make sure your application compiles with this version of Lucene before
+you replace the old Lucene JAR with the new one.  Many methods have
+been deprecated in anticipation of release 2.0, so deprecation
+warnings are to be expected when upgrading from 1.4.3 to 1.9.
+
+Bug fixes
+ 
+ 1. The fix that made IndexWriter.setMaxBufferedDocs(1) work had negative 
+    effects on indexing performance and has thus been reverted. The 
+    argument for setMaxBufferedDocs(int) must now at least be 2, otherwise
+    an exception is thrown. (Daniel Naber)
+ 
+Optimizations
+     
+ 1. Optimized BufferedIndexOutput.writeBytes() to use
+    System.arraycopy() in more cases, rather than copying byte-by-byte.
+    (Lukas Zapletal via Cutting)
+
+1.9 RC1
+
+Requirements
+
+ 1. To compile and use Lucene you now need Java 1.4 or later.
+
+Changes in runtime behavior
+
+ 1. FuzzyQuery can no longer throw a TooManyClauses exception. If a
+    FuzzyQuery expands to more than BooleanQuery.maxClauseCount
+    terms only the BooleanQuery.maxClauseCount most similar terms
+    go into the rewritten query and thus the exception is avoided.
+    (Christoph)
+
+ 2. Changed system property from "org.apache.lucene.lockdir" to
+    "org.apache.lucene.lockDir", so that its casing follows the existing
+    pattern used in other Lucene system properties. (Bernhard)
+
+ 3. The terms of RangeQueries and FuzzyQueries are now converted to
+    lowercase by default (as it has been the case for PrefixQueries
+    and WildcardQueries before). Use setLowercaseExpandedTerms(false)
+    to disable that behavior but note that this also affects
+    PrefixQueries and WildcardQueries. (Daniel Naber)
+
+ 4. Document frequency that is computed when MultiSearcher is used is now
+    computed correctly and "globally" across subsearchers and indices, while
+    before it used to be computed locally to each index, which caused
+    ranking across multiple indices not to be equivalent.
+    (Chuck Williams, Wolf Siberski via Otis, bug #31841)
+
+ 5. When opening an IndexWriter with create=true, Lucene now only deletes
+    its own files from the index directory (looking at the file name suffixes
+    to decide if a file belongs to Lucene). The old behavior was to delete
+    all files. (Daniel Naber and Bernhard Messer, bug #34695)
+
+ 6. The version of an IndexReader, as returned by getCurrentVersion()
+    and getVersion() doesn't start at 0 anymore for new indexes. Instead, it
+    is now initialized by the system time in milliseconds.
+    (Bernhard Messer via Daniel Naber)
+
+ 7. Several default values cannot be set via system properties anymore, as
+    this has been considered inappropriate for a library like Lucene. For
+    most properties there are set/get methods available in IndexWriter which
+    you should use instead. This affects the following properties:
+    See IndexWriter for getter/setter methods:
+      org.apache.lucene.writeLockTimeout, org.apache.lucene.commitLockTimeout,
+      org.apache.lucene.minMergeDocs, org.apache.lucene.maxMergeDocs,
+      org.apache.lucene.maxFieldLength, org.apache.lucene.termIndexInterval,
+      org.apache.lucene.mergeFactor,
+    See BooleanQuery for getter/setter methods:
+      org.apache.lucene.maxClauseCount
+    See FSDirectory for getter/setter methods:
+      disableLuceneLocks
+    (Daniel Naber)
+
+ 8. Fixed FieldCacheImpl to use user-provided IntParser and FloatParser,
+    instead of using Integer and Float classes for parsing.
+    (Yonik Seeley via Otis Gospodnetic)
+
+ 9. Expert level search routines returning TopDocs and TopFieldDocs
+    no longer normalize scores.  This also fixes bugs related to
+    MultiSearchers and score sorting/normalization.
+    (Luc Vanlerberghe via Yonik Seeley, LUCENE-469)
+
+New features
+
+ 1. Added support for stored compressed fields (patch #31149)
+    (Bernhard Messer via Christoph)
+
+ 2. Added support for binary stored fields (patch #29370)
+    (Drew Farris and Bernhard Messer via Christoph)
+
+ 3. Added support for position and offset information in term vectors
+    (patch #18927). (Grant Ingersoll & Christoph)
+
+ 4. A new class DateTools has been added. It allows you to format dates
+    in a readable format adequate for indexing. Unlike the existing
+    DateField class DateTools can cope with dates before 1970 and it
+    forces you to specify the desired date resolution (e.g. month, day,
+    second, ...) which can make RangeQuerys on those fields more efficient.
+    (Daniel Naber)
+
+ 5. QueryParser now correctly works with Analyzers that can return more
+    than one token per position. For example, a query "+fast +car"
+    would be parsed as "+fast +(car automobile)" if the Analyzer
+    returns "car" and "automobile" at the same position whenever it
+    finds "car" (Patch #23307).
+    (Pierrick Brihaye, Daniel Naber)
+
+ 6. Permit unbuffered Directory implementations (e.g., using mmap).
+    InputStream is replaced by the new classes IndexInput and
+    BufferedIndexInput.  OutputStream is replaced by the new classes
+    IndexOutput and BufferedIndexOutput.  InputStream and OutputStream
+    are now deprecated and FSDirectory is now subclassable. (cutting)
+
+ 7. Add native Directory and TermDocs implementations that work under
+    GCJ.  These require GCC 3.4.0 or later and have only been tested
+    on Linux.  Use 'ant gcj' to build demo applications. (cutting)
+
+ 8. Add MMapDirectory, which uses nio to mmap input files.  This is
+    still somewhat slower than FSDirectory.  However it uses less
+    memory per query term, since a new buffer is not allocated per
+    term, which may help applications which use, e.g., wildcard
+    queries.  It may also someday be faster. (cutting & Paul Elschot)
+
+ 9. Added javadocs-internal to build.xml - bug #30360
+    (Paul Elschot via Otis)
+
+10. Added RangeFilter, a more generically useful filter than DateFilter.
+    (Chris M Hostetter via Erik)
+
+11. Added NumberTools, a utility class indexing numeric fields.
+    (adapted from code contributed by Matt Quail; committed by Erik)
+
+12. Added public static IndexReader.main(String[] args) method.
+    IndexReader can now be used directly at command line level
+    to list and optionally extract the individual files from an existing
+    compound index file.
+    (adapted from code contributed by Garrett Rooney; committed by Bernhard)
+
+13. Add IndexWriter.setTermIndexInterval() method.  See javadocs.
+    (Doug Cutting)
+
+14. Added LucenePackage, whose static get() method returns java.util.Package,
+    which lets the caller get the Lucene version information specified in
+    the Lucene Jar.
+    (Doug Cutting via Otis)
+
+15. Added Hits.iterator() method and corresponding HitIterator and Hit objects.
+    This provides standard java.util.Iterator iteration over Hits.
+    Each call to the iterator's next() method returns a Hit object.
+    (Jeremy Rayner via Erik)
+
+16. Add ParallelReader, an IndexReader that combines separate indexes
+    over different fields into a single virtual index.  (Doug Cutting)
+
+17. Add IntParser and FloatParser interfaces to FieldCache, so that
+    fields in arbitrarily formats can be cached as ints and floats.
+    (Doug Cutting)
+
+18. Added class org.apache.lucene.index.IndexModifier which combines
+    IndexWriter and IndexReader, so you can add and delete documents without
+    worrying about synchronization/locking issues.
+    (Daniel Naber)
+
+19. Lucene can now be used inside an unsigned applet, as Lucene's access
+    to system properties will not cause a SecurityException anymore.
+    (Jon Schuster via Daniel Naber, bug #34359)
+
+20. Added a new class MatchAllDocsQuery that matches all documents.
+    (John Wang via Daniel Naber, bug #34946)
+
+21. Added ability to omit norms on a per field basis to decrease
+    index size and memory consumption when there are many indexed fields.
+    See Field.setOmitNorms()
+    (Yonik Seeley, LUCENE-448)
+
+22. Added NullFragmenter to contrib/highlighter, which is useful for
+    highlighting entire documents or fields.
+    (Erik Hatcher)
+
+23. Added regular expression queries, RegexQuery and SpanRegexQuery.
+    Note the same term enumeration caveats apply with these queries as
+    apply to WildcardQuery and other term expanding queries.
+    These two new queries are not currently supported via QueryParser.
+    (Erik Hatcher)
+
+24. Added ConstantScoreQuery which wraps a filter and produces a score
+    equal to the query boost for every matching document.
+    (Yonik Seeley, LUCENE-383)
+
+25. Added ConstantScoreRangeQuery which produces a constant score for
+    every document in the range.  One advantage over a normal RangeQuery
+    is that it doesn't expand to a BooleanQuery and thus doesn't have a maximum
+    number of terms the range can cover.  Both endpoints may also be open.
+    (Yonik Seeley, LUCENE-383)
+
+26. Added ability to specify a minimum number of optional clauses that
+    must match in a BooleanQuery.  See BooleanQuery.setMinimumNumberShouldMatch().
+    (Paul Elschot, Chris Hostetter via Yonik Seeley, LUCENE-395)
+
+27. Added DisjunctionMaxQuery which provides the maximum score across its clauses.
+    It's very useful for searching across multiple fields.
+    (Chuck Williams via Yonik Seeley, LUCENE-323)
+
+28. New class ISOLatin1AccentFilter that replaces accented characters in the ISO
+    Latin 1 character set by their unaccented equivalent.
+    (Sven Duzont via Erik Hatcher)
+
+29. New class KeywordAnalyzer. "Tokenizes" the entire stream as a single token.
+    This is useful for data like zip codes, ids, and some product names.
+    (Erik Hatcher)
+
+30. Copied LengthFilter from contrib area to core. Removes words that are too
+    long and too short from the stream.
+    (David Spencer via Otis and Daniel)
+
+31. Added getPositionIncrementGap(String fieldName) to Analyzer.  This allows
+    custom analyzers to put gaps between Field instances with the same field
+    name, preventing phrase or span queries crossing these boundaries.  The
+    default implementation issues a gap of 0, allowing the default token
+    position increment of 1 to put the next field's first token into a
+    successive position.
+    (Erik Hatcher, with advice from Yonik)
+
+32. StopFilter can now ignore case when checking for stop words.
+    (Grant Ingersoll via Yonik, LUCENE-248)
+
+33. Add TopDocCollector and TopFieldDocCollector.  These simplify the
+    implementation of hit collectors that collect only the
+    top-scoring or top-sorting hits.
+
+API Changes
+
+ 1. Several methods and fields have been deprecated. The API documentation
+    contains information about the recommended replacements. It is planned
+    that most of the deprecated methods and fields will be removed in
+    Lucene 2.0. (Daniel Naber)
+
+ 2. The Russian and the German analyzers have been moved to contrib/analyzers.
+    Also, the WordlistLoader class has been moved one level up in the
+    hierarchy and is now org.apache.lucene.analysis.WordlistLoader
+    (Daniel Naber)
+
+ 3. The API contained methods that declared to throw an IOException
+    but that never did this. These declarations have been removed. If
+    your code tries to catch these exceptions you might need to remove
+    those catch clauses to avoid compile errors. (Daniel Naber)
+
+ 4. Add a serializable Parameter Class to standardize parameter enum
+    classes in BooleanClause and Field. (Christoph)
+
+ 5. Added rewrite methods to all SpanQuery subclasses that nest other SpanQuerys.
+    This allows custom SpanQuery subclasses that rewrite (for term expansion, for
+    example) to nest within the built-in SpanQuery classes successfully.
+
+Bug fixes
+
+ 1. The JSP demo page (src/jsp/results.jsp) now properly closes the
+    IndexSearcher it opens. (Daniel Naber)
+
+ 2. Fixed a bug in IndexWriter.addIndexes(IndexReader[] readers) that
+    prevented deletion of obsolete segments. (Christoph Goller)
+
+ 3. Fix in FieldInfos to avoid the return of an extra blank field in
+    IndexReader.getFieldNames() (Patch #19058). (Mark Harwood via Bernhard)
+
+ 4. Some combinations of BooleanQuery and MultiPhraseQuery (formerly
+    PhrasePrefixQuery) could provoke UnsupportedOperationException
+    (bug #33161). (Rhett Sutphin via Daniel Naber)
+
+ 5. Small bug in skipTo of ConjunctionScorer that caused NullPointerException
+    if skipTo() was called without prior call to next() fixed. (Christoph)
+
+ 6. Disable Similiarty.coord() in the scoring of most automatically
+    generated boolean queries.  The coord() score factor is
+    appropriate when clauses are independently specified by a user,
+    but is usually not appropriate when clauses are generated
+    automatically, e.g., by a fuzzy, wildcard or range query.  Matches
+    on such automatically generated queries are no longer penalized
+    for not matching all terms.  (Doug Cutting, Patch #33472)
+
+ 7. Getting a lock file with Lock.obtain(long) was supposed to wait for
+    a given amount of milliseconds, but this didn't work.
+    (John Wang via Daniel Naber, Bug #33799)
+
+ 8. Fix FSDirectory.createOutput() to always create new files.
+    Previously, existing files were overwritten, and an index could be
+    corrupted when the old version of a file was longer than the new.
+    Now any existing file is first removed.  (Doug Cutting)
+
+ 9. Fix BooleanQuery containing nested SpanTermQuery's, which previously
+    could return an incorrect number of hits.
+    (Reece Wilton via Erik Hatcher, Bug #35157)
+
+10. Fix NullPointerException that could occur with a MultiPhraseQuery
+    inside a BooleanQuery.
+    (Hans Hjelm and Scotty Allen via Daniel Naber, Bug #35626)
+
+11. Fixed SnowballFilter to pass through the position increment from
+    the original token.
+    (Yonik Seeley via Erik Hatcher, LUCENE-437)
+
+12. Added Unicode range of Korean characters to StandardTokenizer,
+    grouping contiguous characters into a token rather than one token
+    per character.  This change also changes the token type to "<CJ>"
+    for Chinese and Japanese character tokens (previously it was "<CJK>").
+    (Cheolgoo Kang via Otis and Erik, LUCENE-444 and LUCENE-461)
+
+13. FieldsReader now looks at FieldInfo.storeOffsetWithTermVector and
+    FieldInfo.storePositionWithTermVector and creates the Field with
+    correct TermVector parameter.
+    (Frank Steinmann via Bernhard, LUCENE-455)
+
+14. Fixed WildcardQuery to prevent "cat" matching "ca??".
+    (Xiaozheng Ma via Bernhard, LUCENE-306)
+
+15. Fixed a bug where MultiSearcher and ParallelMultiSearcher could
+    change the sort order when sorting by string for documents without
+    a value for the sort field.
+    (Luc Vanlerberghe via Yonik, LUCENE-453)
+
+16. Fixed a sorting problem with MultiSearchers that can lead to
+    missing or duplicate docs due to equal docs sorting in an arbitrary order.
+    (Yonik Seeley, LUCENE-456)
+
+17. A single hit using the expert level sorted search methods
+    resulted in the score not being normalized.
+    (Yonik Seeley, LUCENE-462)
+
+18. Fixed inefficient memory usage when loading an index into RAMDirectory.
+    (Volodymyr Bychkoviak via Bernhard, LUCENE-475)
+
+19. Corrected term offsets returned by ChineseTokenizer.
+    (Ray Tsang via Erik Hatcher, LUCENE-324)
+
+20. Fixed MultiReader.undeleteAll() to correctly update numDocs.
+    (Robert Kirchgessner via Doug Cutting, LUCENE-479)
+
+21. Race condition in IndexReader.getCurrentVersion() and isCurrent()
+    fixed by acquiring the commit lock.
+    (Luc Vanlerberghe via Yonik Seeley, LUCENE-481)
+
+22. IndexWriter.setMaxBufferedDocs(1) didn't have the expected effect,
+    this has now been fixed. (Daniel Naber)
+
+23. Fixed QueryParser when called with a date in local form like 
+    "[1/16/2000 TO 1/18/2000]". This query did not include the documents
+    of 1/18/2000, i.e. the last day was not included. (Daniel Naber)
+
+24. Removed sorting constraint that threw an exception if there were
+    not yet any values for the sort field (Yonik Seeley, LUCENE-374)
+
+Optimizations
+     
+ 1. Disk usage (peak requirements during indexing and optimization)
+    in case of compound file format has been improved. 
+    (Bernhard, Dmitry, and Christoph)
+
+ 2. Optimize the performance of certain uses of BooleanScorer,
+    TermScorer and IndexSearcher.  In particular, a BooleanQuery
+    composed of TermQuery, with not all terms required, that returns a
+    TopDocs (e.g., through a Hits with no Sort specified) runs much
+    faster.  (cutting)
+    
+ 3. Removed synchronization from reading of term vectors with an
+    IndexReader (Patch #30736). (Bernhard Messer via Christoph)
+
+ 4. Optimize term-dictionary lookup to allocate far fewer terms when
+    scanning for the matching term.  This speeds searches involving
+    low-frequency terms, where the cost of dictionary lookup can be
+    significant. (cutting)
+
+ 5. Optimize fuzzy queries so the standard fuzzy queries with a prefix 
+    of 0 now run 20-50% faster (Patch #31882).
+    (Jonathan Hager via Daniel Naber)
+    
+ 6. A Version of BooleanScorer (BooleanScorer2) added that delivers
+    documents in increasing order and implements skipTo. For queries
+    with required or forbidden clauses it may be faster than the old
+    BooleanScorer, for BooleanQueries consisting only of optional
+    clauses it is probably slower. The new BooleanScorer is now the
+    default. (Patch 31785 by Paul Elschot via Christoph)
+
+ 7. Use uncached access to norms when merging to reduce RAM usage.
+    (Bug #32847).  (Doug Cutting)
+
+ 8. Don't read term index when random-access is not required.  This
+    reduces time to open IndexReaders and they use less memory when
+    random access is not required, e.g., when merging segments.  The
+    term index is now read into memory lazily at the first
+    random-access.  (Doug Cutting)
+
+ 9. Optimize IndexWriter.addIndexes(Directory[]) when the number of
+    added indexes is larger than mergeFactor.  Previously this could
+    result in quadratic performance.  Now performance is n log(n).
+    (Doug Cutting)
+
+10. Speed up the creation of TermEnum for indices with multiple
+    segments and deleted documents, and thus speed up PrefixQuery,
+    RangeQuery, WildcardQuery, FuzzyQuery, RangeFilter, DateFilter,
+    and sorting the first time on a field.
+    (Yonik Seeley, LUCENE-454)
+
+11. Optimized and generalized 32 bit floating point to byte
+    (custom 8 bit floating point) conversions.  Increased the speed of
+    Similarity.encodeNorm() anywhere from 10% to 250%, depending on the JVM.
+    (Yonik Seeley, LUCENE-467)
+
+Infrastructure
+
+ 1. Lucene's source code repository has converted from CVS to
+    Subversion.  The new repository is at
+    http://svn.apache.org/repos/asf/lucene/java/trunk
+
+ 2. Lucene's issue tracker has migrated from Bugzilla to JIRA.
+    Lucene's JIRA is at http://issues.apache.org/jira/browse/LUCENE
+    The old issues are still available at
+    http://issues.apache.org/bugzilla/show_bug.cgi?id=xxxx
+    (use the bug number instead of xxxx)
+
+
+1.4.3
+
+ 1. The JSP demo page (src/jsp/results.jsp) now properly escapes error
+    messages which might contain user input (e.g. error messages about 
+    query parsing). If you used that page as a starting point for your
+    own code please make sure your code also properly escapes HTML
+    characters from user input in order to avoid so-called cross site
+    scripting attacks. (Daniel Naber)
+  
+  2. QueryParser changes in 1.4.2 broke the QueryParser API. Now the old 
+     API is supported again. (Christoph)
+
+
+1.4.2
+
+ 1. Fixed bug #31241: Sorting could lead to incorrect results (documents
+    missing, others duplicated) if the sort keys were not unique and there
+    were more than 100 matches. (Daniel Naber)
+
+ 2. Memory leak in Sort code (bug #31240) eliminated.
+    (Rafal Krzewski via Christoph and Daniel)
+    
+ 3. FuzzyQuery now takes an additional parameter that specifies the
+    minimum similarity that is required for a term to match the query.
+    The QueryParser syntax for this is term~x, where x is a floating 
+    point number >= 0 and < 1 (a bigger number means that a higher
+    similarity is required). Furthermore, a prefix can be specified
+    for FuzzyQuerys so that only those terms are considered similar that 
+    start with this prefix. This can speed up FuzzyQuery greatly.
+    (Daniel Naber, Christoph Goller)
+    
+ 4. PhraseQuery and PhrasePrefixQuery now allow the explicit specification
+    of relative positions. (Christoph Goller)
+    
+ 5. QueryParser changes: Fix for ArrayIndexOutOfBoundsExceptions 
+    (patch #9110); some unused method parameters removed; The ability
+    to specify a minimum similarity for FuzzyQuery has been added.
+    (Christoph Goller)
+
+ 6. IndexSearcher optimization: a new ScoreDoc is no longer allocated
+    for every non-zero-scoring hit.  This makes 'OR' queries that
+    contain common terms substantially faster.  (cutting)
+
+
+1.4.1
+
+ 1. Fixed a performance bug in hit sorting code, where values were not
+    correctly cached.  (Aviran via cutting)
+
+ 2. Fixed errors in file format documentation. (Daniel Naber)
+
+
+1.4 final
+
+ 1. Added "an" to the list of stop words in StopAnalyzer, to complement
+    the existing "a" there.  Fix for bug 28960
+     (http://issues.apache.org/bugzilla/show_bug.cgi?id=28960). (Otis)
+
+ 2. Added new class FieldCache to manage in-memory caches of field term
+    values.  (Tim Jones)
+
+ 3. Added overloaded getFieldQuery method to QueryParser which
+    accepts the slop factor specified for the phrase (or the default
+    phrase slop for the QueryParser instance).  This allows overriding
+    methods to replace a PhraseQuery with a SpanNearQuery instead,
+    keeping the proper slop factor. (Erik Hatcher)
+
+ 4. Changed the encoding of GermanAnalyzer.java and GermanStemmer.java to
+    UTF-8 and changed the build encoding to UTF-8, to make changed files
+    compile. (Otis Gospodnetic)
+
+ 5. Removed synchronization from term lookup under IndexReader methods
+    termFreq(), termDocs() or termPositions() to improve
+    multi-threaded performance.  (cutting)
+
+ 6. Fix a bug where obsolete segment files were not deleted on Win32.
+
+
+1.4 RC3
+
+ 1. Fixed several search bugs introduced by the skipTo() changes in
+    release 1.4RC1.  The index file format was changed a bit, so
+    collections must be re-indexed to take advantage of the skipTo()
+    optimizations.  (Christoph Goller)
+
+ 2. Added new Document methods, removeField() and removeFields().
+    (Christoph Goller)
+
+ 3. Fixed inconsistencies with index closing.  Indexes and directories
+    are now only closed automatically by Lucene when Lucene opened
+    them automatically.  (Christoph Goller)
+
+ 4. Added new class: FilteredQuery.  (Tim Jones)
+
+ 5. Added a new SortField type for custom comparators.  (Tim Jones)
+
+ 6. Lock obtain timed out message now displays the full path to the lock
+    file. (Daniel Naber via Erik)
+
+ 7. Fixed a bug in SpanNearQuery when ordered. (Paul Elschot via cutting)
+
+ 8. Fixed so that FSDirectory's locks still work when the
+    java.io.tmpdir system property is null.  (cutting)
+
+ 9. Changed FilteredTermEnum's constructor to take no parameters,
+    as the parameters were ignored anyway (bug #28858)
+
+1.4 RC2
+
+ 1. GermanAnalyzer now throws an exception if the stopword file
+    cannot be found (bug #27987). It now uses LowerCaseFilter
+    (bug #18410) (Daniel Naber via Otis, Erik)
+
+ 2. Fixed a few bugs in the file format documentation. (cutting)
+
+
+1.4 RC1
+
+ 1. Changed the format of the .tis file, so that:
+
+    - it has a format version number, which makes it easier to
+      back-compatibly change file formats in the future.
+
+    - the term count is now stored as a long.  This was the one aspect
+      of the Lucene's file formats which limited index size.
+
+    - a few internal index parameters are now stored in the index, so
+      that they can (in theory) now be changed from index to index,
+      although there is not yet an API to do so.
+
+    These changes are back compatible.  The new code can read old
+    indexes.  But old code will not be able read new indexes. (cutting)
+
+ 2. Added an optimized implementation of TermDocs.skipTo().  A skip
+    table is now stored for each term in the .frq file.  This only
+    adds a percent or two to overall index size, but can substantially
+    speedup many searches.  (cutting)
+
+ 3. Restructured the Scorer API and all Scorer implementations to take
+    advantage of an optimized TermDocs.skipTo() implementation.  In
+    particular, PhraseQuerys and conjunctive BooleanQuerys are
+    faster when one clause has substantially fewer matches than the
+    others.  (A conjunctive BooleanQuery is a BooleanQuery where all
+    clauses are required.)  (cutting)
+
+ 4. Added new class ParallelMultiSearcher.  Combined with
+    RemoteSearchable this makes it easy to implement distributed
+    search systems.  (Jean-Francois Halleux via cutting)
+
+ 5. Added support for hit sorting.  Results may now be sorted by any
+    indexed field.  For details see the javadoc for
+    Searcher#search(Query, Sort).  (Tim Jones via Cutting)
+
+ 6. Changed FSDirectory to auto-create a full directory tree that it
+    needs by using mkdirs() instead of mkdir().  (Mladen Turk via Otis)
+
+ 7. Added a new span-based query API.  This implements, among other
+    things, nested phrases.  See javadocs for details.  (Doug Cutting)
+
+ 8. Added new method Query.getSimilarity(Searcher), and changed
+    scorers to use it.  This permits one to subclass a Query class so
+    that it can specify its own Similarity implementation, perhaps
+    one that delegates through that of the Searcher.  (Julien Nioche
+    via Cutting)
+
+ 9. Added MultiReader, an IndexReader that combines multiple other
+    IndexReaders.  (Cutting)
+
+10. Added support for term vectors.  See Field#isTermVectorStored().
+    (Grant Ingersoll, Cutting & Dmitry)
+
+11. Fixed the old bug with escaping of special characters in query
+    strings: http://issues.apache.org/bugzilla/show_bug.cgi?id=24665
+    (Jean-Francois Halleux via Otis)
+
+12. Added support for overriding default values for the following,
+    using system properties:
+      - default commit lock timeout
+      - default maxFieldLength
+      - default maxMergeDocs
+      - default mergeFactor
+      - default minMergeDocs
+      - default write lock timeout
+    (Otis)
+
+13. Changed QueryParser.jj to allow '-' and '+' within tokens:
+    http://issues.apache.org/bugzilla/show_bug.cgi?id=27491
+    (Morus Walter via Otis)
+
+14. Changed so that the compound index format is used by default.
+    This makes indexing a bit slower, but vastly reduces the chances
+    of file handle problems.  (Cutting)
+
+
+1.3 final
+
+ 1. Added catch of BooleanQuery$TooManyClauses in QueryParser to
+    throw ParseException instead. (Erik Hatcher)
+
+ 2. Fixed a NullPointerException in Query.explain(). (Doug Cutting)
+
+ 3. Added a new method IndexReader.setNorm(), that permits one to
+    alter the boosting of fields after an index is created.
+
+ 4. Distinguish between the final position and length when indexing a
+    field.  The length is now defined as the total number of tokens,
+    instead of the final position, as it was previously.  Length is
+    used for score normalization (Similarity.lengthNorm()) and for
+    controlling memory usage (IndexWriter.maxFieldLength).  In both of
+    these cases, the total number of tokens is a better value to use
+    than the final token position.  Position is used in phrase
+    searching (see PhraseQuery and Token.setPositionIncrement()).
+
+ 5. Fix StandardTokenizer's handling of CJK characters (Chinese,
+    Japanese and Korean ideograms).  Previously contiguous sequences
+    were combined in a single token, which is not very useful.  Now
+    each ideogram generates a separate token, which is more useful.
+
+
+1.3 RC3
+
+ 1. Added minMergeDocs in IndexWriter.  This can be raised to speed
+    indexing without altering the number of files, but only using more
+    memory.  (Julien Nioche via Otis)
+
+ 2. Fix bug #24786, in query rewriting. (bschneeman via Cutting)
+
+ 3. Fix bug #16952, in demo HTML parser, skip comments in
+    javascript. (Christoph Goller)
+
+ 4. Fix bug #19253, in demo HTML parser, add whitespace as needed to
+    output (Daniel Naber via Christoph Goller)
+
+ 5. Fix bug #24301, in demo HTML parser, long titles no longer
+    hang things. (Christoph Goller)
+
+ 6. Fix bug #23534, Replace use of file timestamp of segments file
+    with an index version number stored in the segments file.  This
+    resolves problems when running on file systems with low-resolution
+    timestamps, e.g., HFS under MacOS X.  (Christoph Goller)
+
+ 7. Fix QueryParser so that TokenMgrError is not thrown, only
+    ParseException.  (Erik Hatcher)
+
+ 8. Fix some bugs introduced by change 11 of RC2.  (Christoph Goller)
+
+ 9. Fixed a problem compiling TestRussianStem.  (Christoph Goller)
+
+10. Cleaned up some build stuff.  (Erik Hatcher)
+
+
+1.3 RC2
+
+ 1. Added getFieldNames(boolean) to IndexReader, SegmentReader, and
+    SegmentsReader. (Julien Nioche via otis)
+
+ 2. Changed file locking to place lock files in
+    System.getProperty("java.io.tmpdir"), where all users are
+    permitted to write files.  This way folks can open and correctly
+    lock indexes which are read-only to them.
+
+ 3. IndexWriter: added a new method, addDocument(Document, Analyzer),
+    permitting one to easily use different analyzers for different
+    documents in the same index.
+
+ 4. Minor enhancements to FuzzyTermEnum.
+    (Christoph Goller via Otis)
+
+ 5. PriorityQueue: added insert(Object) method and adjusted IndexSearcher
+    and MultiIndexSearcher to use it.
+    (Christoph Goller via Otis)
+
+ 6. Fixed a bug in IndexWriter that returned incorrect docCount().
+    (Christoph Goller via Otis)
+
+ 7. Fixed SegmentsReader to eliminate the confusing and slightly different
+    behaviour of TermEnum when dealing with an enumeration of all terms,
+    versus an enumeration starting from a specific term.
+    This patch also fixes incorrect term document frequencies when the same term
+    is present in multiple segments.
+    (Christoph Goller via Otis)
+
+ 8. Added CachingWrapperFilter and PerFieldAnalyzerWrapper. (Erik Hatcher)
+
+ 9. Added support for the new "compound file" index format (Dmitry
+    Serebrennikov)
+
+10. Added Locale setting to QueryParser, for use by date range parsing.
+
+11. Changed IndexReader so that it can be subclassed by classes
+    outside of its package.  Previously it had package-private
+    abstract methods.  Also modified the index merging code so that it
+    can work on an arbitrary IndexReader implementation, and added a
+    new method, IndexWriter.addIndexes(IndexReader[]), to take
+    advantage of this. (cutting)
+
+12. Added a limit to the number of clauses which may be added to a
+    BooleanQuery.  The default limit is 1024 clauses.  This should
+    stop most OutOfMemoryExceptions by prefix, wildcard and fuzzy
+    queries which run amok. (cutting)
+
+13. Add new method: IndexReader.undeleteAll().  This undeletes all
+    deleted documents which still remain in the index. (cutting)
+
+
+1.3 RC1
+
+ 1. Fixed PriorityQueue's clear() method.
+    Fix for bug 9454, http://nagoya.apache.org/bugzilla/show_bug.cgi?id=9454
+    (Matthijs Bomhoff via otis)
+
+ 2. Changed StandardTokenizer.jj grammar for EMAIL tokens.
+    Fix for bug 9015, http://nagoya.apache.org/bugzilla/show_bug.cgi?id=9015
+    (Dale Anson via otis)
+
+ 3. Added the ability to disable lock creation by using disableLuceneLocks
+    system property.  This is useful for read-only media, such as CD-ROMs.
+    (otis)
+
+ 4. Added id method to Hits to be able to access the index global id.
+    Required for sorting options.
+    (carlson)
+
+ 5. Added support for new range query syntax to QueryParser.jj.
+    (briangoetz)
+
+ 6. Added the ability to retrieve HTML documents' META tag values to
+    HTMLParser.jj.
+    (Mark Harwood via otis)
+
+ 7. Modified QueryParser to make it possible to programmatically specify the
+    default Boolean operator (OR or AND).
+    (Péter Halácsy via otis)
+
+ 8. Made many search methods and classes non-final, per requests.
+    This includes IndexWriter and IndexSearcher, among others.
+    (cutting)
+
+ 9. Added class RemoteSearchable, providing support for remote
+    searching via RMI.  The test class RemoteSearchableTest.java
+    provides an example of how this can be used.  (cutting)
+
+ 10. Added PhrasePrefixQuery (and supporting MultipleTermPositions).  The
+     test class TestPhrasePrefixQuery provides the usage example.
+     (Anders Nielsen via otis)
+
+ 11. Changed the German stemming algorithm to ignore case while
+     stripping. The new algorithm is faster and produces more equal
+     stems from nouns and verbs derived from the same word.
+     (gschwarz)
+
+ 12. Added support for boosting the score of documents and fields via
+     the new methods Document.setBoost(float) and Field.setBoost(float).
+
+     Note: This changes the encoding of an indexed value.  Indexes
+     should be re-created from scratch in order for search scores to
+     be correct.  With the new code and an old index, searches will
+     yield very large scores for shorter fields, and very small scores
+     for longer fields.  Once the index is re-created, scores will be
+     as before. (cutting)
+
+ 13. Added new method Token.setPositionIncrement().
+
+     This permits, for the purpose of phrase searching, placing
+     multiple terms in a single position.  This is useful with
+     stemmers that produce multiple possible stems for a word.
+
+     This also permits the introduction of gaps between terms, so that
+     terms which are adjacent in a token stream will not be matched by
+     and exact phrase query.  This makes it possible, e.g., to build
+     an analyzer where phrases are not matched over stop words which
+     have been removed.
+
+     Finally, repeating a token with an increment of zero can also be
+     used to boost scores of matches on that token.  (cutting)
+
+ 14. Added new Filter class, QueryFilter.  This constrains search
+     results to only match those which also match a provided query.
+     Results are cached, so that searches after the first on the same
+     index using this filter are very fast.
+
+     This could be used, for example, with a RangeQuery on a formatted
+     date field to implement date filtering.  One could re-use a
+     single QueryFilter that matches, e.g., only documents modified
+     within the last week.  The QueryFilter and RangeQuery would only
+     need to be reconstructed once per day. (cutting)
+
+ 15. Added a new IndexWriter method, getAnalyzer().  This returns the
+     analyzer used when adding documents to this index. (cutting)
+
+ 16. Fixed a bug with IndexReader.lastModified().  Before, document
+     deletion did not update this.  Now it does.  (cutting)
+
+ 17. Added Russian Analyzer.
+     (Boris Okner via otis)
+
+ 18. Added a public, extensible scoring API.  For details, see the
+     javadoc for org.apache.lucene.search.Similarity.
+
+ 19. Fixed return of Hits.id() from float to int. (Terry Steichen via Peter).
+
+ 20. Added getFieldNames() to IndexReader and Segment(s)Reader classes.
+     (Peter Mularien via otis)
+
+ 21. Added getFields(String) and getValues(String) methods.
+     Contributed by Rasik Pandey on 2002-10-09
+     (Rasik Pandey via otis)
+
+ 22. Revised internal search APIs.  Changes include:
+
+       a. Queries are no longer modified during a search.  This makes
+       it possible, e.g., to reuse the same query instance with
+       multiple indexes from multiple threads.
+
+       b. Term-expanding queries (e.g. PrefixQuery, WildcardQuery,
+       etc.)  now work correctly with MultiSearcher, fixing bugs 12619
+       and 12667.
+
+       c. Boosting BooleanQuery's now works, and is supported by the
+       query parser (problem reported by Lee Mallabone).  Thus a query
+       like "(+foo +bar)^2 +baz" is now supported and equivalent to
+       "(+foo^2 +bar^2) +baz".
+
+       d. New method: Query.rewrite(IndexReader).  This permits a
+       query to re-write itself as an alternate, more primitive query.
+       Most of the term-expanding query classes (PrefixQuery,
+       WildcardQuery, etc.) are now implemented using this method.
+
+       e. New method: Searchable.explain(Query q, int doc).  This
+       returns an Explanation instance that describes how a particular
+       document is scored against a query.  An explanation can be
+       displayed as either plain text, with the toString() method, or
+       as HTML, with the toHtml() method.  Note that computing an
+       explanation is as expensive as executing the query over the
+       entire index.  This is intended to be used in developing
+       Similarity implementations, and, for good performance, should
+       not be displayed with every hit.
+
+       f. Scorer and Weight are public, not package protected.  It now
+       possible for someone to write a Scorer implementation that is
+       not in the org.apache.lucene.search package.  This is still
+       fairly advanced programming, and I don't expect anyone to do
+       this anytime soon, but at least now it is possible.
+
+       g. Added public accessors to the primitive query classes
+       (TermQuery, PhraseQuery and BooleanQuery), permitting access to
+       their terms and clauses.
+
+     Caution: These are extensive changes and they have not yet been
+     tested extensively.  Bug reports are appreciated.
+     (cutting)
+
+ 23. Added convenience RAMDirectory constructors taking File and String
+     arguments, for easy FSDirectory to RAMDirectory conversion.
+     (otis)
+
+ 24. Added code for manual renaming of files in FSDirectory, since it
+     has been reported that java.io.File's renameTo(File) method sometimes
+     fails on Windows JVMs.
+     (Matt Tucker via otis)
+
+ 25. Refactored QueryParser to make it easier for people to extend it.
+     Added the ability to automatically lower-case Wildcard terms in
+     the QueryParser.
+     (Tatu Saloranta via otis)
+
+
+1.2 RC6
+
+ 1. Changed QueryParser.jj to have "?" be a special character which
+    allowed it to be used as a wildcard term. Updated TestWildcard
+    unit test also. (Ralf Hettesheimer via carlson)
+
+1.2 RC5
+
+ 1. Renamed build.properties to default.properties and updated
+    the BUILD.txt document to describe how to override the
+    default.property settings without having to edit the file. This
+    brings the build process closer to Scarab's build process.
+    (jon)
+
+ 2. Added MultiFieldQueryParser class. (Kelvin Tan, via otis)
+
+ 3. Updated "powered by" links. (otis)
+
+ 4. Fixed instruction for setting up JavaCC - Bug #7017 (otis)
+
+ 5. Added throwing exception if FSDirectory could not create directory
+    - Bug #6914 (Eugene Gluzberg via otis)
+
+ 6. Update MultiSearcher, MultiFieldParse, Constants, DateFilter,
+    LowerCaseTokenizer javadoc (otis)
+
+ 7. Added fix to avoid NullPointerException in results.jsp
+    (Mark Hayes via otis)
+
+ 8. Changed Wildcard search to find 0 or more char instead of 1 or more
+    (Lee Mallobone, via otis)
+
+ 9. Fixed error in offset issue in GermanStemFilter - Bug #7412
+    (Rodrigo Reyes, via otis)
+
+ 10. Added unit tests for wildcard search and DateFilter (otis)
+
+ 11. Allow co-existence of indexed and non-indexed fields with the same name
+     (cutting/casper, via otis)
+
+ 12. Add escape character to query parser.
+     (briangoetz)
+
+ 13. Applied a patch that ensures that searches that use DateFilter
+     don't throw an exception when no matches are found. (David Smiley, via
+     otis)
+
+ 14. Fixed bugs in DateFilter and wildcardquery unit tests. (cutting, otis, carlson)
+
+
+1.2 RC4
+
+ 1. Updated contributions section of website.
+    Add XML Document #3 implementation to Document Section.
+    Also added Term Highlighting to Misc Section. (carlson)
+
+ 2. Fixed NullPointerException for phrase searches containing
+    unindexed terms, introduced in 1.2RC3.  (cutting)
+
+ 3. Changed document deletion code to obtain the index write lock,
+    enforcing the fact that document addition and deletion cannot be
+    performed concurrently.  (cutting)
+
+ 4. Various documentation cleanups.  (otis, acoliver)
+
+ 5. Updated "powered by" links.  (cutting, jon)
+
+ 6. Fixed a bug in the GermanStemmer.  (Bernhard Messer, via otis)
+
+ 7. Changed Term and Query to implement Serializable.  (scottganyo)
+
+ 8. Fixed to never delete indexes added with IndexWriter.addIndexes().
+    (cutting)
+
+ 9. Upgraded to JUnit 3.7. (otis)
+
+1.2 RC3
+
+ 1. IndexWriter: fixed a bug where adding an optimized index to an
+    empty index failed.  This was encountered using addIndexes to copy
+    a RAMDirectory index to an FSDirectory.
+
+ 2. RAMDirectory: fixed a bug where RAMInputStream could not read
+    across more than across a single buffer boundary.
+
+ 3. Fix query parser so it accepts queries with unicode characters.
+    (briangoetz)
+
+ 4. Fix query parser so that PrefixQuery is used in preference to
+    WildcardQuery when there's only an asterisk at the end of the
+    term.  Previously PrefixQuery would never be used.
+
+ 5. Fix tests so they compile; fix ant file so it compiles tests
+    properly.  Added test cases for Analyzers and PriorityQueue.
+
+ 6. Updated demos, added Getting Started documentation. (acoliver)
+
+ 7. Added 'contributions' section to website & docs. (carlson)
+
+ 8. Removed JavaCC from source distribution for copyright reasons.
+    Folks must now download this separately from metamata in order to
+    compile Lucene.  (cutting)
+
+ 9. Substantially improved the performance of DateFilter by adding the
+    ability to reuse TermDocs objects.  (cutting)
+
+10. Added IndexReader methods:
+      public static boolean indexExists(String directory);
+      public static boolean indexExists(File directory);
+      public static boolean indexExists(Directory directory);
+      public static boolean isLocked(Directory directory);
+      public static void unlock(Directory directory);
+    (cutting, otis)
+
+11. Fixed bugs in GermanAnalyzer (gschwarz)
+
+
+1.2 RC2, 19 October 2001:
+ - added sources to distribution
+ - removed broken build scripts and libraries from distribution
+ - SegmentsReader: fixed potential race condition
+ - FSDirectory: fixed so that getDirectory(xxx,true) correctly
+   erases the directory contents, even when the directory
+   has already been accessed in this JVM.
+ - RangeQuery: Fix issue where an inclusive range query would
+   include the nearest term in the index above a non-existant
+   specified upper term.
+ - SegmentTermEnum: Fix NullPointerException in clone() method
+   when the Term is null.
+ - JDK 1.1 compatibility fix: disabled lock files for JDK 1.1,
+   since they rely on a feature added in JDK 1.2.
+
+1.2 RC1 (first Apache release), 2 October 2001:
+  - packages renamed from com.lucene to org.apache.lucene
+  - license switched from LGPL to Apache
+  - ant-only build -- no more makefiles
+  - addition of lock files--now fully thread & process safe
+  - addition of German stemmer
+  - MultiSearcher now supports low-level search API
+  - added RangeQuery, for term-range searching
+  - Analyzers can choose tokenizer based on field name
+  - misc bug fixes.
+
+1.01b (last Sourceforge release), 2 July 2001
+ . a few bug fixes
+ . new Query Parser
+ . new prefix query (search for "foo*" matches "food")
+
+1.0, 2000-10-04
+
+This release fixes a few serious bugs and also includes some
+performance optimizations, a stemmer, and a few other minor
+enhancements.
+
+0.04 2000-04-19
+
+Lucene now includes a grammar-based tokenizer, StandardTokenizer.
+
+The only tokenizer included in the previous release (LetterTokenizer)
+identified terms consisting entirely of alphabetic characters.  The
+new tokenizer uses a regular-expression grammar to identify more
+complex classes of terms, including numbers, acronyms, email
+addresses, etc.
+
+StandardTokenizer serves two purposes:
+
+ 1. It is a much better, general purpose tokenizer for use by
+    applications as is.
+
+    The easiest way for applications to start using
+    StandardTokenizer is to use StandardAnalyzer.
+
+ 2. It provides a good example of grammar-based tokenization.
+
+    If an application has special tokenization requirements, it can
+    implement a custom tokenizer by copying the directory containing
+    the new tokenizer into the application and modifying it
+    accordingly.
+
+0.01, 2000-03-30
+
+First open source release.
+
+The code has been re-organized into a new package and directory
+structure for this release.  It builds OK, but has not been tested
+beyond that since the re-organization.
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
new file mode 100644
index 0000000..8c03103
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/source-bundle/about_files/CVS/Entries
@@ -0,0 +1,4 @@
+/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
new file mode 100644
index 0000000..532ad3d
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/source-bundle/about_files/CVS/Repository
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000..24126f4
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/source-bundle/about_files/CVS/Root
@@ -0,0 +1 @@
+: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
new file mode 100644
index 0000000..3114c57
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/source-bundle/about_files/CVS/Tag
@@ -0,0 +1 @@
+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
new file mode 100755
index 0000000..dfd5693
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/source-bundle/about_files/LICENSE.txt
@@ -0,0 +1,240 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+
+Some code in src/java/org/apache/lucene/util/UnicodeUtil.java was
+derived from unicode conversion examples available at
+http://www.unicode.org/Public/PROGRAMS/CVTUTF.  Here is the copyright
+from those sources:
+
+/*
+ * Copyright 2001-2004 Unicode, Inc.
+ * 
+ * Disclaimer
+ * 
+ * This source code is provided as is by Unicode, Inc. No claims are
+ * made as to fitness for any particular purpose. No warranties of any
+ * kind are expressed or implied. The recipient agrees to determine
+ * applicability of information provided. If this file has been
+ * purchased on magnetic or optical media from Unicode, Inc., the
+ * sole remedy for any claim will be exchange of defective media
+ * within 90 days of receipt.
+ * 
+ * Limitations on Rights to Redistribute This Code
+ * 
+ * Unicode, Inc. hereby grants the right to freely use the information
+ * supplied in this file in the creation of products supporting the
+ * Unicode Standard, and to make copies of this file in any form
+ * for internal or external distribution as long as this notice
+ * remains attached.
+ */
+
+
+Some code in src/java/org/apache/lucene/util/ArrayUtil.java was
+derived from Python 2.4.2 sources available at
+http://www.python.org. Full license is here:
+
+  http://www.python.org/download/releases/2.4.2/license/
+
+
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
new file mode 100755
index 0000000..92fd344
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/source-bundle/about_files/NOTICE.txt
@@ -0,0 +1,11 @@
+Apache Lucene
+Copyright 2006 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+The snowball stemmers in
+  contrib/snowball/src/java/net/sf/snowball
+were developed by Martin Porter and Richard Boulton.
+The full snowball package is available from
+  http://snowball.tartarus.org/
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
new file mode 100755
index 0000000..ad1315c
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/source-bundle/about_files/README.txt
@@ -0,0 +1,46 @@
+Lucene README file
+
+$Id: README.txt 490368 2006-12-26 20:44:29Z gsingers $
+
+INTRODUCTION
+
+Lucene is a Java full-text search engine.  Lucene is not a complete
+application, but rather a code library and API that can easily be used
+to add search capabilities to applications.
+
+The Lucene web site is at:
+  http://lucene.apache.org/
+
+Please join the Lucene-User mailing list by sending a message to:
+  java-user-subscribe at lucene.apache.org
+
+FILES
+
+lucene-core-XX.jar
+  The compiled lucene library.
+
+lucene-demos-XX.jar
+  The compiled simple example code.
+
+luceneweb.war
+  The compiled simple example Web Application.
+
+contrib/*
+  Contributed code which extends and enhances Lucene, but is not
+  part of the core library.  Of special note are the JAR files in the analyzers and snowball directory which
+  contain various analyzers that people may find useful in place of the StandardAnalyzer.
+
+
+
+docs/index.html
+  The contents of the Lucene website.
+
+docs/api/index.html
+  The Javadoc Lucene API documentation.  This includes the core
+  library, the demo, as well as all of the contrib modules.
+
+src/java
+  The Lucene source code.
+
+src/demo
+  Some example code.
diff --git a/eclipse/plugins/org.apache.lucene/source-bundle/build.properties b/eclipse/plugins/org.apache.lucene/source-bundle/build.properties
new file mode 100755
index 0000000..b550e2b
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/source-bundle/build.properties
@@ -0,0 +1,14 @@
+###############################################################################
+# Copyright (c) 2007, 2008 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials 
+# are made available under the terms of the Common Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/cpl-v10.html
+# 
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+bin.includes = about.html,\
+               about_files/,\
+               plugin.properties,\
+               META-INF/
diff --git a/eclipse/plugins/org.apache.lucene/source-bundle/plugin.properties b/eclipse/plugins/org.apache.lucene/source-bundle/plugin.properties
new file mode 100755
index 0000000..a159548
--- /dev/null
+++ b/eclipse/plugins/org.apache.lucene/source-bundle/plugin.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2000, 2005 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+pluginName=Apache Lucene Source
+providerName=Eclipse.org
diff --git a/eclipse/plugins/org.eclipse.ant.core/.settings/org.eclipse.jdt.core.prefs b/eclipse/plugins/org.eclipse.ant.core/.settings/org.eclipse.jdt.core.prefs
index e510b3e..ae25ba7 100644
--- a/eclipse/plugins/org.eclipse.ant.core/.settings/org.eclipse.jdt.core.prefs
+++ b/eclipse/plugins/org.eclipse.ant.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,9 @@
-#Mon Dec 01 10:42:13 PST 2008
+#Thu May 05 15:06:07 CDT 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.builder.cleanOutputFolder=clean
 org.eclipse.jdt.core.builder.duplicateResourceTask=warning
 org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
 org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
 org.eclipse.jdt.core.circularClasspath=error
 org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
@@ -20,28 +21,29 @@ org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
 org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=error
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=ignore
 org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
 org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
 org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
 org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
 org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
 org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
 org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
@@ -49,28 +51,35 @@ org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
 org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
 org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=error
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
@@ -85,11 +94,12 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverridin
 org.eclipse.jdt.core.compiler.problem.unusedImport=error
 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
 org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.3
diff --git a/eclipse/plugins/org.eclipse.ant.core/.settings/org.eclipse.jdt.launching.prefs b/eclipse/plugins/org.eclipse.ant.core/.settings/org.eclipse.jdt.launching.prefs
new file mode 100644
index 0000000..5ee1bba
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.ant.core/.settings/org.eclipse.jdt.launching.prefs
@@ -0,0 +1,3 @@
+#Wed Feb 02 09:42:25 CST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=error
diff --git a/eclipse/plugins/org.eclipse.ant.core/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.ant.core/META-INF/MANIFEST.MF
index ce39c3b..b25056d 100644
--- a/eclipse/plugins/org.eclipse.ant.core/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.ant.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.ant.core; singleton:=true
-Bundle-Version: 3.2.201.qualifier
+Bundle-Version: 3.2.300.qualifier
 Bundle-Activator: org.eclipse.ant.core.AntCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.ant.core/buildfiles/buildExtraJAR.xml b/eclipse/plugins/org.eclipse.ant.core/buildfiles/buildExtraJAR.xml
index 4b7c46f..a86fcc1 100644
--- a/eclipse/plugins/org.eclipse.ant.core/buildfiles/buildExtraJAR.xml
+++ b/eclipse/plugins/org.eclipse.ant.core/buildfiles/buildExtraJAR.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
-     Copyright (c) 2005, 2006 IBM Corporation and others.
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Copyright (c) 2005, 2011 IBM Corporation and others.
      All rights reserved. This program and the accompanying materials
      are made available under the terms of the Eclipse Public License v1.0
      which accompanies this distribution, and is available at
diff --git a/eclipse/plugins/org.eclipse.ant.core/buildnotes_platform-ant.html b/eclipse/plugins/org.eclipse.ant.core/buildnotes_platform-ant.html
deleted file mode 100644
index aa102dd..0000000
--- a/eclipse/plugins/org.eclipse.ant.core/buildnotes_platform-ant.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Mozilla/4.7 [en] (WinNT; I) [Netscape]">
-   <title>Eclipse 3.6 Ant Release Notes</title>
-</head>
-<body>
-
-<h1>
-Eclipse 3.6 Ant Build Notes</h1>
-
-<h2>Enhancements in 3.6</h2>
-<p>None.</p>
-
-<h2>July 6, 2009</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=277487">Bug 277487</a>: Ant UI tests should not force focus of test workbench when breakpoint is hit<br>
-</body>
-</html>
\ No newline at end of file
diff --git a/eclipse/plugins/org.eclipse.ant.core/r2_0_buildnotes_platform-ant.html b/eclipse/plugins/org.eclipse.ant.core/r2_0_buildnotes_platform-ant.html
deleted file mode 100644
index 238d69a..0000000
--- a/eclipse/plugins/org.eclipse.ant.core/r2_0_buildnotes_platform-ant.html
+++ /dev/null
@@ -1,552 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Mozilla/4.7 [en] (WinNT; I) [Netscape]">
-   <title>Eclipse Platform Release Notes Core</title>
-</head>
-<body>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20020612
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Resolved Bugs</h3>
-
-<ul>
-<li>
-<a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfield=bug_status&chfieldfrom=2002%2F06%2F11&chfieldto=2002%2F06%2F12&chfieldvalue=&product=Platform&component=Ant&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&field0-0-1=noop&type0-0-1=noop&value0-0-1=&cmdtype=doit&order=Bug+Number">Click
-here</a> to see PRs which have been marked as RESOLVED, VERIFIED or CLOSED
-since the last integration build.</li>
-</ul>
-
-<h1>
-
-<hr WIDTH="100%">Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20020611
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Resolved Bugs</h3>
-
-<ul>
-<li>
-<a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfield=bug_status&chfieldfrom=2002%2F06%2F07&chfieldto=2002%2F06%2F11&chfieldvalue=&product=Platform&component=Ant&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&field0-0-1=noop&type0-0-1=noop&value0-0-1=&cmdtype=doit&order=Bug+Number">Click
-here</a> to see PRs which have been marked as RESOLVED, VERIFIED or CLOSED
-since the last integration build.</li>
-</ul>
-
-<h1>
-
-<hr WIDTH="100%">Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20020607
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Resolved Bugs</h3>
-
-<ul>
-<li>
-<a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfield=bug_status&chfieldfrom=2002%2F05%2F31&chfieldto=2002%2F06%2F07&chfieldvalue=&product=Platform&component=Ant&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&field0-0-1=noop&type0-0-1=noop&value0-0-1=&cmdtype=doit&order=Bug+Number">Click
-here</a> to see PRs which have been marked as RESOLVED, VERIFIED or CLOSED
-since the last integration build.</li>
-</ul>
-
-<h1>
-
-<hr WIDTH="100%">Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20020531
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Resolved Bugs</h3>
-
-<ul>
-<li>
-<a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfield=bug_status&chfieldfrom=2002%2F05%2F30&chfieldto=2002%2F05%2F31&chfieldvalue=&product=Platform&component=Ant&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&field0-0-1=noop&type0-0-1=noop&value0-0-1=&cmdtype=doit&order=Bug+Number">Click
-here</a> to see PRs which have been marked as RESOLVED, VERIFIED or CLOSED
-since the last integration build.</li>
-</ul>
-
-<hr WIDTH="100%">
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20020530
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Resolved Bugs</h3>
-
-<ul>
-<li>
-<a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfield=bug_status&chfieldfrom=2002%2F05%2F29&chfieldto=2002%2F05%2F30&chfieldvalue=&product=Platform&component=Ant&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&order=Bug+Number">Click
-here</a> to see PRs which have been marked as RESOLVED, VERIFIED or CLOSED
-since the last integration build.</li>
-</ul>
-
-<h1>
-
-<hr WIDTH="100%">Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20020529
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Resolved Bugs</h3>
-
-<ul>
-<li>
-<a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfield=bug_status&chfieldfrom=2002%2F05%2F21&chfieldto=2002%2F05%2F29&chfieldvalue=&product=Platform&component=Ant&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&order=Bug+Number">Click
-here</a> to see PRs which have been marked as RESOLVED, VERIFIED or CLOSED
-since the last integration build.</li>
-</ul>
-
-<h1>
-
-<hr WIDTH="100%">Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20020521
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-The plug-in <b><tt>org.eclipse.ant.ui</tt></b> has been removed in favor
-of <b><tt>org.eclipse.ui.externaltools</tt></b>.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Resolved Bugs</h3>
-
-<ul>
-<li>
-<a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfield=bug_status&chfieldfrom=2002%2F05%2F14&chfieldto=2002%2F05%2F21&chfieldvalue=&product=Platform&component=Ant&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&order=Bug+Number">Click
-here</a> to see PRs which have been marked as RESOLVED, VERIFIED or CLOSED
-since the last integration build.</li>
-</ul>
-
-<hr WIDTH="100%">
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20020514
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-Ant type eclipse.commapatternset has been removed.</li>
-</ul>
-
-<h3>
-Resolved Bugs</h3>
-
-<ul>
-<li>
-<a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfield=bug_status&chfieldfrom=2002%2F04%2F30&chfieldto=2002%2F05%2F14&chfieldvalue=&product=Platform&component=Ant&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&order=Bug+Number">Click
-here</a> to see PRs which have been marked as RESOLVED, VERIFIED or CLOSED
-since the last integration build.</li>
-</ul>
-
-<h1>
-
-<hr WIDTH="100%">Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20020430
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-Type commapatternset is now called eclipse.commapatternset .</li>
-</ul>
-
-<h3>
-Resolved Bugs</h3>
-
-<ul>
-<li>
-<a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfield=bug_status&chfieldfrom=2002%2F04%2F12&chfieldto=2002%2F04%2F30&chfieldvalue=&product=Platform&component=Ant&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&order=Bug+Number">Click
-here</a> to see PRs which have been marked as RESOLVED, VERIFIED or CLOSED
-since the last integration build.</li>
-</ul>
-
-<h1>
-
-<hr WIDTH="100%">Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20020411
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Resolved Bugs</h3>
-
-<ul>
-<li>
-<a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfield=bug_status&chfieldfrom=2002%2F04%2F09&chfieldto=2002%2F04%2F12&chfieldvalue=&product=Platform&component=Ant&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&namedcmd=Active&newqueryname=&order=Bug+Number">Click
-here</a> to see PRs which have been marked as RESOLVED, VERIFIED or CLOSED
-since the last integration build.</li>
-</ul>
-
-<h1>
-
-<hr WIDTH="100%">Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20020409
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-<b><tt>org.eclipse.ant.core</tt></b> does not export <b><tt>org.apache.ant</tt></b>
-anymore. Plug-ins that need to have access to Ant classes need to require
-<b><tt>org.apache.ant</tt></b>
-directly.</li>
-
-<li>
-Tasks <b><tt>refreshLocal</tt></b> and <b><tt>incrementalBuild</tt></b>
-are not available anymore. Use <b><tt>eclipse.refreshLocal</tt></b> and
-<b><tt>eclipse.incrementalBuild</tt></b>
-instead.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-New property <b><tt>eclipse.running</tt></b> is set for scripts running
-inside Eclipse.</li>
-
-<li>
-It is now possible to extend the Ant classpath by adding new JARs, folders,
-tasks and types through a preference (Workbench->Preferences->Ant->Customize).</li>
-</ul>
-
-<h3>
-Resolved Bugs</h3>
-
-<ul>
-<li>
-<a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfield=bug_status&chfieldfrom=2002%2F01%2F29&chfieldto=2002%2F04%2F09&chfieldvalue=&product=Platform&component=Ant&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&namedcmd=Active&newqueryname=&order=Bug+Number">Click
-here</a> to see PRs which have been marked as RESOLVED, VERIFIED or CLOSED
-since the last integration build.</li>
-</ul>
-
-<h1>
-
-<hr WIDTH="100%">Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20020129
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Resolved Bugs</h3>
-
-<ul>
-<li>
-<a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfield=bug_status&chfieldfrom=2001%2F12%2F17&chfieldto=2002%2F01%2F29&chfieldvalue=&product=Platform&component=Ant&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&namedcmd=ant&newqueryname=&order=Bug+Number">Click
-here</a> to see PRs which have been marked as RESOLVED, VERIFIED or CLOSED
-since the last integration build.</li>
-</ul>
-
-<h1>
-
-<hr WIDTH="100%">Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20011218
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Resolved Bugs</h3>
-
-<ul>
-<li>
-<a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfield=bug_status&chfieldfrom=2001%2F12%2F11&chfieldto=2001%2F12%2F17&chfieldvalue=&product=Platform&component=Ant&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&namedcmd=ant&newqueryname=&order=Bug+Number">Click
-here</a> to see PRs which have been marked as RESOLVED, VERIFIED or CLOSED
-since the last integration build.</li>
-</ul>
-
-<h1>
-
-<hr WIDTH="100%">Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20011211
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-Ant code from Apache has moved to a new plug-in called org.apache.ant..</li>
-</ul>
-
-<h3>
-Resolved Bugs</h3>
-
-<ul>
-<li>
-<a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfield=bug_status&chfieldfrom=2001%2F11%2F27&chfieldto=2001%2F12%2F10&chfieldvalue=&product=Platform&component=Ant&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&namedcmd=Active&newqueryname=&order=Bug+Number">Click
-here</a> to see PRs which have been marked as RESOLVED, VERIFIED or CLOSED
-since the last integration build.</li>
-</ul>
-
-<h1>
-
-<hr WIDTH="100%">Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20011127 (v213)
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=5391">5391</a> 
-Upgrade to Ant 1.4.1</li>
-</ul>
-
-<h1>
-
-<hr WIDTH="100%">Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20011120 (v211)
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=5331">5331</a> 
-Ant does not override optional tasks with org.eclipse.ant.core.antTasks
-extension point</li>
-</ul>
-
-</body>
-</html>
diff --git a/eclipse/plugins/org.eclipse.ant.core/r2_1_buildnotes_platform-ant.html b/eclipse/plugins/org.eclipse.ant.core/r2_1_buildnotes_platform-ant.html
deleted file mode 100644
index 6ce0828..0000000
--- a/eclipse/plugins/org.eclipse.ant.core/r2_1_buildnotes_platform-ant.html
+++ /dev/null
@@ -1,706 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Mozilla/4.7 [en] (WinNT; I) [Netscape]">
-   <title>Eclipse Platform Release Notes Ant</title>
-</head>
-<body>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build March 25, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=35610">35610</a>: External tools plugin.xml error<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build March 17, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=35138">35138</a>: NPE during shutdown<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34767">34767</a>: Ant preferences not imported<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=35100">35100</a>: Migrate actions to command extension point<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build March 13, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34726">34726</a>: Ant tests do not need the overhead of AutomatedSuite.run<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34922">34922</a>: Typos<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34439">34439</a>: Index out of bounds editing custom task<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34496">34496</a>: double click adds type without name<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34682">34682</a>: External entity with unrecognized protocol<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34678">34678</a>: Duplicate properties in files<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34663">34663</a>: Ant attempts to resolve taskdefs before resolving properties<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build March 12, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34442">34442</a>: Custom task does not work in folder (only in jar)<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34472">34472</a>: External tools preference is not clear<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34519">34519</a>: Dialog slow to cancel when Properties/External Tools was selected<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build March 6, 2003
-<p>
-<b>Note:</b> Adding the Xerces JARs to your runtime Ant classpath is no longer required.
-In fact, adding these JARs can cause problems. The Xerces classes are loaded from the Xerces plugin provided with Eclipse.
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32643">32643</a>: PlantyContentOutlinePage: 'Open With' shows up in context menu for non-existant external entity<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33682">33682</a>: Ant build file editor causes exceptions when file empty<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33794">33794</a>: Variables should be sorted in the "Select Variable" dialog<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33826">33826</a>: Preferences>Editor>Appearance: layout problem<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33069">33069</a>: Stack traces using ant editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31727">31727</a>: Ant Editor tests fail when run as PDE JUnit tests<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33838">33838</a>: Have build.xml as a default name for -find emulation<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32700">32700</a>: Refresh Tab Scope variable selected but no selection widget<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33685">33685</a>: Ant view: open with not available for targets<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32657">32657</a>: Ant build stops working after terminating build<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33861">33861</a>: [External Tools] Pref page too prominent<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33870">33870</a>: The build.properties for org.eclipse.ant.tests.core is incorrect<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33837">33837</a>: Ant editor code assist is case sensitive<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33859">33859</a>: AntEditor: error nodes in outline are inconsistent with the Java editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33867">33867</a>: Misspelling in Ant View context menu<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33874">33874</a>: AntEditor: no context menu on vertical ruler<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33857">33857</a>: AntEditor: doesn't support hovers on annotations<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33928">33928</a>: NPE closing workbench<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33981">33981</a>: Better positioning of error squiggles in Ant Editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33264">33264</a>: Content assist fails if reference external entity<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33664">33644</a>: Class org/xml/sax/Parser violates loader constraints with IBM vm 131<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32890">32890</a>: Coloring bug in ant editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33892">33892</a>: BadLocationException possible during reconciliation of AntEditor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33952">33952</a>: AntEditor: possible automatic move of cursor while editing<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build March 4, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33443">33443</a>: No need for our own Ant version implementation<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33263">33263</a>: Ant completion of properties is incorrect.<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32825">32825</a>: Missing NLS strings for Ant Editor preference page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32183">32183</a>: Running with Ant1.6 alpha<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32477">32477</a>: Errors in external entities and nested external entities aren't supported by the editor outline<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32551">32551</a>: "Run Ant" causes ClassCastException with filesets<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32587">32587</a>: AntView actions are incorrecly enabled --> NPE<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32824">32824</a>: BadLocationException creating build.xml file<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32624">32624</a>: Problem with asyncExec(..) Runnable in PlantyContentOutlinePage if control of treeviewer gets disposed.<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32787">32787</a>: AssertionFailedException selecting error node in AntEditor outline<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33043">33043</a>: Custom types are broken<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33288">33288</a>: Ant View tooltips should use book capitalization<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32517">32517</a>: No mneumonics on the Choose Configuration Type dialog<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31433">31433</a>: Ant view will not set its focus when selecting the window<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33514">33514</a>: Ant integration appears broken in I20030227<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32715">32715</a>: Cancelling removing a external tool builder fails<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32836">32836</a>: Cannot remove custom task<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33284">33284</a>: Ant preferences: additional classpath entries not removed permanently<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33117">33117</a>: ClassCastException with tasks using Xerces<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32837">32837</a>: Tasks tab restore defaults<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32827">32827</a>: Editor selection for external entities can be improved<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32809">32809</a>: AntView search dialog retains name of removed working set<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32693">32693</a>: Duplicate mneumonic on Program main tab<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33534">33534</a>: Ant Editor: range indication not supported<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33272">33272</a>: Leaking PlantyDocumentProviders<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32768">32768</a>: Edit launch config from Ant view starts out "dirty"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32811">32811</a>: Setting ANT_HOME for specific config does not update classpath<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32781">32781</a>: Description in Ant preference page is confusing<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33702">33702</a>: [Ant View] Properties action<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33346">33346</a>: Move to Ant 1.5.2<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32521">32521</a>: (minor)AntView status line shows "no description"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33670">33670</a>: Ant view error strings are too long<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32762">32762</a>: ${resource_loc} variable component specific resource tree too small<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Feb 21, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23969">23969</a>: Launcher should throw JVM exit code to parent process when build fails<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Feb 20, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31819">31819</a>: New support for color in TableViewers and TreeViewers<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32158">32158</a>: Can't remove erroneous project builders<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30716">30716</a>: cannot change external tool builder launch configuration properties<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31949">31949</a>: Use OpenWith menu for external entities in the AntEditor outline<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32091">32091</a>: AntClassloader should be setting its parent classloader<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31625">31625</a>: Mixing build files in Ant view does not work<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31934">31934</a>: Targets tab gets very wide if lots of targets selected<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=19459">19459</a>: [ExternalTools] failure to execute invalid tools should be better handled by ui.<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32297">32297</a>: "plug-in" should be spelled with a hyphen<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32276">32276</a>: Stack trace running ant.bat as an external process<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31955">31955</a>: Outline is not created until initial reconcilation: noticeable delay<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32345">32345</a>: Ant Editor doesn't support annotations<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32374">32374</a>: BadLocationException on external entity build file<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32423">32423</a>: Cannot use Run as Ant build with the Ant Editor outline with focus<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32419">32419</a>: Put External Tools launch button with Run and Debug launch buttons<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Feb 18, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28770">28770</a>: Display default target in project label in Ant view<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30596">30596</a>: Fixes for the Ant Editor Tests<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29236">29236</a>: AntView tests & Ant editor tests<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31780">31780</a>: Workaround JFace selection bug<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31776">31776</a>: Ant targets cannot be configured within the list box if many targets exist<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31777">31777</a>: Add reconciling to the Ant editor outline page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=21793">21793</a>: Ant ProjectHelper not loaded correctly [set thread context classloader]<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31796">31796</a>: Ant Editor syntax coloring fails over multiple lines<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30836">30836</a>: XMLElements from external entities have incorrect selection in AntEditor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31369">31369</a>: External Processes are not typed<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31439">31439</a>: PlantyException on opening ant script<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31588">31588</a>: Show In... support from the Ant<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31792">31792</a>: Project.init shortcut not working for datatypes<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31797">31797</a>: AntEditor syntax color does not update until the editor is re-opened<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31935">31935</a>: No targets selected, yet still have targets in target execution order<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31876">31876</a>: ClassCastException code assisting in Ant Editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31948">31948</a>: AntEditor reconciling has broken resolution of external entities<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32069">32069</a>: Color preferences are applied too early<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27613">27613</a>: Code duplication with Ant preference pages and Ant launch config tabs<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Feb 13, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31587">31587</a>: Open Editor for external entities should use selection<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31561">31561</a>: Parse build files faster<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31672">31672</a>: Broken backwards compatibility with Ant 1.4.*<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31678">31678</a>: Disallow the AntClassLoader to load core Ant classes from plugin parents<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30679">30679</a>: External tool migration and writing to System.err<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31097">31097</a>: Ant Color Option list needs scrollbars<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28928">28928</a>: Set minimum size of Runtime class path<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Feb 11, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30939">30939</a>: DBCS characters are garbled at the Outline view using non-native workbench encoding<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31180">31180</a>: Outline colors all elements whose name matches default target's<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29815">29815</a>: Ant artwork<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29898">29898</a>: Updating actions in the AntView<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30931">30931</a>: [Ant View] Run button not enabled when first target added to list<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30961">30961</a>: Arguments field on the ExternalToolsMain tab needs to be multiline<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30239">30239</a>: Some bugs in launch configurations for external tools<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31378">31378</a>: AntTargetsTab order tab does not color default target correctly<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31200">31200</a>: Unable to uncheck Ant Targets after clicking "Revert"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31145">31145</a>: Show external entities as root nodes in the outline page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30884">30884</a>: PlantyCompletionProcessor does not handle external entities<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30844">30844</a>: AntClasspathTab top table will grow unbounded<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29572">29572</a>: headless Ant support does not properly handle IDE based Ant tasks<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Feb 6, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31055">31055</a>: NPE determining if default target<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Feb 5, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30239">30239</a>: Some bugs in launch configurations for external tools<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26750">26750</a>: "Run with..." dialog for AntView<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29231">29231</a>: Ant view is listed under "External Tools" in menu<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29824">29824</a>: Ant view toolbars should follow type hierarchy example<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30220">30220</a>: external builder not readded to projects<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30228">30228</a>: Mneumonic collision on Refresh tab for resource variable<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30649">30649</a>: Ant Runtime Classpath Up/Down buttons broken<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30591">30591</a>: DBCS:After remove all targets, "Run Ant..." will repeat last target<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29822">29822</a>: Streamline single target case for Ant View<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30331">30331</a>: [Ant View] Add build files sorts case dependant<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30318">30318</a>: Planty should be renamed to "Ant Editor"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29820">29820</a>: Reduce clutter in Ant View<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30098">30098</a>: AntSecurityManager throws exception when exiting Eclipse<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30715">30715</a>: Incorrect string description for ${build_type} variable<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30420">30420</a>: StringIndexOutOfBoundsException on restart with Ant editor active<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30744">30744</a>: Activating a target in the Ant view switches view layout<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30589">30589</a>: DBCS:Clicking "Up" or "Down" make Target lost<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29318">29318</a>: Two builds at the same time...one starts logging to the DOS console<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29271">29271</a>: External tools ant output always goes to the console<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30547">30547</a>: Ant view properties action doesn't handle more than one config<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30680">30680</a>: "Widget is disposed" setting variable arguments for Ant Build<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30769">30769</a>: Missing icon for target error node<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29885">29885</a>: Ant editor (planty) does not handle relative paths nicely<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29744">29744</a>: [External Tools] refresh ${working_set} does not work<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30559">30559</a>: ExternalToolsPlugin.log(Throwable) logs no message<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30770">30770</a>: When things go wrong parsing for the Ant Editor outline<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30767">30767</a>: NPE on resource changed from AntView<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30343">30343</a>: Ant Editor outline does not indicate default target<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24108">24108</a>: Nls external tools<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26683">26683</a>: Targets tab behavior<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27325">27325</a>: "activate" terminology<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29828">29828</a>: Too many preference pages<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30915">30915</a>: Selected resource tracking fails<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30932">30932</a>: Restore defaults does not work for color preferences<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30845">30845</a>: org.eclipse.ui.externaltools.internal.ant.dtd.test.dumper.java<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30093">30093</a>: Handling bad definitions of extension points<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Jan 28, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29878">29878</a>: Chkpii failures for Ant / external tools<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29857">29857</a>: Open with "Planty"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28877">28877</a>: Double clicking active target should run the active target<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29816">29816</a>: Support "delete" key in the Ant view for active targets<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30035">30035</a>: NPE running build file in external project<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29315">29315</a>: AntProgressBuildListener writing to .log on build cancelled<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29321">29321</a>: Set ANT_HOME does not force you to enter location<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29249">29249</a>: Ant view updates for resource changes inefficiently<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27675">27675</a>: Show custom Eclipse tasks / types<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30083">30083</a>: Adding -logger XmlLogger cause Exception on build finished<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27627">27627</a>: API review<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30086">30086</a>: Ant view not updated when project deleted<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29743">29743</a>: [External Tools] Apply button does not enable in "refresh tab"<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Jan 21, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26532">26532</a>: [External Tools] the external tools menu in the run menu<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25860">25860</a>: Ant runner sets basedir incorrectly<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26667">26667</a>: External Tool variables are expanded in launch config dialog<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29504">29504</a>: External Tools' Eclipse variables are disallowed to have text before/after<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=16618">16618</a>: [ExternalTools] Re-launch last External Tool hotkey <br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26523">26523</a>: NPE in getHyperLink<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29573">29573</a>: External tool variable scope is too restrictive<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29672">29672</a>: When external tool builders go bad<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29152">29152</a>: Migrate extension point schema ownership<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29148">29148</a>: Contribution of Planty 0.9.1<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28746">28746</a>: Please sort build targets alphabetically<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29322">29322</a>: Revert has no effect on Build Options tab<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29806">29806</a>: Default script name<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29812">29812</a>: Define placeholder for Ant View<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29811">29811</a>: Add "Ant View" to top level menu<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28306">28306</a>: External tool builder not deleted on cancel<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28577">28577</a>: External tool builder not added<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28769">28769</a>: New Ant View doesn't gracefully handle missing targets<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29449">29449</a>: SearchForBuildFilesDialog.searchForBuildFiles optimization<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29663">29663</a>: Descriptions in the AntView<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29818">29818</a>: Replace "Go To File" with "Open With ->"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=3079">3079</a>: [ExternalTools] Clicking on output should open resource<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27684">27684</a>: Tasks and Types lists need to be sorted<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Jan 14, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26688">26688</a>: Rendering of Ant projects in the Ant View<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27699">27699</a>: Move up/down enabled when no selection and only one target<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29180">29180</a>: Support double-click in the selection dialog<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28809">28809</a>: ANT_HOME not set on first run of Ant tool<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27540">27540</a>: Run Ant vs. Ant View<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=19623">19623</a>: [ExternalTools] Display full command line for external tool<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29220">29220</a>: Ant view execution order contains extra node<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29221">29221</a>: Run as Ant does not report anything on some failures<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24338">24338</a>: Cancelling an Ant run can take a long time<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=21012">21012</a>: [ExternalTools] Cancel tool does not cancel tool<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28933">28933</a>: Cannot add tasks/types from folder<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28876">28876</a>: Ant View in M4 should split vertical<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29269">29269</a>: ClassNotFoundException: TaskLineTracker<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26978">26978</a>: Ant targets tab shouldn't add all targets by defaultt<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26882">26882</a>: Need "run for build kinds" UI for project builders<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28431">28431</a>: Variable expansion is using incorrect path separators<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28569">28569</a>: Browse workspace dialog needs colon<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28570">28570</a>: Missing mneumonic for copy button in External Tools builders page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28305">28305</a>: Edit properties for Launch Configuration for External tools<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Jan 7, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27983">27983</a>: Ant logger does not respect console buffer size<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Dec 17, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28276">28276</a>: Should not expose "ant class loader" option to user<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Dec 16, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28301">28301</a>: Creation of an External Tool Builder gets name wrong.<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28306">28306</a>: External tool builder not deleted on cancel<br>
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Dec 13, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27984">27984</a>: Total build time wrong<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23661">23661</a>: [ExternalTools] Launching Ant on xml file that is in the active editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=20581">20581</a>: [ExternalTools] Variables should insert at caret<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26182">26182</a>: Ant preference page has conflicting mnemonics<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26200">26200</a>: External tools menu is missing mnemonics<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27525">27525</a>: Remove All Projects and Remove all build files<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28052">28052</a>: AntProcessBuildLogger doesn't handle empty locations<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27804">27804</a>: VariableContextManager and ExternalToolsPlugin#startup<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28130">28130</a>: 1.3 incompatible compile when target, source set to "1.3" using 1.4.* vm<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28136">28136</a>: Ant view "Run" button is ambiguous<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28213">28213</a>: Adding a file to the Ant view that already exists takes way too long<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26689">26689</a>: navigate from ant view to editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26554">26554</a>: Ant view should update when projects closed/removed<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Dec 10, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27328">27328</a>: Search for build file does not remeber last search text<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27541">27541</a>: Cannot add an Ant External Tool Builder<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27050">27050</a>: NullBuildLogger no longer needed<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=16574">16574</a>: [ExternalTools] External tool builders should use same set of external tools<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27101">27101</a>: AntView enhancement<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27686">27686</a>: Having both Run Ant and Run Ant... in the same menu is problematic<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27669">27669</a>: Ant view toolbar is misleading<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27615">27615</a>: Incorrect button enablement on AntClasspathPage<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=22793">22793</a>: [ExternalTools] Ant preference page jar area changes size<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27814">27814</a>: AntLaunchShortcut refererences internal debug UI class<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27665">27665</a>: Buildfile hyperlink off by 1<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27323">27323</a>: can only single-select active targets<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27700">27700</a>: Ant View: I can activate a target more than once<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27810">27810</a>: BuilderPropertyPage makes multiple dispatching listeners<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=15405">15405</a>: Make all ANT configuration defined at config level<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27841">27841</a>: Illegal reference to LaunchGroup and DebugUIPlugin<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27832">27832</a>: Easy to cut off the "Reuse Ant classloader" option<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27831">27831</a>: Save changes prompt from classpath tab<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25649">25649</a>: Add action to add ant project to ant view<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27505">27505</a>: Ant specific actions in External tools base<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27865">27865</a>: Can't cancel AntView search<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27702">27702</a>: IllegalArgumentException in AntView<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27846">27846</a>: Cannot add new ext tool builer<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=20856">20856</a>: [ExternalTools] Preferences/Ant/Classpath inconsistency<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27440">27440</a>: Cached classloader misses changes to tasks / types<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25650">25650</a>: Add action to ant view to search for build files<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27954">27954</a>: Merge Main and Options tabs<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27841">27841</a>: Ext tool builders have wrong icon and NPE'd<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=17782">17782</a>: [ExternalTools] Custom tasks not checked for validity<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26455">26455</a>: -find option not yet implemented<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27703">27703</a>: Add classpath tab for Ant<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27776">27776</a>: Don't use the term "Ant Script"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27780">27780</a>: Ant Preference page reorganization<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27856">27856</a>: Description field on ExternalToolsMainTab<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27964">27964</a>: NoSuchElement exception in AddCustomDialog<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27956">27956</a>: Create Ant Main tab to limit location selection<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Dec 03, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=20014">20014</a>: [ExternalTools] Tool location should accept only files<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26918">26918</a>: Projects with external builders cause NPEs when built in headless mode<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26671">26671</a>: Ant external tool hangs Eclipse<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25709">25709</a>: Lists on Targets page of External Tools properties need scrollbars<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26637">26637</a>: Process timestamp showing as launch configuration property<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26638">26638</a>: Too much logging to the log<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26995">26995</a>: Run Ant action should prompt for config<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26449">26449</a>: pref page: set ANT_HOME 'Browse' button size is unusual<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27500">27500</a>: Ant tasks do not always have a name<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25712">25712</a>: external tools tabs missing mneumonics<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27124">27124</a>: Adjust hyperlink for adorned tasks in Ant output<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27049">27049</a>: AntProcessBuildLogger does not write to logfile<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24704">24704</a>: Tasks with the same name can be entered via the pref page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27345">27345</a>: "Don't ask again" preference when migrating external tool builders<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27128">27128</a>: Hyperlinking for Ant tasks does not work on older Ants<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27141">27141</a>: [External Tools] Unexpected Run Ant dialog behaviour.<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27531">27531</a>: Browse for Ant home should store last location<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27157">27157</a>: Two launch histories for external tools<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27534">27534</a>: Extra runtime classpath entries lost if Ant home specified<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25500">25500</a>: Add JAR to classpath should default to workspace root<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=13144">13144</a>: [ExternalTools] Ant preference page details<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27449">27449</a>: External Tools/Ant should honour dialog font<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27206">27206</a>: Additional ant classpath urls do not show up for adding tasks/types<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24865">24865</a>: Misc Restricted to Selected Objects in Breakpoint Properties dialog<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27265">27265</a>: Adornment adjustment is incorrect for long task names.<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=20921">20921</a>: [ExternalTools] Project properties runs autobuild for all projects<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Nov 26, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27009">27009</a>: External tool option tab defaults to "run in background"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24699">24699</a>: Ant classpath should be separated into two components?<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26405">26405</a>: AntTargetsTab doesn't save target selection<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26415">26415</a>: Migrate external tool project builders to use launch configurations<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26704">26704</a>: Remove External Tools View<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26705">26705</a>: Remove "ExternalTool" UI code<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26708">26708</a>: output should be the same as from command line<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27014">27014</a>: Prompt for argument checkbox should be temporarily removed<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27033">27033</a>: AntView uses JDK 1.4 method String.split(...)<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26744">26744</a>: [ExternalTools] Console always opens build file with Text editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26636">26636</a>: Cached Ant classloader not reset with classpath change<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=16849">16849</a>: [ExternalTools] Ant does not respect output level preference<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26948">26948</a>: Requesting invalid target execution causes NPE in ProgressBuildListener<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26042">26042</a>: Can't run Ant script with new Ant on MacOS X<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26606">26606</a>: Ant errors not showing in console<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=19520">19520</a>: [ExternalTools] Performance suffers with console log ouput enabled<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=22402">22402</a>: [ExternalTools] Port fix for handling spaces in arguments...<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26192">26192</a>: NPE from ant targets tab<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26729">26729</a>: External tools menu does not update<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26714">26714</a>: Ant loses preferences<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Nov 19, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26112">26112</a>: "Run Ant..." implies dialog<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=6498">6498</a>: [ExternalTools] selecting and building individual targets in ANT scripts<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=18971">18971</a>: [ExternalTools] Using external tool configs in other contexts<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=19450">19450</a>: [ExternalTools] menu should limit itself to the first n tools (perhaps n = 20)<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=21809">21809</a>: Let user specify installation directory of Ant<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24718">24718</a>: Run Ant should be programmatically available<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25059">25059</a>: [ExternalTools] Refresh Scopes dialog should be wizard<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25062">25062</a>: Support execution of ant tasks in a seperate thread<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25821">25821</a>: External Tool] Error Message "External Tool runner internal error"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26061">26061</a>: Changes to Ant classpath don't persist<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26418">26418</a>: Remove "launch configuration mode" as an option in external tools<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26629">26629</a>: Error message has reversed arguments<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=19450">19450</a>: [ExternalTools] menu should limit itself to the first n tools (perhaps n = 20)<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=22738">22738</a>: [ExternalTools] Tool arguments should be a wizard<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=13275">13275</a>: [ExternalTools] Ant Wizard should not "always" be modal<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=20857">20857</a>: Problems with Ant classpath not being picked up<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Nov 13, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26050">26050</a>: Unnamed projects cause NPE in Ant View<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=16982">16982</a>: [ExternalTools] Console font setting should be workbench text font<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25592">25592</a>: [External Tools] Log console should have autoscroll<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=18478">18478</a>: [External Tools] Minor: output not always in right order<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=22727">22727</a>: [External Tools] Program tool output not shown on log console<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25762">25762</a>: Problem starting JUnit plugin tests<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25746">25746</a>: Runtime exec support should be in debug core<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25877">25877</a>: should save all files before execute ant script<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23662">23662</a>: [ExternalTools] External tools history manipulation<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25907">25907</a>: [ExternalTools] ExternalToolMenuDelegate leaking menus<br>
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Nov 12, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25759">25759</a>: NPE trying to open the antview preferences page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=22730">22730</a>: [ExternalTools] Capture output<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25397">25397</a>: AntPage flashes when resized<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25493">25493</a>: NPE if default target does not exist in external tool builder ant file<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25648">25648</a>: Add remove action to ant view<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25468">25468</a>: Backwards compatibility with Ant 1.4.1<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Nov 05, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25509">25509</a>: NPE from InternalAntRunner<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25639">25639</a>: Double click in tasks and types tabs should invoke edit<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25656">25656</a>: [ant] Cannot add multiple Jars to ant classpath at the same time<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25693">25693</a>: Implement support for the -diagnostics option<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25647">25647</a>: Add Ant View to Eclipse<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25698">25698</a>: Global properties<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25699">25699</a>: Global property files<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25702">25702</a>:  [External Tools] Restore defaults does not work<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24525">24525</a>:  Active targets not shown in ant tool property page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24578">24578</a>:  Can't add variable to tool arguments<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Oct 29, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24847">24847</a>: duplicate options not handled the same as cmd line Ant<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25133">25133</a>: Implement support for the 1.5.1 feature: -propertyfile<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25213">25213</a>: -propertyfile should not abort build if the property file is not found<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24580">24580</a>: Expose more information in TargetInfo<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=17803">17803</a>: [ExternalTools] AntPage table should scroll horizontally<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=18294">18294</a>: [ExternalTools] Ant preference page: classpath list too wide<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24383">24383</a>: Update the printUsage of InternalAntRunner<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24824">24824</a>: DefaultLogger should be used for headless Ant<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=20576">20576</a>: [ExternalTools] Should specify order of jars on classpath<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24234">24234</a>: Ant test suite<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24318">24318</a>: Move to Ant 1.5.1<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25134">25134</a>: Implement support for the 1.5.1 feature: -inputhandler<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Oct 22, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24756">24756</a>: -projecthelp indicates BUILD SUCCESSFUL<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24831">24831</a>: Same URL multiple times in the AntClassLoader<br>
-
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Oct 16, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=15821">15821</a>: [ExternalTools] Minor: Ant console "steals" focus<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=22400">22400</a>: [ExternalTools] Run Ant... action displayed for invalid resources (build I0813)<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Oct 15, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=6020">6020</a>: Tasks calling System.exit crash Eclipse<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23651">23651</a>: [doc] AntTasks and AntTypes refer to non-existant API<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23653">23653</a>: [doc] Extra Ant classpath entries extension<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24459">24459</a>: AntCorePlugin startup<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=19899">19899</a>: If the user never changes the Ant classpath, it should always be computed<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23917">23917</a>: logfile not created in the correct location when path not fully specified<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24587">24587</a>: Project properties not set properly if no arguments passed<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24696">24696</a>: ExternalTools antrunner.jar is still in the HEAD stream<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24418">24418</a>: Option without necessary corresponding argument not handled correctly<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24594">24594</a>: Targets specified as arguments not recognized<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23995">23995</a>: deadlock while running build.xml<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24733">24733</a>: Help text is wrong<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24710">24710</a>: Custom ant task classes not found<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Oct 09, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24527">24527</a>: java.io.FileNotFoundException occurs when invoking AntRunner<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Oct 08, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=20557">20557</a>: Running an empty ant script takes about 2 seconds<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=22459">22459</a>: AntRunner prints stack trace on OperationCanceledException<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23383">23383</a>: API: Add @since tags<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24290">24290</a>: Ant preferences are only saved at shutdown<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23584">23584</a>: Java should be capitalized<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=17484">17484</a>: [ExternalTools] Adding tasks from JARs in the Ant Preference Page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23664">23664</a>: Better reporting of errors when reading Ant build file<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24415">24415</a>: Running an Ant script with console logging turned off writes to OS console<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24452">24452</a>: Key clashes within extension point definitions<br>
-
-<h3>
-Problem Reports Closed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23350">23350</a>: Possible NPE<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Oct 01, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23482">23482</a>: Rework the Core Ant code to be able to use the NLS tools<br> 
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=14180">14180</a>: Ant -help not function<br> 
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=19801">19801</a>: AntCorePreferences, Type, Tasks could be a public class<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23881">23881</a>: Same error logged three times<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23913">23913</a>: Issues with InternalAntRunner#printHelp(Project)<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=22714">22714</a>: Arguments line lose spaces when printed to console<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23132">23132</a>: -logfile option for ant doesnt seem to work<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=16740">16740</a>: [ExternalTools] Irrelevant stack trace for errors in Ant build file<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=19838">19838</a>: Error codes for Ant Core should be public<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=21478">21478</a>: Insufficient Ant activation error reporting<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23658">23658</a>: Build file is not logged to log console view<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=22465">22465</a>: Wrong ant script causes fatal error written to console<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23924">23924</a>: handling of incorrect / unrecognized arguments<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23720">23720</a>: [doc] Extension point listing is incorrect<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=22702">22702</a>: XmlLogger not working?<br>
-
-<h3>
-Problem Reports Closed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=21479">21479</a>: Ant classpath refers to old 'xerces.jar'<br> 
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23832">23832</a>: Update Ant pages on dev.eclipse.org<br>
-
-</body>
-</html>
diff --git a/eclipse/plugins/org.eclipse.ant.core/r3_0_buildnotes_platform-ant.html b/eclipse/plugins/org.eclipse.ant.core/r3_0_buildnotes_platform-ant.html
deleted file mode 100644
index ccaa5ea..0000000
--- a/eclipse/plugins/org.eclipse.ant.core/r3_0_buildnotes_platform-ant.html
+++ /dev/null
@@ -1,956 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Mozilla/4.7 [en] (WinNT; I) [Netscape]">
-   <title>Ant Release Notes </title>
-</head>
-<body>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build for RC3, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=66867">66867</a>: icon allignment<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=66883">66883</a>: RC2, external tools: VM arguments not forwarded to separate JRE<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55358">55358</a>: Create templates for commonly used tasks and types.<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55242">55242</a>: NPE on shutting down Eclipse<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=66734">66734</a>: NPE in RemoteAntProcessFactory from "null" attributes (1.1.x VM)<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=67057">67057</a>: Migration of builder from 2.0.2 to 3.0<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=67302">67302</a>: AntEditorMarkerUpdater susceptable to CME<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build for RC2, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=65655">65655</a>: eclipse.home ant property improperly set<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=60828">60828</a>: wizard banner for import ant build file<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=64668">64668</a>: Style (bold/italic) not working in Ant Editor on comments<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=65086">65086</a>: Missing code completions for attribute values<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=65075">65075</a>: Outline not cleared when change to empty buildfile<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=65208">65208</a>: Taskdef undefined<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=65758">65758</a>: "&Add Buildfiles" displayed on Ant view toolbar<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=65582">65582</a>: warning in generated javadoc for AntCorePreferences<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=66171">66171</a>: Polish patch: support view activation via a keyboard shortcut<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=65348">65348</a>: Unused sections in anttasks_1.6.0.xml<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=65404">65404</a>: Rule conflicts during launch config change notification<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=64461">64461</a>: Ant Editor image does not update when problem prefs changed<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=65465">65465</a>:	Search for Buildfiles button Search disabled<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=64684">64684</a>: DocumentSetupParticipants (easily) interfere with each other<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=65757">65757</a>: Different built-in properties from Ant at the commandline<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=66058">66058</a>: Change project builder "handle" format<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=64713">64713</a>: Ant editor locks jars supplying tasks<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=66303">66303</a>: NPE during shutdown from integrated external too builder<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=66342">66342</a>: Ant editor indentation problem<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=65391">65391</a>: No confirm before migration of external builder: 2.1.3 -> 3.0<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=64928">64928</a>: Change builder when workspace is locked<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build May 27, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63448">63448</a>: Exception with non-existent property file<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55793">55793</a>: [Editor] Taskdef warnings length is not adjusted correctly in targets<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63123">63123</a>: Run from context menu of external entity does not build<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63165">63165</a>: AntModel#possiblyWaitForReconcile<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51333">51333</a>: Position for error markers is wrong<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=62396">62396</a>: Allow configuration of Ant buildfile warnings and errors<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=64475">64475</a>: Reconciling multiple times for changes to preferences<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build May 25, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63760">63760</a>: No external tool build on clean if first builder disabled<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63558">63558</a>: formatter removes text<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63335">63335</a>: VM arguments text pane should grab horizontal space<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63884">63884</a>: NPE editing Ant builders<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63604">63604</a>: Modal progress improvements round two<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63339">63339</a>: AntUtil#getFileForLocation(...) has incorrect behavior on WinOS<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build May 20, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=62830">62830</a>: Ant Build and Ant Build... both appear on Run menu<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63010">63010</a>: Colon for projects label from Ant build tab<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63142">63142</a>: Error remains after turning off Build before launch<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63151">63151</a>: NPE parsing buildfile<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63045">63045</a>: Use JFace MessageDialogWithToggle<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=62826">62826</a>: Remove duplicate property configuration<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=62967">62967</a>: VM never exits (using older VM for an Ant build)<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63125">63125</a>: Problem from import not reported correctly<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=60916">60916</a>: Icon look unalligned<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build May 18, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61676">61676</a>: AntLaunchShortcut should seed copied config name better<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61788">61788</a>: Cleanup IntrospectionHelpers when editor closes<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61947">61947</a>: InternalAntRunner.java has 2 copyright notices<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51381">51381</a>: Add "Import from Ant buildfile"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51781">51781</a>: Top level tasks causing problems<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61396">61396</a>: Consistency in Ant shortcuts<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=57379">57379</a>: partition scanner doesn't handle CDATA sections<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61830">61830</a>: Ant Editor shows bogus errors when using property setting tasks<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=62234">62234</a>: Ant color settings should NOT be shown in Workbench>Colors and Fonts<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61402">61402</a>: Remove AntEditor annotation and quick diff pref pages<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=62563">62563</a>: NPE editing external Ant file<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34971">34971</a>: Global and local properties and property files<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61553">61553</a>: formatter should expose api for formatting docs & tags together<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54723">54723</a>: [Editor] No indication of error, no outline<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=58374">58374</a>: Building with external build files from editor "context"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61955">61955</a>: dangerous practice of catching Throwable<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54466">54466</a>: ant formatter preference page should include preview window<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=62237">62237</a>: Ant syntax coloring options lacks a preview<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=62403">62403</a>: Create separate Code Assist page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61806">61806</a>: Move off of InputDialog deprecated code<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build May 11, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51416">51416</a>: Migrate "Run Ant..." action to Run context menu<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61018">61018</a>: Copy and Paste in Ant Editor inserts extra unwanted tabs<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=60303">60303</a>: Variables buttons missing mnemonics<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55128">55128</a>: Properties value hover shown for text that is not a property<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=59737">59737</a>: Not all properties set during parsing<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61394">61394</a>: Attribute and element elements of macrodef do not present attribute proposals<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61602">61602</a>: ant.ui AntUtil not compiling in HEAD<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61605">61605</a>: more robust version of AntUIPlugin.stop<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61284">61284</a>: Failing code completion tests for Ant<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55618">55618</a>: [Editor] Hover value for old property<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=60693">60693</a>: No code completions for starting a buildfile<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=60348">60348</a>: Template proposals show up when code assist for properties<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=60145">60145</a>: ant editor has wrong values for properties for <import><br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=60362">60362</a>: Run Ant forces workspace build<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61617">61617</a>: valid chars in content type ids<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61652">61652</a>: Move Ant outline actions to Debug context menu launching<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61689">61689</a>: Ant doesn't release taskdef classes after a run<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build May 4, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=60163">60163</a>: Accessibility: New Builder Dialog missing object info for textInput controls<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=60546">60546</a>: Default target null does not exist in this project<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=60521">60521</a>: Global classpath Ant home should indicate default<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=60807">60807</a>: Targets tab checkboxes not using dialog font<br>
-<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=60067">60067</a>: Ant Editor adds marker which cannot be deleted<br>
-<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=59985">59985</a>: Move from ProgressMonitorDialog to IProgressService.busyCursorWhile()<br>
-<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=60312">60312</a>: Adapt to changes from bug 60258<br>
-<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=60473">60473</a>: projecthelp does not work for separate VM builds<br>
-<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=60678">60678</a>: PDE ant tasks fail to load when self hosting<br>
-<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=60691">60691</a>: AntModel should reuse classloader until classpath changes<br>
-<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=60761">60761</a>: Ant build file content-type<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61652">61652</a>: Double quoting doesn't work for variable expansion with external tools<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build April 27, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=59755">59755</a>: Cannot set ant home to ant used in 2.1.x<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=59862">59862</a>: Code completion could cache the current prefix<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=59024">59024</a>: template code completion doesn't use prefix to limit options<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=59866">59866</a>: Copy/Paste of entire lines breaks indentation in Ant editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=57855">57855</a>: Sorting targets option is completely hidden<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53339">53339</a>: Make the InternalAntRunner more lazy<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55662">55662</a>: formatter references deprecated code<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=59513">59513</a>: ant input task causes stack overflow<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=59917">59917</a>: NPE in AntEditorCompletionProcessor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=60011">60011</a>: NPE from AntEditor during shutdown<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55436">55436</a>: Template additional proposal info is not working<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=59863">59863</a>: Code completion when text selection is not empty<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build April 20, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47285">47285</a>: Open External File does not work on build.xml<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=58426">58426</a>: NPE in PartiallySynchronizedDocument.replace(..)<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25590">25590</a>: Should be possible to use variables specifying Ant classpath<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43266">43266</a>: Using variables in Ant Properties<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=57839">57839</a>: Mimic classpath tab support for variables in the classpath pref page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=58263">58263</a>: organization of colors for Ant<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55429">55429</a>: Ant editor typing can be slow due to reconcile<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=57195">57195</a>: Auto-indent in Ant editor is broken<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build April 13, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55047">55047</a>: [Editor] Ant tasks and types not cleared when parsing<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37943">37943</a>: ${project_loc} for ANT ext tool builder location can't find targets.<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=56199">56199</a>: AntEditor move to file buffer document provider<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=58206">58206</a>: Help with memory footprint: dispose Ant model for Ant doc<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52688">52688</a>: Provide "build_project" variables<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=57317">57317</a>: Typing in Ant buildfile location is brutally slow<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=57332">57332</a>: Too much validation going on in launch config Location<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=57984">57984</a>: NPE from startup with open Ant Editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55824">55824</a>: macrodef code assist offers wrong attributes<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=56296">56296</a>: code assist for custom tasks: type references<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build April 6, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=56959">56959</a>: Move the AntEditorMarkerUpdater to make use of MarkerUtilities<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=57140">57140</a>: Ant launching and the prelaunch checks<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55823">55823</a>: problems view not updated until save<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54458">54458</a>: formatter swallows text when attribute values include --><br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51215">51215</a>: fix partioner to handle angle brackets in attribute values.<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=56657">56657</a>: External tool builders need to adapt to new build story<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55355">55355</a>: Move to new template extension point for ant editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40255">40255</a>: Ant formatter<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54461">54461</a>: add an AutoIndentStrategy to ant editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55429">55429</a>: Ant editor typing can be slow due to reconcile<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55433">55433</a>: Enhance property file support<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55782">55782</a>: Edit/Remove buttons incorrectly enabled for the AntEnvironmentTab<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55982">55982</a>: Rename "alternate JRE" to "separate JRE"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49830">49830</a>: Code assist for refid<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54935">54935</a>: Ant editor title image does not indicate error when first opened<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55961">55961</a>: Move/Add the link with editor action to the view menu<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=57000">57000</a>: Do not handle Property file names with spaces<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=56297">56297</a>: code assist for custom tasks: enumerations<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=56299">56299</a>: code assist for custom tasks:  boolean attributes<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=56488">56488</a>: template support should be context aware<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Mar 30, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55818">55818</a>: AntEditorContentOutlinePage retains too much state<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55813">55813</a>: ProjectHelper static state needs to be cleaned up<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=56055">56055</a>: Remove top level ant.jar in org.apache.ant<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=56293">56293</a>: editor incorrectly reports "taskdef class not found<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=56258">56258</a>: escape entities in ant warning hovers<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Mar 23, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54756">54756</a>: add *.macrodef & *.ent to editor's file associations<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50303">50303</a>: Ant Editor outline "Link with Editor"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55118">55118</a>: NPE from AntModel<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55313">55313</a>: Add a mnemonic for one of the launch config tabs for builders<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38935">38935</a>: Completion for custom ant tasks in ant editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54933">54933</a>: Ant error overlay drawn in different quadrant than Java<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37180">37180</a>: Ant editor errors and warnings should appear in the problem list<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49829">49829</a>: Code assist should include previously defined macrodefs<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50452">50452</a>: Another way to resolve a location for a tools.jar<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53688">53688</a>: Update Ant preference page to reflect classpath tab<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53715">53715</a>: Add environment tab to Ant launch config types<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55003">55003</a>: Nodes with warnings have error icon<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55140">55140</a>: Build hangs if running on separate VM that is older than 1.4<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52076">52076</a>: Preference page for the Ant Formatter<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52449">52449</a>: Show error for target that depends on a non-existant target<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55119">55119</a>: Assertion failed dumped to console<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55122">55122</a>: Ant editor code assist locks up Eclipse if reconciling error<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55543">55543</a>: Opening an Ant editor is taking 10 seconds<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54937">54937</a>: [Editor] Changing property does not change value<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53458">53458</a>: "Import" elements open with select element in open editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50986">50986</a>: Classpath tab for External tool Ant builds<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55306">55306</a>: Incorrect schema for org.eclipse.ant.core.extraClasspathEntries<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51307">51307</a>: calls to taskdef printing "Dropping \d from path as it doesn't exist"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52446">52446</a>: Label for tasks/types has leading slash<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Mar 16, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54115">54115</a>: Hungry code assist (is eating characters)<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54359">54359</a>: Button enablement on the classpath tabs<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54361">54361</a>: Missing Ant home no longer indicated<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52724">52724</a>: Errors from the ant task do not provide links<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51825">51825</a>: add to outline view "filter top level tasks and types" action<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54731">54731</a>: remove dependency on apache ant in ant core and ui buildfiles<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54784">54784</a>: NPE from XMLTextHover<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38267">38267</a>: tools.jar needs to be updated when setting to run in a separate VM<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51698">51698</a>: Output still displayed when "Capture output" off in sep VM<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54369">54369</a>: Remove pref for "Warn ... for changing the Ant JRE"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53152">53152</a>: Eclipse "locks up" aka super slow when editing a large build.xml<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54664">54664</a>: Cannot run a build.xml from a non-Java project<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=48934">48934</a>: Move to use the Platform UI color support<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Mar 9, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53316">53316</a>: Hidden functionality of the copy button for builders<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53511">53511</a>: External tool builders run in background when they shouldn't<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49445">49445</a>: outline and ant runner views should  include imported targets<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34685">34685</a>: Error indicated but no error squiggle or message<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53681">53681</a>: NPE if external entity does not exist<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49014">49014</a>: Classpath should be expanded on entry into tab<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=48051">48051</a>: Add "Restore defaults" button to the Ant Classpath Page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=48053">48053</a>: Remove Update classpath functionality from the JRE tab<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52883">52883</a>: SeparateVM Ant builds cannot be specified to run in the foreground<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53778">53778</a>: Ant classpath missing global entries<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53891">53891</a>: Spelling error in Ant Code Formatter preference page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53696">53696</a>: Failing Ant UI test: testMixedElement<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53547">53547</a>: Ant Outline view - toggle control to Show/Hide included elements<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53690">53690</a>: Code completion proposals case sensitive<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52211">52211</a>: Persisting classpath when the same as default<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40688">40688</a>: Code assist for closing a task should not need "&lt/"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54113">54113</a>: [Editor] Highlight range incorrect for selected element<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53687">53687</a>: StringIndexOutOfBoundsException on code completion<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52040">52040</a>: Ant editor reports error on my custom task<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=48041">48041</a>: Updating classpath support for separate VMs<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Mar 2, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52973">52973</a>: Better message for specifying an Ant home that does not exist<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52972">52972</a>: Ant classpath tab does not indicate an error if the Ant home has been deleted<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53115">53115</a>: Contribute remote Ant support as an extraClasspathEntry<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53244">53244</a>: External tool builders generate outgoing "ATTR_LAUNCH_IN_BACKGROUND" change<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51726">51726</a>: Show In is enabled for selections in Ant editor outline<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51731">51731</a>: Navigate/Show In for external elements<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51347">51347</a>: External entity support (Open With etc)<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53125">53125</a>: Navigate support for Import<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53142">53142</a>: ClassCastException determining properties for top level code assist<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Feb 24, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52209">52209</a>: JARs from global classpath not found for build<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52332">52332</a>: caret off by one after code assist<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51579">51579</a>: Pref Page Ant/Editor/Annotations; 2 checkboxes do not use dialog font<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51784">51784</a>: Setting Java executable for Alternate JRE is forgotten<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37944">37944</a>: .project file paths to external tools hardcoded to specific project<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52400">52400</a>: ClassCastException in BuilderPropertyPage<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52713">52713</a>: Provide descriptions for Ant and Program config types<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52329">52329</a>: Move to Ant 1.6.1<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40618">40618</a>: No JRE tab for Ant project builders<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47373">47373</a>: Setting properties for separate VM<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51733">51733</a>: Code assist: no completions available<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51007">51007</a>: Review the "remove Xerces" code in AntRunner<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47901">47901</a>: Extend contributed "object"s extension points to specify whether to be included in separate VM build<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52793">52793</a>: Builder Launch in Background setting is forgotten<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47312">47312</a>: Setting tasks and types for separate VM build<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51101">51101</a>: [Dialogs] New Builder Dialog should not come up w/ an error message<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51393">51393</a>: Ant in external JVM doesn't honor extraClassPath extension<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38821">38821</a>: Ant editor: indenting size<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Feb 17, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51694">51694</a>: base directory not honored when run in separate VM<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51696">51696</a>: alternate label for Ant build file "Location"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51789">51789</a>: Run Ant... in ant view does not run<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52200">52200</a>: NPE possible if hovering over text in AntEditor with no project node<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52182">52182</a>: BadLocationException during reconcile<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51937">51937</a>: Widget is disposed problem possible from BuilderPropertyPage<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Feb 12, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51882">51882</a>: Project builders property dialog fails with graphic disposed<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Feb 10, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51332">51332</a>: Outline positions to wrong offset in editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50389">50389</a>: Problem altering order of ant targets when mutliple targets selected<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49554">49554</a>: JDK 1.5 and Ant Editor troubles<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51298">51298</a>: No "Environment" tab on program project builders<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51319">51319</a>: "Run" in Outline View does not work for default target<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Feb 3, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50795">50795</a>: Possible lockup from executing implicit target<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50410">50410</a>: Cannot use older Ant installs<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50494">50494</a>: AntView context menu cleanup<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50505">50505</a>: Malformed URL exception from antcore preferences<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49275">49275</a>: Ant Editor Outline view - no longer works as of M5<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49792">49792</a>: Update the Ant code assist support files for Ant 1.6.0<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Jan 27, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45915">45915</a>: Checkbox table view for external tools<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=44125">44125</a>: Performance issues with Ant editor: slow to open<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50351">50351</a>: Should not be able to remove/edit wrapped builders<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40501">40501</a>: Missing Ant syntax errors<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=44995">44995</a>: Option to hide properties in Ant outline view<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50529">50529</a>: incorrect error annotation length for error target<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=44343">44343</a>: Create an object model for Ant UI<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50575">50575</a>: Editor selection is incorrect for some multiline elements<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50046">50046</a>: Add property text hovering to the Ant Editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49386">49386</a>: code assist should include previosly defined properties<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50653">50653</a>: No code assist proposals when starting in error state<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Jan 20, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50019">50019</a>: No overview ruler for the AntEditor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49579">49579</a>: Adapt to the marker annotation changes<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50016">50016</a>: AntEditorPreferencePage does not present all of the annotation prefs<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34548">34548</a>: Add 'Run task' to outline view of build.xml files<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50144">50144</a>: Classpath for separate Ant build is duplicated<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50170">50170</a>: TaskDescriptionProvider could be shared by all AntEditors<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33361">33361</a>: [External Tools] copy button does nothing<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Jan 13, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49747">49747</a>: misspelled title in Any Property File Selection Dialog<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49709">49709</a>: ClassCastException when adding non-file as a property file<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32727">32727</a>: Console color for Ant not updated until forced to redraw<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45923">45923</a>: Move to Ant 1.6<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49810">49810</a>: Code assist for attributes of a target<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41591">41591</a>: Ant 1.6 new options<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49886">49886</a>: Hide internal targets icon needs to be updated<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49697">49697</a>: ant editor outline page's label provider is case sensitive<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49380">49380</a>: editor outline should have icon for macrodef<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=44491">44491</a>: Move to using ProjectHelper2<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47581">47581</a>: Duplicates on the Ant runtime classpath<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Jan 6, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=48803">48803</a>: Run ant doesnt save build.xml before display of run dialog<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49016">49016</a>: [Ant view] Missing acclerator keys<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Dec 15, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=48127">48127</a>: Ant will not launch with an incomplete class path<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=48445">48445</a>: Ant core external tool builder not successful<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47422">47422</a>: Internal error on launching ant target<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=48747">48747</a>: Specify Ant logger argument then build fails<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Dec 9, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47941">47941</a>: Ant core buildfiles doesn't work without binary plugins<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=48098">48098</a>: NPE creating new Ant launch configuration<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=48012">48012</a>: BuildFailedTracker does not handle failure message with no line numbers<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=44935">44935</a>: Xerces warnings for Ant classpath<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47137">47137</a>: Context menu actions of the AntEditor outline<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=48113">48113</a>: Select an element in the AntView after single deletion<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37332">37332</a>: Targets tab needs to reset if classpath changed<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=39251">39251</a>: Need some way for variables to provide multiple arguments<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47139">47139</a>: changing color pref does not update editor until re-opened<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47140">47140</a>: Ant editor missing current line highlight<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47289">47289</a>: Ant UI giving wrong error message<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=48184">48184</a>: org.apache.ant must not list any dependencies<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=48165">48165</a>: Error when location is corrected<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43814">43814</a>: Ant Runtime error, but do not affect eclipse work<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=46897">46897</a>: Ant view not sorted after a project is renamed.<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47933">47933</a>: Multiple listeners added to fields in ExternalToolsMainTab<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Dec 2, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47745">47745</a>: Remove xerces from ant ui tests for seperate VM<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45974">45974</a>: Move the Ant projects to use the PDE required plugins container support<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=44565">44565</a>: StringIndexOutOfBounds from BuildFailedTracker<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47308">47308</a>: Add Ant task error in preferences in 3.0M5<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47368">47368</a>: Ant custom tasks and types need to use variables<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47748">47748</a>: Should not prompt when running tests<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45985">45985</a>: BUILD FAILED: java.lang.NoSuchMethodError: attempting to use jar task on Ant 1.6b2<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42983">42983</a>: Variables get run mutliple times for Run ant...<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47370">47370</a>: Improve AntPage.getContents(boolean)<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47477">47477</a>: Improve Builders property page description<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47821">47821</a>: Do not force the expansion of the Ant classpath entries<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30638">30638</a>: Ant Runtime page is cut off in High Contrast<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Nov 25, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47155">47155</a>: Context menu for plugin.xml file should not have Run Ant...<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Nov 20, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=46916">46916</a>: Ant source is shipped in the wrong directory<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47133">47133</a>: Non-Java project Ant build defaults to same VM<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Nov 19, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47043">47043</a>: Update the classpath for a separate JRE leads to a NPE<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=46815">46815</a>: VM widgets enabled when set to run in same VM<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Nov 18, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36406">36406</a>: Ant target icons conflict with GTK tree expander<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=46740">46740</a>: Loss of the separate output directories for org.eclipse.ant.ui<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=46734">46734</a>: No error logged if Build logger incompatible instance<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=46703">46703</a>: Moving multiple Ant classpath entries does not work<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43798">43798</a>: Incessant dialogs when trying to set the JRE for Ant config<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=46819">46819</a>: enable/disable builder bug - cannot cancel<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29677">29677</a>: Need A Way To Run Ant Instead of The Default Java Builder<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45899">45899</a>: Make build in separate VM the default setting for Ant launch configs<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45995">45995</a>: Setting Ant home adds jars in reverse order<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Nov 11, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=46049">46049</a>: Rename "external tool builders" property page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45644">45644</a>: NumberFormatException if multiline build errors in remote VM build<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=44093">44093</a>: Tests for external tool builder migration<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45781">45781</a>: tools.jar on classpath<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Oct 28, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=44494">44494</a>: Remove direct dependancies on the Xerces plugin<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=44988">44988</a>: Incorrect javac output with -verbose<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45285">45285</a>: Multi-select in AntView<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=44368">44368</a>: Space between buttons on Ant tasks and types page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45473">45473</a>: AntRunner.setMessageOutputLevel should only set when changed from dflt<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45288">45288</a>: Help: Running Ant buildfiles programmatically incorrect<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45881">45881</a>: NPE in AntCorePreference<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45844">45844</a>: Ant problems in I20031029 when no tools.jar<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45450">45450</a>: Rework the presentation of the Ant classpath<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Oct 21, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=44369">44369</a>: Duplicate mneumonic on the Ant Editor Code Assist page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=44271">44271</a>: Update OutlinePreparingHandler for deprecations in IDocument<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41289">41289</a>: TaskLinkManager needs to be cleaned up earlier<br>
-
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Oct 7, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43845">43845</a>: Ant Editor code assist should display error in the status bar<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43541">43541</a>: Run Ant... launch config comes up in dirty state<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=44042">44042</a>: Move the Ant test console line tracker to implement IConsoleLineTrackerExtension<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=35687">35687</a>: AntEditor should demonstrate proper use of MultiLineRule in conjunction with damager/repairer<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=44090">44090</a>: Error building org.eclipse.core.resources<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38243">38243</a>: Editing an external tool builder modifies the .project file<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Sept 30, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=39250">39250</a>: DnD build file into ant view<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37287">37287</a>: Ant view not persisted within session<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38677">38677</a>: Ant target table sorting and filtering<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43522">43522</a>: Ant preference page does not update for preference change<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43255">43255</a>: Junit tasks showing "null"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43384">43384</a>: Info to make running separate JRE easier<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43542">43542</a>: Ant home Browse button on the AntClasspath tab has incorrect layout<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40269">40269</a>: Document requirements for developing Ant tasks in self hosting workspace<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43773">43773</a>: Project Resource doesn't Refresh for External Tool in separate VM<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42595">42595</a>: NPE while scrolling background ant output in console<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43626">43626</a>: BuildFailedTracker not adding link<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43628">43628</a>: Review all uses of getFileForLocation(IPath)<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40500">40500</a>: Incorrect code assist in AntEditor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43618">43618</a>: Child jvm for ant build not exiting when build fails<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43530">43530</a>: Newly added classpath elements should be selected<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43081">43081</a>: Ant Errors not linking to source when using linked folders<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Sept 23, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38995">38995</a>: Cannot run target from antview - "An error occurred please see log for more details<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43322">43322</a>: [External Tools] Cannot create new 'program' config<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41819">41819</a>: Document the antRunner application entry point<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38389">38389</a>: AntClasspathTab top label gets truncated<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43382">43382</a>: AntWorkingDirectoryBlock not disabled fully for same VM<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41877">41877</a>:	Change from "show" to "do not show"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43287">43287</a>: [Dialog] Ant Build Targets tab font<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43320">43320</a>: Ant "tables" are not "delete" enabled<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43363">43363</a>: Cannot use user's xerces to parse targets<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Sept 16, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42334">42334</a>: Pref Page Ant/Runtime Button labeling inconsistencies<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42808">42808</a>: After creation of new Ant object select that object<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33673">33673</a>: Option to filter subtargets from Ant view<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42926">42926</a>: ant.home not set at parse time<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42491">42491</a>: Can edit contributed Ant objects<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42495">42495</a>:	Change in DirectoryDialog behavior dealing with ampersands in message<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42741">42741</a>:	Config classpath does not update for change in global Ant home<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42983">42983</a>:	Variables get run multiple times for Run ant...<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43043">43043</a>:	-help does not work for Ant build in separate VM<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=39295">39295</a>:	Sort targets alphabetically in Ant outline<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42966">42966</a>:	New option shortcuts<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34001">34001</a>:	Warn user when specifies Xerces on Ant runtime classpath<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38815">38815</a>:	update Xerces in the Ant runtime classpath<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42984">42984</a>: No way to set working directory, VM args for Ant processes<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Sept 9, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42327">42327</a>: [Dialog] "Order targets" dialog margin spaces<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42063">42063</a>: Pref Page Ant/Runtime Add.. dialog margin spacing<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41998">41998</a>: RemoteAntBuildListener server connection not closed on failure<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42351">42351</a>: Ant UI and help contexts<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42420">42420</a>: No progress shown when external program running in foreground<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41068">41068</a>: Ant in separate VM does not color output<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41156">41156</a>: Links for tasks missing if use -debug<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42222">42222</a>: Separate VM console output not showing till end<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41997">41997</a>: Clean up RemoteAntBuildLogger<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37653">37653</a>: ant.home is not set<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41671">41671</a>: Ant error popups message box and prints into the console<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42136">42136</a>: External tools; Ant BuildConfiguration; JRE tab problems<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42333">42333</a>: Ant build failed error messages no longer shown in console<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42484">42484</a>: NPE if ctrl dbl click in Ant properties block<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42737">42737</a>: Subtarget -> internal target<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=39294">39294</a>: Allow filtering of helper targets in Ant outline<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Sept 2, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41581">41581</a>: The Ant UI packages are incorrectly named<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42137">42137</a>: External tools; Ant Build Configuration; Properties tab; button sizes<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Aug 27, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42029">42029</a>: eclipse.running flag not being set properly<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42073">42073</a>: Can't manually build plug-ins<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40972">40972</a>: Ant class loader should define findClass, not loadClass<br>
-<h1>
-
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Aug 26, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41779">41779</a>: Run ant has no effect from within the synchronize view<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=39567">39567</a>: Use a Job for the BackgroundResourceRefresher<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41835">41835</a>: Ant in separate VM setting eclipse.running<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41841">41841</a>: Use InternalAntRunner as Ant entry point for separate VM<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41521">41521</a>: AntConsoleColorProvider should be marked as readOnly<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41816">41816</a>: Ant Editor annotation list should be dynamically sized.<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40069">40069</a>: Move Ant editor to use standard annotation types<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Aug 20, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41498">41498</a>: Update doc for Ant properties extension point<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41301">41301</a>: BuilderPropertyPage should have both enable and disable buttons<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41300">41300</a>: No multi-select in the External Tool builder property page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41277">41277</a>: Move to Ant 1.5.4<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41616">41616</a>: Ant view play button should be async<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41717">41717</a>: NPE in AntEditor on latest text framework<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Aug 12, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40922">40922</a>: Ability to disable an external tool builder<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41273">41273</a>: Build Options page does not use dialog font for widgets<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41157">41157</a>: links missing in seperate VM<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41120">41120</a>: Buildfile link not available when using -debug<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40490">40490</a>: Scoped external tool builder not triggered if change in different project<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41119">41119</a>: Multi-line task output differs from cmd line Ant<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40037">40037</a>: Duplicate properties silently fail<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41419">41419</a>: Can overwrite contributed properties<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41454">41454</a>: NPE out of AntProcessBuildLogger<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Aug 6, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34415">34415</a>: Missing file link in build failed message<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40502">40502</a>: Provide an extension to set ant property values<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40871">40871</a>: No code assist proposals for properties in echo task<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40935">40935</a>: BUILD FAILED message with ant: handling "-Debug"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40951">40951</a>: NullPointerException at autocompletion on sql tag<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41041">41041</a>: Remote Ant should not have extra classpath entries on the classpath<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24129">24129</a>: Ability to (optionally) run ANT in a separate JVM<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41158">41158</a>: NPE from ant classpath provider<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build July 29, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40672">40672</a>: NPE during full build in ExternalToolBuilder<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37248">37248</a>: Make org.eclipse.ant.tests.ui part of the build<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37902">37902</a>: Code-Assist for <fail> tasks makes incorrect suggestions<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40733">40733</a>: Contributed Ant objects should indicate contributor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40778">40778</a>: Questionable Ant warning: "library tools.jar not on runtime classpath"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40165">40165</a>: Notify user when Ant does not have tools.jar on the Ant runtime classpath<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40879">40879</a>: Tests needed for Ant Core<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build July 22, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40254">40254</a>: Ant code assist should not require "<"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40212">40212</a>: incorrect location of 'properties' in context menu of ant view<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build July 16, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40044">40044</a>: Incorrect error message if remove auto activation delay<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38844">38844</a>: Two code assist entries for WsdlToDotnet task<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40138">40138</a>: Incorrect dialog titles for adding / editing tasks / types<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40277">40277</a>: Update the package names for the Ant UI tests<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build July 15, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=39722">39722</a>: Ant core schemas should mark the library as a resource<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=39713">39713</a>: Ant build not triggered on second save<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38614">38614</a>: External tool builder not triggered when checking project out from repository<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=39215">39215</a>: Ant is run in Java Applet security mode<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=39067">39067</a>: Allow to run same build.xml multiple times<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=39814">39814</a>: core.resources has invalid external tool builder??<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=39978">39978</a>: Edit button should be disabled for multiselect<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34597">34597</a>: Search results are not shown in overview ruler or as squigglies<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40048">40048</a>: Ant editor has no syntax highlighting<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build July 8, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38525">38525</a>: Deadlock refreshing resources for an external tool when in background<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38900">38900</a>: Ant target names not quoted when "Run Ant in a separate Java virtual machine" is checked<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build June 17, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38820">38820</a>: Ant editor: Content Assist wrong behaviour with upper case<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38728">38728</a>: Remove AntClassloader workarounds for self hosting<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38707">38707</a>: Working sets should not be considered for full builds<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build June 10, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38023">38023</a>: NPE attempting to Run as > Ant Build<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38645">38645</a>: Exception occured creating launch configuration tabs<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34683">34683</a>: Standardize the parser used throughout ExternalTools<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38609">38609</a>: External tool project builders always run in background<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build June 3, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38142">38142</a>: Unknown extension point specified in org.eclipse.ui.externaltools<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37522">37522</a>: properties with capitals are lost in content assist<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38029">38029</a>: Build fails resulting from errors in build file provides no link<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37516">37516</a>: AntRunner should return an IPlatformRunnable return code<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38284">38284</a>: [External Tools] Illegal access to DebugUIPlugin<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37529">37529</a>: Ant UI tests failing<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38287">38287</a>: TVT21: Use of variable makes the string difficult to translate<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build May 13, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37060">37060</a>: Ant core preference store persistance<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37173">37173</a>: VariableSelectionDialog needs a key listener<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37451">37451</a>: XDOCtasks.xml does not need to be included in binary plugin<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37520">37520</a>: Cannot edit properties from double click<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37502">37502</a>: Property icon missing in Ant editor outline and from content assist proposals<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=35834">35834</a>: Action set icons: some color; some not<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32444">32444</a>: No configurability for code completion in Ant Editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=20169">20169</a>: Help context ids for External tools<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25337">25337</a>: External Builder Configuration<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31699">31699</a>: Ant editor completion should provide minimal required keys<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36869">36869</a>: WorkingSetComponent should allow creating/editing of working sets<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36971">36971</a>: Classpath not set correctly for parsing target<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build May 06, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36574">36574</a>: Additional classpath entries on Ant dont take effect<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36848">36848</a>: Support double-click in variable selection dialog<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37088">37088</a>: Argument expansion consistently fails<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37074">37074</a>: External tool builders should not default to run in the background<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37007">37007</a>: NPE with missing name for property<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37185">37185</a>: Properties not sorted properly after edit<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37059">37059</a>: Better error reporting when arguments cannot be expanded<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37094">37094</a>: Specifying -D with spaces differs from cmd line<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36875">36875</a>: Targets tab defaults 50/50 split for names and descriptions<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build April 29, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=35511">35511</a>: NPE running external tools<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36444">36444</a>: Ant view needs a refresh action<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36581">36581</a>: External tool closed when Eclipse exits<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29316">29316</a>: Classpath entries and task/type paths separators not platform specific<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36870">36870</a>: Separate the Ant UI from ExternalToolsUI<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37056">37056</a>: NPE creating new Ant config<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36937">36937</a>: WorkingSetComponent should set the working set images<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36538">36538</a>: Add a ${variable} that prompts the user with a dialog<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build April 22, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=35507">35507</a>: Preference pages do not set help on control<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=35508">35508</a>: Ant editor preference page doesn't set widget fonts<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34608">34608</a>: Exception using content assist<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=35497">35497</a>: ArrayIndexOutOfBounds on external tools page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=35726">35726</a>: Remove unused icons in External Tools<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34984">34984</a>: RunTargetAction causing parsing of build file out of ProjectNode<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36076">36076</a>: Ant View does not refresh for projects outside the workspace<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31691">31691</a>: Allow unrecognized arguments to pass through<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34488">34488</a>: When "-quiet" no report of build success or failure<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36570">36570</a>: Ant view parses files during shutdown<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34709">34709</a>: Should be allowed to apply changes to Ant launch config when errors<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=35648">35648</a>: No help context for variable selection dialog<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36660">36660</a>: Double click in external tool builder property page should invoke edit<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36728">36728</a>: NPE after upgrading<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36353">36353</a>: Move to Ant 1.5.3<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27245">27245</a>: If Ant "core" classes cannot be found, no error reported<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34645">34645</a>: Representation of default targets<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36158">36158</a>: Workbench Help set on wrong Composite<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36596">36596</a>: No completion proposals for properties that contain '-'<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36412">36412</a>: Refreshing for specific resource should set an initial selection<br>
-</body>
-</html>
diff --git a/eclipse/plugins/org.eclipse.ant.core/r3_1_buildnotes_platform-ant.html b/eclipse/plugins/org.eclipse.ant.core/r3_1_buildnotes_platform-ant.html
deleted file mode 100644
index b41e819..0000000
--- a/eclipse/plugins/org.eclipse.ant.core/r3_1_buildnotes_platform-ant.html
+++ /dev/null
@@ -1,825 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Mozilla/4.7 [en] (WinNT; I) [Netscape]">
-   <title>Ant Release Notes</title>
-</head>
-<body>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-3.1 RC3
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=99443">99443</a>: 3.1: TCT 127, 156, 168, 171, 172, 173  - Translation Clarification<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=99652">99652</a>: 3.1: TCT 213 - Translation Clarification<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=99865">99865</a>: Java Project creation wizard description: Creates --> Create<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=99946">99946</a>: 3.1: TCT 219, 220 - Translation Clarification<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=99961">99961</a>: 3.1: TCT 221 - Translation Clarification<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=99499">99499</a>: Internal error during matchjob<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=100157">100157</a>: 3.1: TCT 222, 224, 225 - Translation Clarification<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=99444">99444</a>: 3.1: TCT 202 - Suggestion<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=99727">99727</a>: Keywords for preference pages<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=96314">96314</a>: Move to Ant 1.6.5<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-3.1 RC2
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=66861">66861</a>: Javac errors in the console do not link to source when using presetdef<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=96921">96921</a>: Trailing Space  after property values<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=97121">97121</a>: It takes forever to open folder with large xml file<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=97136">97136</a>: New Java Project [from an Ant file] wizard; layout<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=97216">97216</a>: java.lang.NumberFormatException when launching ANT<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=97639">97639</a>: ant task debugging and breakpoints on targets<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=97708">97708</a>: Pref Page Ant/Editor - enablement after "Restore Defaults"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=97710">97710</a>: Pref Page Ant/Editor/Code Assist - enablement after "Restore Defaults"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=97711">97711</a>: Pref Page Ant/Editor/Formatter - margins<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=97741">97741</a>: Console created for same JRE builds when capture off<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=98202">98202</a>: NPE placing breakpoint on task outside of target<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=98980">98980</a>: 3.1: tct 177, 178, 179 , 180, 185- Translation clarification<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=99033">99033</a>: 3.1:tct 175- Translation clarification<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=98412">98412</a>: JARs from ${user.home}/.ant/lib not added to Ant classpath<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=98853">98853</a>: Ant editor doesn't recognize macrodefs with a uri<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=99235">99235</a>: Fully qualified paths in antfile attribute do not open file<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=98872">98872</a>: Incorrect stack representation with same named targets in subbuilds<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=96022">96022</a>: Step over antcall or ant will suspend on completion of other antcall/ant<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=97707">97707</a>: Pref Page Ant<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=97716">97716</a>: Pref Page Ant/Runtime/Classpath/Ant Home/dialog<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=97717">97717</a>: Pref Page Ant/Runtime/Classpath/Add variable/dialog - margin<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=97722">97722</a>: Pref Page Ant/Runtime/Tasks/Add Task dialog problems<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=98005">98005</a>: 3.1 RC1 javadoc warnings: ant<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=98533">98533</a>: Missing closing semicolon in xml description<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=94633">94633</a>: Concurrent Modification Exception whilst editing Ant file<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=98014">98014</a>: NPE logging from tasks with UNKNOWN_LOCATION<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=98305">98305</a>: XML hover is not showing HTML comments properly<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-May 27, 3.1RC1, 2005
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=85309">85309</a>: step over does not step out of macrodef<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=94769">94769</a>: Step over (macrodef) resumes Ant debugger<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=95812">95812</a>: Ant and external tool plug-ins need to be restricted<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=94471">94471</a>: Linkage error on startup with Xerces on the Ant runtime classpath<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=94466">94466</a>: Problems using <input> and Ant 1.5.4<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=74195">74195</a>: Allow user to choose the javac declaration to use for import from buildfile<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=87787">87787</a>: Widget disposed error creating new builder during build<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=96830">96830</a>: fragments break external Ant execution<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=96868">96868</a>: Memory cleanup for Ant support<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=96885">96885</a>: Infinite loop from occurrences finding with empty string identifier<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=96859">96859</a>: Remove validation of default target at runtime<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=96888">96888</a>: No property hover for properties with '(' or ')' in names<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=96037">96037</a>: AntSourcePathComputerDelegate does not setup for external buildfiles<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-May 25, 2005
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=84608">84608</a>: Setting BuildLoggers<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=91674">91674</a>: Namespace imported ant targets not listed<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=95663">95663</a>: Formatter use of System property of line.separator<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=96175">96175</a>: Ant launch configurations for external files not "found" after Eclipse restart<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=96530">96530</a>: Remove BuildFailedTracker<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=96541">96541</a>: Cache SWT library location<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=88614">88614</a>: AntEditor performance<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=79134">79134</a>: Investigate Ant Separate VM tests slow down<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-May 23, 2005
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=83964">83964</a>: Imported property expansion in Hover text<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-May 21, 2005
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=80431">80431</a>: External buildfile does not have Run As / Debug As<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=96161">96161</a>: External buildfiles do not provide links<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=87543">87543</a>: AntBreakpoint hover info not updated with changes to linenumber<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-May 20, 2005
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=95988">95988</a>: javac error linking not working<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=95297">95297</a>: Ant export filter: Export also JUnit tests<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=85769">85769</a>: Dependency stack incorrect when ant or antcall on stack<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=94309">94309</a>: Move to Ant 1.6.4<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=93330">93330</a>: Ant 1.6.3: ProjectHelper changes required<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=95701">95701</a>: ServerSocket used for RemoteAntBuildListener should set timeout<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=94573">94573</a>: Stepping over an <ant> task causes hang or NullPointerException in some build files<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=96128">96128</a>: Contributed entries missing for specifying task library<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=95863">95863</a>: Ant antfile hyperlink does not open editor<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-May 18, 2005
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=95611">95611</a>: Quotes in environment path crashes ant target runs<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=94578">94578</a>: Caching of location information for linking<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=95061">95061</a>: Region incorrect for <name/> tags<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=95296">95296</a>: Ant export filter overwrites existing build.xml silently<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=95675">95675</a>: Ant classpath order of buttons<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=95298">95298</a>: Ant export filter: Don't add JRE 1.5 libraries to classpath<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-May 17, 2005
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=94972">94972</a>: Formatter preference page quickly shows error status on initial display<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=95300">95300</a>: Ant export filter: Buildfiles are not indented with JRE 1.5<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=95416">95416</a>: NPE on code assist<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=95422">95422</a>: Auto-reconcile editor toolbar button not synched correctly<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-M7, 2005
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=81867">81867</a>: Functioning Ant Scripts Please<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=93273">93273</a>: AntEditor caching of AntModel<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=93335">93335</a>: ProjectHelper caching of SAX helpers<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=93378">93378</a>: Changing tab width does not effect open Ant editors<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=90584">90584</a>: DBCS3.1: build failure with DBCS<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=91346">91346</a>: available property reference not found for marking occurrences<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=93496">93496</a>: NoClassDefFoundError when trying to open a build script in the ant editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=92640">92640</a>: Typing performance: Imports reparsed on typing<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=94572">94572</a>: Cache fNodeBeingResolved index in the AntModel<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=93923">93923</a>: Add keywords to preference pages<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=94543">94543</a>: BadLocationException during AntFoldingStructureProvider.addFoldingRegions<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=94757">94757</a>: highlight off by one<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=95151">95151</a>: NPE removing defined tasks<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=94524">94524</a>: Ant View context menu "open" on imported target results in NullPointerException<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=64707">64707</a>: Ant documentCreation extension is "over defined"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=93333">93333</a>: Ant 1.6.3: Definition of tasks with the Ant editor using Eclipse contributed classpath<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=81418">81418</a>: Handling marshalling line.separator<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=93334">93334</a>: Ant 1.6.3: Ant core FrameworkTests.testGetTargets fails<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=94774">94774</a>: orphaned "fetching children from debug target job"<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-May 3, 2005
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=89234">89234</a>: adopt content type association for Ant editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=92546">92546</a>: Ant content type describer activating ant core<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=89265">89265</a>: "Rename in File" moves cursor position<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=90549">90549</a>: Mark Occurrences should work for one position past reference<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=93053">93053</a>: Turn off reconciling during rename<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=93462">93462</a>: Can't run build files on external JRE from target<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=88138">88138</a>: Move to Ant 1.6.3<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=92831">92831</a>: [api] missing @since3.1 tags on AntCorePlugin<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=93348">93348</a>: Ant 1.6.3: InternalAntRunner.getTargets will fail with top level taskdefs<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-Apr 26, 2005
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=91349">91349</a>: NPE on marking occurrences<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=91495">91495</a>: Finished Ant Task in Debug view not marked as terminated<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=91422">91422</a>: Update Ant buildfiles for plugins extra JARs from Jar'd Eclipse<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=91332">91332</a>: Console stop button does not stop a debugging session<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=91989">91989</a>: Exception when closing Ant editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=90782">90782</a>: DBCS3.1: Internal error occurred retrieving targets<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=91249">91249</a>: Ant editor: double click on 'identifiers' containing digits doesn't select the whole 'identifier'<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-Apr 19, 2005
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=90905">90905</a>: JAR the Ant plugins<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=91580">91580</a>: Setting working directory to default doesn't work after setting to non-default<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-Apr 12, 2005
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=89079">89079</a>: Deprecations in org.eclipse.ui.commands extensions<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=90260">90260</a>: NPE in AntEditor$EditorSelectionChangedListener.selectionChanged<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=90455">90455</a>: Move to new NLS API<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=86772">86772</a>: CCE Opening empty Ant build script<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=90597">90597</a>: Ant script exits when not expected<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=90759">90759</a>: Separate VM Ant builds are broken<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=90760">90760</a>: AntEditorTests failing<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=89709">89709</a>: 'include buildfiles that contains errors' option has no effect<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=91054">91054</a>: Turn off occurrence highlighting during rename<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=88262">88262</a>: create component XML for Ant plugins<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=89894">89894</a>: Exported build file doesn't include local plugin dependencies<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-Apr 5, 2005
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=89195">89195</a>: ant content type over defined for <project> tag<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=89926">89926</a>: Checking the "Set Input Handler" box clears the default "java.library.path"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=90237">90237</a>: Ant view marks as error buildfiles with no targets<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=89651">89651</a>: attempt to show external doc for macrodef call<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=90130">90130</a>: Promote Ant import to a 'New Java Project' wizard<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=89745">89745</a>: projects reordered in the ant view when buildfile is saved<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=89519">89519</a>: Ant content type is 'Ant BuildFile' instead of 'Ant Build File'<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=89481">89481</a>: Adapt link on ant editor preference page pointing to general editors preference page [preference]<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=83195">83195</a>: Mnemonic collision on AntJRETab<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-M6, 2005
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=88555">88555</a>: Occurrences hilights first textual match in element regardless of context<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=80135">80135</a>: [plan item] Ant editor improvements<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=88831">88831</a>: Many occurrences are missed<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=88893">88893</a>: Building Ant plugin Ant support JARs fails<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=89078">89078</a>: Rename in file for the Ant editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=84400">84400</a>: Step over incorrectly runs to completion<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=87379">87379</a>: Ant versions backwards compatibility<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=88218">88218</a>: ant debugger requires 2 step intos to go into ant task<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=88963">88963</a>: Antcall and Ant references to targets not marked as occurrences<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=83738">83738</a>: Allow unqualified tool name in location field for External Tools<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=79133">79133</a>: Investigate Ant Editor UI tests slow down: code folding<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=84307">84307</a>: Need more control on build file error checking<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=89666">89666</a>: Ant Editor sets "F3" as Open Declaration accelerator<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=89682">89682</a>: mark occurrences inconsistent with defnition vs. reference for location props<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=80159">80159</a>: [plan item] Import/export of Ant build files<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51382">51382</a>: Add "Export project to buildfile"<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-Mar 22, 2005
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=88557">88557</a>: NPE from occurrence finder<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=88037">88037</a>: eclipse doesn't parse imports with indirect eclipse variables references in file attribute<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=85752">85752</a>: External builder not started when configured with a resource working set<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=88554">88554</a>: Occurrence hilight for default target is off by one character<br>
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-Mar 15, 2005
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=87719">87719</a>: [jars] Patch to run against a JAR'd Eclipse<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=86223">86223</a>: Mark Occurrences feature<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=87710">87710</a>: Source lookup fails when ant task that sets dir<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=87553">87553</a>: No navigation from ant antfile attribute<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=87600">87600</a>: No problem annotation from import in buildfile<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=60995">60995</a>: Ant use of deprecated runtime code<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=86224">86224</a>: Open Declaration not included in navigation stack<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-Mar 8, 2005
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=86659">86659</a>: Environment is not properly set for external targets<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=86894">86894</a>: AntThread can return an array of nulls for variables<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=81260">81260</a>: breakpoints on targets<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-Mar 1, 2005
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=59935">59935</a>: Names of targets in the Ant console should act as hyperlinks<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=86222">86222</a>: Open Declaration loses track of position of definition<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=86174">86174</a>: AntSecurityException while running nested antRunner<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=86727">86727</a>: NPE from variables view with Ant properties<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=84742">84742</a>: Changing problem severity reporting does not change reporting in open editors<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=86428">86428</a>: Move AntDebugElement to subclass DebugElement<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-Feb 22, 2005
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=85915">85915</a>: AntSecurityManager imports sun.* class<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=85908">85908</a>: Crashing ClassCircularityError with -Xverify:none<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=85450">85450</a>: Run Ant menu cannot be enabled for files not ending in .xml<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=85890">85890</a>: extraClasspathEntries error message could be more helpful<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-M5 Feb 18, 2005
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=85590">85590</a>: IndexOutOfBoundsException in the Ant preference page on loss of selection<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=85302">85302</a>: Replace reference to JDT UI internal class CHyperLink with SWT Link<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=85550">85550</a>: ant builder always cleans<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=85357">85357</a>: extra target in the dependency tree<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=85718">85718</a>: Exception creating builder<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-Feb 15, 2005
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=82598">82598</a>: Ant UI test failures from incorrect output<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=81324">81324</a>: Exiting while debugging same JRE build<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=84834">84834</a>: No console hyperlinks with javac failures/errors<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=60860">60860</a>: Custom Property task crashes Eclipse<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63685">63685</a>: Customize what happens on each build kind when using external builders and Ant<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=75501">75501</a>: Add more hover tests<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=83364">83364</a>: Buildfile dialog does not recall the last directory selected.<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=85158">85158</a>: Update builders to execute clean target on Clean<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=82405">82405</a>: Adjust to new ICommand API<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=83508">83508</a>: testHoverRegionWithSpaces failing during build<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=85023">85023</a>: remove empty .options files from build<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=84694">84694</a>: More "Open Declaration" functionality in Ant editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=75729">75729</a>: "Preferences->Ant->Runtime->Ant Home..." doesn't set ANT_HOME<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=65653">65653</a>: Warn when target depends on itself<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-Feb 8, 2005
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51403">51403</a>: Ant in Eclipse breaks after upgrading to Java 1.4.2<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=84082">84082</a>: Move to use the FastPartitioner<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=80435">80435</a>: Problems using the XmlLogger as a listener<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=84342">84342</a>: Ant Formatter new line<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=71888">71888</a>: Problems on Save<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=83359">83359</a>: Provide errors in the AntEditor for circular dependancies<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=73411">73411</a>: Ant formatter replaces single quotes by double quotes in tasks attributes<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-Feb 1, 2005
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=83644">83644</a>: NPE in RemoteAntDebugBuildListener<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=83367">83367</a>: AntEditor hover while debugging<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=82870">82870</a>: Cannot debug Ant builds in non-Java projects<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=83647">83647</a>: Old Tasks / Types remain after reconciliation<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=83322">83322</a>: When defined properties not showing up in the Variables view<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=71358">71358</a>: Poor performance editing Ant buildfile with "large" taskdef<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=83455">83455</a>: Reuse in Ant Build Loggers<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=83577">83577</a>: dependency stack frames do not find source<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=84190">84190</a>: NPE with taskdef<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=81811">81811</a>: Ant UI performance tests take much longer on Linux-GTK than Win32<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=83896">83896</a>: All stack annotations shown as Debug Call Stack<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-Jan 25, 2005
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=83146">83146</a>: Warnings in latest integration build<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=83131">83131</a>: Build fails if only running the implicit target<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=82833">82833</a>: BuildException stacktrace not printed when ant run with -v option<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=82875">82875</a>: Stack frames for external targets mapped to incorrect file<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=82498">82498</a>: Ant Run to line not respecting skip breakpoints pref<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=83153">83153</a>: Ant editor depends resolution fails with spaces<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=83261">83261</a>: NumberFormatException getting variables<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=83254">83254</a>: Cannot allow debug session for Ant build to occur in the foreground<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=83273">83273</a>: NPE while editing buildfile<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=83343">83343</a>: Show dependancy calling in the Ant stack<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=83436">83436</a>: AntTargetsTab will not validate without targets<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=83578">83578</a>: Mnemonic collision on Ant Main tab<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=83358">83358</a>: StackOverflowError from ProgressBuildListener if circular dependancy<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-Jan 18, 2005
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=81029">81029</a>: Silent failure on build if .launch for builder is missing<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=82713">82713</a>: Runtime Classpath tree item coloration<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=82478">82478</a>: Ant view is not sorted correctly<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=82415">82415</a>: [debug] Source lookup broken when working with multiple files<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=82894">82894</a>: Ant Debugger sometimes get RESUME before SUSPEND<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=70238">70238</a>: Clicking junit call stack items doesn't open source anymore<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=81717">81717</a>: ClassCastException in Ant Editor with installed Web Tools plug-ins<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=82835">82835</a>: Ant Editor should use a shared document provider<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=82880">82880</a>: AntTargetsTab will not validate without default target<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=76690">76690</a>: Previously added property files not filtered<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=82543">82543</a>: Attribute completion for new Ant 1.6.* tasks<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=82528">82528</a>: Return from ant call resumes<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=82959">82959</a>: Ant view : tasks are sorted<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=80988">80988</a>: Migrate StringMatcher to RegEx 1.4 support<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=82777">82777</a>: Up/Down buttons in Ant Runtime Classpath tab<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=82799">82799</a>: JARs added by the user in Ant Runtime flagged as require<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-Jan 11, 2005
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=82168">82168</a>: ant.home and ant.library.dir not set for parsing<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=81970">81970</a>: ANT View Hide Internal Targets<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=82172">82172</a>: StringIndexOutOfBounds on removing chars during code complete<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52687">52687</a>: Code assist should propose properties defined in the Runtime Prefs<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=58351">58351</a>: Extraclasspathentries should show up in the UI<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=81270">81270</a>: Variables view scrolls to top on step<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=78453">78453</a>: Back and forth navigation after hyperlink navigation<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=78708">78708</a>: Properties tab correct presentation of properties to be set for builds<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=82396">82396</a>: Change to have Ant objects use the plugin identifiers instead of names<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=82344">82344</a>: Types, Tasks and Properties page clean up<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=56072">56072</a>: Ant objects should indicate which are included in a separate VM<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55562">55562</a>: Transient properties are displayed in the 'Properties' launch configuration tab<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=78923">78923</a>: Warn when a builder is disabled<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=82486">82486</a>: Ant view does not update project name<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=81296">81296</a>: Better presentation of Ant properties when debugging<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-Jan 4, 2005
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=81541">81541</a>: NPE attempting to add breakpoint to external buildfile<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=82031">82031</a>: Project attributes not able to be code completed<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=81409">81409</a>: Set relevant preference pages for Ant editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=81408">81408</a>: Remove quick diff actions<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=81328">81328</a>: Debugging fails on Ant older than 1.6<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=81367">81367</a>: Projects do not require the default attribute<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-Dec 21, 2004
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=81484">81484</a>: ConnectException in RemoteAntDebugBuildListener<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=81573">81573</a>: Spelling mistakes in the Import > Existing Ant Buildfile description<br>
-
-<h1>
-Eclipse Platform Build Notes <br>
-Ant</h1>
-M4, 2004
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=81280">81280</a>: NPE on removing launch if build never actually starts<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=81299">81299</a>: Retrieving properties fails for empty string properties<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=81268">81268</a>: Property presentation<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=81274">81274</a>: BadLocationException in Ant Editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=81371">81371</a>: "Open declaration" doesnt work on names with spaces<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=81479">81479</a>: Ant debugger hits disabled breakpoints<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Dec 14, 2004
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=80541">80541</a>: Run to Line breakpoints for Ant debugging<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24131">24131</a>: Ability to debug ANT buildfile in some type of ANT debugger<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=80651">80651</a>: NPE in Ant debugger<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=80287">80287</a>: Ant debugger leaves highlight in editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=79463">79463</a>: Deadlock debugging ant script<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=80555">80555</a>: Ant debugger does not respect skip breakpoints pref<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=80707">80707</a>: Make breakpoint / run mode check debug model specific<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=77330">77330</a>: Ant build configuration; main tab<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Dec 8, 2004
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=80382">80382</a>: Copy/Paste results in a divide by 0 error in the Ant editor<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Dec 7, 2004
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=76536">76536</a>: Status line error message not cleared for Ant view<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=79822">79822</a>: Cache AntElementNode labels<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=79835">79835</a>: Too much filtering in the Ant content outline page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=76226">76226</a>: Lost some support with changes to AntTargetsTab<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=79884">79884</a>: ArrayIndexOutOfBoundsException attempting to getTargets<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=71590">71590</a>: Serializable classes and declaring a static final serialVersionUID<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=79788">79788</a>: Adapt to new hyperlink support<br> 
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Nov 30, 2004
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=78648">78648</a>: Allow multi-select in the Ant view<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=79602">79602</a>: Adjust the Ant auto indent to the deprecations<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=76216">76216</a>: AntView should prompt before remove all<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=78646">78646</a>: Error nodes in the Ant view hide which file they're from<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Nov 23, 2004
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=78799">78799</a>: Capture Output option is redundant<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=79012">79012</a>: Add launch shortcut hotkey for Ant builds<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Nov 16, 2004
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=78198">78198</a>: NPE if buildfile does not designate default target<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=78141">78141</a>: Ant build unable to scan build files using import<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=78000">78000</a>: Build triggered when only team-private resources have changed<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=78196">78196</a>: Tooltip for the RunTargetAction not correct for selection<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=78201">78201</a>: ClassCastException on Refresh in the AntView<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=78466">78466</a>: IllegalThreadStateException opening Ant LCD<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=78162">78162</a>: Double click on Ant view tasks Open the editor (should start that target)<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=77728">77728</a>: Duplicate "Source" command category<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Nov 9, 2004
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=78030">78030</a>: Ant editor should propose values for project default attribute<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=78028">78028</a>: Ant Completion processor is not directly filtering templates by context<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=77973">77973</a>: AntView is parsing buildfiles on startup<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=77975">77975</a>: AntModels from error AntView elements are not disposed<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=77723">77723</a>: Open external documentation has no menu entry<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=77386">77386</a>: Allow user to set URL for external doc location<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-3.1M3, Nov 5, 2004
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=75744">75744</a>: XmlTextHover shows affordance based on JDT prefs<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=77169">77169</a>: Pass ProgressMonitor through when creating project from import<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=65480">65480</a>: Present reference attribute value proposals for javac attributes<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=58815">58815</a>: "Show source of selected elements only" for the Ant Editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=77246">77246</a>: Cancel Decay thread when Ant UI plugin stopped<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=76986">76986</a>: Ant Editor pref page does not handle multiple errors<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31602">31602</a>: Add hyperlink support in Ant editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=75665">75665</a>: NPE running Ant UI performance test suite<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=76976">76976</a>: NPE in AntProjectNodeProxy<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=77216">77216</a>: NPE trying to open an existing launching configuration for an external builder<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=77218">77218</a>: NPE retrieving targets for empty buildfile<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=72054">72054</a>: Literal quotes no longer work in external tool arguments<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=69948">69948</a>: TVT3.0: tools.jar warning message is too long<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49390">49390</a>: Ant manual as external documentation (Shift-F2)<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45484">45484</a>: Ant builds using an external JVM with [input] tasks cannot request input.<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=77549">77549</a>: NPE in initial reconcile of Ant Editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=77727">77727</a>: OK not enabled on empty input when run on separate VM<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=77401">77401</a>: "No targets" error not cleared<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=77523">77523</a>: Same JRE input handler comes up in error state<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=77519">77519</a>: Separate JRE input handler not working on non Win32 OS<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=77777">77777</a>: Increase in build time from adding SWT Input handler<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Oct 26, 2004
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=76207">76207</a>: ClassCastException changing preference for Code Assist<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=76712">76712</a>: Differences depending on how AntModel generated<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=76838">76838</a>: Provide Show in target list for the Ant editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=72652">72652</a>: Refactor AntModel<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=76366">76366</a>: Navigation actions in the context menu<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=76843">76843</a>: Lost the generation of Ant problems<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55357">55357</a>: templates do not appear in content assist when expected<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=76231">76231</a>: Centralized Ant navigation support<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=68885">68885</a>: Execution of implicit target retrieving targets for Ant LCD<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=76607">76607</a>: Double click opening in Ant view does not select element<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=76973">76973</a>: StringIndexOutOfBounds navigating within property declaration<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=76608">76608</a>: AntView Open With support for "normal" targets should select element<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=72598">72598</a>: "*.ant" file association does not provide syntax coloring<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=74113">74113</a>: Error annotations for external buildfiles<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=76217">76217</a>: AntView buildfile selection dialog does not filter added buildfiles<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Oct 19, 2004
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=76138">76138</a>: Ant editor not following tab/space setting on shift right<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=76225">76225</a>: Move the ExternalAntBuildfileImportPage to use the AntUtil support<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=72566">72566</a>: Rework AntView to make use of AntModel support<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63051">63051</a>: Consistency with "Run" in AntView<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=75319">75319</a>: Move the AntTargetsTab to retrieve target information from an AntModel<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=48018">48018</a>: AntView open with does not correctly with external entity targets<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=76129">76129</a>: ClassCastException filtering for internal targets in Ant LCD<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=76293">76293</a>: Import Ant buildfile fails if no destdir<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=73602">73602</a>: InternalAntRunner.getTargets can fail with top level taskdefs<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=76414">76414</a>: Templates show up when code completing for nested elements<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=72482">72482</a>: No "Folding" context menu item in the Ant editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=76300">76300</a>: NPE if attempt to import empty buildfile<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=75802">75802</a>: scp task missing in code completion helper files<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55057">55057</a>: Ant view support for imported elements<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=76346">76346</a>: Bad attribute completion for <attribute> tag<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=74775">74775</a>: Folders in "Ant Build... ", Classpath tab ignored in other contexts<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=76535">76535</a>: DnD to the Ant view should always show the plus sign<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Oct 12, 2004
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50583">50583</a>: Patternsets, paths and fileset hovering (F2)<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=73553">73553</a>: Format keybinding wrong on Mac<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=69258">69258</a>: Target navigation for Ant editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=59745">59745</a>: Present buildfile source view for additional proposal info<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=71689">71689</a>: Syntax colored folded region annotation hover<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=65200">65200</a>: Ctrl-Shift-Q does not work to toggle Quick diff in AntEditor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=75940">75940</a>: Open declaration support in the Ant editor requires full selection<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=75759">75759</a>: Navigation to property definition<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=75804">75804</a>: Add Task dialog needs to be resizeable<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Oct 5, 2004
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=74840">74840</a>: Variables not substituted in user properties for same JRE Ant Build<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=75133">75133</a>: Variables get run mutliple times for Run ant...<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=75224">75224</a>: Remove remnants of incremental reconciliation<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=75369">75369</a>: 3.1M2: Tooltips in ANT editor show "xx changed lines"<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Sep 28, 2004
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=73807">73807</a>: Parsing the Ant dtd on startup<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=74490">74490</a>: Decay Ant code completion data structures<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=75137">75137</a>: AntRunner#addUserProperties(Map) does not add<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=71296">71296</a>: Ant editor performance tests: opening / typing<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=75064">75064</a>: The remove builder button in project properties is inactive<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Sep 23, 2004
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=74539">74539</a>: [TYPO] Missing 's' in "existing" in dialog title "Import  project from existing Ant buildfile"<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Sep 21, 2004
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=74102">74102</a>: Identity instead of equals for import buildfile javac resolution<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=74117">74117</a>: Improve error message when user specifies buildfile that does not exist for import<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=74117">74114</a>: Silent failure when importing buildfile with no javac target<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=74122">74122</a>: Buildfile project name not updated when change imported buildfile<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=73724">73724</a>: Logfile output differs from console output: extra linebreaks<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=73800">73800</a>: Check for updates to code completion for Ant 1.6.2<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=66235">66235</a>: Working directoy error not cleared after setting to be in same VM<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=74060">74060</a>: NPEs in Ant tests<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=74105">74105</a>: Duplicate files in the Ant UI jar<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=74372">74372</a>: Import Project from buildfile adds all classpath entries as libraries<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Sep 14, 2004
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=73637">73637</a>: CodeAssist for <fail> task makes incorrect suggestions<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=70871">70871</a>: Update the XMLMarkerAnnotation for the MarkerAnnotation deprecations<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=67980">67980</a>: Prolog error message in console<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=69104">69104</a>: [ant] Add buildfile need to show all file<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47246">47246</a>: Antview add file dialog should allow multi select<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=73284">73284</a>: InternalAntRunner should check for bad string index and generate more helpful error msgs<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=73568">73568</a>: .externalToolBuilders folder remains when all builders removed<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=73584">73584</a>: Ant JRE tab allows to specify *no* JRE<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=73595">73595</a>: Import Project from buildfile does not handle BuildExceptions<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=71419">71419</a>: Missing action for 'External Tools Launch Configuration'<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=67003">67003</a>: <splash> task creates process that never ends<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Sep 7, 2004
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=73102">73102</a>: ProjectHelper retains old state in memory<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=73268">73268</a>: ArrayIndexOutOfBoundsException when double click in Builder page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=72823">72823</a>: Ant Builder should not create console when not capturing output<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63344">63344</a>: Missing some Ant output as the streams have been closed<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=68886">68886</a>: Code completion in Ant editor not work with xmlbuddy<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=71438">71438</a>: Ordering of builders not considered for builds other than full builds<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Aug 31, 2004
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=70650">70650</a>: Project builders do not execute in specified order<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=71688">71688</a>: Customization of initally folded regions<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=72746">72746</a>: Remove All image broken in Ant view<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=66062">66062</a>: DocumentModelChangeEvent and IDocumentModelEventListener<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=72512">72512</a>: Global Properties not set for editor parsing<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=72473">72473</a>: Remove external tools plugin unused dependancies<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=65479">65479</a>: taskString could be cached in AntEditorCompletionProcessor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=72619">72619</a>: Add DTD syntax coloring<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Aug 24, 2004
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=72077">72077</a>: No code completion for most built-in properties<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=71685">71685</a>: Imported nested tasks / attributes<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=72224">72224</a>: Error logged when failure to get introspection helper<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Aug 17, 2004
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=71956">71956</a>: Setting selection in the outline updates editor twice<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=71696">71696</a>: Buildfile prologs are not foldable<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=71687">71687</a>: Comments are not foldable in the Ant Editor<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Aug 10, 2004
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=71319">71319</a>: Duplicate target hover error message<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=71596">71596</a>: Some files missing from the distribution of the Ant plugin<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=71475">71475</a>: ant.tests.core builds extra jar on any resource change<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=60134">60134</a>: Code folding in the Ant Editor<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Aug 03, 2004
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=70841">70841</a>: Move to Ant 1.6.2<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=69768">69768</a>: TVT3.0: Preferences -> Ant has text showing up in english<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=70734">70734</a>: TVT3.0: Duplicate mnemonics, ''Build Ant'' and ''Build Ant...''?<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-July 27, 2004
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=56295">56295</a>: new icon for taskdef needed<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=68840">68840</a>: Source not found on Console hyperlink for Separate VM builds<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=68252">68252</a>: unused icons in Ant ui<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=68081">68081</a>: Ant view's Add Buildfiles popup item should have trailing ellipses<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=68886">68886</a>: Code completion in Ant editor not work with xmlbuddy<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=69177">69177</a>: Error messages not logged for build failure due to bad inputhandler<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=69235">69235</a>: Fully qualify the Ant partition name<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=70429">70429</a>: missing <pre> and </pre> tags in Examples section of configurationDuplicationMaps.exsd<br>
-
-</body>
-</html>
diff --git a/eclipse/plugins/org.eclipse.ant.core/r3_2_buildnotes_platform-ant.html b/eclipse/plugins/org.eclipse.ant.core/r3_2_buildnotes_platform-ant.html
deleted file mode 100644
index 064f35b..0000000
--- a/eclipse/plugins/org.eclipse.ant.core/r3_2_buildnotes_platform-ant.html
+++ /dev/null
@@ -1,186 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Mozilla/4.7 [en] (WinNT; I) [Netscape]">
-   <title>Eclipse 3.2 Ant Release Notes</title>
-</head>
-<body>
-
-<h1>
-Eclipse 3.2 Ant Build Notes</h1>
-
-<h2>RC2 - April 28, 2006</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=137088">137088</a>: StringIndexOutOfBoundsException in AntLaunchDelegate.appendProperty()<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=73814">73814</a>: AntEditorContentOutlineTests.testParsingOfNonValidFile fails on Xerces<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=138089">138089</a>: pathelements for project dependencies are syntactically incorrect<br>
-
-<h2>RC 1 - April 13, 2006</h2>
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=134932">134932</a>: support retrieving the path from AntElementNode<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=133380">133380</a>: Polish of the Ant preference page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=134303">134303</a>: Fix broken NLS strings<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=135765">135765</a>: need to adopt ICU4J APIs<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=132339">132339</a>: Update the External Tools launcher wizard to use a PNG image<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=136480">136480</a>: Performance improvement for the AntModel<br>
-
-<h2>3.2 M6 - March 30, 2006</h2>
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=106803">106803</a>: Ant launcher not setting working directory<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=111740">111740</a>: Ant editor shows text in black and white until file is edited<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=107721">107721</a>: Ant fails to detect  when default JRE changes<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=133184">133184</a>: Create markers for Ant build using javac<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=124405">124405</a>: Migrate ant launch configs to support resource filtering<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=128493">128493</a>: Organize manifests<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=133190">133190</a>: Namespace support for the Ant extension points<br>
-
-<h2>March 14, 2006</h2>
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=130751">130751</a>: NPE creating build.xml file<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=131421">131421</a>: debug as ant build ignores global user property<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=131803">131803</a>: javac task in build.xml should have debug="true", at least optionally<br>
-
-<h2>March 7, 2006</h2>
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=130129">130129</a>: Intermittent failure saving Ant build script<br>
-
-<h2>February 28, 2006</h2>
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=102282">102282</a>: Missing hyperlinks in Ant error output<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=128176">128176</a>: ant editor: Property rename doesn't find unless-attribute of fail task.<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=128104">128104</a>: Ant export filter: Make use of project build order<br>
-
-<h2>February 21, 2006</h2>
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=128512">128512</a>: Ant export filter: Fix confirm overwrite message<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=128103">128103</a>: Ant export filter: Make use of specified junit directory<br>
-
-<h2>3.2 M5 - February 17, 2006</h2>
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=117787">117787</a>: StringIndexOutOfBoundsException finding occurrences<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=104114">104114</a>: Comment template fails<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=111217">111217</a>: Ant editor support for content assist proposal cycling<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=127088">127088</a>: Should not be prompted for save ditry editors when building<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=127193">127193</a>: top level entries should not be allowed for global Ant runtime classpath<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=125038">125038</a>: Arguments in "Main" folder of "Run an Ant buildfile" launch dialog does not take care of quoting<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=124210">124210</a>: special comments would better be Processing instructions<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=126490">126490</a>: [refactoring] rename does not update Ant buildfile reference<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=128152">128152</a>: Ant UI failures from changes to LaunchSuspendTrigger<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=107476">107476</a>: Missing ETC directory<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=108937">108937</a>: NullPointerException when trying to Run As ant task<br>
-
-<h2>February 7, 2006</h2>
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=108114">108114</a>: <input> task with long validargs list: dialog size to small<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=107813">107813</a>: BadLocationException when using Ant with DocType Entity<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=110557">110557</a>: Manifest file error in export -package list<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=126392">126392</a>: loadproperties does not set properties for Ant editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=123026">123026</a>: [patch] Ant source attachments incorrectly configured<br>
-
-<h2>January 31, 2006</h2>
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=104320">104320</a>: Should not call IDocumentSetupParticipant.setup(IDocument)<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=107335">107335</a>: eclipse doesn't expand eclipse variables references in properties defined in property files<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=125367">125367</a>: [patch] An ant script without targets or default target is not recognized as an ant file<br>
-
-<h2>January 24, 2006</h2>
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=101090">101090</a>: No console output when running ant in separate jvm<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=112533">112533</a>: Ant duplicates the "format" command<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=104416">104416</a>: Common tab missing on Ant Build for Java Project Properties Builders<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=124562">124562</a>: Extension point task proposal test failing<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=99703">99703</a>: incorrect line terminators with windows install of ant 1.6.4<br>
-
-<h2>January 17, 2006</h2>
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=102641">102641</a>: Ant crashes if property is defined that's value ends with a backslash<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=106588">106588</a>: ATTR_PROJECT_NAME is not updated for change in buildfile<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=111427">111427</a>: Adding a builder with .project read-only<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=117776">117776</a>: Ant Icons: Export Dialog icons have inconsistent metaphors<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=122634">122634</a>: ISynchronizable.getLockObject() can be null<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=111532">111532</a>: update dialog size / position persistance<br>
-
-<h2>January 10, 2006</h2>
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=105677">105677</a>: ContributedClasspathEntriesEntry throws NullPointerException<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=101766">101766</a>: antcall target attribute could benefit of content assist<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=108276">108276</a>: [patch] Absolute path in build.xml from export<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=110636">110636</a>: Ant UI does not compile on JDK 1.5<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=122663">122663</a>: Code completion does not present nested target element for antcall<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=122421">122421</a>: Improve Ant Export Filter<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=104748">104748</a>: Linked resources not resolved to local file system folder in generated Ant build file<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=121052">121052</a>: "Export Ant Buildfiles" doesn't copy resources<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=120804">120804</a>: Export Ant Buildfiles NullPointerException<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=89751">89751</a>: Export Ant buildfiles should allow user to specify a name<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=113650">113650</a>: export ant build files doesn't set the correct classpath with simple projects<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=122913">122913</a>: documentCreation extension point has been deprecated<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=104684">104684</a>: Ant classpath gets corrupted when adding external jars named *-tools.jar in Global Entries<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=118949">118949</a>: Ant fails to run in external JVM if comma in project path<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=122664">122664</a>: Ant>Editor>Problems>Names text field limited to a single line<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=96789">96789</a>: Export buildfiles doesn't have run targets' classpath correct<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=114085">114085</a>: export ant build file doesn't handle spaces too well and eclipse variables in arguements<br>
-
-<h2>December 13, 2005</h2>
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=119585">119585</a>: dangerous uses of "new GC(Display)"<br>
-
-<h2>November 29, 2005</h2>
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=117793">117793</a>: Doc references incorrect version of Ant<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=118413">118413</a>: [ext tools] Import ext tool builder shows private launch configs<br>
-
-<h2>November 22, 2005</h2>
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=117383">117383</a>: The Javac paths specified in the custom build scripts need to be extended<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=116843">116843</a>: Errors when building ant projects<br>
-
-<h2>October 31, 2005</h2>
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=113899">113899</a>: Ant node hyperlink does not function if dir attribute is relative<br>
-
-<h2>October 11, 2005</h2>
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=111908">111908</a>: Adapt to changes in JavaFileEditorInput for more flexible workspaces<br>
-
-<h2>October 4, 2005</h2>
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=110164">110164</a>: Last paragraph in the "Creating Ant buildfiles" doesn't parse<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=111199">111199</a>: Self hosting instructions out of date<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=102300">102300</a>: RemoteAntBuildListener throws exception for jspc task<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55574">55574</a>: Go to Annotation<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32088">32088</a>: Inconsistent terminology for content assist<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=89195">89195</a>: ant content type over defined for <project> tag<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=108990">108990</a>: provide category for ant build files export wizard<br>
-
-<h2>August 16, 2005</h2>
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=106859">106859</a>: TVT 3.1 - TCT 590 - External Tools Icon is not BiDi Enabled<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=106703">106703</a>: TVT 3.1: TCT 584 - Memonic confliction in Ant Runtime Preferences page<br>
-
-<h2>August 8, 2005</h2>
-<h3>
-Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=104854">104854</a>: XML syntax coloring wrong when PI on more than 1 line.<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=105231">105231</a>: [BIDI] need to add $nl$/ to icon paths for reversed icons<br>
-</body>
-</html>
\ No newline at end of file
diff --git a/eclipse/plugins/org.eclipse.ant.core/r3_3_buildnotes_platform-ant.html b/eclipse/plugins/org.eclipse.ant.core/r3_3_buildnotes_platform-ant.html
deleted file mode 100644
index 2ad7bf3..0000000
--- a/eclipse/plugins/org.eclipse.ant.core/r3_3_buildnotes_platform-ant.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Mozilla/4.7 [en] (WinNT; I) [Netscape]">
-   <title>Eclipse 3.3 Ant Release Notes</title>
-</head>
-<body>
-
-<h1>
-Eclipse 3.3 Ant Build Notes</h1>
-
-<h2>3.3 RC4 2007 Friday, 8 June 2007</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=192438">192438</a>: [doc] Ant build file export wizard doc out of date<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=192201">192201</a>: Ant screenshots out of date<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=192130">192130</a>: Ant Preference pages need to be updated in the User Guide<br>
-
-<h2>3.3 RC1 2007 Friday, 18 May 2007</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=183283">183283</a>: Exporting product produces Exception if installation path has spaces<br>
-
-<h2>3.3 M7 2007 Friday, 4 May 2007</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=180093">180093</a>: Missing nls message<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=137980">137980</a>: Move to Ant 1.7<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=182444">182444</a>: jars.extra.classpath causes duplicate classpath entry<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=182577">182577</a>: executing ant build in same JRE seems to leak input handling thread<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=164958">164958</a>: Hover over problem is wrong<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=182653">182653</a>: [DOC] Update org.eclipse.platform.doc.user\tasks\antRunner.htm<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=155566">155566</a>: [DOC] Ant Builder has no "Run the builder" settings<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=183702">183702</a>: Move off of deprecated FileUtils methods<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=184215">184215</a>: Error when opening build.xml with macrodef<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=163534">163534</a>: Eclipse ANT "- projecthelp" produces mixed up results<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=179837">179837</a>: Some external tool builders not running, then NPE<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=184112">184112</a>: Exclude support jars from signing<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=184124">184124</a>: remove open LCD test from ant test suite<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=177833">177833</a>: Adapt to validate edit deprecations within ExportUtil<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=152067">152067</a>: [Ant 1.7] Default value is available for the input task<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=160767">160767</a>: [Help] General XML files not openable by ant editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=175350">175350</a>: [Ant 1.7] References are more lazily loaded --> incomplete code assistance<br>
-
-<h2>3.3 M6 2007 Friday, 23 March 2007</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=174276">174276</a>: JavaFileEditorInput will be deleted<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=138007">138007</a>: system_path macro should support common extensions in Windows<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=168094">168094</a>: Hyperlinks from Ant output not working<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=174726">174726</a>: a possible null-dereference in "org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntEditorContentOutlinePage.java"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=175345">175345</a>: ResourceException running Ant UI test suite<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=177125">177125</a>: Buildfile template should declare encoding<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=177135">177135</a>: Replace hard coded hyperlink detector with extension<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=177581">177581</a>: Adopt "Show Tooltip" / F2 support from Platform Text<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=178031">178031</a>: Adopt tabs to spaces support from Platform Text<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=175823">175823</a>: org.apache.ant should have plug-in nature<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=170859">170859</a>: Move AntRunner to IApplication<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=147337">147337</a>: Need a link source option for Ant build script<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=176157">176157</a>: testAttributePrposals test fails on Harmony VM due to inconsistent check<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=175692">175692</a>: EmptyStackException handling a warning<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=175186">175186</a>: Add a build variable for showing changeset (patch included)<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=174759">174759</a>: ant editor breaks on imported build files<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=175352">Bug 175352</a>: [Ant 1.7] More eager cleanup after execute --> macrodef stepping problems<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=176620">Bug 176620</a>: AntCLassLoader loads classes from plugin bundle, but not resources<br>
-
-<h2>3.3 M5 Friday, 9 February 2007</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=170050">170050</a>: small error in ant hover info<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=170145">170145</a>: [launching] new mapping for launch shortcuts<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=167291">167291</a>: Unable to create XML editor with wrapper version of Ant<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=171420">171420</a>: [launching] New fields for launch delegates<br>
-
-<h2>3.3 M4 Friday, 15 December 2006</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=163382">163382</a>: add property file to support signing<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=163962">163962</a>: condition task 'else' attribute does not appear in content assist?<br>
-
-<h2>3.3 M3 Friday, 3 November 2006</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=158332">158332</a>: Get rid of copied HTML rendering classes<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=161267">161267</a>: [launching] deleting ant config produces error<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=161273">161273</a>: [launching] using context menu in LCD to create a new or duplicate causes errors<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=155510">155510</a>: Project properties->Builders: Cancel doesn't work properly.<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=161845">161845</a>: ANT build export fails when ECLIPSE_HOME is not in list of variable<br>
-
-<h2>3.3 M2 Friday, 22 September 2006</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=155793">155793</a>: Patch to fix jface.text.Assert deprecation<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=155447">155447</a>: incorrect service segment for org.eclipse.ant.ui in R3_2_maintenance branch<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=152063">152063</a>: Improvements to the Ant tasks / types selfhosting help<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=156621">156621</a>: Wrong name for interface in ant extension documentation<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=155762">155762</a>: 21 Error dialogs before the Ant LCD appears<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=149739">149739</a>: Improve AntRunner javadocs<br>
-
-<h2>3.3 M1 Thursday, 10 August 2006</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=152480">152480</a>: Update the platform ant home resources<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=143008">143008</a>: Changing Ant Home and Reloading build file results in ClasscastException<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=150825">150825</a>: No syntax coloring if Ant Editor is associated with different content type or extension<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=152508">152508</a>: ANT file names pattern...<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=152625">152625</a>: Adapt external tools to the propertyPages extension point deprecations<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=141317">141317</a>: Templates don't work when creating a new build file<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=139190">139190</a>: Name column in the Ant launch dialog is not properly sized<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=146298">146298</a>: [launching] Eclipse does not ask to save dirty editors before running an external program<br>
-</body>
-</html>
\ No newline at end of file
diff --git a/eclipse/plugins/org.eclipse.ant.core/r3_4_buildnotes_platform-ant.html b/eclipse/plugins/org.eclipse.ant.core/r3_4_buildnotes_platform-ant.html
deleted file mode 100644
index cf98b6e..0000000
--- a/eclipse/plugins/org.eclipse.ant.core/r3_4_buildnotes_platform-ant.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Mozilla/4.7 [en] (WinNT; I) [Netscape]">
-   <title>Eclipse 3.4 Ant Release Notes</title>
-</head>
-<body>
-
-<h1>
-Eclipse 3.4 Ant Build Notes</h1>
-
-<h2>Enhancements in 3.4</h2>
-<p>A new application entry point (<code>org.eclispe.ant.ui.antRunner</code>) has 
-  been added to the Ant UI plug-in that allows an Ant buildfile to be run. This is 
-  similar to the existing application entry point (<code>org.eclipse.ant.core.antRunner</code>) 
-  in the Ant Core plug-in, but allows ant buildfiles that require access to the workbench 
-  to execute.</p>
-
-<h2>May 14, 2008</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=220385">Bug 220385</a>: [api] enabled API tooling for ant projects<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=231305">Bug 231305</a>: external tools bunlde version not correct<br>
-
-<h2>May 12, 2008</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=199014">Bug 199014</a>: [ant templates]Invalid ant templates: target1 & buildFile1<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=220930">Bug 220930</a>: Ant Editor folding preference not retained across sessions<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=229474">Bug 229474</a>: table in ant Targets tab has no vertical scrollbar<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=154907">Bug 154907</a>: Sort variables in the Variables view<br>
-
-<h2>Friday, May 9, 2008</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=231305">Bug 231305</a>: external tools bunlde version not correct<br>
-
-<h2>3.4 M7 Monday, April 28, 2008 (warm-up build)</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=225901">Bug 225901</a>: Ant test failure in nightly builds<br>
-
-<h2>3.4 M6 Thursday, March 20, 2008 (warm-up build)</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=223125">Bug 223125</a>: ColorManager is not disposed.<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=223198">Link</a>: Builder failed due to NPE<br>
-
-<h2>3.4 M4 - December 14, 2007</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=212179">212179</a>: [launching] Incorrect resolution of launch configuration --> no reuse<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=212562">Bug 212562</a>: [launching] Need a way to query for existing launch configs without reporting error<br>
-
-<h2>3.4 M3 Friday, November 2007</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=200347">200347</a>: Running build from ant view with multiple build files runs incorrect one<br>
-
-<h1>
-Eclipse 3.4 Ant Build Notes</h1>
-
-<h2>3.4 M2 Friday, 22 September 2007</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=199490">199490</a>: Java project from Ant wizard needs changes to label casing<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=201169">201169</a>: javac problem markers not generated for compilers other than Eclipse<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=201083">201083</a>: ant view - 'remove all buildfiles' doesn't<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=190836">190836</a>: NPE removing invalid ant file from Ant view<br>
-
-
-<h2>3.4 M1 Thursday, 21 August 2007</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=200167">200167</a>: Keybindings on the Mac conflict with reserved OS bindings<br>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/eclipse/plugins/org.eclipse.ant.core/r3_5_buildnotes_platform-ant.html b/eclipse/plugins/org.eclipse.ant.core/r3_5_buildnotes_platform-ant.html
deleted file mode 100644
index f1023f3..0000000
--- a/eclipse/plugins/org.eclipse.ant.core/r3_5_buildnotes_platform-ant.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Mozilla/4.7 [en] (WinNT; I) [Netscape]">
-   <title>Eclipse 3.5 Ant Release Notes</title>
-</head>
-<body>
-
-<h1>
-Eclipse 3.5 Ant Build Notes</h1>
-
-<h2>Enhancements in 3.5</h2>
-<ul>
-  <li>Added API constants for Ant launch configuration attributes - <code>org.eclipse.ant.ui.launching.IAntLaunchConfigurationConstants</code>.</li>
-</ul>
-
-<h2>May 5, 2009</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=275839">Bug 275839</a>: Eclipse Preferences Ant Runtime -- NPE -- (PDE Export fails)<br>
-
-<h2>May 5, 2009</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=274603">Bug 274603</a>: Unreachable strings<br>
-
-<h2>May 7, 2009</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=274601">Bug 274601</a>: Problem with InternalAntRunner_Specifying_property_files_is_a_Ant_1_5___feature__Please_update_your_Ant_classpath__6<br>
-
-<h2>April 14, 2009</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=222615">Bug 222615</a>: Export Ant buildfile does not export JUnit4 style tests<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=223902">Bug 223902</a>: [launching] No descriptions for ant launch shortcuts<br>
-
-<h2>April 7, 2009</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=270041">Bug 270041</a>: Any first Ant target invocation builds open java projects while Build Automatically is turned off<br>
-
-<h2>March 23, 2009</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=161354">Bug 161354</a>: Exported ANT scripts should use the 'dir' attribute of the ant task<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=201143">Bug 201143</a>: exported ant script does not apply include/exclude filter on init target's copy task<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=267459">Bug 267459</a>: Java project with an external jar file from FS root on the build path throws a NPE during the Ant Buildfile generation.<br>
-
-<h2>February 3, 2009</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=218074">Bug 218074</a>: button label truncations on External Tools Builders config dialog<br>
-
-<h2>3.5 M5 - January 30, 2009</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=262378">Bug 262378</a>: Ant test suite does not handle dynamic plugin version length<br>
-
-<h2>December 22, 2008</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=215530">Bug 215530</a>: Ant targets no longer bring up "Ant Configuration Settings" Dialog box<br>
-
-<h2>November 25, 2008</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=253100">Bug 253100</a>: 'Builders' property page should remember it has warned the user<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=256299">Bug 256299</a>: Simplify setup of ContentAssistAction<br>
-
-<h2>November 18, 2008</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=255370">Bug 255370</a>: AntBuildfileContentDescriber should extend org.eclipse.core.runtime.content.XMLContentDescriber<br>
-
-<h2>October 4, 2008</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=251259">Bug 251259</a>: Use the new contentType extension point<br>
-
-<h2>Aug 19, 2008</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=244581">Bug 244581</a>: Javadoc warnings in N20080818-2000<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=244301">Bug 244301</a>: javadoc errors in N20080814-2000<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=244121">Bug 244121</a>: Warning in build<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42262">Bug 42262</a>: Ant API<br>
-
-<h2>July 22, 2008</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=241538">Bug 241538</a>: ant tests need to be updated to reflect ant 1.7.1<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=209504">Bug 209504</a>: Adopt Apache Ant 1.7.1<br>
-
-<h2>July 8, 2008</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=158627">Bug 158627</a>: Eclipse is not following a variable import link<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=201180">Bug 201180</a>: Export ant buildfile does not export bootclasspath correctly<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=192726">Bug 192726</a>: ant exporter incorrectly defines path variables<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=195840">Bug 195840</a>: Import a XML file with BOM character in ant editor fails<br>
-
-<h2>June 30, 2008</h2>
-<h3>Problem Reports Fixed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=238665">Bug 238665</a>: Change to use bundle activation policy for Ant core and Ant ui<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=238990">Bug 238990</a>: Remove no longer used code to setup code assist navigation<br>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/eclipse/plugins/org.eclipse.ant.core/schema/antTasks.exsd b/eclipse/plugins/org.eclipse.ant.core/schema/antTasks.exsd
index 77e7a13..6e33754 100644
--- a/eclipse/plugins/org.eclipse.ant.core/schema/antTasks.exsd
+++ b/eclipse/plugins/org.eclipse.ant.core/schema/antTasks.exsd
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ant.core">
+<schema targetNamespace="org.eclipse.ant.core" xmlns="http://www.w3.org/2001/XMLSchema">
 <annotation>
       <appInfo>
          <meta.schema plugin="org.eclipse.ant.core" id="antTasks" name="Ant Tasks"/>
@@ -20,6 +20,11 @@ request that the declaring plug-in load the specified class.
    </annotation>
 
    <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
       <complexType>
          <sequence>
             <element ref="antTask" minOccurs="0" maxOccurs="unbounded"/>
@@ -65,7 +70,7 @@ request that the declaring plug-in load the specified class.
          <attribute name="uri" type="string">
             <annotation>
                <documentation>
-                   The uri that this definition should live in. Only used if using Ant newer than 1.6.
+                  The uri that this definition should live in. Only used if using Ant newer than 1.6.
                </documentation>
             </annotation>
          </attribute>
@@ -111,6 +116,7 @@ for the library containing the task.
       </complexType>
    </element>
 
+
    <annotation>
       <appInfo>
          <meta.section type="examples"/>
@@ -124,9 +130,11 @@ for the library containing the task.
    </extension> 
 </pre>
 </p>
+In the above example the <code>antSupport.jar</code> must be created using an Ant project builder. For more information about creating project builders and how they work, please refer to the following help topics: <b>Contributing tasks and types</b>, <b>Ant buildfiles as project builders</b> and <b>Creating a project builder Ant buildfile</b>
       </documentation>
    </annotation>
 
+
    <annotation>
       <appInfo>
          <meta.section type="implementation"/>
@@ -142,7 +150,7 @@ eclipse.incrementalBuild and eclipse.refreshLocal.
          <meta.section type="copyright"/>
       </appInfo>
       <documentation>
-         Copyright (c) 2000, 2006 IBM Corporation and others.<br>
+         Copyright (c) 2000, 2011 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
 available under the terms of the Eclipse Public License v1.0 which 
 accompanies this distribution, and is available at 
diff --git a/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.java b/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.java
index 61d38c4..ebe2bc6 100644
--- a/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.java
+++ b/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -99,7 +99,7 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
 		}
 
 		public String toString() {
-			return from.toString() + "->" + (to == null ? "" : to.toString()); //$NON-NLS-1$//$NON-NLS-2$
+			return from.toString() + "->" + (to == null ? IAntCoreConstants.EMPTY_STRING : to.toString()); //$NON-NLS-1$
 		}
 	}
 
@@ -206,7 +206,7 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
 	
 	private void restoreTasks(Preferences prefs) {
 		 String tasks = prefs.getString(IAntCoreConstants.PREFERENCE_TASKS);
-		 if (tasks.equals("")) { //$NON-NLS-1$
+		 if (tasks.equals(IAntCoreConstants.EMPTY_STRING)) {
 			 customTasks = new Task[0];
 		 } else {
 			 customTasks = extractTasks(prefs, getArrayFromString(tasks));
@@ -215,7 +215,7 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
 	
 	private void restoreTypes(Preferences prefs) {
 		String types = prefs.getString(IAntCoreConstants.PREFERENCE_TYPES);
-		if (types.equals("")) {//$NON-NLS-1$
+		if (types.equals(IAntCoreConstants.EMPTY_STRING)) {
 			customTypes = new Type[0];
 		} else {
 			customTypes = extractTypes(prefs, getArrayFromString(types));
@@ -224,14 +224,14 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
 	
 	private void restoreAntHomeEntries(Preferences prefs) {
 		String entries = prefs.getString("ant_urls"); //old constant //$NON-NLS-1$
-		if (entries.equals("")) {//$NON-NLS-1$
+		if (entries.equals(IAntCoreConstants.EMPTY_STRING)) {
 			entries= prefs.getString(IAntCoreConstants.PREFERENCE_ANT_HOME_ENTRIES);
 		} else {
 			prefs.setToDefault("ant_urls"); //$NON-NLS-1$
 			antHomeEntries= migrateURLEntries(getArrayFromString(entries));
 			return;
 		}
-		if (entries.equals("")) {//$NON-NLS-1$
+		if (entries.equals(IAntCoreConstants.EMPTY_STRING)) {
 			antHomeEntries= getDefaultAntHomeEntries();
 		} else {
 			antHomeEntries= extractEntries(getArrayFromString(entries));
@@ -240,14 +240,14 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
 	
 	private void restoreAdditionalEntries(Preferences prefs) {
 		String entries = prefs.getString("urls"); //old constant //$NON-NLS-1$
-		if (entries.equals("")) {//$NON-NLS-1$
+		if (entries.equals(IAntCoreConstants.EMPTY_STRING)) {
 			entries = prefs.getString(IAntCoreConstants.PREFERENCE_ADDITIONAL_ENTRIES);
 		} else {
 			prefs.setToDefault("urls"); //$NON-NLS-1$
 			additionalEntries= migrateURLEntries(getArrayFromString(entries));
 			return;
 		}
-		if (entries.equals("")) {//$NON-NLS-1$
+		if (entries.equals(IAntCoreConstants.EMPTY_STRING)) {
 			IAntClasspathEntry toolsJarEntry= getToolsJarEntry();
 			List userLibs= getUserLibraries();
 			if (toolsJarEntry == null) {
@@ -314,7 +314,7 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
 	
 	private void restoreCustomProperties(Preferences prefs) {
 		String properties = prefs.getString(IAntCoreConstants.PREFERENCE_PROPERTIES);
-		if (properties.equals("")) {//$NON-NLS-1$
+		if (properties.equals(IAntCoreConstants.EMPTY_STRING)) {
 			customProperties = new Property[0];
 		} else {
 			customProperties = extractProperties(prefs, getArrayFromString(properties));
@@ -323,7 +323,7 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
 	
 	private void restoreCustomPropertyFiles(Preferences prefs) {
 		String propertyFiles= prefs.getString(IAntCoreConstants.PREFERENCE_PROPERTY_FILES);
-		if (propertyFiles.equals("")) { //$NON-NLS-1$
+		if (propertyFiles.equals(IAntCoreConstants.EMPTY_STRING)) {
 			customPropertyFiles= new String[0];
 		} else {
 			customPropertyFiles= getArrayFromString(propertyFiles);
@@ -342,7 +342,7 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
 			task.setTaskName(taskName);
 			task.setClassName(values[0]);
 			String library= values[1];
-			if (library.startsWith("file:")) { //$NON-NLS-1$
+			if (library.startsWith(IAntCoreConstants.FILE_PROTOCOL)) {
 				//old format where URLs were persisted
 				library= library.substring(5);
 			}
@@ -364,7 +364,7 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
 			type.setTypeName(typeName);
 			type.setClassName(values[0]);
 			String library= values[1];
-			if (library.startsWith("file:")) { //$NON-NLS-1$
+			if (library.startsWith(IAntCoreConstants.FILE_PROTOCOL)) {
 				//old format where URLs were persisted
 				library= library.substring(5);
 			}
@@ -486,7 +486,7 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
 	 * 
 	 * @param packages the live list of {@link ExportedPackage}s to inspect
 	 * @return the bundle that represents the highest version of <code>org.apache.ant</code> or <code>null</code>
-	 * if there are other providers for the <code>org.apache.ant.tools</code> packages.
+	 * if there are no <code>org.apache.ant</code> providers of the <code>org.apache.ant.tools</code> package.
 	 */
 	Bundle findHighestAntVersion(ExportedPackage[] packages) {
 		Bundle bundle = null;
@@ -552,7 +552,7 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
 				continue;
 			}
 			Task task = new Task();
-			task.setTaskName(element.getAttribute(AntCorePlugin.NAME));
+			task.setTaskName(element.getAttribute(IAntCoreConstants.NAME));
 			task.setClassName(element.getAttribute(AntCorePlugin.CLASS));
 			
 			configureAntObject(result, element, task, task.getTaskName(), InternalCoreAntMessages.AntCorePreferences_No_library_for_task);
@@ -587,7 +587,7 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
 				continue;
 			}
 			Type type = new Type();
-			type.setTypeName(element.getAttribute(AntCorePlugin.NAME));
+			type.setTypeName(element.getAttribute(IAntCoreConstants.NAME));
 			type.setClassName(element.getAttribute(AntCorePlugin.CLASS));
 			
 			configureAntObject(result, element, type, type.getTypeName(), InternalCoreAntMessages.AntCorePreferences_No_library_for_type);
@@ -595,6 +595,22 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
 		return result;
 	}
 
+	/*
+	 * Create a "file:" URL for the specified File making sure the URL ends with a slash if the File denotes a directory.
+	 */
+	private URL getClasspathEntryURL(Bundle bundle, String library) throws IOException {
+		File urlFile;
+		if (library.equals("/")) { //$NON-NLS-1$
+			urlFile = FileLocator.getBundleFile(bundle);
+		} else {
+			urlFile = new File(FileLocator.toFileURL(bundle.getEntry(library)).getPath());
+		}
+		if (!urlFile.exists())
+			return null;
+	    String path = urlFile.getAbsolutePath();
+	    return new URL(IAntCoreConstants.FILE_PROTOCOL + (urlFile.isDirectory() ? path + "/" : path));  //$NON-NLS-1$
+	}
+
 	private void configureAntObject(List result, IConfigurationElement element, AntObject antObject, String objectName, String errorMessage) {
 		String runtime = element.getAttribute(AntCorePlugin.ECLIPSE_RUNTIME);
 		if (runtime != null) {
@@ -617,10 +633,8 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
             IContributor contributor= element.getContributor();
 			antObject.setPluginLabel(contributor.getName());
 			Bundle bundle = Platform.getBundle(contributor.getName());
-			URL url = FileLocator.toFileURL(bundle.getEntry(library));
-			File urlFile = new File(url.getPath());
-			if (urlFile.exists()) {
-				url = new URL("file:" +  urlFile.getAbsolutePath()); //$NON-NLS-1$
+			URL url = getClasspathEntryURL(bundle, library);
+			if (url != null) {
 				addURLToExtraClasspathEntries(url, element);
 				result.add(antObject);
 				addPluginClassLoader(bundle);
@@ -629,7 +643,7 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
 			} 
 
 			//type specifies a library that does not exist
-			IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_LIBRARY_NOT_SPECIFIED, NLS.bind(errorMessage, new String[]{url.toExternalForm(), element.getContributor().getName()}), null);
+			IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_LIBRARY_NOT_SPECIFIED, NLS.bind(errorMessage, new String[]{library, element.getContributor().getName()}), null);
 			AntCorePlugin.getPlugin().getLog().log(status);
 			return;
 		} catch (MalformedURLException e) {
@@ -657,15 +671,13 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
 			String library = element.getAttribute(AntCorePlugin.LIBRARY);
 			Bundle bundle = Platform.getBundle(element.getContributor().getName());
 			try {
-				URL url = FileLocator.toFileURL(bundle.getEntry(library));
-				File urlFile = new File(url.getPath());
-				if (urlFile.exists()) {
-					url = new URL("file:" +  urlFile.getAbsolutePath()); //$NON-NLS-1$
+				URL url = getClasspathEntryURL(bundle, library);
+				if (url != null) {
 					addURLToExtraClasspathEntries(url, element);  
 					addPluginClassLoader(bundle);
 				} else {
 					//extra classpath entry that does not exist
-					IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_LIBRARY_NOT_SPECIFIED, NLS.bind(InternalCoreAntMessages.AntCorePreferences_6, new String[]{url.toExternalForm(), element.getContributor().getName()}), null);
+					IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_LIBRARY_NOT_SPECIFIED, NLS.bind(InternalCoreAntMessages.AntCorePreferences_6, new String[]{library, element.getContributor().getName()}), null);
 					AntCorePlugin.getPlugin().getLog().log(status);
 					continue;
 				}
@@ -708,11 +720,11 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
 			if (!relevantRunningHeadless(element)) {
 				continue;
 			}
-			String name = element.getAttribute(AntCorePlugin.NAME);
+			String name = element.getAttribute(IAntCoreConstants.NAME);
 			if (name == null) {
 				continue;
 			}
-			String value = element.getAttribute(AntCorePlugin.VALUE);
+			String value = element.getAttribute(IAntCoreConstants.VALUE);
 			Property property= null;
 			if (value != null) {
 				property = new Property(name, value);
@@ -746,16 +758,17 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
 	 * @since 3.0
 	 */
 	public IAntClasspathEntry getToolsJarEntry(IPath javaHomePath) {
-		if ("jre".equalsIgnoreCase(javaHomePath.lastSegment())) { //$NON-NLS-1$
-			javaHomePath = javaHomePath.removeLastSegments(1);
+		IPath newjh = javaHomePath;
+		if ("jre".equalsIgnoreCase(newjh.lastSegment())) { //$NON-NLS-1$
+			newjh = newjh.removeLastSegments(1);
 		}
-		javaHomePath= javaHomePath.append("lib").append("tools.jar"); //$NON-NLS-1$ //$NON-NLS-2$
-		File tools= javaHomePath.toFile();
+		newjh= newjh.append("lib").append("tools.jar"); //$NON-NLS-1$ //$NON-NLS-2$
+		File tools= newjh.toFile();
 		if (!tools.exists()) {
 			//attempt to find in the older 1.1.* 
-			javaHomePath= javaHomePath.removeLastSegments(1);
-			javaHomePath= javaHomePath.append("classes.zip"); //$NON-NLS-1$
-			tools= javaHomePath.toFile();
+			newjh= newjh.removeLastSegments(1);
+			newjh= newjh.append("classes.zip"); //$NON-NLS-1$
+			tools= newjh.toFile();
 			if (!tools.exists()) {
 				return null;
 			}
@@ -892,7 +905,7 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
 	private void addLibraries(Bundle source, List destination) throws IOException, MalformedURLException {
 		ManifestElement[] libraries = null;
 		try {
-			libraries = ManifestElement.parseHeader(Constants.BUNDLE_CLASSPATH, (String) source.getHeaders("").get(Constants.BUNDLE_CLASSPATH)); //$NON-NLS-1$
+			libraries = ManifestElement.parseHeader(Constants.BUNDLE_CLASSPATH, (String) source.getHeaders(IAntCoreConstants.EMPTY_STRING).get(Constants.BUNDLE_CLASSPATH));
 		} catch (BundleException e) {
 			IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_MALFORMED_URL, InternalCoreAntMessages.AntCorePreferences_0, e);
 			AntCorePlugin.getPlugin().getLog().log(status);
@@ -1503,13 +1516,13 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
 	 */
 	protected String[] getArrayFromString(String list) {
 		String separator= ","; //$NON-NLS-1$
-		if (list == null || list.trim().equals("")) { //$NON-NLS-1$
+		if (list == null || list.trim().equals(IAntCoreConstants.EMPTY_STRING)) {
 			return new String[0];
 		}
 		ArrayList result = new ArrayList();
 		for (StringTokenizer tokens = new StringTokenizer(list, separator); tokens.hasMoreTokens();) {
 			String token = tokens.nextToken().trim();
-			if (!token.equals("")) { //$NON-NLS-1$
+			if (!token.equals(IAntCoreConstants.EMPTY_STRING)) {
 				result.add(token);
 			}
 		}
@@ -1547,7 +1560,7 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
 		}	
 		
 		if (customTasks.length == 0) {
-			prefs.setValue(IAntCoreConstants.PREFERENCE_TASKS, ""); //$NON-NLS-1$
+			prefs.setValue(IAntCoreConstants.PREFERENCE_TASKS, IAntCoreConstants.EMPTY_STRING);
 			return;
 		}
 		StringBuffer tasks = new StringBuffer();
@@ -1569,7 +1582,7 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
 		}	
 				
 		if (customTypes.length == 0) {
-			prefs.setValue(IAntCoreConstants.PREFERENCE_TYPES, ""); //$NON-NLS-1$
+			prefs.setValue(IAntCoreConstants.PREFERENCE_TYPES, IAntCoreConstants.EMPTY_STRING);
 			return;
 		}
 		StringBuffer types = new StringBuffer();
@@ -1591,7 +1604,7 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
 		}
 		
 		if (customProperties.length == 0) {
-			prefs.setValue(IAntCoreConstants.PREFERENCE_PROPERTIES, ""); //$NON-NLS-1$
+			prefs.setValue(IAntCoreConstants.PREFERENCE_PROPERTIES, IAntCoreConstants.EMPTY_STRING);
 			return;
 		}
 		StringBuffer properties = new StringBuffer();
@@ -1604,8 +1617,8 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
 	}
 
 	protected void updateAdditionalEntries(Preferences prefs) {
-		prefs.setValue("urls", ""); //old constant removed  //$NON-NLS-1$//$NON-NLS-2$
-		String serialized= ""; //$NON-NLS-1$
+		prefs.setValue("urls", IAntCoreConstants.EMPTY_STRING); //old constant removed  //$NON-NLS-1$
+		String serialized= IAntCoreConstants.EMPTY_STRING;
 		IAntClasspathEntry toolsJarEntry= getToolsJarEntry();
 		List userLibs= getUserLibraries();
 		if (userLibs == null) {
@@ -1635,7 +1648,7 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
 		
 		prefs.setValue(IAntCoreConstants.PREFERENCE_ADDITIONAL_ENTRIES, serialized);
 		
-		String prefAntHome= ""; //$NON-NLS-1$
+		String prefAntHome= IAntCoreConstants.EMPTY_STRING;
 		if (antHome != null && !antHome.equals(getDefaultAntHome())) {
 			prefAntHome= antHome;
 		} 
@@ -1643,7 +1656,7 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
 	}
 	
 	protected void updateAntHomeEntries(Preferences prefs) {
-		prefs.setValue("ant_urls", ""); //old constant removed  //$NON-NLS-1$//$NON-NLS-2$
+		prefs.setValue("ant_urls", IAntCoreConstants.EMPTY_STRING); //old constant removed  //$NON-NLS-1$
 		
 		//see if the custom entries are just the default entries
 		IAntClasspathEntry[] defaultEntries= getDefaultAntHomeEntries();
@@ -1660,7 +1673,7 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
 		if (dflt) {
 			//always want to recalculate the default Ant urls
 			//to pick up any changes in the default Ant classpath
-			prefs.setValue(IAntCoreConstants.PREFERENCE_ANT_HOME_ENTRIES, ""); //$NON-NLS-1$
+			prefs.setValue(IAntCoreConstants.PREFERENCE_ANT_HOME_ENTRIES, IAntCoreConstants.EMPTY_STRING);
 			return;
 		}
 		StringBuffer entries = new StringBuffer();
diff --git a/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/core/AntRunner.java b/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/core/AntRunner.java
index edddfbf..c16eb11 100644
--- a/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/core/AntRunner.java
+++ b/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/core/AntRunner.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -340,7 +340,7 @@ public class AntRunner implements IApplication {
 			
 			if (buildLoggerClassName == null) {
 				//indicate that the default logger is not to be used
-				buildLoggerClassName= ""; //$NON-NLS-1$
+				buildLoggerClassName= IAntCoreConstants.EMPTY_STRING;
 			}
 			// add build logger
 			Method addBuildLogger = classInternalAntRunner.getMethod("addBuildLogger", new Class[] { String.class }); //$NON-NLS-1$
diff --git a/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/core/IAntPropertyValueProvider.java b/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/core/IAntPropertyValueProvider.java
index 0cf7155..6f250b3 100644
--- a/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/core/IAntPropertyValueProvider.java
+++ b/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/core/IAntPropertyValueProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2005 BBDO Detroit and others.
+ * Copyright (c) 2003, 2006 BBDO Detroit and others.
  * All rights reserved. This program and the accompanying materials 
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/core/ProjectInfo.java b/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/core/ProjectInfo.java
index 41b1605..0db8c2a 100644
--- a/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/core/ProjectInfo.java
+++ b/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/core/ProjectInfo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.ant.core;
 
+import org.eclipse.ant.internal.core.IAntCoreConstants;
+
 
 /**
  * Represents information about a project within an Ant build file.
@@ -28,12 +30,12 @@ public class ProjectInfo {
 	 * Create a project information
 	 * 
 	 * @param name project name
-	 * @param description a brief explanation of the project's purpose 		or
+	 * @param description a brief explanation of the project's purpose or
 	 * <code>null</code> if not specified
 	 */
 	/*package*/
 	ProjectInfo(String name, String description) {
-		this.name = name == null ? "" : name; //$NON-NLS-1$
+		this.name = name == null ? IAntCoreConstants.EMPTY_STRING : name;
 		this.description = description;
 	}
 
diff --git a/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/core/TargetInfo.java b/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/core/TargetInfo.java
index bfec707..7eede73 100644
--- a/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/core/TargetInfo.java
+++ b/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/core/TargetInfo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.ant.core;
 
+import org.eclipse.ant.internal.core.IAntCoreConstants;
+
 
 /**
  * Represents information about a target within an Ant build file.
@@ -38,7 +40,7 @@ public class TargetInfo {
 	 */
 	/*package*/
 	TargetInfo(ProjectInfo project, String name, String description, String[] dependencies, boolean isDefault) {
-		this.name = name == null ? "" : name; //$NON-NLS-1$
+		this.name = name == null ? IAntCoreConstants.EMPTY_STRING : name;
 		this.description = description;
 		this.project = project;
 		this.dependencies = dependencies;
diff --git a/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntClasspathEntry.java b/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntClasspathEntry.java
index 45d19ec..9069438 100644
--- a/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntClasspathEntry.java
+++ b/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntClasspathEntry.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -42,10 +42,10 @@ public class AntClasspathEntry implements IAntClasspathEntry {
 		}
 		try {
 			String expanded = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(entryString);
-			return new URL("file:" + expanded); //$NON-NLS-1$
+			return new URL(IAntCoreConstants.FILE_PROTOCOL + expanded);
 		} catch (CoreException e) {
 			try {
-				return new URL("file:" + entryString); //$NON-NLS-1$
+				return new URL(IAntCoreConstants.FILE_PROTOCOL + entryString);
 			} catch (MalformedURLException e1) {
 				return null;
 			}
diff --git a/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntCoreUtil.java b/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntCoreUtil.java
index 483b4b3..1bc54fb 100644
--- a/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntCoreUtil.java
+++ b/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntCoreUtil.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
+ * Copyright (c) 2004, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -73,12 +73,12 @@ public class AntCoreUtil {
 		}
 		commands.remove(index);
 		if (index == commands.size()) {// if this is the last command
-			return ""; //$NON-NLS-1$
+			return IAntCoreConstants.EMPTY_STRING;
 		}
 		
 		String command = (String) commands.get(index);
 		if (command.startsWith("-")) { //new parameter //$NON-NLS-1$
-			return ""; //$NON-NLS-1$
+			return IAntCoreConstants.EMPTY_STRING;
 		}
 		commands.remove(index);
 		return command;
@@ -94,7 +94,7 @@ public class AntCoreUtil {
 				int posEq = name.indexOf("="); //$NON-NLS-1$
 				if (posEq == 0) {
 					value= name.substring(1);
-					name= ""; //$NON-NLS-1$
+					name= IAntCoreConstants.EMPTY_STRING;
 				} else if (posEq > 0 && posEq != name.length() - 1) {
 					value = name.substring(posEq + 1).trim();
 					name = name.substring(0, posEq);
diff --git a/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntObject.java b/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntObject.java
index 2b0fc00..30ab90f 100644
--- a/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntObject.java
+++ b/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntObject.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -82,7 +82,7 @@ public abstract class AntObject {
 	 * @see java.lang.Object#toString()
 	 */
 	public String toString() {
-		if (fURI == null || fURI.equals("") || fURI.equals("antlib:org.apache.tools.ant")) {  //$NON-NLS-1$//$NON-NLS-2$
+		if (fURI == null || fURI.equals(IAntCoreConstants.EMPTY_STRING) || fURI.equals("antlib:org.apache.tools.ant")) {  //$NON-NLS-1$
             return fName;
         }
 		return fURI + ':' + fName;
diff --git a/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/IAntCoreConstants.java b/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/IAntCoreConstants.java
index 30c2dbc..d969f33 100644
--- a/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/IAntCoreConstants.java
+++ b/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/IAntCoreConstants.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.ant.internal.core;
 
+import org.eclipse.ant.core.AntCorePlugin;
+
 
 /**
  * Common constants.
@@ -43,4 +45,83 @@ public interface IAntCoreConstants {
 	public static final String PREFERENCE_PROPERTIES = "properties"; //$NON-NLS-1$
 	public static final String PREFERENCE_PROPERTY_FILES = "propertyfiles"; //$NON-NLS-1$
 	public static final String PREFIX_PROPERTY = "property."; //$NON-NLS-1$
+
+	/**
+	 * Constant for the word 'default'
+	 * <br><br>
+	 * Value is: <code>default</code>
+	 * 
+	 * @since org.eclipse.ant.core 3.2.200
+	 */
+	public static final String DEFAULT = "default"; //$NON-NLS-1$
+
+	/**
+	 * Constant for the word 'dir'
+	 * <br><br>
+	 * Value is: <code>dir</code>
+	 * 
+	 * @since org.eclipse.ant.core 3.2.200
+	 */
+	public static final String DIR = "dir"; //$NON-NLS-1$
+	
+	/**
+	 * Constant for the empty {@link String}
+	 * 
+	 * @since org.eclipse.ant.core 3.2.200
+	 */
+	public static final String EMPTY_STRING = ""; //$NON-NLS-1$
+	
+	/**
+	 * Constant for the word 'file'
+	 * <br><br>
+	 * Value is: <code>file</code>
+	 * 
+	 * @since org.eclipse.ant.core 3.2.200
+	 */
+	public static final String FILE = "file"; //$NON-NLS-1$
+
+	/**
+	 * Constant representing a file URL protocol
+	 * <br><br>
+	 * Value is: <code>file:</code>
+	 * 
+	 * @since org.eclipse.ant.core 3.2.200
+	 */
+	public static final String FILE_PROTOCOL = "file:"; //$NON-NLS-1$
+	
+	/**
+	 * Constant for the word 'name'
+	 * <br><br>
+	 * Value is: <code>name</code>
+	 * 
+	 * @since org.eclipse.ant.core 3.2.200
+	 */
+	public static final String NAME = AntCorePlugin.NAME;
+
+	/**
+	 * Constant for the word 'value'
+	 * <br><br>
+	 * Value is: <code>value</code>
+	 * 
+	 * @since org.eclipse.ant.core 3.2.200
+	 */
+	public static final String VALUE = AntCorePlugin.VALUE;
+
+	/**
+	 * Constant for the word 'description'
+	 * <br><br>
+	 * Value is: <code>description</code>
+	 * 
+	 * @since org.eclipse.ant.core 3.2.200
+	 */
+	public static final String DESCRIPTION = "description"; //$NON-NLS-1$
+
+	/**
+	 * Constant for the encoding <code>UTF-8</code>
+	 * <br><br>
+	 * Value is: <code>UTF-8</code>
+	 * 
+	 * @since org.eclipse.ant.core 3.3.0
+	 */
+	public static final String UTF_8 = "UTF-8"; //$NON-NLS-1$
 }
diff --git a/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/contentDescriber/AntHandler.java b/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/contentDescriber/AntHandler.java
index 22d5b4b..2a48c60 100644
--- a/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/contentDescriber/AntHandler.java
+++ b/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/contentDescriber/AntHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
+ * Copyright (c) 2004, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,6 +18,7 @@ import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
+import org.eclipse.ant.internal.core.IAntCoreConstants;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -55,7 +56,6 @@ public final class AntHandler extends DefaultHandler {
         }
     }
 
-    private static final String DEFAULT_ATTRIBUTE= "default"; //$NON-NLS-1$
     private static final String PROJECT = "project"; //$NON-NLS-1$
     private static final String TARGET= "target"; //$NON-NLS-1$
     private static final String MACRODEF= "macrodef"; //$NON-NLS-1$
@@ -141,7 +141,7 @@ public final class AntHandler extends DefaultHandler {
      * @see org.xml.sax.helpers.DefaultHandler#resolveEntity(java.lang.String, java.lang.String)
      */
     public InputSource resolveEntity(String publicId, String systemId) throws SAXException {
-        return new InputSource(new StringReader("")); //$NON-NLS-1$
+        return new InputSource(new StringReader(IAntCoreConstants.EMPTY_STRING));
     }
 
     /*
@@ -158,7 +158,7 @@ public final class AntHandler extends DefaultHandler {
                 throw new StopParsingException();
             }
             if (attributes != null) {
-                fDefaultAttributeFound= attributes.getValue(DEFAULT_ATTRIBUTE) != null;
+                fDefaultAttributeFound= attributes.getValue(IAntCoreConstants.DEFAULT) != null;
                 if (fDefaultAttributeFound) {
                     throw new StopParsingException();
                 }
diff --git a/eclipse/plugins/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntRunner.java b/eclipse/plugins/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntRunner.java
index 4b69c48..752c21a 100644
--- a/eclipse/plugins/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntRunner.java
+++ b/eclipse/plugins/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntRunner.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2000, 2009 IBM Corporation and others.
+ *  Copyright (c) 2000, 2011 IBM Corporation and others.
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
@@ -55,6 +55,7 @@ import org.eclipse.ant.core.Type;
 import org.eclipse.ant.internal.core.AbstractEclipseBuildLogger;
 import org.eclipse.ant.internal.core.AntCoreUtil;
 import org.eclipse.ant.internal.core.AntSecurityManager;
+import org.eclipse.ant.internal.core.IAntCoreConstants;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IPath;
@@ -739,7 +740,7 @@ public class InternalAntRunner {
 	private BuildLogger createLogger() {
 		if (loggerClassname == null) {
 			buildLogger= new DefaultLogger();
-		} else if (!"".equals(loggerClassname)) { //$NON-NLS-1$
+		} else if (!IAntCoreConstants.EMPTY_STRING.equals(loggerClassname)) {
 			try {
 				buildLogger = (BuildLogger) (Class.forName(loggerClassname).newInstance());
 			} catch (ClassCastException e) {
@@ -837,8 +838,8 @@ public class InternalAntRunner {
 			project.log(message, priority);	
 		} else {
 			if (buildListeners != null) {
-				project = new Project();
-				BuildEvent event = new BuildEvent(project);
+				Project p = new Project();
+				BuildEvent event = new BuildEvent(p);
 				event.setMessage(message, priority);
 				//notify the build listeners that are not registered as
 				//no project existed
@@ -1163,7 +1164,7 @@ public class InternalAntRunner {
 		if (p < 0) { return; }
 
 		// remove everything preceding that last '-arg'
-		String s = ""; //$NON-NLS-1$
+		String s = IAntCoreConstants.EMPTY_STRING;
 		for (int i = 0; i <= p; i++) {
 			s += " " + ((String) commands.get(0)); //$NON-NLS-1$
 			commands.remove(0);
diff --git a/eclipse/plugins/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/ProgressBuildListener.java b/eclipse/plugins/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/ProgressBuildListener.java
index f192299..c069c4c 100644
--- a/eclipse/plugins/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/ProgressBuildListener.java
+++ b/eclipse/plugins/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/ProgressBuildListener.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2000, 2009 IBM Corporation and others.
+ *  Copyright (c) 2000, 2011 IBM Corporation and others.
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
@@ -28,6 +28,7 @@ import org.apache.tools.ant.Task;
 import org.apache.tools.ant.taskdefs.Ant;
 import org.apache.tools.ant.taskdefs.CallTarget;
 import org.eclipse.ant.core.AntCorePlugin;
+import org.eclipse.ant.internal.core.IAntCoreConstants;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
@@ -94,10 +95,11 @@ public class ProgressBuildListener implements BuildListener {
 		projects = new HashMap();
 		mainProject = project;
 		ProjectMonitors monitors = new ProjectMonitors();
-		if (monitor == null) {
-			monitor= new NullProgressMonitor();
+		IProgressMonitor localmonitor = monitor;
+		if (localmonitor == null) {
+			localmonitor= new NullProgressMonitor();
 		}
-		monitors.setMainMonitor(monitor);
+		monitors.setMainMonitor(localmonitor);
 		projects.put(mainProject, monitors);
 		List targets= new ArrayList(targetNames.size());
 		for (int i = 0; i < targetNames.size(); i++) {
@@ -108,7 +110,7 @@ public class ProgressBuildListener implements BuildListener {
 			}
 		}
 		int work = computeWork(targets);
-		monitors.getMainMonitor().beginTask("", work);  //$NON-NLS-1$
+		monitors.getMainMonitor().beginTask(IAntCoreConstants.EMPTY_STRING, work);
 	}
 
 	/* (non-Javadoc)
@@ -190,7 +192,7 @@ public class ProgressBuildListener implements BuildListener {
 
 		monitors.setTargetMonitor(subMonitorFor(monitors.getMainMonitor(), 1));
 		int work = (target != null) ? target.getTasks().length : 100;
-		monitors.getTargetMonitor().beginTask("", work);  //$NON-NLS-1$
+		monitors.getTargetMonitor().beginTask(IAntCoreConstants.EMPTY_STRING, work);
 	}
 
 	protected ProjectMonitors createMonitors(Project currentProject, Target target) {
@@ -209,7 +211,7 @@ public class ProgressBuildListener implements BuildListener {
 			parentProject = null;
 			monitors.setMainMonitor(subMonitorFor(parentMonitors.getTaskMonitor(), 1));
 		}
-		monitors.getMainMonitor().beginTask("", work);  //$NON-NLS-1$
+		monitors.getMainMonitor().beginTask(IAntCoreConstants.EMPTY_STRING, work);
 		projects.put(currentProject, monitors);
 		return monitors;
 	}
@@ -255,7 +257,7 @@ public class ProgressBuildListener implements BuildListener {
 		}
 		currentTaskThread= Thread.currentThread();
 		monitors.setTaskMonitor(subMonitorFor(monitors.getTargetMonitor(), 1));
-		monitors.getTaskMonitor().beginTask("", 1);  //$NON-NLS-1$
+		monitors.getTaskMonitor().beginTask(IAntCoreConstants.EMPTY_STRING, 1);
 		// If this script is calling another one, track the project chain.
 		if (task instanceof Ant) {
 			parentProject = currentProject;
diff --git a/eclipse/plugins/org.eclipse.ant.launching/.settings/org.eclipse.jdt.core.prefs b/eclipse/plugins/org.eclipse.ant.launching/.settings/org.eclipse.jdt.core.prefs
index 8bd34ab..0a0e78e 100644
--- a/eclipse/plugins/org.eclipse.ant.launching/.settings/org.eclipse.jdt.core.prefs
+++ b/eclipse/plugins/org.eclipse.ant.launching/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,13 @@
-#Sun Sep 20 13:08:07 CEST 2009
+#Thu May 05 15:06:07 CDT 2011
 eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
@@ -7,68 +15,93 @@ org.eclipse.jdt.core.compiler.compliance=1.4
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
 org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=error
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=ignore
 org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
 org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
 org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
 org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
 org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
 org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
 org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
 org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
 org.eclipse.jdt.core.compiler.problem.nullReference=error
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
 org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
 org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/eclipse/plugins/org.eclipse.ant.launching/.settings/org.eclipse.jdt.launching.prefs b/eclipse/plugins/org.eclipse.ant.launching/.settings/org.eclipse.jdt.launching.prefs
new file mode 100644
index 0000000..5ee1bba
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.ant.launching/.settings/org.eclipse.jdt.launching.prefs
@@ -0,0 +1,3 @@
+#Wed Feb 02 09:42:25 CST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=error
diff --git a/eclipse/plugins/org.eclipse.ant.launching/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.ant.launching/META-INF/MANIFEST.MF
index dd528aa..e62489a 100644
--- a/eclipse/plugins/org.eclipse.ant.launching/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.ant.launching/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.ant.launching;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.0.100.qualifier
 Bundle-Activator: org.eclipse.ant.internal.launching.AntLaunching
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.debug.core;bundle-version="[3.6.0,4.0.0)",
diff --git a/eclipse/plugins/org.eclipse.ant.launching/common/org/eclipse/ant/internal/launching/debug/AntDebugState.java b/eclipse/plugins/org.eclipse.ant.launching/common/org/eclipse/ant/internal/launching/debug/AntDebugState.java
index 27592ec..49332ed 100644
--- a/eclipse/plugins/org.eclipse.ant.launching/common/org/eclipse/ant/internal/launching/debug/AntDebugState.java
+++ b/eclipse/plugins/org.eclipse.ant.launching/common/org/eclipse/ant/internal/launching/debug/AntDebugState.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
+ * Copyright (c) 2005, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -24,6 +24,7 @@ import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Target;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.taskdefs.MacroInstance;
+import org.eclipse.ant.internal.core.IAntCoreConstants;
 import org.eclipse.ant.internal.launching.debug.model.DebugMessageIds;
 
 public class AntDebugState {
@@ -59,6 +60,39 @@ public class AntDebugState {
 		fLogger= logger;
 	}
 
+	public void buildStarted() {
+        fProjectToTargetNames= new HashMap();
+        fProjectToMapOfTargetToBuildSequence= new HashMap();
+    }
+    
+    /**
+     * Call-back from {@link org.eclipse.ant.internal.launching.runtime.logger.AntProcessDebugBuildLogger}
+     * when the build has finished
+     * @since 1.0.1
+     */
+    public void buildFinished() {
+    	if(fProjectToTargetNames != null) {
+    		fProjectToTargetNames.clear();
+    	}
+    	if(fProjectToMapOfTargetToBuildSequence != null) {
+    		fProjectToMapOfTargetToBuildSequence.clear();
+    	}
+    	fTargetsExecuting.clear();
+    	fTargetsToExecute.clear();
+    	if(fInitialProperties != null) {
+    		fInitialProperties.clear();
+    	}
+    	if(fProperties != null) {
+    		fProperties.clear();
+    	}
+    	if(fTaskToProxies != null) {
+    		fTaskToProxies.clear();
+    	}
+    	if(fTasks != null) {
+    		fTasks.clear();
+    	}
+    }
+	
 	public void waitIfSuspended() {
 		fLogger.waitIfSuspended();
 	}
@@ -128,7 +162,9 @@ public class AntDebugState {
 
 	public void setTargetExecuting(Target target) {
         if (target == null) {
-            fTargetsExecuting.pop();
+        	if(!fTargetsExecuting.isEmpty()) {
+        		fTargetsExecuting.pop();
+        	}
         } else {
             fTargetsExecuting.push(target);
         }
@@ -209,34 +245,38 @@ public class AntDebugState {
 		
 		setCurrentTask(event.getTask());
 		setConsiderTargetBreakpoints(false);
-		if (!getTasks().isEmpty()) {
+		Stack tasks = getTasks();
+		if (!tasks.isEmpty()) {
 			//cache the parent task proxy as when that task is started or finished the
 			//proxy is not yet available or is nulled out
-			Task parentTask = (Task) getTasks().peek();
+			Task parentTask = (Task) tasks.peek();
 			Object proxy = parentTask.getRuntimeConfigurableWrapper().getProxy();
 			if (proxy != null) {
 				fTaskToProxies.put(parentTask, proxy);
 			}
 		}
-		getTasks().push(getCurrentTask());
+		tasks.push(getCurrentTask());
 		waitIfSuspended();
 	}
 	
 
     public void taskFinished() {
-    	Task lastTask= (Task)getTasks().pop();
-        setLastTaskFinished(lastTask);
-        setCurrentTask(null);
-        String taskName= lastTask.getTaskName();
-       
-        if (getStepOverTask() != null) {
-        	if ((fgAntCallTaskName.equals(taskName) || fgAntTaskName.equals(taskName)) && (!fgAntCallTaskName.equals(getStepOverTask().getTaskName()) && !fgAntTaskName.equals(getStepOverTask().getTaskName()))) {
-        		setShouldSuspend(true);
-        	} else if (fTaskToProxies.remove(lastTask) instanceof MacroInstance) {
-        		setShouldSuspend(true);
-        	}
-        }
-        waitIfSuspended();
+    	Stack tasks = getTasks();
+    	if(!tasks.empty()) {
+	    	Task lastTask= (Task)tasks.pop();
+	        setLastTaskFinished(lastTask);
+	        setCurrentTask(null);
+	        String taskName= lastTask.getTaskName();
+	       
+	        if (getStepOverTask() != null) {
+	        	if ((fgAntCallTaskName.equals(taskName) || fgAntTaskName.equals(taskName)) && (!fgAntCallTaskName.equals(getStepOverTask().getTaskName()) && !fgAntTaskName.equals(getStepOverTask().getTaskName()))) {
+	        		setShouldSuspend(true);
+	        	} else if (fTaskToProxies.remove(lastTask) instanceof MacroInstance) {
+	        		setShouldSuspend(true);
+	        	}
+	        }
+    	}
+    	 waitIfSuspended();
     }
 
     public void stepOver() {
@@ -360,13 +400,13 @@ public class AntDebugState {
         Project projectExecuting= null;
         if (targetExecuting != null) {
             projectExecuting= targetExecuting.getProject();
-        } else { //no target...must be a task
+        } else if(!tasks.empty()) { //no target...must be a task
             Task task= (Task) tasks.peek();
             projectExecuting= task.getProject();
         }
         
 		if (!isAfterTaskEvent()) {
-			appendToStack(stackRepresentation, targetExecuting.getName(), "", getLocation(targetExecuting)); //$NON-NLS-1$
+			appendToStack(stackRepresentation, targetExecuting.getName(), IAntCoreConstants.EMPTY_STRING, getLocation(targetExecuting));
 		}
 		for (int i = tasks.size() - 1; i >= 0 ; i--) {
 			Task task= (Task) tasks.get(i);
@@ -406,20 +446,21 @@ public class AntDebugState {
 	     	for (int i = startIndex; i <= dependancyStackDepth; i++) {
 	     		stackTarget= (Target) buildSequence.get(i);
 	            if (stackTarget.dependsOn(targetExecuting.getName())) {
-	     		    appendToStack(stackRepresentation, stackTarget.getName(), "", getLocation(stackTarget)); //$NON-NLS-1$
+	     		    appendToStack(stackRepresentation, stackTarget.getName(), IAntCoreConstants.EMPTY_STRING, getLocation(stackTarget));
 	            }
 	     	}
 	     }
     }
 
 	public void marshallProperties(StringBuffer propertiesRepresentation, boolean escapeLineSep) {
-		if (getTasks().isEmpty()) {
+		Stack tasks = getTasks();
+		if (tasks.isEmpty()) {
 			return;
 		}
 	    propertiesRepresentation.append(DebugMessageIds.PROPERTIES);
 	    propertiesRepresentation.append(DebugMessageIds.MESSAGE_DELIMITER);
 		
-		Project project= ((Task)getTasks().peek()).getProject();
+		Project project= ((Task)tasks.peek()).getProject();
 		Map lastProperties= getProperties(); 
 		
 	    Map currentProperties= project.getProperties();
@@ -522,9 +563,4 @@ public class AntDebugState {
 	    //the target to execute
 	    return (Target) allTargets.get(targets.remove(0));
 	}
-    
-    public void buildStarted() {
-        fProjectToTargetNames= new HashMap();
-        fProjectToMapOfTargetToBuildSequence= new HashMap();
-    }
 }
diff --git a/eclipse/plugins/org.eclipse.ant.launching/loggers/org/eclipse/ant/internal/launching/runtime/logger/AntProcessBuildLogger.java b/eclipse/plugins/org.eclipse.ant.launching/loggers/org/eclipse/ant/internal/launching/runtime/logger/AntProcessBuildLogger.java
index f8acbe4..3be4461 100644
--- a/eclipse/plugins/org.eclipse.ant.launching/loggers/org/eclipse/ant/internal/launching/runtime/logger/AntProcessBuildLogger.java
+++ b/eclipse/plugins/org.eclipse.ant.launching/loggers/org/eclipse/ant/internal/launching/runtime/logger/AntProcessBuildLogger.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -21,6 +21,7 @@ import org.apache.tools.ant.Location;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Target;
 import org.eclipse.ant.internal.core.AbstractEclipseBuildLogger;
+import org.eclipse.ant.internal.core.IAntCoreConstants;
 import org.eclipse.ant.internal.launching.AntLaunch;
 import org.eclipse.ant.internal.launching.AntLaunching;
 import org.eclipse.ant.internal.launching.AntLaunchingUtil;
@@ -217,7 +218,7 @@ public class AntProcessBuildLogger extends NullBuildLogger {
     				}
     				line = r.readLine();
     			}
-    			logMessage("", event, Project.MSG_ERR); //$NON-NLS-1$
+    			logMessage(IAntCoreConstants.EMPTY_STRING, event, Project.MSG_ERR);
     		} catch (IOException e) {
     		}
         }
diff --git a/eclipse/plugins/org.eclipse.ant.launching/loggers/org/eclipse/ant/internal/launching/runtime/logger/AntProcessDebugBuildLogger.java b/eclipse/plugins/org.eclipse.ant.launching/loggers/org/eclipse/ant/internal/launching/runtime/logger/AntProcessDebugBuildLogger.java
index 13ddfa3..04bd7f5 100644
--- a/eclipse/plugins/org.eclipse.ant.launching/loggers/org/eclipse/ant/internal/launching/runtime/logger/AntProcessDebugBuildLogger.java
+++ b/eclipse/plugins/org.eclipse.ant.launching/loggers/org/eclipse/ant/internal/launching/runtime/logger/AntProcessDebugBuildLogger.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -56,6 +56,36 @@ public class AntProcessDebugBuildLogger extends AntProcessBuildLogger implements
 	}
 
 	/* (non-Javadoc)
+	 * @see org.eclipse.ant.internal.launching.runtime.logger.AntProcessBuildLogger#buildFinished(org.apache.tools.ant.BuildEvent)
+	 */
+	public void buildFinished(BuildEvent event) {
+		super.buildFinished(event);
+		cleanup();
+	}
+	
+	/**
+	 * Cleans up all held memory.
+	 * <br><br>
+	 * Called from {@link #buildFinished(BuildEvent)} and {@link #terminate()}
+	 * @since 1.0.1
+	 */
+	void cleanup() {
+		if(fAntDebugTarget != null) {
+			IProcess process= getAntProcess(fProcessId);
+			if(process != null) {
+				ILaunch launch= process.getLaunch();
+				launch.removeDebugTarget(fAntDebugTarget);
+			}
+		}
+		if(fDebugState != null) {
+			fDebugState.buildFinished();
+		}
+		if(fBreakpoints != null) {
+			fBreakpoints.clear();
+		}
+	}
+	
+	/* (non-Javadoc)
 	 * @see org.apache.tools.ant.BuildListener#taskFinished(org.apache.tools.ant.BuildEvent)
 	 */
 	public void taskFinished(BuildEvent event) {
@@ -147,6 +177,13 @@ public class AntProcessDebugBuildLogger extends AntProcessBuildLogger implements
 	}
 
 	/* (non-Javadoc)
+	 * @see org.eclipse.ant.internal.launching.debug.IAntDebugController#terminate()
+	 */
+	public void terminate() {
+		cleanup();
+	}
+	
+	/* (non-Javadoc)
 	 * @see org.eclipse.ant.internal.ui.debug.IAntDebugController#stepOver()
 	 */
 	public synchronized void stepOver() {
@@ -176,7 +213,7 @@ public class AntProcessDebugBuildLogger extends AntProcessBuildLogger implements
 	 * @see org.eclipse.ant.internal.ui.debug.IAntDebugController#getProperties()
 	 */
 	public void getProperties() {
-		if (!fAntDebugTarget.isSuspended()) {
+		if (fAntDebugTarget == null || !fAntDebugTarget.isSuspended()) {
 			return;
 		}
 	    StringBuffer propertiesRepresentation= new StringBuffer();
@@ -234,7 +271,9 @@ public class AntProcessDebugBuildLogger extends AntProcessBuildLogger implements
 	 */
 	public void targetFinished(BuildEvent event) {
 		super.targetFinished(event);
-		fDebugState.setTargetExecuting(null);
+		if(fDebugState != null) {
+			fDebugState.setTargetExecuting(null);
+		}
 	}
 
 	/* (non-Javadoc)
diff --git a/eclipse/plugins/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/InternalAntRunner.java b/eclipse/plugins/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/InternalAntRunner.java
index 1119f39..990a5e6 100644
--- a/eclipse/plugins/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/InternalAntRunner.java
+++ b/eclipse/plugins/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/InternalAntRunner.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * Portions Copyright  2000-2005 The Apache Software Foundation
  * All rights reserved. This program and the accompanying materials are made 
  * available under the terms of the Apache Software License v2.0 which 
@@ -46,6 +46,7 @@ import org.apache.tools.ant.Target;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.TaskAdapter;
 import org.apache.tools.ant.util.FileUtils;
+import org.eclipse.ant.internal.core.IAntCoreConstants;
 import org.eclipse.ant.internal.launching.remote.logger.RemoteAntBuildLogger;
 
 /**
@@ -222,7 +223,7 @@ public class InternalAntRunner {
 		//notify the logger that project help message are coming
 		//since there is no buildstarted or targetstarted to 
 		//to be used to establish the connection
-		logMessage(project, "", MSG_PROJECT_HELP); //$NON-NLS-1$
+		logMessage(project, IAntCoreConstants.EMPTY_STRING, MSG_PROJECT_HELP);
 		// find the target with the longest name
 		int maxLength = 0;
 		Enumeration ptargets = project.getTargets().elements();
@@ -255,7 +256,7 @@ public class InternalAntRunner {
 		Collections.sort(topDescriptions);
 		
 		String defaultTargetName = project.getDefaultTarget();
-		if (defaultTargetName != null && !"".equals(defaultTargetName)) { // shouldn't need to check but... //$NON-NLS-1$
+		if (defaultTargetName != null && !IAntCoreConstants.EMPTY_STRING.equals(defaultTargetName)) { // shouldn't need to check but...
 			List defaultName = new ArrayList(1);
 			List defaultDesc = null;
 			defaultName.add(defaultTargetName);
@@ -521,7 +522,7 @@ public class InternalAntRunner {
 	private BuildLogger createLogger() {
 		if (loggerClassname == null) {
 			buildLogger= new DefaultLogger();
-		} else if (!"".equals(loggerClassname)) { //$NON-NLS-1$
+		} else if (!IAntCoreConstants.EMPTY_STRING.equals(loggerClassname)) {
 			try {
 				buildLogger = (BuildLogger) (Class.forName(loggerClassname).newInstance());
 			} catch (ClassCastException e) {
@@ -586,8 +587,8 @@ public class InternalAntRunner {
 			project.log(message, priority);	
 		} else {
 			if (buildListeners != null) {
-				project = new Project();
-				BuildEvent event = new BuildEvent(project);
+				Project p = new Project();
+				BuildEvent event = new BuildEvent(p);
 				event.setMessage(message, priority);
 				//notify the build listeners that are not registered as
 				//no project existed
@@ -879,7 +880,7 @@ public class InternalAntRunner {
 		if (p < 0) { return; }
 
 		// remove everything preceding that last '-arg'
-		String s = ""; //$NON-NLS-1$
+		String s = IAntCoreConstants.EMPTY_STRING;
 		for (int i = 0; i <= p; i++) {
 			s += " " + ((String) commands.get(0)); //$NON-NLS-1$
 			commands.remove(0);
@@ -981,7 +982,7 @@ public class InternalAntRunner {
 				int posEq = name.indexOf("="); //$NON-NLS-1$
 				if (posEq == 0) {
 					value= name.substring(1);
-					name= ""; //$NON-NLS-1$
+					name= IAntCoreConstants.EMPTY_STRING;
 				} else if (posEq > 0 && posEq != name.length() - 1) {
 					value = name.substring(posEq + 1).trim();
 					name = name.substring(0, posEq);
@@ -1138,12 +1139,12 @@ public class InternalAntRunner {
 		}
 		commands.remove(index);
 		if (index == commands.size()) {// if this is the last command
-			return ""; //$NON-NLS-1$
+			return IAntCoreConstants.EMPTY_STRING;
 		}
 		
 		String command = (String) commands.get(index);
 		if (command.startsWith("-")) { //new parameter //$NON-NLS-1$
-			return ""; //$NON-NLS-1$
+			return IAntCoreConstants.EMPTY_STRING;
 		}
 		
 		commands.remove(index);
diff --git a/eclipse/plugins/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/logger/RemoteAntBuildLogger.java b/eclipse/plugins/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/logger/RemoteAntBuildLogger.java
index fcaa8dd..95aad77 100644
--- a/eclipse/plugins/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/logger/RemoteAntBuildLogger.java
+++ b/eclipse/plugins/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/logger/RemoteAntBuildLogger.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
+ * Copyright (c) 2003, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -29,6 +29,7 @@ import org.apache.tools.ant.Location;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Target;
 import org.apache.tools.ant.util.StringUtils;
+import org.eclipse.ant.internal.core.IAntCoreConstants;
 import org.eclipse.ant.internal.launching.debug.AntDebugState;
 import org.eclipse.ant.internal.launching.remote.AntSecurityException;
 import org.eclipse.ant.internal.launching.remote.InternalAntRunner;
@@ -55,7 +56,7 @@ public class RemoteAntBuildLogger extends DefaultLogger {
     /**
      * Host to connect to, default is the localhost
      */
-    protected String fHost= ""; //$NON-NLS-1$
+    protected String fHost= IAntCoreConstants.EMPTY_STRING;
     /**
      * Port to connect to.
      */
@@ -311,7 +312,7 @@ public class RemoteAntBuildLogger extends DefaultLogger {
         StringBuffer message;
         String taskName= event.getTask().getTaskName();
         if (taskName != null && taskName.equals(fLastTaskName)) {
-            taskName= ""; //$NON-NLS-1$
+            taskName= IAntCoreConstants.EMPTY_STRING;
         } else {
             fLastTaskName= taskName;
         }
diff --git a/eclipse/plugins/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/logger/RemoteAntDebugBuildLogger.java b/eclipse/plugins/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/logger/RemoteAntDebugBuildLogger.java
index 73f08bb..10f5d35 100644
--- a/eclipse/plugins/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/logger/RemoteAntDebugBuildLogger.java
+++ b/eclipse/plugins/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/logger/RemoteAntDebugBuildLogger.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
+ * Copyright (c) 2003, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -188,6 +188,28 @@ public class RemoteAntDebugBuildLogger extends RemoteAntBuildLogger implements I
 	}
 
 	/* (non-Javadoc)
+	 * @see org.eclipse.ant.internal.launching.remote.logger.RemoteAntBuildLogger#buildFinished(org.apache.tools.ant.BuildEvent)
+	 */
+	public void buildFinished(BuildEvent event) {
+		super.buildFinished(event);
+		fDebugState.buildFinished();
+		fDebugState = null;
+		if(fBreakpoints != null) {
+			fBreakpoints.clear();
+		}
+		if(fRequestReader != null) {
+			try {
+				fRequestReader.close();
+			} catch (IOException e) {
+				
+			}
+		}
+		if(fRequestWriter != null) {
+			fRequestWriter.close();
+		}
+	}
+	
+	/* (non-Javadoc)
 	 * @see org.apache.tools.ant.BuildListener#taskStarted(org.apache.tools.ant.BuildEvent)
 	 */
 	public void taskStarted(BuildEvent event) {
diff --git a/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/AntLaunchingUtil.java b/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/AntLaunchingUtil.java
index 3acfd09..9d59fb5 100644
--- a/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/AntLaunchingUtil.java
+++ b/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/AntLaunchingUtil.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -21,6 +21,7 @@ import java.util.StringTokenizer;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.util.FileUtils;
+import org.eclipse.ant.internal.core.IAntCoreConstants;
 import org.eclipse.ant.internal.launching.launchConfigurations.AntHomeClasspathEntry;
 import org.eclipse.ant.internal.launching.launchConfigurations.AntProcess;
 import org.eclipse.ant.internal.launching.launchConfigurations.RemoteAntRuntimeProcess;
@@ -254,7 +255,7 @@ public final class AntLaunchingUtil {
 		for (int i = 0; i < entries.length; i++) {
 			IRuntimeClasspathEntry entry = entries[i];
 			try {
-				urls[i] = new URL("file:" + entry.getLocation()); //$NON-NLS-1$
+				urls[i] = new URL(IAntCoreConstants.FILE_PROTOCOL + entry.getLocation());
 			} catch (MalformedURLException e) {
 				throw new CoreException(new Status(IStatus.ERROR, AntLaunching
 						.getUniqueIdentifier(), AntLaunching.INTERNAL_ERROR,
diff --git a/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/IAntDebugController.java b/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/IAntDebugController.java
index abeac52..9078d3f 100644
--- a/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/IAntDebugController.java
+++ b/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/IAntDebugController.java
@@ -1,66 +1,72 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.internal.launching.debug;
-
-import org.eclipse.debug.core.model.IBreakpoint;
-
-public interface IAntDebugController {
-	
-    /**
-     * Resume the Ant build
-     */
-	public void resume();
-    
-    /**
-     * Suspend the Ant build
-     */
-	public void suspend();
-    
-     /**
-     * Step into the current Ant task
-     */
-	public void stepInto();
-    
-     /**
-     * Step over the current Ant task
-     */
-	public void stepOver();
-    
-    /**
-     * The provided breakpoint has been added or removed depending on the <code>added</code> parameter.
-     * Updates the controller for this change.
-     * 
-     * @param breakpoint the breakpoint that has been added or removed
-     * @param added whether or not the breakpoint has been added 
-     */
-	public void handleBreakpoint(IBreakpoint breakpoint, boolean added);
-    
-     /**
-     * Retrieve the properties of the Ant build.
-     * May occur asynchronously depending on implementation.
-     */
-	public void getProperties();
-    
-    /**
-     * Retrieve the stack frames of the Ant build.
-     * May occur asynchronously depending on implementation.
-     */
-	public void getStackFrames();
-
-	/**
-	 * Some strings are escaped when marshalled for socket communication.
-	 * The Ant debug controller will properly unescape these Strings if required.
-	 * 
-	 * @param value The buffer of the string to unescape
-	 * @return The unescaped string
-	 */
-	public StringBuffer unescapeString(StringBuffer value);
-}
+/*******************************************************************************
+ * Copyright (c) 2004, 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.ant.internal.launching.debug;
+
+import org.eclipse.debug.core.model.IBreakpoint;
+
+public interface IAntDebugController {
+	
+    /**
+     * Resume the Ant build
+     */
+	public void resume();
+    
+    /**
+     * Suspend the Ant build
+     */
+	public void suspend();
+    
+     /**
+     * Step into the current Ant task
+     */
+	public void stepInto();
+    
+     /**
+     * Step over the current Ant task
+     */
+	public void stepOver();
+	
+	/**
+	 * The debugging session has terminated
+	 * @since 1.0.1
+	 */
+	public void terminate();
+    
+    /**
+     * The provided breakpoint has been added or removed depending on the <code>added</code> parameter.
+     * Updates the controller for this change.
+     * 
+     * @param breakpoint the breakpoint that has been added or removed
+     * @param added whether or not the breakpoint has been added 
+     */
+	public void handleBreakpoint(IBreakpoint breakpoint, boolean added);
+    
+     /**
+     * Retrieve the properties of the Ant build.
+     * May occur asynchronously depending on implementation.
+     */
+	public void getProperties();
+    
+    /**
+     * Retrieve the stack frames of the Ant build.
+     * May occur asynchronously depending on implementation.
+     */
+	public void getStackFrames();
+
+	/**
+	 * Some strings are escaped when marshalled for socket communication.
+	 * The Ant debug controller will properly unescape these Strings if required.
+	 * 
+	 * @param value The buffer of the string to unescape
+	 * @return The unescaped string
+	 */
+	public StringBuffer unescapeString(StringBuffer value);
+}
diff --git a/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/AntDebugTarget.java b/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/AntDebugTarget.java
index 855971d..a320843 100644
--- a/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/AntDebugTarget.java
+++ b/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/AntDebugTarget.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -172,14 +172,14 @@ public class AntDebugTarget extends AntDebugElement implements IDebugTarget, IDe
 	 * @see org.eclipse.debug.core.model.ISuspendResume#canResume()
 	 */
 	public boolean canResume() {
-		return !isTerminated() && isSuspended();
+		return !fTerminated && fSuspended;
 	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.core.model.ISuspendResume#canSuspend()
 	 */
 	public boolean canSuspend() {
-		return !isTerminated() && !isSuspended();
+		return !fTerminated && !fSuspended;
 	}
 	
 	/* (non-Javadoc)
@@ -193,8 +193,12 @@ public class AntDebugTarget extends AntDebugElement implements IDebugTarget, IDe
 	 * @see org.eclipse.debug.core.model.ISuspendResume#resume()
 	 */
 	public void resume() throws DebugException {
-	    fSuspended= false;
-	    fController.resume();
+		fSuspended= false;
+		fController.resume();
+		if(fThread.isSuspended()) {
+			fThread.resumedByTarget();
+		}
+		fireResumeEvent(DebugEvent.CLIENT_REQUEST);
 	}
 	
 	/**
@@ -219,27 +223,31 @@ public class AntDebugTarget extends AntDebugElement implements IDebugTarget, IDe
 	 * @see org.eclipse.debug.core.IBreakpointListener#breakpointAdded(org.eclipse.debug.core.model.IBreakpoint)
 	 */
 	public void breakpointAdded(IBreakpoint breakpoint) {
-		fController.handleBreakpoint(breakpoint, true);
-        if (breakpoint instanceof AntLineBreakpoint) {
-            if (((AntLineBreakpoint) breakpoint).isRunToLine()) {
-                if (fRunToLineBreakpoints == null) {
-                    fRunToLineBreakpoints= new ArrayList();
-                }
-                fRunToLineBreakpoints.add(breakpoint);
-            }
-        }
+		if(!fTerminated) {
+			fController.handleBreakpoint(breakpoint, true);
+	        if (breakpoint instanceof AntLineBreakpoint) {
+	            if (((AntLineBreakpoint) breakpoint).isRunToLine()) {
+	                if (fRunToLineBreakpoints == null) {
+	                    fRunToLineBreakpoints= new ArrayList();
+	                }
+	                fRunToLineBreakpoints.add(breakpoint);
+	            }
+	        }
+		}
 	}
 
     /* (non-Javadoc)
 	 * @see org.eclipse.debug.core.IBreakpointListener#breakpointRemoved(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.resources.IMarkerDelta)
 	 */
 	public void breakpointRemoved(IBreakpoint breakpoint, IMarkerDelta delta) {
-		fController.handleBreakpoint(breakpoint, false);
-        if (fRunToLineBreakpoints != null) {
-            if (fRunToLineBreakpoints.remove(breakpoint) && fRunToLineBreakpoints.isEmpty()) {
-                fRunToLineBreakpoints= null;
-            }
-        }
+		if(!fTerminated) {
+			fController.handleBreakpoint(breakpoint, false);
+	        if (fRunToLineBreakpoints != null) {
+	            if (fRunToLineBreakpoints.remove(breakpoint) && fRunToLineBreakpoints.isEmpty()) {
+	                fRunToLineBreakpoints= null;
+	            }
+	        }
+		}
 	}
 	
 	/* (non-Javadoc)
@@ -330,23 +338,26 @@ public class AntDebugTarget extends AntDebugElement implements IDebugTarget, IDe
 	 * Called when this debug target terminates.
 	 */
 	public void terminated() {
-		fThreads= new IThread[0];
-		fTerminated = true;
-		fSuspended = false;
-		if (DebugPlugin.getDefault() != null) {
-			DebugPlugin.getDefault().getBreakpointManager().removeBreakpointListener(this);
-			DebugPlugin.getDefault().removeDebugEventListener(this);
-			DebugPlugin.getDefault().getBreakpointManager().removeBreakpointManagerListener(this);
-		}
-		if (!getProcess().isTerminated()) {
-		    try {
-                fProcess.terminate();
-                resume();
-		    } catch (DebugException e) {       
-		    }
-		}
-		if (DebugPlugin.getDefault() != null) {
-			fireTerminateEvent();
+		if(!fTerminated) {
+			fThreads= new IThread[0];
+			fTerminated = true;
+			fSuspended = false;
+			fController.terminate();
+			fController = null;
+			if (DebugPlugin.getDefault() != null) {
+				DebugPlugin.getDefault().getBreakpointManager().removeBreakpointListener(this);
+				DebugPlugin.getDefault().removeDebugEventListener(this);
+				DebugPlugin.getDefault().getBreakpointManager().removeBreakpointManagerListener(this);
+			}
+			if (!getProcess().isTerminated()) {
+			    try {
+	                fProcess.terminate();
+			    } catch (DebugException e) {       
+			    }
+			}
+			if (DebugPlugin.getDefault() != null) {
+				fireTerminateEvent();
+			}
 		}
 	}
 	
@@ -358,6 +369,7 @@ public class AntDebugTarget extends AntDebugElement implements IDebugTarget, IDe
 	public void stepOver() {
 	    fSuspended= false;
 		fController.stepOver();
+		fireResumeEvent(DebugEvent.CLIENT_REQUEST);
 	}
 	
 	/**
@@ -368,6 +380,7 @@ public class AntDebugTarget extends AntDebugElement implements IDebugTarget, IDe
 	public void stepInto() {
 	    fSuspended= false;
 	    fController.stepInto();
+	    fireResumeEvent(DebugEvent.CLIENT_REQUEST);
 	}
 	
 	/**
@@ -420,11 +433,15 @@ public class AntDebugTarget extends AntDebugElement implements IDebugTarget, IDe
     }
     
 	public void getStackFrames() {
-		fController.getStackFrames();
+		if(isSuspended()) {
+			fController.getStackFrames();
+		}
 	}
 	
 	public void getProperties() {
-		fController.getProperties();
+		if(!fTerminated) {
+			fController.getProperties();
+		}
 	}
 
     /* (non-Javadoc)
diff --git a/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/AntThread.java b/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/AntThread.java
index a3f5eeb..d319cdd 100644
--- a/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/AntThread.java
+++ b/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/AntThread.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -25,6 +25,8 @@ import org.eclipse.debug.core.model.IVariable;
  */
 public class AntThread extends AntDebugElement implements IThread {
 	
+	static final IBreakpoint[] NO_BREAKPOINTS = new IBreakpoint[0];
+	
 	/**
 	 * Breakpoints this thread is suspended at or <code>null</code>
 	 * if none.
@@ -154,7 +156,7 @@ public class AntThread extends AntDebugElement implements IThread {
 	 */
 	public IBreakpoint[] getBreakpoints() {
 		if (fBreakpoints == null) {
-			return new IBreakpoint[0];
+			return NO_BREAKPOINTS;
 		}
 		return fBreakpoints;
 	}
@@ -199,6 +201,14 @@ public class AntThread extends AntDebugElement implements IThread {
 		getDebugTarget().resume();
 	}
 	
+	/**
+	 * Call-back when the target is resumed
+	 * @since 1.0
+	 */
+	void resumedByTarget() {
+		aboutToResume(DebugEvent.CLIENT_REQUEST, false);
+	}
+	
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.core.model.ISuspendResume#suspend()
 	 */
diff --git a/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/RemoteAntDebugBuildListener.java b/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/RemoteAntDebugBuildListener.java
index 6d86b7a..b13a14b 100644
--- a/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/RemoteAntDebugBuildListener.java
+++ b/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/RemoteAntDebugBuildListener.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
+ * Copyright (c) 2003, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -23,6 +23,7 @@ import org.eclipse.ant.internal.launching.debug.IAntDebugController;
 import org.eclipse.ant.internal.launching.launchConfigurations.RemoteAntBuildListener;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.DebugEvent;
+import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.model.IBreakpoint;
@@ -69,8 +70,14 @@ public class RemoteAntDebugBuildListener extends RemoteAntBuildListener implemen
 		}
 	}	
 	
-	public RemoteAntDebugBuildListener(ILaunch launch) {
-		super(launch);
+	/**
+	 * Constructor
+	 * 
+	 * @param launch the backing launch to listen to
+	 * @param encoding the encoding to use for communications
+	 */
+	public RemoteAntDebugBuildListener(ILaunch launch, String encoding) {
+		super(launch, encoding);
 		//fDebug= true;
 	}
 	
@@ -80,7 +87,9 @@ public class RemoteAntDebugBuildListener extends RemoteAntBuildListener implemen
 		} else if (message.startsWith(DebugMessageIds.SUSPENDED)){
 			handleSuspendMessage(message);
 		} else if (message.startsWith(DebugMessageIds.TERMINATED)){
-			fTarget.terminated();
+			try {
+				fTarget.terminate();
+			} catch (DebugException e) {}
 		} else if (message.startsWith(DebugMessageIds.STACK)){
 			AntThread thread= (AntThread) fTarget.getThreads()[0];
 			thread.buildStack(message);
@@ -130,7 +139,7 @@ public class RemoteAntDebugBuildListener extends RemoteAntBuildListener implemen
     		try {
     			fRequestSocket = new Socket("localhost", fRequestPort); //$NON-NLS-1$
     			fRequestWriter = new PrintWriter(fRequestSocket.getOutputStream(), true);
-    			fResponseReader = new BufferedReader(new InputStreamReader(fRequestSocket.getInputStream()));
+    			fResponseReader = new BufferedReader(new InputStreamReader(fRequestSocket.getInputStream(), getEncoding()));
     			
     			fReaderThread= new ReaderThread();
     			fReaderThread.start();
@@ -178,8 +187,10 @@ public class RemoteAntDebugBuildListener extends RemoteAntBuildListener implemen
 	
 	protected synchronized void shutDown() {
         if (fTarget != null) {
-            fTarget.terminated();
-            fTarget= null;
+            try {
+				fTarget.terminate();
+				fTarget= null;
+			} catch (DebugException e) {}
         }
 		fLaunch= null;
 		if (DebugPlugin.getDefault() != null) {
@@ -220,6 +231,12 @@ public class RemoteAntDebugBuildListener extends RemoteAntBuildListener implemen
 	}
 
 	/* (non-Javadoc)
+	 * @see org.eclipse.ant.internal.launching.debug.IAntDebugController#terminate()
+	 */
+	public void terminate() {
+	}
+	
+	/* (non-Javadoc)
 	 * @see org.eclipse.ant.internal.ui.debug.IAntDebugController#suspend()
 	 */
 	public void suspend() {
diff --git a/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/AntLaunchDelegate.java b/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/AntLaunchDelegate.java
index 15088ae..3662460 100644
--- a/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/AntLaunchDelegate.java
+++ b/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/AntLaunchDelegate.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -597,15 +597,14 @@ public class AntLaunchDelegate extends LaunchConfigurationDelegate {
 			boolean setInputHandler) throws CoreException {
 		boolean debug = fMode.equals(ILaunchManager.DEBUG_MODE);
 		if (captureOutput) {
+			String encoding = DebugPlugin.getDefault().getLaunchManager().getEncoding(configuration);
 			if (debug) {
-				RemoteAntDebugBuildListener listener = new RemoteAntDebugBuildListener(
-						launch);
+				RemoteAntDebugBuildListener listener = new RemoteAntDebugBuildListener(launch, encoding);
 				if (requestPort != -1) {
 					listener.startListening(port, requestPort);
 				}
 			} else if (!fUserSpecifiedLogger) {
-				RemoteAntBuildListener client = new RemoteAntBuildListener(
-						launch);
+				RemoteAntBuildListener client = new RemoteAntBuildListener(launch, encoding);
 				if (port != -1) {
 					client.startListening(port);
 				}
diff --git a/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/ContributedClasspathEntriesEntry.java b/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/ContributedClasspathEntriesEntry.java
index 71ac04c..09c42e0 100644
--- a/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/ContributedClasspathEntriesEntry.java
+++ b/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/ContributedClasspathEntriesEntry.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -21,6 +21,7 @@ import java.util.List;
 import org.eclipse.ant.core.AntCorePlugin;
 import org.eclipse.ant.core.AntCorePreferences;
 import org.eclipse.ant.core.IAntClasspathEntry;
+import org.eclipse.ant.internal.core.IAntCoreConstants;
 import org.eclipse.ant.internal.launching.AntLaunching;
 import org.eclipse.ant.internal.launching.AntLaunchingUtil;
 import org.eclipse.core.runtime.CoreException;
@@ -155,7 +156,7 @@ public class ContributedClasspathEntriesEntry extends AbstractRuntimeClasspathEn
                    continue;
                 }
                 String urlFileName= bundleURL.getFile();
-                if (urlFileName.startsWith("file:")) { //$NON-NLS-1$
+                if (urlFileName.startsWith(IAntCoreConstants.FILE_PROTOCOL)) {
                     try {
                         urlFileName= new URL(urlFileName).getFile();
                         if (urlFileName.endsWith("!/")) { //$NON-NLS-1$
diff --git a/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/RemoteAntBuildListener.java b/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/RemoteAntBuildListener.java
index 2191556..083d7e2 100644
--- a/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/RemoteAntBuildListener.java
+++ b/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/RemoteAntBuildListener.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2003, 2009 IBM Corporation and others.
+ *  Copyright (c) 2003, 2011 IBM Corporation and others.
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
@@ -38,7 +38,7 @@ import org.eclipse.debug.core.model.IProcess;
 
 /**
  * Parts adapted from org.eclipse.jdt.internal.junit.ui.RemoteTestRunnerClient
- * The client side of the RemoteAntBuildLogger. Handles the marshalling of the
+ * The client side of the RemoteAntBuildLogger. Handles the marshaling of the
  * different messages.
  */
 public class RemoteAntBuildListener implements ILaunchesListener {
@@ -61,6 +61,11 @@ public class RemoteAntBuildListener implements ILaunchesListener {
 	private String fLastFileName = null;
 	private String fLastTaskName = null;
 	private boolean fBuildFailed = false;
+	/**
+	 * The encoding to use
+	 * @since 3.7
+	 */
+	private String fEncoding;
 
 	/**
 	 * Reads the message stream from the RemoteAntBuildLogger
@@ -78,20 +83,15 @@ public class RemoteAntBuildListener implements ILaunchesListener {
 			Exception exception = null;
 			try {
 				fServerSocket = new ServerSocket(fServerPort);
-
-				int socketTimeout = Platform
-						.getPreferencesService()
-						.getInt(
+				int socketTimeout = Platform.getPreferencesService().getInt(
 								AntLaunching.getUniqueIdentifier(),
 								IAntLaunchingPreferenceConstants.ANT_COMMUNICATION_TIMEOUT,
 								20000, null);
 				fServerSocket.setSoTimeout(socketTimeout);
 				fSocket = fServerSocket.accept();
-				fBufferedReader = new BufferedReader(new InputStreamReader(
-						fSocket.getInputStream(), "UTF-8")); //$NON-NLS-1$
+				fBufferedReader = new BufferedReader(new InputStreamReader(fSocket.getInputStream(), fEncoding));
 				String message;
-				while (fBufferedReader != null
-						&& (message = fBufferedReader.readLine()) != null) {
+				while (fLaunch != null && fBufferedReader != null && (message = fBufferedReader.readLine()) != null) {
 					receiveMessage(message);
 				}
 			} catch (SocketException e) {
@@ -108,12 +108,29 @@ public class RemoteAntBuildListener implements ILaunchesListener {
 		}
 	}
 
-	public RemoteAntBuildListener(ILaunch launch) {
+	/**
+	 * Constructor
+	 * 
+	 * @param launch the backing launch to listen to
+	 * @param encoding the encoding to use for communications
+	 */
+	public RemoteAntBuildListener(ILaunch launch, String encoding) {
 		super();
 		fLaunch = launch;
+		fEncoding = encoding;
 		DebugPlugin.getDefault().getLaunchManager().addLaunchListener(this);
 	}
-
+	
+	/**
+	 * Returns the encoding set on the listener
+	 * 
+	 * @return the encoding set on the listener
+	 * @since 3.7
+	 */
+	protected String getEncoding() {
+		return fEncoding;
+	}
+	
 	/**
 	 * Start listening to an Ant build. Start a server connection that the
 	 * RemoteAntBuildLogger can connect to.
@@ -129,8 +146,7 @@ public class RemoteAntBuildListener implements ILaunchesListener {
 	protected synchronized void shutDown() {
 		fLaunch = null;
 		if (DebugPlugin.getDefault() != null) {
-			DebugPlugin.getDefault().getLaunchManager().removeLaunchListener(
-					this);
+			DebugPlugin.getDefault().getLaunchManager().removeLaunchListener(this);
 		}
 		try {
 			if (fBufferedReader != null) {
@@ -161,23 +177,20 @@ public class RemoteAntBuildListener implements ILaunchesListener {
 		} else if (message.startsWith(MessageIds.TARGET)) {
 			receiveTargetMessage(message);
 		} else if (message.startsWith(MessageIds.PROCESS_ID)) {
-			message = message.substring(MessageIds.PROCESS_ID.length());
-			fProcessId = message;
+			fProcessId = message.substring(MessageIds.PROCESS_ID.length());
 		} else {
 			int index = message.indexOf(',');
 			if (index > 0) {
 				int priority = Integer.parseInt(message.substring(0, index));
-				message = message.substring(index + 1);
-				writeMessage(
-						message + System.getProperty("line.separator"), priority); //$NON-NLS-1$
-				if (message.startsWith("BUILD FAILED")) { //$NON-NLS-1$
+				String msg = message.substring(index + 1);
+				writeMessage(msg + System.getProperty("line.separator"), priority); //$NON-NLS-1$
+				if (msg.startsWith("BUILD FAILED")) { //$NON-NLS-1$
 					fBuildFailed = true;
 				} else if (fBuildFailed) {
-					if (message.startsWith("Total time:")) { //$NON-NLS-1$
+					if (msg.startsWith("Total time:")) { //$NON-NLS-1$
 						fBuildFailed = false;
 					} else {
-						AntLaunchingUtil.linkBuildFailedMessage(message,
-								getProcess());
+						AntLaunchingUtil.linkBuildFailedMessage(msg, getProcess());
 					}
 				}
 
@@ -186,9 +199,9 @@ public class RemoteAntBuildListener implements ILaunchesListener {
 	}
 
 	private void receiveTargetMessage(String message) {
-		message = message.substring(MessageIds.TARGET.length());
-		StringTokenizer tokenizer = new StringTokenizer(message, ","); //$NON-NLS-1$
-		message = tokenizer.nextToken();
+		String msg = message.substring(MessageIds.TARGET.length());
+		StringTokenizer tokenizer = new StringTokenizer(msg, ","); //$NON-NLS-1$
+		msg = tokenizer.nextToken();
 		if (tokenizer.hasMoreTokens()) {
 			int locationLength = Integer.parseInt(tokenizer.nextToken());
 			String location = tokenizer.nextToken();
@@ -198,28 +211,24 @@ public class RemoteAntBuildListener implements ILaunchesListener {
 				location += tokenizer.nextToken();
 			}
 			int lineNumber = Integer.parseInt(tokenizer.nextToken());
-			generateLink(message, location, lineNumber, 0, message.length() - 1);
+			generateLink(msg, location, lineNumber, 0, msg.length() - 1);
 		}
-		writeMessage(
-				message + System.getProperty("line.separator"), Project.MSG_INFO); //$NON-NLS-1$
+		writeMessage(msg + System.getProperty("line.separator"), Project.MSG_INFO); //$NON-NLS-1$
 	}
 
 	private void receiveTaskMessage(String message) {
-		message = message.substring(MessageIds.TASK.length());
-
-		int index = message.indexOf(',');
-		int priority = Integer.parseInt(message.substring(0, index));
-		int index2 = message.indexOf(',', index + 1);
-		String taskName = message.substring(index + 1, index2);
+		String msg = message.substring(MessageIds.TASK.length());
+		int index = msg.indexOf(',');
+		int priority = Integer.parseInt(msg.substring(0, index));
+		int index2 = msg.indexOf(',', index + 1);
+		String taskName = msg.substring(index + 1, index2);
 		if (taskName.length() == 0) {
 			taskName = fLastTaskName;
 		}
-		int index3 = message.indexOf(',', index2 + 1);
-		int lineLength = Integer
-				.parseInt(message.substring(index2 + 1, index3));
+		int index3 = msg.indexOf(',', index2 + 1);
+		int lineLength = Integer.parseInt(msg.substring(index2 + 1, index3));
 		int index4 = index3 + 1 + lineLength;
-
-		String line = message.substring(index3 + 1, index4);
+		String line = msg.substring(index3 + 1, index4);
 		StringBuffer labelBuff = new StringBuffer();
 		labelBuff.append('[');
 		labelBuff.append(taskName);
@@ -228,26 +237,21 @@ public class RemoteAntBuildListener implements ILaunchesListener {
 		line = labelBuff.toString();
 
 		fLastTaskName = taskName;
-
-		int locationIndex = message.indexOf(',', index4 + 1);
+		int locationIndex = msg.indexOf(',', index4 + 1);
 		int finalIndex = locationIndex + 1;
-		String fileName = message.substring(index4 + 1, locationIndex);
+		String fileName = msg.substring(index4 + 1, locationIndex);
 		int locationLength = 0;
 		if (fileName.length() == 0) {
 			fileName = fLastFileName;
 		} else {
-			finalIndex = message.indexOf(',', locationIndex) + 1;
+			finalIndex = msg.indexOf(',', locationIndex) + 1;
 			locationLength = Integer.parseInt(fileName);
-			fileName = message.substring(finalIndex, finalIndex
-					+ locationLength);
+			fileName = msg.substring(finalIndex, finalIndex	+ locationLength);
 			locationLength += 1; // set past delimiter
 		}
 		fLastFileName = fileName;
-		int lineNumber = Integer.parseInt(message.substring(finalIndex
-				+ locationLength));
-
-		int size = AntLaunching.LEFT_COLUMN_SIZE
-				- (taskName.length() + 3);
+		int lineNumber = Integer.parseInt(msg.substring(finalIndex + locationLength));
+		int size = AntLaunching.LEFT_COLUMN_SIZE - (taskName.length() + 3);
 		int offset = Math.max(size - 2, 1);
 		int length = AntLaunching.LEFT_COLUMN_SIZE - size - 3;
 		if (fileName != null) {
@@ -256,15 +260,13 @@ public class RemoteAntBuildListener implements ILaunchesListener {
 
 		StringBuffer fullMessage = new StringBuffer();
 		adornMessage(taskName, line, fullMessage);
-		writeMessage(
-				fullMessage
-						.append(System.getProperty("line.separator")).toString(), priority); //$NON-NLS-1$
+		writeMessage(fullMessage.append(System.getProperty("line.separator")).toString(), priority); //$NON-NLS-1$
 	}
 
-	private void generateLink(String line, String fileName, int lineNumber,
-			int offset, int length) {
-		((AntLaunch) fLaunch).addLinkDescriptor(line, fileName, lineNumber,
-				offset, length);
+	private void generateLink(String line, String fileName, int lineNumber,	int offset, int length) {
+		if(fLaunch != null) {
+			((AntLaunch) fLaunch).addLinkDescriptor(line, fileName, lineNumber, offset, length);
+		}
 	}
 
 	/**
@@ -273,13 +275,10 @@ public class RemoteAntBuildListener implements ILaunchesListener {
 	protected IProcess getProcess() {
 		if (fProcess == null) {
 			if (fProcessId != null) {
-				IProcess[] all = DebugPlugin.getDefault().getLaunchManager()
-						.getProcesses();
+				IProcess[] all = DebugPlugin.getDefault().getLaunchManager().getProcesses();
 				for (int i = 0; i < all.length; i++) {
 					IProcess process = all[i];
-					if (fProcessId
-							.equals(process
-									.getAttribute(AbstractEclipseBuildLogger.ANT_PROCESS_ID))) {
+					if (fProcessId.equals(process.getAttribute(AbstractEclipseBuildLogger.ANT_PROCESS_ID))) {
 						fProcess = process;
 						break;
 					}
@@ -323,19 +322,17 @@ public class RemoteAntBuildListener implements ILaunchesListener {
 	 * Builds a right justified task prefix for the given build event, placing
 	 * it in the given string buffer.
 	 * 
-	 * @param event
-	 *            build event
-	 * @param fullMessage
-	 *            buffer to place task prefix in
+	 * @param taskName the name of the task, can be <code>null</code>
+	 * @param line the line of text
+	 * @param fullMessage buffer to place task prefix in
 	 */
-	private void adornMessage(String taskName, String line,
-			StringBuffer fullMessage) {
-		if (taskName == null) {
-			taskName = "null"; //$NON-NLS-1$
+	private void adornMessage(String taskName, String line, StringBuffer fullMessage) {
+		String tname = taskName;
+		if (tname == null) {
+			tname = "null"; //$NON-NLS-1$
 		}
 
-		int size = AntLaunching.LEFT_COLUMN_SIZE
-				- (taskName.length() + 6);
+		int size = AntLaunching.LEFT_COLUMN_SIZE - (tname.length() + 6);
 		for (int i = 0; i < size; i++) {
 			fullMessage.append(' ');
 		}
diff --git a/eclipse/plugins/org.eclipse.ant.ui/.settings/org.eclipse.jdt.core.prefs b/eclipse/plugins/org.eclipse.ant.ui/.settings/org.eclipse.jdt.core.prefs
index 3e6e01e..ae25ba7 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/eclipse/plugins/org.eclipse.ant.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,9 @@
-#Wed Oct 14 08:50:53 CDT 2009
+#Thu May 05 15:06:07 CDT 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.builder.cleanOutputFolder=clean
 org.eclipse.jdt.core.builder.duplicateResourceTask=warning
 org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
 org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
 org.eclipse.jdt.core.circularClasspath=error
 org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
@@ -20,26 +21,27 @@ org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
 org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=error
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=ignore
 org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
 org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
 org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
 org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
 org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
@@ -49,29 +51,35 @@ org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
 org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
 org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=error
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
@@ -86,11 +94,12 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverridin
 org.eclipse.jdt.core.compiler.problem.unusedImport=error
 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
 org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
 org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.3
diff --git a/eclipse/plugins/org.eclipse.ant.ui/.settings/org.eclipse.jdt.launching.prefs b/eclipse/plugins/org.eclipse.ant.ui/.settings/org.eclipse.jdt.launching.prefs
new file mode 100644
index 0000000..5ee1bba
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.ant.ui/.settings/org.eclipse.jdt.launching.prefs
@@ -0,0 +1,3 @@
+#Wed Feb 02 09:42:25 CST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=error
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor Content Assist Dev/TaskXMLFileMerger.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor Content Assist Dev/TaskXMLFileMerger.java
index bd3af71..1bf76a8 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor Content Assist Dev/TaskXMLFileMerger.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor Content Assist Dev/TaskXMLFileMerger.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2005 GEBIT Gesellschaft fuer EDV-Beratung
+ * Copyright (c) 2002, 2006 GEBIT Gesellschaft fuer EDV-Beratung
  * und Informatik-Technologien mbH, 
  * Berlin, Duesseldorf, Frankfurt (Germany) and others.
  * All rights reserved. This program and the accompanying materials 
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Atom.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Atom.java
index 80cf656..b12afcd 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Atom.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Atom.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2005 Object Factory Inc.
+ * Copyright (c) 2002, 2011 Object Factory Inc.
  * All rights reserved. This program and the accompanying materials 
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -23,7 +23,7 @@ public class Atom implements IAtom {
 
 	protected Atom(int kind, String name) {
 		fKind = kind;
-		fName = name.intern();
+		fName = name;
 	}
 	
 	/* (non-Javadoc)
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Model.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Model.java
index 53ff464..9625ff0 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Model.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Model.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2005 Object Factory Inc.
+ * Copyright (c) 2002, 2011 Object Factory Inc.
  * All rights reserved. This program and the accompanying materials 
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,12 +7,14 @@
  * 
  * Contributors:
  *		Object Factory Inc. - Initial implementation
+ *		IBM Corporation - bug fixes
  *******************************************************************************/
 package org.eclipse.ant.internal.ui.dtd.schema;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
+import org.eclipse.ant.internal.core.IAntCoreConstants;
 import org.eclipse.ant.internal.ui.dtd.IAtom;
 import org.eclipse.ant.internal.ui.dtd.IModel;
 
@@ -207,7 +209,7 @@ public class Model implements IModel {
 	 * @see org.eclipse.ant.internal.ui.dtd.IModel#getQualifier()
 	 */
 	public String getQualifier() {
-		return fMin == 1 ? (fMax == UNBOUNDED ? "+" : "") : (fMax == UNBOUNDED ? "*" : "?"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		return fMin == 1 ? (fMax == UNBOUNDED ? "+" : IAntCoreConstants.EMPTY_STRING) : (fMax == UNBOUNDED ? "*" : "?"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 	}
 	
 	/**
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/NfmParser.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/NfmParser.java
index aadaa3a..6b197ee 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/NfmParser.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/NfmParser.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2005 Object Factory Inc.
+ * Copyright (c) 2002, 2006 Object Factory Inc.
  * All rights reserved. This program and the accompanying materials 
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/SchemaFactory.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/SchemaFactory.java
index 063dbce..01f2209 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/SchemaFactory.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/SchemaFactory.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2005 Object Factory Inc.
+ * Copyright (c) 2002, 2006 Object Factory Inc.
  * All rights reserved. This program and the accompanying materials 
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/SortedMap.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/SortedMap.java
index 78fc1d9..3142c12 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/SortedMap.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/SortedMap.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2005 Object Factory Inc.
+ * Copyright (c) 2002, 2006 Object Factory Inc.
  * All rights reserved. This program and the accompanying materials 
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntCompletionProposal.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntCompletionProposal.java
index a91e5f2..70762dd 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntCompletionProposal.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntCompletionProposal.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
+ * Copyright (c) 2003, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,6 +11,7 @@
 
 package org.eclipse.ant.internal.ui.editor;
 
+import org.eclipse.ant.internal.core.IAntCoreConstants;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.DocumentEvent;
 import org.eclipse.jface.text.IDocument;
@@ -92,7 +93,7 @@ public class AntCompletionProposal implements ICompletionProposal, ICompletionPr
 	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#validate(org.eclipse.jface.text.IDocument, int, org.eclipse.jface.text.DocumentEvent)
 	 */
 	public boolean validate(IDocument document, int offset, DocumentEvent event) {
-		String enteredText= ""; //$NON-NLS-1$
+		String enteredText= IAntCoreConstants.EMPTY_STRING;
 		try {
 			enteredText = document.get(fReplacementOffset, offset-fReplacementOffset);
 		} catch (BadLocationException e) {
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditor.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditor.java
index 7a56061..97ef7f9 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditor.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditor.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2008 GEBIT Gesellschaft fuer EDV-Beratung
+ * Copyright (c) 2002, 2011 GEBIT Gesellschaft fuer EDV-Beratung
  * und Informatik-Technologien mbH,
  * Berlin, Duesseldorf, Frankfurt (Germany) and others.
  * All rights reserved. This program and the accompanying materials
@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.ResourceBundle;
 
+import org.eclipse.ant.internal.core.IAntCoreConstants;
 import org.eclipse.ant.internal.ui.AntUIPlugin;
 import org.eclipse.ant.internal.ui.AntUtil;
 import org.eclipse.ant.internal.ui.ExternalHyperlink;
@@ -45,35 +46,21 @@ import org.eclipse.ant.internal.ui.model.AntModelCore;
 import org.eclipse.ant.internal.ui.model.AntProjectNode;
 import org.eclipse.ant.internal.ui.model.IAntModelListener;
 import org.eclipse.ant.internal.ui.preferences.AntEditorPreferenceConstants;
-
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.ShellAdapter;
-import org.eclipse.swt.events.ShellEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-
+import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
-
-import org.eclipse.core.resources.IFile;
-
+import org.eclipse.debug.ui.actions.IRunToLineTarget;
+import org.eclipse.debug.ui.actions.IToggleBreakpointsTarget;
+import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.jdt.ui.actions.IJavaEditorActionDefinitionIds;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.Separator;
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.viewers.IPostSelectionProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.DocumentEvent;
 import org.eclipse.jface.text.IAutoEditStrategy;
@@ -99,7 +86,19 @@ import org.eclipse.jface.text.source.SourceViewerConfiguration;
 import org.eclipse.jface.text.source.projection.IProjectionListener;
 import org.eclipse.jface.text.source.projection.ProjectionSupport;
 import org.eclipse.jface.text.source.projection.ProjectionViewer;
-
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.jface.viewers.IPostSelectionProvider;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.events.ShellAdapter;
+import org.eclipse.swt.events.ShellEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPartService;
@@ -107,24 +106,16 @@ import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.editors.text.TextEditor;
 import org.eclipse.ui.ide.IDE;
 import org.eclipse.ui.part.IShowInTargetList;
-import org.eclipse.ui.views.contentoutline.ContentOutline;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-
 import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
 import org.eclipse.ui.texteditor.IDocumentProvider;
 import org.eclipse.ui.texteditor.IEditorStatusLine;
 import org.eclipse.ui.texteditor.ITextEditorActionConstants;
 import org.eclipse.ui.texteditor.TextOperationAction;
-
-import org.eclipse.ui.editors.text.TextEditor;
-
-import org.eclipse.debug.ui.actions.IRunToLineTarget;
-import org.eclipse.debug.ui.actions.IToggleBreakpointsTarget;
-
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jdt.ui.actions.IJavaEditorActionDefinitionIds;
+import org.eclipse.ui.views.contentoutline.ContentOutline;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
 
 /**
  * The actual editor implementation for Eclipse's Ant integration.
@@ -555,10 +546,6 @@ public class AntEditor extends TextEditor implements IReconcilingParticipant, IP
 			}
 		};
 		AntModelCore.getDefault().addAntModelListener(fAntModelListener);
-
-		if (isFoldingEnabled()) {
-			fFoldingStructureProvider= new AntFoldingStructureProvider(this);
-		}
     }
    
 	/* (non-Javadoc)
@@ -924,7 +911,7 @@ public class AntEditor extends TextEditor implements IReconcilingParticipant, IP
             return null;
         }
         
-		return ""; //$NON-NLS-1$
+		return IAntCoreConstants.EMPTY_STRING;
 	}
 	
 	/* (non-Javadoc)
@@ -1385,17 +1372,17 @@ public class AntEditor extends TextEditor implements IReconcilingParticipant, IP
 	/**
 	 * The editor has entered or exited linked mode.
 	 * @param inLinkedMode whether an enter or exit has occurred
-	 * @param effectsOccurrences whether to change the state of the occurrences finder
+	 * @param affectsOccurrences whether to change the state of the occurrences finder
 	 */
-	public void setInLinkedMode(boolean inLinkedMode, boolean effectsOccurrences) {
+	public void setInLinkedMode(boolean inLinkedMode, boolean affectsOccurrences) {
 		if (inLinkedMode) {
 			getAntModel().setShouldReconcile(false);
-			if (effectsOccurrences) {
+			if (affectsOccurrences) {
 				uninstallOccurrencesFinder();
 			}
 		} else {
 			getAntModel().setShouldReconcile(true);
-			if (effectsOccurrences) {
+			if (affectsOccurrences) {
 				installOccurrencesFinder();
 			}
 		}
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorCompletionProcessor.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorCompletionProcessor.java
index d31247b..d324cf0 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorCompletionProcessor.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorCompletionProcessor.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2008 GEBIT Gesellschaft fuer EDV-Beratung
+ * Copyright (c) 2002, 2011 GEBIT Gesellschaft fuer EDV-Beratung
  * und Informatik-Technologien mbH, 
  * Berlin, Duesseldorf, Frankfurt (Germany) and others.
  * All rights reserved. This program and the accompanying materials 
@@ -32,6 +32,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 
 import org.apache.tools.ant.BuildException;
@@ -43,6 +44,7 @@ import org.apache.tools.ant.taskdefs.MacroDef;
 import org.apache.tools.ant.taskdefs.MacroInstance;
 import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.apache.tools.ant.types.Reference;
+import org.eclipse.ant.internal.core.IAntCoreConstants;
 import org.eclipse.ant.internal.ui.AntUIImages;
 import org.eclipse.ant.internal.ui.AntUIPlugin;
 import org.eclipse.ant.internal.ui.IAntUIConstants;
@@ -52,6 +54,7 @@ import org.eclipse.ant.internal.ui.dtd.IElement;
 import org.eclipse.ant.internal.ui.dtd.ISchema;
 import org.eclipse.ant.internal.ui.dtd.ParseError;
 import org.eclipse.ant.internal.ui.dtd.Parser;
+import org.eclipse.ant.internal.ui.editor.TaskDescriptionProvider.ProposalNode;
 import org.eclipse.ant.internal.ui.editor.templates.AntContext;
 import org.eclipse.ant.internal.ui.editor.templates.AntTemplateAccess;
 import org.eclipse.ant.internal.ui.editor.templates.AntTemplateInformationControlCreator;
@@ -300,12 +303,13 @@ public class AntEditorCompletionProcessor  extends TemplateCompletionProcessor i
 		ITextSelection selection= (ITextSelection) viewer.getSelectionProvider().getSelection();
 
 		// adjust offset to end of normalized selection
-		if (selection.getOffset() == offset) {
-			offset= selection.getOffset() + selection.getLength();
+		int newoffset = offset;
+		if (selection.getOffset() == newoffset) {
+			newoffset= selection.getOffset() + selection.getLength();
 		}
 
-		String prefix= extractPrefix(viewer, offset);
-		Region region= new Region(offset - prefix.length(), prefix.length());
+		String prefix= extractPrefix(viewer, newoffset);
+		Region region= new Region(newoffset - prefix.length(), prefix.length());
 		TemplateContext context= createContext(viewer, region);
 		if (context == null) {
 			return new ICompletionProposal[0];
@@ -488,14 +492,14 @@ public class AntEditorCompletionProcessor  extends TemplateCompletionProcessor i
         }
         
         if (proposals.length > 0) {
-        	errorMessage= ""; //$NON-NLS-1$
+        	errorMessage= IAntCoreConstants.EMPTY_STRING;
         }
         return proposals;
 
     }
     
     private ICompletionProposal[] getProjectAttributeValueProposals(String prefix, String attributeName) {
-		if (attributeName.equalsIgnoreCase("default")) { //$NON-NLS-1$
+		if (attributeName.equalsIgnoreCase(IAntCoreConstants.DEFAULT)) {
 			return getDefaultValueProposals(prefix);
 		}
 
@@ -540,12 +544,12 @@ public class AntEditorCompletionProcessor  extends TemplateCompletionProcessor i
 			id= ((AntTaskNode)node).getId();
 		}
 		List proposals= new ArrayList(refIds.size());
-		int i= 0;
 		String refId;
 		ICompletionProposal proposal;
 		int prefixLength= prefix.length();
 		int replacementOffset= cursorPosition - prefixLength;
-		for (Iterator iter = refIds.iterator(); iter.hasNext(); i++) {
+		Iterator iter= refIds.iterator();
+		while (iter.hasNext()) {
 			refId= (String) iter.next();
 			if (!refId.equals(id) && (prefixLength == 0 || refId.toLowerCase().startsWith(prefix))) {
 				proposal= new AntCompletionProposal(refId, replacementOffset, prefixLength, refId.length(), null, refId, null, AntCompletionProposal.TASK_PROPOSAL);
@@ -584,7 +588,6 @@ public class AntEditorCompletionProcessor  extends TemplateCompletionProcessor i
         Map targets= getTargets();
         Set targetNames= targets.keySet();
         List proposals= new ArrayList(targets.size() - 2); //current target and implicit target
-        int index= 0;
         Iterator itr= targetNames.iterator();
         while (itr.hasNext()) {
             String targetName = (String) itr.next();
@@ -594,7 +597,6 @@ public class AntEditorCompletionProcessor  extends TemplateCompletionProcessor i
             if (targetName.toLowerCase().startsWith(prefix) && targetName.length() > 0){
                 ICompletionProposal proposal = new AntCompletionProposal(targetName, cursorPosition - prefix.length(), prefix.length(), targetName.length(), getTargetImage(targetName), targetName, ((Target)targets.get(targetName)).getDescription(), AntCompletionProposal.TASK_PROPOSAL);
                 proposals.add(proposal);
-                index++;
             }
         }
         return (ICompletionProposal[])proposals.toArray(new ICompletionProposal[proposals.size()]);      
@@ -605,7 +607,7 @@ public class AntEditorCompletionProcessor  extends TemplateCompletionProcessor i
      * target cannot be found, <code>null</code> will be returned. 
      * 
      * @param targetName the target's name
-     * @return an image suitable for representating the target, or <code>null</code> if the target cannot be found
+     * @return an image suitable for representing the target, or <code>null</code> if the target cannot be found
      * @since 3.6
      */
     private Image getTargetImage(String targetName) {
@@ -848,7 +850,7 @@ public class AntEditorCompletionProcessor  extends TemplateCompletionProcessor i
 			}
 			String description = getDescriptionProvider().getDescriptionForTaskAttribute(taskName, attrName);
 			if(description != null) {
-			    proposalInfo = (proposalInfo == null ? "" : proposalInfo); //$NON-NLS-1$
+			    proposalInfo = (proposalInfo == null ? IAntCoreConstants.EMPTY_STRING : proposalInfo);
 			    proposalInfo += description;
 			}
 		}
@@ -1103,9 +1105,9 @@ public class AntEditorCompletionProcessor  extends TemplateCompletionProcessor i
 	}
 
 	/** 
-    * Returns proposals that define the structure of a buildfile.
+    * Returns proposals that define the structure of a build file.
     * 
-    * Note that template proposals which define the structure of a buildfile 
+    * Note that template proposals which define the structure of a build file 
     * are handled by {@link #determineTemplateProposals(ITextViewer, int)} 
     * which limits proposals by context type.
 
@@ -1217,12 +1219,10 @@ public class AntEditorCompletionProcessor  extends TemplateCompletionProcessor i
     private String getTaskProposalReplacementString(String aTaskName, boolean hasNested) {
         StringBuffer replacement = new StringBuffer("<"); //$NON-NLS-1$
         replacement.append(aTaskName); 
-        Node attributeNode= getDescriptionProvider().getAttributesNode(aTaskName);
-		
-        if (attributeNode != null) {
-			appendRequiredAttributes(replacement, attributeNode);
-        } 
-        
+        ProposalNode task = getDescriptionProvider().getTaskNode(aTaskName);
+        if(task != null) {
+        	appendRequiredAttributes(replacement,task);
+        }
         if (hasNested) {
         	replacement.append("></"); //$NON-NLS-1$
             replacement.append(aTaskName);
@@ -1233,25 +1233,25 @@ public class AntEditorCompletionProcessor  extends TemplateCompletionProcessor i
         return replacement.toString();               
     }
 
-    private void appendRequiredAttributes(StringBuffer replacement, Node attributeNode) {
-		boolean requiredAdded= false;
-		NodeList attributes= attributeNode.getChildNodes();
-		String required;
-		Node attribute;
-		for (int i = 0; i < attributes.getLength(); i++) {
-			attribute = attributes.item(i);
-			required= getDescriptionProvider().getRequiredOfNode(attribute);
-			if (required.equalsIgnoreCase("yes")) { //$NON-NLS-1$
-				String attributeName= getDescriptionProvider().getTaskAttributeName(attribute);
-				replacement.append(' ');
-				replacement.append(attributeName);
-				replacement.append("=\"\""); //$NON-NLS-1$
-				if (!requiredAdded){
-					additionalProposalOffset= attributeName.length() + 2;
-					requiredAdded= true;
-				}	
+    private void appendRequiredAttributes(StringBuffer replacement, ProposalNode task) {
+    	if(task.nodes != null) {
+			boolean requiredAdded = false;
+			Entry entry = null;
+			for (Iterator i = task.nodes.entrySet().iterator();i.hasNext();) {
+				entry = (Entry) i.next();
+				String name = (String) entry.getKey();
+				ProposalNode att = (ProposalNode) entry.getValue();
+				if ("yes".equalsIgnoreCase(att.required)) { //$NON-NLS-1$
+					replacement.append(' ');
+					replacement.append(name);
+					replacement.append("=\"\""); //$NON-NLS-1$
+					if (!requiredAdded){
+						additionalProposalOffset = name.length() + 2;
+						requiredAdded = true;
+					}	
+				}
 			}
-		}
+    	}
 	}
 
 	/**
@@ -1342,7 +1342,7 @@ public class AntEditorCompletionProcessor  extends TemplateCompletionProcessor i
         if (startOfWordToken != anOffset) {
             currentPrefix= aDocumentText.substring(startOfWordToken, anOffset).toLowerCase();
         } else {
-            currentPrefix= ""; //$NON-NLS-1$
+            currentPrefix= IAntCoreConstants.EMPTY_STRING;
         }
         return currentPrefix;
     }
@@ -1406,14 +1406,19 @@ public class AntEditorCompletionProcessor  extends TemplateCompletionProcessor i
             int spaceIndex = stringToPrefix.lastIndexOf(' ');
             int lessThanIndex = stringToPrefix.lastIndexOf('<');
             int greaterThanIndex = stringToPrefix.lastIndexOf('>');
-            
             // Task proposal
-            if(lessThanIndex > spaceIndex && greaterThanIndex < lessThanIndex) {
-                int slashIndex = stringToPrefix.lastIndexOf('/');
-                if(slashIndex == lessThanIndex +1) {
-                    return PROPOSAL_MODE_TASK_PROPOSAL_CLOSING; // ... </
-                }
-                return PROPOSAL_MODE_TASK_PROPOSAL;
+            if(greaterThanIndex < lessThanIndex) {
+            	//we are inside an open element
+            	if(lastChar == '$') {
+            		return PROPOSAL_MODE_PROPERTY_PROPOSAL;
+            	}
+            	if(lessThanIndex > spaceIndex) {
+	                int slashIndex = stringToPrefix.lastIndexOf('/');
+	                if(slashIndex == lessThanIndex +1) {
+	                    return PROPOSAL_MODE_TASK_PROPOSAL_CLOSING; // ... </
+	                }
+	                return PROPOSAL_MODE_TASK_PROPOSAL;
+            	}
             }
             if(lessThanIndex < greaterThanIndex) {
             	if (isPropertyProposalMode(stringToPrefix)) {
@@ -1443,7 +1448,7 @@ public class AntEditorCompletionProcessor  extends TemplateCompletionProcessor i
 		return false;
 	}
     /**
-     * Returns the last occuring task string in the specified string.
+     * Returns the last occurring task string in the specified string.
      * <P>
      * The returned string must not necessarily be a valid Ant task string.
      * This can be tested with the method <code>inNamedTaskKnown(String)</code>
@@ -1483,7 +1488,7 @@ public class AntEditorCompletionProcessor  extends TemplateCompletionProcessor i
     
 
     /**
-     * Returns the last occuring attribute string in the specified string.
+     * Returns the last occurring attribute string in the specified string.
      * <code>null</code> is returned if no attribute string is available.
      * <P>
      * Calling this method is only safe if the current proposal mode is really
@@ -1587,7 +1592,7 @@ public class AntEditorCompletionProcessor  extends TemplateCompletionProcessor i
     		node= antModel.getOpenElement();
     	}
     	if (node == null) {
-    		return ""; //$NON-NLS-1$
+    		return IAntCoreConstants.EMPTY_STRING;
     	} else if (node instanceof AntTaskNode) {
     		String name= node.getName();
     		if (offset <= node.getOffset() + name.length() - 1) {
@@ -1706,10 +1711,13 @@ public class AntEditorCompletionProcessor  extends TemplateCompletionProcessor i
 	 * does not contain the brackets.
 	 */
 	protected int getRelevance(Template template, String prefix) {
-		if (prefix.startsWith("<")) //$NON-NLS-1$
-			prefix= prefix.substring(1);
-		if (template.getName().startsWith(prefix))
+		String newprefix = prefix;
+		if (newprefix.startsWith("<")) {//$NON-NLS-1$
+			newprefix= prefix.substring(1);
+		}
+		if (template.getName().startsWith(newprefix)) {
 			return 90; 
+		}
 		return 0;
 	}
 
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorSourceViewerConfiguration.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorSourceViewerConfiguration.java
index d4eaf62..9c373df 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorSourceViewerConfiguration.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorSourceViewerConfiguration.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2008 GEBIT Gesellschaft fuer EDV-Beratung
+ * Copyright (c) 2002, 2011 GEBIT Gesellschaft fuer EDV-Beratung
  * und Informatik-Technologien mbH,
  * Berlin, Duesseldorf, Frankfurt (Germany) and others.
  * All rights reserved. This program and the accompanying materials
@@ -20,6 +20,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.eclipse.ant.internal.core.IAntCoreConstants;
 import org.eclipse.ant.internal.ui.AntSourceViewerConfiguration;
 import org.eclipse.ant.internal.ui.editor.formatter.XmlDocumentFormattingStrategy;
 import org.eclipse.ant.internal.ui.editor.formatter.XmlElementFormattingStrategy;
@@ -262,7 +263,7 @@ public class AntEditorSourceViewerConfiguration extends AntSourceViewerConfigura
 			list.add(prefix.toString());
 		}
 
-		list.add(""); //$NON-NLS-1$
+		list.add(IAntCoreConstants.EMPTY_STRING);
 		
 		return (String[]) list.toArray(new String[list.size()]);
 	}
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/TaskDescriptionProvider.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/TaskDescriptionProvider.java
index b8f1882..2f1ffca 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/TaskDescriptionProvider.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/TaskDescriptionProvider.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2005 GEBIT Gesellschaft fuer EDV-Beratung
+ * Copyright (c) 2002, 2011 GEBIT Gesellschaft fuer EDV-Beratung
  * und Informatik-Technologien mbH, 
  * Berlin, Duesseldorf, Frankfurt (Germany) and others.
  * All rights reserved. This program and the accompanying materials 
@@ -24,6 +24,7 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
+import org.eclipse.ant.internal.core.IAntCoreConstants;
 import org.eclipse.ant.internal.ui.AntUIPlugin;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.operation.IRunnableWithProgress;
@@ -31,10 +32,8 @@ import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.progress.IProgressService;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
@@ -62,13 +61,45 @@ public class TaskDescriptionProvider {
     public static final String XML_TAG_ATTRIBUTES = "attributes"; //$NON-NLS-1$
     public static final String XML_TAG_ELEMENT = "element"; //$NON-NLS-1$
     public static final String XML_TAG_STRUCTURE = "structure"; //$NON-NLS-1$
-    public static final String XML_TAG_DESCRIPTION = "description"; //$NON-NLS-1$
-    public static final String XML_ATTRIBUTE_NAME = "name"; //$NON-NLS-1$
     public static final String XML_ATTRIBUTE_REQUIRED = "required"; //$NON-NLS-1$
+
+    /**
+     * Class to avoid holding on to DOM element handles
+     * @since 3.5
+     */
+    class ProposalNode {
+    	String desc = null;
+    	String required = null;
+    	HashMap nodes = null;
+    	
+    	ProposalNode(String desc, String required) {
+    		this.desc = desc;
+    		this.required = required;
+    	}
+    	
+    	void addChild(String name, ProposalNode node) {
+    		if(nodes == null) {
+    			nodes = new HashMap(9);
+    		}
+    		nodes.put(name, node);
+    	}
+    	
+    	ProposalNode getChild(String name) {
+    		if(nodes != null) {
+    			return (ProposalNode) nodes.get(name);
+    		}
+    		return null;
+    	}
+    }
     
     private static TaskDescriptionProvider fgDefault;
 
-    private Map taskNodes= null;
+    /**
+     * Mapping of {@link String} to {@link ProposalNode}
+     * <br><br>
+     * <code>Map<String, ProposalNode></code>
+     */
+    private Map taskNodes = null;
     
     /**
      * Meant to be a singleton
@@ -80,9 +111,8 @@ public class TaskDescriptionProvider {
     	if (fgDefault == null) {
     		fgDefault= new TaskDescriptionProvider();
     		IRunnableWithProgress runnable= new IRunnableWithProgress() {
-				public void run(IProgressMonitor monitor)
-									throws InvocationTargetException, InterruptedException {					
-						fgDefault.initialize();
+				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {					
+					fgDefault.initialize();
 				}
 			};
 			
@@ -97,32 +127,74 @@ public class TaskDescriptionProvider {
     }
 
     /**
-     * Parses the task description xml file and stores the information.
+     * Parses the task description XML file and stores the information.
      */
     protected void initialize() {
-    	taskNodes= new HashMap();
-        Document tempDocument = parseFile(TASKS_DESCRIPTION_XML_FILE_NAME);
-        Node tempRootNode = tempDocument.getDocumentElement();
-        NodeList tempChildNodes = tempRootNode.getChildNodes();
-        for(int i=0; i<tempChildNodes.getLength(); i++) {
-            Node tempNode = tempChildNodes.item(i);
-            if(tempNode.getNodeType() == Node.ELEMENT_NODE) {
-                String tempTagName = tempNode.getNodeName();
-                if(tempTagName.equals(XML_TAG_TASK)) {
-                    NamedNodeMap tempAttributes = tempNode.getAttributes();
-                    Node tempAttributeNode = tempAttributes.getNamedItem(XML_ATTRIBUTE_NAME);
-                    if(tempAttributeNode != null) {
-                        String tempTaskName = tempAttributeNode.getNodeValue();
-                        if(tempTaskName != null) {
-                            taskNodes.put(tempTaskName, tempNode);
-                        }
+    	taskNodes = new HashMap();
+        Document doc = parseFile(TASKS_DESCRIPTION_XML_FILE_NAME);
+        Node root = doc.getDocumentElement();
+        NodeList tasks = root.getChildNodes();
+        Node node = null;
+        for(int i=0; i < tasks.getLength(); i++) {
+            node = tasks.item(i);
+            if(node.getNodeType() == Node.ELEMENT_NODE) {
+                if(XML_TAG_TASK.equals(node.getNodeName())) {
+                	Element task = (Element) node;
+                	String name = task.getAttribute(IAntCoreConstants.NAME);
+                    if(name != null) {
+                    	ProposalNode tasknode = new ProposalNode(getDescription(task), null);
+                    	taskNodes.put(name, tasknode);
+                    	NodeList nodes = task.getElementsByTagName(XML_TAG_ATTRIBUTE);
+                    	Element e = null;
+                    	for (int j = 0; j < nodes.getLength(); j++) {
+							e = (Element) nodes.item(j);
+							addNode(e, tasknode);
+						}
+                    	nodes = task.getElementsByTagName(XML_TAG_ELEMENT);
+                    	for (int j = 0; j < nodes.getLength(); j++) {
+							e = (Element) nodes.item(j);
+							addNode(e, tasknode);
+						}
                     }
                 }
             }
         }
     }
     
-
+    /**
+     * Adds a new child {@link ProposalNode} to the given parent node
+     * 
+     * @param element
+     * @param node
+     * @since 3.5
+     */
+    void addNode(Element element, ProposalNode node) {
+    	String name = element.getAttribute(IAntCoreConstants.NAME);
+    	if(name != null) {
+    		node.addChild(name, new ProposalNode(getDescription(element), element.getAttribute(XML_ATTRIBUTE_REQUIRED)));
+    	}
+    }
+    
+    /**
+     * Recursively find the description text for the parent {@link Element} 
+     * @param element
+     * @return the description element text or <code>null</code>
+     * @since 3.5
+     */
+    String getDescription(Element element) {
+    	NodeList nodes = element.getChildNodes();
+    	for (int i = 0; i < nodes.getLength(); i++) {
+    		Node node = nodes.item(i);
+			if(node.getNodeType() == Node.ELEMENT_NODE && IAntCoreConstants.DESCRIPTION.equals(node.getNodeName())) {
+				node = node.getFirstChild();
+				if(node != null) {
+					return node.getNodeValue();
+				}
+			}
+		}
+    	return null;
+    }
+    
     /**
      * Returns the (DOM) document as a result of parsing the file with the 
      * specified file name.
@@ -164,61 +236,13 @@ public class TaskDescriptionProvider {
      * no description available.
      */
     public String getDescriptionForTask(String aTaskName) {
-        Element taskElement = (Element)taskNodes.get(aTaskName);
-        if(taskElement != null) {
-            return getDescriptionOfNode(taskElement);
-        }
+    	ProposalNode task = (ProposalNode) taskNodes.get(aTaskName);
+    	if(task != null) {
+    		return task.desc;
+    	}
         return null;
     }
 
-
-    /**
-     * Returns the description of the specified node.
-     * <P>
-     * The node must be either one of task node or attribute node.
-     */
-    private String getDescriptionOfNode(Node aNode) {
-        NodeList tempChildNodes = aNode.getChildNodes();
-        for (int i=0; i<tempChildNodes.getLength(); i++) {
-            Node tempNode = tempChildNodes.item(i);
-            if(tempNode instanceof Element && XML_TAG_DESCRIPTION.equals(tempNode.getNodeName())) {
-                Element tempDescriptionElement = (Element)tempNode;
-                Node tempChildNode = tempDescriptionElement.getFirstChild();
-                if(tempChildNode instanceof Text) {
-                    return ((Text)tempChildNode).getData();
-                }
-                break; 
-            }
-        }
-        return null;
-    }
-    
-    /**
-     * Returns the Required value of the specified node.
-     * <P>
-     * Currently the XML file has Required defined as NOTDEFINED in
-     * some cases. If so the value returned is an empty string
-     */
-    protected String getRequiredOfNode(Node aNode) {
-    	
-    	String tmpNodeName = aNode.getNodeName();
-    	String tmpRequiredValue = null;
-    	
-   		if(aNode.getNodeType() == Node.ELEMENT_NODE && 
-   			(XML_TAG_ATTRIBUTE.equals(tmpNodeName) || XML_TAG_ELEMENT.equals(tmpNodeName)) ) {
-        	  
-        	  tmpRequiredValue = aNode.getAttributes().getNamedItem(XML_ATTRIBUTE_REQUIRED).getNodeValue();
-   		}
-   		
-   		if(tmpRequiredValue == null || tmpRequiredValue.equals("NOTDEFINED")) { //$NON-NLS-1$
-   			return ""; //$NON-NLS-1$
-   		}
-   		
-   		return tmpRequiredValue;
-                   
-    }
-
-    
     /**
      * Returns the description string for the specified attribute of the 
      * specified task.
@@ -227,28 +251,12 @@ public class TaskDescriptionProvider {
      * not known or no description available.
      */
     public String getDescriptionForTaskAttribute(String aTaskName, String anAttributeName) {
-        
-        String tmpDescription = null;	
-        	
-        Node tmpAttributesNode = getAttributesNode(aTaskName);
-        	
-        if(tmpAttributesNode != null) {
-        	
-        	tmpDescription = getDescriptionForNodeNamedWithNameInNodeList( XML_TAG_ATTRIBUTE, anAttributeName,
-        																tmpAttributesNode.getChildNodes());															
-    		//If Description is null we try the elements section else we're satisfied.
-    		if( tmpDescription != null ) {
-    			return tmpDescription;
-    		}
-        }
-        //Not yet found. Try the elements Node
-    	tmpAttributesNode = getElementsNode(aTaskName);
-    	if(tmpAttributesNode != null) {
-    		tmpDescription = getDescriptionForNodeNamedWithNameInNodeList( XML_TAG_ELEMENT, anAttributeName,
-            														   tmpAttributesNode.getChildNodes());
-            
-            return tmpDescription;  
-            
+        ProposalNode task = (ProposalNode) taskNodes.get(aTaskName);
+        if(task != null) {
+        	ProposalNode att = task.getChild(anAttributeName);
+        	if(att != null) {
+        		return att.desc;
+        	}
         }
         return null;
     }
@@ -261,170 +269,30 @@ public class TaskDescriptionProvider {
      * known or no description available.
      */
     public String getRequiredAttributeForTaskAttribute(String aTaskName, String anAttributeName) {
- 
-        String tmpRequired = null;	
-        	
-        Node tmpAttributesNode = getAttributesNode(aTaskName);
-        	
-        if(tmpAttributesNode != null) {
-        	
-        	tmpRequired = getRequiredForNodeNamedWithNameInNodeList( XML_TAG_ATTRIBUTE, anAttributeName,
-        																tmpAttributesNode.getChildNodes());															
-    		
-    		//If Required is null we try the elements section else we're satisfied.
-    		if( tmpRequired != null ) {
-    			return tmpRequired;
-    		}
-        }
-        
-        //Not yet found. Try the elements Node
-    	tmpAttributesNode = getElementsNode(aTaskName);
-    	if(tmpAttributesNode != null) {
-    		tmpRequired = getDescriptionForNodeNamedWithNameInNodeList( XML_TAG_ELEMENT, anAttributeName,
-            														   tmpAttributesNode.getChildNodes());
-            //Return it even if its null
-            return tmpRequired;  
-            
+    	ProposalNode task = (ProposalNode) taskNodes.get(aTaskName);
+        if(task != null) {
+        	ProposalNode att = task.getChild(anAttributeName);
+        	if(att != null) {
+        		return att.required;
+        	}
         }
-        
-        //Not found return null
         return null;
     }
     
     /**
-     * Returns the Elements Node of the specified TaskName
-     * 
-     * @param aTaskName The name of the task
-     * @return The Elements Node of the Task.
+     * Returns the {@link ProposalNode} for the given task name or <code>null</code> if one does not exist
+     * @param aTaskName
+     * @return the {@link ProposalNode} for the given name or <code>null</code>
+     * @since 3.5
      */
-    private Node getElementsNode(String aTaskName) {
-    	
-    	Node tmpStructureNode = getStructureNode(aTaskName);
-    	if(tmpStructureNode != null) {
-    		return getChildNodeNamedOfTypeFromNode(XML_TAG_ELEMENTS, Node.ELEMENT_NODE,
-    												tmpStructureNode);
-    	}
-    	return null;
-    }
-    
-    /**
-     * Returns the Attributes Node of the specified TaskName
-     * 
-     * @param aTaskName The name of the task
-     * @return The Attributes Node of the Task or <code>null</code> if one
-     * does not exist.
-     */    
-    protected Node getAttributesNode(String aTaskName) {
-    	
-        Node tmpStructureNode = getStructureNode(aTaskName);
-        if(tmpStructureNode != null){
-        	return getChildNodeNamedOfTypeFromNode(XML_TAG_ATTRIBUTES, Node.ELEMENT_NODE,
-                                                             tmpStructureNode);
-    	} 
-        return null;
-    }
-
-    /**
-     * Returns the Structure Node of the specified TaskName
-     * 
-     * @param aTaskName The name of the task
-     * @return The Structure Node of the Task.
-     */        
-    private Node getStructureNode(String aTaskName) {	
-    	Element taskElement = (Element)taskNodes.get(aTaskName);
-        if(taskElement != null) {
-        	//Dig us down to the Structure node
-        	Node structureNode = getChildNodeNamedOfTypeFromNode(XML_TAG_STRUCTURE, Node.ELEMENT_NODE,
-        	                                                     taskElement);
-        	return structureNode;
-        }
-        return null;
-    }
-    
-    /**
-     * Returns the Description for a Node satisfying the criterias in the
-     * NodeList given as Argument.
-     * 
-     * @param aNodeName The Name of the Node
-     * @param anAttributeName The string of the Name value
-     * @param anAttributesNodeList The NodeList to search in.
-     * @return The Description found or null if none is found
-     */
-    private String getDescriptionForNodeNamedWithNameInNodeList( String aNodeName, String anAttributeName,
-    																 NodeList anAttributesNodeList) {
-    	for (int i=0; i<anAttributesNodeList.getLength(); i++) {
-                Node tempNode = anAttributesNodeList.item(i);
-                if(tempNode.getNodeType() == Node.ELEMENT_NODE && aNodeName.equals(tempNode.getNodeName())) {
-                	if( anAttributeName.equals(getTaskAttributeName(tempNode)) ) {
-                    	return getDescriptionOfNode(tempNode);
-                	}
-                }
-        }
-        
-        //Not found
-        return null;																 	
-	}
-	
-	
-    /**
-     * Returns the Name of Task Attribute.
-     * 
-     * @return The Name of the Attribute.
-     */
-    public String getTaskAttributeName(Node aTaskAttributeNode) {
-    	NamedNodeMap tmpNamedNodeMap = aTaskAttributeNode.getAttributes();	
-    	return tmpNamedNodeMap.getNamedItem(XML_ATTRIBUTE_NAME).getNodeValue();
-    }
-    
-    /**
-     * Returns the ChildNode of the node defined by the Arguments. The
-     * first child found matching the criterias is returned.
-     * 
-     * @param aNodeName The Name of the Node to return.
-     * @param aType The Type of the node @see Node
-     * @param aParentNode The Node to get the child from
-     * 
-     * @return The First Child Node found matching the criterias,
-     * or null if none is found.
-     */
-    private Node getChildNodeNamedOfTypeFromNode(String aNodeName, short aNodeType, Node aParentNode) {
-    
-    	NodeList tmpNodeList = aParentNode.getChildNodes();
-		for(int i=0; i<tmpNodeList.getLength(); ++i ) {
-			Node tmpNode = tmpNodeList.item(i);
-			if( (tmpNode.getNodeType() == aNodeType) && aNodeName.equals(tmpNode.getNodeName()) ) {
-				return tmpNode;
-			}
-		}
-		//Not found
-		return null;    	
-    }
-    
-     /**
-     * Returns the Required Field for a Node satisfying the criterias in the
-     * NodeList given as Argument.
-     * 
-     * @param aNodeName The Name of the Node
-     * @param anAttributeName The string of the Name value
-     * @param anAttributesNodeList The NodeList to search in.
-     * @return The Description found or null if none is found
-     */
-    private String getRequiredForNodeNamedWithNameInNodeList( String aNodeName, String anAttributeName,
-    																 NodeList anAttributesNodeList) {
-    	for (int i=0; i<anAttributesNodeList.getLength(); i++) {
-    		Node tempNode = anAttributesNodeList.item(i);
-            if(tempNode.getNodeType() == Node.ELEMENT_NODE && aNodeName.equals(tempNode.getNodeName())) {
-        		if( anAttributeName.equals(getTaskAttributeName(tempNode)) ) {
-                	return getRequiredOfNode(tempNode);
-            	}
-            }
-        }
-        
-        //Not found
-        return null;																 	
+    ProposalNode getTaskNode(String aTaskName) {
+    	return (ProposalNode) taskNodes.get(aTaskName);
     }
     
     protected static void reset() {
+    	if(fgDefault != null && fgDefault.taskNodes != null) {
+    		fgDefault.taskNodes.clear();
+    	}
     	fgDefault= null;
     }
 }
\ No newline at end of file
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/actions/ToggleLineBreakpointAction.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/actions/ToggleLineBreakpointAction.java
index 46a5312..26c5e69 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/actions/ToggleLineBreakpointAction.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/actions/ToggleLineBreakpointAction.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,20 +12,29 @@ package org.eclipse.ant.internal.ui.editor.actions;
 
 import org.eclipse.ant.internal.launching.debug.IAntDebugConstants;
 import org.eclipse.ant.internal.launching.debug.model.AntLineBreakpoint;
-import org.eclipse.core.resources.IResource;
+
+import org.eclipse.swt.widgets.Display;
+
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.ILineBreakpoint;
-import org.eclipse.debug.ui.actions.IToggleBreakpointsTarget;
-import org.eclipse.jface.text.ITextSelection;
+
+import org.eclipse.core.resources.IResource;
+
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.widgets.Display;
+
+import org.eclipse.jface.text.ITextSelection;
+
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IFileEditorInput;
 import org.eclipse.ui.IWorkbenchPart;
 
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.core.model.IBreakpoint;
+import org.eclipse.debug.core.model.ILineBreakpoint;
+
+import org.eclipse.debug.ui.DebugUITools;
+import org.eclipse.debug.ui.actions.IToggleBreakpointsTarget;
+
 public class ToggleLineBreakpointAction implements IToggleBreakpointsTarget {
 	
 	/* (non-Javadoc)
@@ -50,8 +59,7 @@ public class ToggleLineBreakpointAction implements IToggleBreakpointsTarget {
 			IBreakpoint breakpoint = breakpoints[i];
 			if (resource.equals(breakpoint.getMarker().getResource())) {
 				if (((ILineBreakpoint)breakpoint).getLineNumber() == (lineNumber + 1)) {
-					// remove
-					breakpoint.delete();
+					DebugUITools.deleteBreakpoints(new IBreakpoint[] { breakpoint }, part.getSite().getShell(), null);
 					return;
 				}
 			}
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/anttasks_1.6.0.xml b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/anttasks_1.6.0.xml
index 356e3fb..eed65ab 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/anttasks_1.6.0.xml	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/anttasks_1.6.0.xml	
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
-     Copyright (c) 2005, 2007 IBM Corporation and others.
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Copyright (c) 2005, 2011 IBM Corporation and others.
      All rights reserved. This program and the accompanying materials
      are made available under the terms of the Eclipse Public License v1.0
      which accompanies this distribution, and is available at
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/FormattingPreferences.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/FormattingPreferences.java
index a7b5f4a..7a2fbd9 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/FormattingPreferences.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/FormattingPreferences.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2005 John-Mason P. Shackelford and others.
+ * Copyright (c) 2004, 2011 John-Mason P. Shackelford and others.
  * All rights reserved. This program and the accompanying materials 
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,6 +11,7 @@
  *******************************************************************************/
 package org.eclipse.ant.internal.ui.editor.formatter;
 
+import org.eclipse.ant.internal.core.IAntCoreConstants;
 import org.eclipse.ant.internal.ui.AntUIPlugin;
 import org.eclipse.ant.internal.ui.preferences.AntEditorPreferenceConstants;
 import org.eclipse.jface.preference.IPreferenceStore;
@@ -25,7 +26,7 @@ public class FormattingPreferences {
        if (!useSpacesInsteadOfTabs()) {
             canonicalIndent = "\t"; //$NON-NLS-1$
         } else {
-            String tab = ""; //$NON-NLS-1$
+            String tab = IAntCoreConstants.EMPTY_STRING;
             for (int i = 0; i < getTabWidth(); i++) {
                 tab = tab.concat(" "); //$NON-NLS-1$
             }
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlDocumentFormatter.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlDocumentFormatter.java
index a9dbfb7..4d9abf6 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlDocumentFormatter.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlDocumentFormatter.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2006s John-Mason P. Shackelford and others.
+ * Copyright (c) 2004, 2011 John-Mason P. Shackelford and others.
  * All rights reserved. This program and the accompanying materials 
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,6 +16,7 @@ import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
 
+import org.eclipse.ant.internal.core.IAntCoreConstants;
 import org.eclipse.ant.internal.ui.AntUIPlugin;
 import org.eclipse.ant.internal.ui.preferences.AntEditorPreferenceConstants;
 import org.eclipse.core.runtime.Assert;
@@ -206,7 +207,7 @@ public class XmlDocumentFormatter {
          * @see org.eclipse.ant.internal.ui.editor.formatter.XmlDocumentFormatter.TagReader#getStartOfTag()
          */
         public String getStartOfTag() {
-            return ""; //$NON-NLS-1$
+            return IAntCoreConstants.EMPTY_STRING;
         }
 
         /* (non-Javadoc)
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlFormatter.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlFormatter.java
index 9891a45..9273679 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlFormatter.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlFormatter.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2006 John-Mason P. Shackelford and others.
+ * Copyright (c) 2004, 2011 John-Mason P. Shackelford and others.
  * All rights reserved. This program and the accompanying materials 
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  * 
  * Contributors:
  *     John-Mason P. Shackelford - initial API and implementation
+ *     IBM Corporation - bug fixes
  *******************************************************************************/
 package org.eclipse.ant.internal.ui.editor.formatter;
 
@@ -14,6 +15,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import org.eclipse.ant.internal.core.IAntCoreConstants;
 import org.eclipse.ant.internal.ui.editor.templates.AntContext;
 import org.eclipse.ant.internal.ui.editor.text.AntDocumentSetupParticipant;
 import org.eclipse.ant.internal.ui.editor.text.AntEditorPartitionScanner;
@@ -222,11 +224,11 @@ public class XmlFormatter {
 	private static String getLeadingText(IDocument document, IAntModel model, int completionOffset) {
 		AntProjectNode project= model.getProjectNode(false);
 		if (project == null) {
-			return ""; //$NON-NLS-1$
+			return IAntCoreConstants.EMPTY_STRING;
 		}
 		AntElementNode node= project.getNode(completionOffset);// - fAccumulatedChange);
 		if (node == null) {
-			return ""; //$NON-NLS-1$
+			return IAntCoreConstants.EMPTY_STRING;
 		}
 		
 		StringBuffer buf= new StringBuffer();
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntEditorContentOutlinePage.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntEditorContentOutlinePage.java
index 69728fe..cc15786 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntEditorContentOutlinePage.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntEditorContentOutlinePage.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2005 GEBIT Gesellschaft fuer EDV-Beratung
+ * Copyright (c) 2002, 2009 GEBIT Gesellschaft fuer EDV-Beratung
  * und Informatik-Technologien mbH, 
  * Berlin, Duesseldorf, Frankfurt (Germany) and others.
  * All rights reserved. This program and the accompanying materials 
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntEditorMarkerUpdater.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntEditorMarkerUpdater.java
index 834afb7..392a891 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntEditorMarkerUpdater.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntEditorMarkerUpdater.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
+ * Copyright (c) 2004, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,6 +18,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.eclipse.ant.core.AntCorePlugin;
+import org.eclipse.ant.internal.core.IAntCoreConstants;
 import org.eclipse.ant.internal.ui.AntUIPlugin;
 import org.eclipse.ant.internal.ui.model.IAntModel;
 import org.eclipse.ant.internal.ui.model.IProblem;
@@ -51,7 +52,7 @@ public class AntEditorMarkerUpdater {
 		 */
 		public IStatus runInWorkspace(IProgressMonitor monitor) {
 			updateMarkers0(fProblems);
-			return new Status(IStatus.OK, AntUIPlugin.getUniqueIdentifier(), IStatus.OK, "", null); //$NON-NLS-1$
+			return new Status(IStatus.OK, AntUIPlugin.getUniqueIdentifier(), IStatus.OK, IAntCoreConstants.EMPTY_STRING, null);
 		}
 	}
 	
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntContext.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntContext.java
index b50d081..f4cb3db 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntContext.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntContext.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2004, 2009 IBM Corporation and others.
+ *  Copyright (c) 2004, 2010 IBM Corporation and others.
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
@@ -12,14 +12,19 @@
 package org.eclipse.ant.internal.ui.editor.templates;
 
 import org.eclipse.ant.internal.ui.model.IAntModel;
+
 import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.Position;
+import org.eclipse.jface.text.TextUtilities;
 import org.eclipse.jface.text.templates.DocumentTemplateContext;
 import org.eclipse.jface.text.templates.Template;
 import org.eclipse.jface.text.templates.TemplateBuffer;
 import org.eclipse.jface.text.templates.TemplateContextType;
 import org.eclipse.jface.text.templates.TemplateException;
+import org.eclipse.jface.text.templates.TemplateTranslator;
 
 public class AntContext extends DocumentTemplateContext {
 	
@@ -34,12 +39,15 @@ public class AntContext extends DocumentTemplateContext {
 	 * @see org.eclipse.jface.text.templates.TemplateContext#evaluate(org.eclipse.jface.text.templates.Template)
 	 */
 	public TemplateBuffer evaluate(Template template) throws BadLocationException, TemplateException {
+		if (!canEvaluate(template))
+			return null;
+
+		TemplateBuffer templateBuffer= createTemplateBuffer(template);
 
-		TemplateBuffer templateBuffer= super.evaluate(template);
-		
 		if (templateBuffer == null) {
 			return null;
 		}
+
 		//TODO Not enabled see bug 55356
 //		if (false && AntUIPlugin.getDefault().getPreferenceStore().getBoolean(AntEditorPreferenceConstants.TEMPLATES_USE_CODEFORMATTER)) {
 //			FormattingPreferences prefs = new FormattingPreferences();
@@ -47,7 +55,30 @@ public class AntContext extends DocumentTemplateContext {
 //		}
 		return templateBuffer;
 	}
-	
+
+	private TemplateBuffer createTemplateBuffer(Template template) throws BadLocationException, TemplateException {
+		String lineDelimiter= TextUtilities.getDefaultLineDelimiter(getDocument());
+		IDocument document= new Document(template.getPattern());
+		convertLineDelimiters(document, lineDelimiter);
+
+		TemplateTranslator translator= new TemplateTranslator();
+		TemplateBuffer buffer= translator.translate(document.get());
+
+		getContextType().resolve(buffer, this);
+
+		return buffer;
+	}
+
+	private static void convertLineDelimiters(IDocument document, String defaultLineDelimiter) throws BadLocationException {
+		int lines= document.getNumberOfLines();
+		for (int line= 0; line < lines; line++) {
+			IRegion region= document.getLineInformation(line);
+			String lineDelimiter= document.getLineDelimiter(line);
+			if (lineDelimiter != null)
+				document.replace(region.getOffset() + region.getLength(), lineDelimiter.length(), defaultLineDelimiter);
+		}
+	}
+
 	/**
 	 * @return Returns the AntModel.
 	 */
@@ -59,12 +90,24 @@ public class AntContext extends DocumentTemplateContext {
 	 * @see org.eclipse.jface.text.templates.DocumentTemplateContext#getEnd()
 	 */
 	public int getEnd() {
-		int replacementOffset = getCompletionOffset();
-		int replacementLength = getCompletionLength();
-		if (replacementOffset > 0 && getDocument().get().charAt(replacementOffset - 1) == '<' && getDocument().getLength() > 1) {
-			replacementLength++;
+		int start= getCompletionOffset();
+		int length= getCompletionLength();
+
+		IDocument document= getDocument();
+		if (start > 0 && document.get().charAt(start - 1) == '<' && document.getLength() > 1) {
+			length++;
 		}
-		return replacementLength + replacementOffset;
+
+		int end= getCompletionOffset() + length;
+
+		try {
+			while (start != end && Character.isWhitespace(document.getChar(end - 1)))
+				end--;
+		} catch (BadLocationException e) {
+			// Return latest valid end
+		}
+
+		return end;
 	}
 	
 	/* (non-Javadoc)
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntTemplatePreferencePage.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntTemplatePreferencePage.java
index 41b3227..ada3f5f 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntTemplatePreferencePage.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntTemplatePreferencePage.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005  John-Mason P. Shackelford and others.
+ * Copyright (c) 2000, 2011  John-Mason P. Shackelford and others.
  * All rights reserved. This program and the accompanying materials 
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,6 +11,7 @@
  *******************************************************************************/
 package org.eclipse.ant.internal.ui.editor.templates;
 
+import org.eclipse.ant.internal.core.IAntCoreConstants;
 import org.eclipse.ant.internal.ui.AntUIPlugin;
 import org.eclipse.ant.internal.ui.editor.formatter.FormattingPreferences;
 import org.eclipse.ant.internal.ui.editor.formatter.XmlFormatter;
@@ -95,7 +96,7 @@ public class AntTemplatePreferencePage extends TemplatePreferencePage {
 				viewer.getDocument().set(template.getPattern());
 			}
 		} else {
-			viewer.getDocument().set(""); //$NON-NLS-1$
+			viewer.getDocument().set(IAntCoreConstants.EMPTY_STRING);
 		}		
 	}
 	/* (non-Javadoc)
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorDocumentProvider.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorDocumentProvider.java
index 3c8279c..c63d65b 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorDocumentProvider.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorDocumentProvider.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2006 GEBIT Gesellschaft fuer EDV-Beratung
+ * Copyright (c) 2002, 2007 GEBIT Gesellschaft fuer EDV-Beratung
  * und Informatik-Technologien mbH, 
  * Berlin, Duesseldorf, Frankfurt (Germany) and others.
  * All rights reserved. This program and the accompanying materials 
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntFoldingStructureProvider.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntFoldingStructureProvider.java
index 5202f51..f70c588 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntFoldingStructureProvider.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntFoldingStructureProvider.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
+ * Copyright (c) 2004, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -23,6 +23,7 @@ import org.eclipse.ant.internal.ui.editor.AntEditor;
 import org.eclipse.ant.internal.ui.model.AntElementNode;
 import org.eclipse.ant.internal.ui.model.AntModel;
 import org.eclipse.ant.internal.ui.model.AntProjectNode;
+
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.Position;
@@ -41,7 +42,6 @@ public class AntFoldingStructureProvider {
 	private Map fPositionToElement= new HashMap();
 	
 	public AntFoldingStructureProvider(AntEditor editor) {
-		super();
 		fEditor = editor;
 	}
 	
@@ -85,14 +85,13 @@ public class AntFoldingStructureProvider {
 			}
 	
 			Set currentRegions= new HashSet();
+			List root= new ArrayList();
 			AntProjectNode node= antModel.getProjectNode();
-			if (node == null || node.getOffset() == -1 || node.getLength() == -1) {
-				return;
+			if (node != null && node.getOffset() != -1) {
+				root.add(node);
+				List nodes= antModel.getNonStructuralNodes();
+				root.addAll(nodes);
 			}
-			List root= new ArrayList(2);
-			root.add(node);
-			List nodes= antModel.getNonStructuralNodes();
-			root.addAll(nodes);
 			addFoldingRegions(currentRegions, root);
 			updateFoldingRegions(model, currentRegions);
 		} catch (BadLocationException be) {
@@ -118,9 +117,9 @@ public class AntFoldingStructureProvider {
 				fPositionToElement.put(position, element);
 			}
 			
-			children= element.getChildNodes();
-			if (children != null) {
-				addFoldingRegions(regions, children);
+			List childNodes= element.getChildNodes();
+			if (childNodes != null) {
+				addFoldingRegions(regions, childNodes);
 			}
 		}
 	}
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLTextHover.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLTextHover.java
index 90f616b..a8f6c6c 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLTextHover.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLTextHover.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,6 +18,7 @@ import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.AbstractFileSet;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.PatternSet;
+import org.eclipse.ant.internal.core.IAntCoreConstants;
 import org.eclipse.ant.internal.launching.debug.model.AntProperty;
 import org.eclipse.ant.internal.launching.debug.model.AntStackFrame;
 import org.eclipse.ant.internal.launching.debug.model.AntValue;
@@ -201,8 +202,8 @@ public class XMLTextHover implements ITextHover, ITextHoverExtension, IInformati
 				HTMLPrinter.addBullet(buffer, includes[i]);
 			}
 		}
-		HTMLPrinter.addParagraph(buffer, ""); //$NON-NLS-1$
-		HTMLPrinter.addParagraph(buffer, ""); //$NON-NLS-1$
+		HTMLPrinter.addParagraph(buffer, IAntCoreConstants.EMPTY_STRING);
+		HTMLPrinter.addParagraph(buffer, IAntCoreConstants.EMPTY_STRING);
 		if (excludes != null && excludes.length > 0) {
 			HTMLPrinter.addSmallHeader(buffer, AntEditorTextMessages.XMLTextHover_6);
 			for (int i = 0; i < excludes.length; i++) {
@@ -302,24 +303,25 @@ public class XMLTextHover implements ITextHover, ITextHoverExtension, IInformati
 
 	private static IRegion cleanRegionForNonProperty(int offset, IDocument document, IRegion region) throws BadLocationException {
 		//do not allow spaces in region that is not a property
-		String text= document.get(region.getOffset(), region.getLength());
+		IRegion r = region;
+		String text= document.get(r.getOffset(), r.getLength());
 		if (text.startsWith("/")) { //$NON-NLS-1$
 			text= text.substring(1);
-			region= new Region(region.getOffset() + 1, region.getLength() - 1);
+			r= new Region(r.getOffset() + 1, r.getLength() - 1);
 		}
 		StringTokenizer tokenizer= new StringTokenizer(text, " "); //$NON-NLS-1$
 		if (tokenizer.countTokens() != 1) {
 		    while(tokenizer.hasMoreTokens()) {
 		        String token= tokenizer.nextToken();
 		        int index= text.indexOf(token);
-		        if (region.getOffset() + index <= offset && region.getOffset() + index + token.length() >= offset) {
-		            region= new Region(region.getOffset() + index, token.length());
+		        if (r.getOffset() + index <= offset && r.getOffset() + index + token.length() >= offset) {
+		            r= new Region(r.getOffset() + index, token.length());
 		            break;
 		        }
 		    }
 		}
 		
-		return region;
+		return r;
 	}
 	
 	/* (non-Javadoc)
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/utils/ProjectHelper.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/utils/ProjectHelper.java
index 1dc834e..093bfa0 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/utils/ProjectHelper.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/utils/ProjectHelper.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -29,6 +29,7 @@ import javax.xml.parsers.SAXParserFactory;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Location;
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.ProjectHelperRepository;
 import org.apache.tools.ant.RuntimeConfigurable;
 import org.apache.tools.ant.Target;
 import org.apache.tools.ant.Task;
@@ -37,6 +38,7 @@ import org.apache.tools.ant.helper.AntXMLContext;
 import org.apache.tools.ant.helper.ProjectHelper2;
 import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.JAXPUtils;
+import org.eclipse.ant.internal.core.IAntCoreConstants;
 import org.eclipse.ant.internal.ui.model.IAntModel;
 import org.eclipse.jface.text.BadLocationException;
 import org.xml.sax.Attributes;
@@ -60,7 +62,7 @@ public class ProjectHelper extends ProjectHelper2 {
 	private static FileUtils fu= null;
     
 	/**
-	 * The buildfile that is to be parsed. Must be set if parsing is to
+	 * The build file that is to be parsed. Must be set if parsing is to
 	 * be successful.
 	 */
 	private File buildFile= null;
@@ -158,7 +160,7 @@ public class ProjectHelper extends ProjectHelper2 {
             String fileName= contextLocator.getSystemId();
             String normalizedFileName= (String) fNormalizedFileNames.get(fileName);
             if (normalizedFileName == null) {
-                if (fileName.startsWith("file:")) { //$NON-NLS-1$
+                if (fileName.startsWith(IAntCoreConstants.FILE_PROTOCOL)) {
                     normalizedFileName= getFileUtils().fromURI(fileName);
                     fNormalizedFileNames.put(fileName, normalizedFileName);
                 } else {
@@ -298,7 +300,7 @@ public class ProjectHelper extends ProjectHelper2 {
 			}
             if (context.getCurrentTarget() == null) {
                 //exception occurred creating the project
-                context.getProject().addTarget("", context.getImplicitTarget()); //$NON-NLS-1$
+                context.getProject().addTarget(IAntCoreConstants.EMPTY_STRING, context.getImplicitTarget());
                 context.setCurrentTarget(context.getImplicitTarget());
             }
 			if (currentImportStackSize == 1) {
@@ -514,23 +516,31 @@ public class ProjectHelper extends ProjectHelper2 {
 	}
 	
 	/**
+	 * Constructor
+	 * <p>
+	 * This constructor is only to be used by the {@link ProjectHelperRepository} when loading
+	 * instances of registered helpers.
+	 * </p>
+	 * @since 3.7
+	 * @noreference This constructor is not intended to be referenced by clients.
+	 */
+	public ProjectHelper() {}
+	
+	/**
      * Parses the project file, configuring the project as it goes.
      *
      * @param project the current project
-     * @param source  the xml source or a java.io.File
+     * @param source  the XML source or a {@link File}
      * @param handler the root handler to use (contains the current context)
-     * @exception BuildException if the configuration is invalid or cannot
-     *                           be read
+     * @exception BuildException if the configuration is invalid or cannot be read
      */
-    public void parse(Project project, Object source, org.apache.tools.ant.helper.ProjectHelper2.RootHandler handler) throws BuildException {
-    	
+    public void parse(Project project, Object source, ProjectHelper2.RootHandler handler) throws BuildException {
     	if (!(source instanceof String) && !(source instanceof File)) {
     		//this should only occur with a source URL and that should not be possible currently
     		//as Antlib hard codes using ProjectHelper2 (bug 152793)
     		super.parse(project, source, handler);
     		return;
     	}
-    	
     	AntXMLContext context = (AntXMLContext)project.getReference("ant.parsing.context"); //$NON-NLS-1$
 		//switch to using "our" handler so parsing will continue on hitting errors.
     	handler = new RootHandler(context, mainHandler);
@@ -543,7 +553,12 @@ public class ProjectHelper extends ProjectHelper2 {
                 stream = new FileInputStream(buildFile);
                 inputSource = new InputSource(stream);
         	} else if (source instanceof String) {
-        		stream = new ByteArrayInputStream(((String)source).getBytes("UTF-8")); //$NON-NLS-1$
+        		IAntModel model = getAntModel();
+        		String encoding = IAntCoreConstants.UTF_8;
+        		if(model != null) {
+        			encoding = model.getEncoding();
+        		}
+        		stream = new ByteArrayInputStream(((String)source).getBytes(encoding));
         		inputSource = new InputSource(stream);
         	}
         	
@@ -597,7 +612,7 @@ public class ProjectHelper extends ProjectHelper2 {
         }
     }
 
-	/**
+    /**
 	 * Sets the buildfile that is about to be parsed or <code>null</code> if
 	 * parsing has completed.
 	 * 
@@ -636,7 +651,7 @@ public class ProjectHelper extends ProjectHelper2 {
             try {
                 Target newCurrent = new Target();
                 newCurrent.setProject(project);
-                newCurrent.setName(""); //$NON-NLS-1$
+                newCurrent.setName(IAntCoreConstants.EMPTY_STRING);
                 context.setCurrentTarget(newCurrent);
                 context.setCurrentTargets(new HashMap());
                 context.setImplicitTarget(newCurrent);
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/internal/ui/antsupport/inputhandler/AntInputHandler.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/internal/ui/antsupport/inputhandler/AntInputHandler.java
index 655ec18..8c2f191 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/internal/ui/antsupport/inputhandler/AntInputHandler.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/internal/ui/antsupport/inputhandler/AntInputHandler.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,6 +14,7 @@ package org.eclipse.ant.internal.ui.antsupport.inputhandler;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.input.DefaultInputHandler;
 import org.apache.tools.ant.input.InputRequest;
+import org.eclipse.ant.internal.core.IAntCoreConstants;
 import org.eclipse.ant.internal.ui.antsupport.AntSupportMessages;
 import org.eclipse.jface.dialogs.IInputValidator;
 import org.eclipse.jface.dialogs.InputDialog;
@@ -59,7 +60,7 @@ public class AntInputHandler extends DefaultInputHandler {
 						} 
 						if (fFirstValidation) {
 						    fFirstValidation= false;
-						    return ""; //$NON-NLS-1$
+						    return IAntCoreConstants.EMPTY_STRING;
 						}
 						return AntSupportMessages.AntInputHandler_Invalid_input_2;
 					}
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/AntUIPlugin.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/AntUIPlugin.java
index 778b9d5..c002aa1 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/AntUIPlugin.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/AntUIPlugin.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,6 +14,7 @@ package org.eclipse.ant.internal.ui;
 
 import java.util.Locale;
 
+import org.eclipse.ant.internal.core.IAntCoreConstants;
 import org.eclipse.ant.internal.ui.editor.DecayCodeCompletionDataStructuresThread;
 import org.eclipse.ant.internal.ui.editor.text.AntEditorDocumentProvider;
 import org.eclipse.core.runtime.IStatus;
@@ -53,8 +54,6 @@ public class AntUIPlugin extends AbstractUIPlugin {
 	 */
 	public static final String PI_ANTUI = "org.eclipse.ant.ui"; //$NON-NLS-1$
 	
-	private static final String EMPTY_STRING= ""; //$NON-NLS-1$
-	
 	/**
 	 * The combined preference store.
 	 * @since 3.1
@@ -139,7 +138,7 @@ public class AntUIPlugin extends AbstractUIPlugin {
 	 */
 	public static IStatus newErrorStatus(String message, Throwable exception) {
 		if (message == null) {
-			message= EMPTY_STRING; 
+			return new Status(IStatus.ERROR, IAntUIConstants.PLUGIN_ID, 0, IAntCoreConstants.EMPTY_STRING, exception);
 		}		
 		return new Status(IStatus.ERROR, IAntUIConstants.PLUGIN_ID, 0, message, exception);
 	}
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/AntUIPreferenceInitializer.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/AntUIPreferenceInitializer.java
index 0289642..ace694e 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/AntUIPreferenceInitializer.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/AntUIPreferenceInitializer.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -34,6 +34,7 @@ public class AntUIPreferenceInitializer extends AbstractPreferenceInitializer {
 		prefs.setDefault(IAntUIPreferenceConstants.ANT_FIND_BUILD_FILE_NAMES, "build.xml"); //$NON-NLS-1$
 		
 		prefs.setDefault(IAntUIPreferenceConstants.DOCUMENTATION_URL, "http://ant.apache.org/manual"); //$NON-NLS-1$
+		prefs.setDefault(IAntUIPreferenceConstants.USE_WORKSPACE_JRE, false);
 	
 		EditorsUI.useAnnotationsPreferencePage(prefs);
 		EditorsUI.useQuickDiffPreferencePage(prefs);
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/AntUtil.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/AntUtil.java
index 05b7cd5..72d106d 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/AntUtil.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/AntUtil.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -24,6 +24,7 @@ import java.util.regex.Pattern;
 import org.apache.tools.ant.Target;
 import org.eclipse.ant.core.AntCorePlugin;
 import org.eclipse.ant.internal.core.AntCoreUtil;
+import org.eclipse.ant.internal.core.IAntCoreConstants;
 import org.eclipse.ant.internal.launching.AntLaunchingUtil;
 import org.eclipse.ant.internal.ui.editor.AntEditor;
 import org.eclipse.ant.internal.ui.model.AntElementNode;
@@ -247,7 +248,7 @@ public final class AntUtil {
 		AntTargetNode[] targets= getTargets(project);
         if (targets == null) {
             Hashtable antTargets= project.getProject().getTargets();
-            Target implicitTarget= (Target) antTargets.get(""); //$NON-NLS-1$
+            Target implicitTarget= (Target) antTargets.get(IAntCoreConstants.EMPTY_STRING);
             if (implicitTarget != null) {
                 AntTargetNode implicitTargetNode= new AntTargetNode(implicitTarget);
                 project.addChildNode(implicitTargetNode);
@@ -397,7 +398,7 @@ public final class AntUtil {
 		if (path.length() == 0) {
 			return null;
 		}
-		if (path.startsWith("file:")) { //$NON-NLS-1$
+		if (path.startsWith(IAntCoreConstants.FILE_PROTOCOL)) {
 			// remove "file:"
 			path= path.substring(5, path.length());
 		}
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/ColumnSorter.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/ColumnSorter.java
index df0ea2b..9ced695 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/ColumnSorter.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/ColumnSorter.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
+ * Copyright (c) 2009, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.ant.internal.ui;
 
+import org.eclipse.ant.internal.core.IAntCoreConstants;
 import org.eclipse.ant.internal.ui.preferences.AntObjectLabelProvider;
 import org.eclipse.jface.viewers.ColumnViewer;
 import org.eclipse.jface.viewers.Viewer;
@@ -92,11 +93,11 @@ public abstract class ColumnSorter extends ViewerComparator {
 	public int compare(Viewer viewer, Object e1, Object e2) {
 		String text1 = getCompareText(e1, this.columnidx);
 		if(text1 == null) {
-			text1 = ""; //$NON-NLS-1$
+			text1 = IAntCoreConstants.EMPTY_STRING; 
 		}
 		String text2 = getCompareText(e2, this.columnidx);
 		if(text2 == null) {
-			text2 = ""; //$NON-NLS-1$
+			text2 = IAntCoreConstants.EMPTY_STRING; 
 		}
 		return (this.direction == SWT.UP ? -1 : 1) * 
 			text1.compareTo(text2);
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/IAntUIPreferenceConstants.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/IAntUIPreferenceConstants.java
index 9d1e23b..74dbe88 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/IAntUIPreferenceConstants.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/IAntUIPreferenceConstants.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -84,4 +84,11 @@ public interface IAntUIPreferenceConstants {
 	 * Ant documentation.
 	 */
 	public static final String DOCUMENTATION_URL = "documentation.url"; //$NON-NLS-1$
+	
+	 /**
+     * Boolean preference that allows Ant to always be run in the same JRE as the workspace
+     * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=135807"
+     * @since 3.7
+     */
+    public static final String USE_WORKSPACE_JRE = "workspacejre"; //$NON-NLS-1$
 }
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/AntNewJavaProjectPage.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/AntNewJavaProjectPage.java
index bec0e91..0b5dbed 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/AntNewJavaProjectPage.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/AntNewJavaProjectPage.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -21,6 +21,7 @@ import java.util.List;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.UnknownElement;
 import org.apache.tools.ant.taskdefs.Javac;
+import org.eclipse.ant.internal.core.IAntCoreConstants;
 import org.eclipse.ant.internal.ui.AntUIPlugin;
 import org.eclipse.ant.internal.ui.AntUtil;
 import org.eclipse.ant.internal.ui.model.AntElementNode;
@@ -249,7 +250,7 @@ public class AntNewJavaProjectPage extends WizardPage {
 	 */
 	private String getProjectNameFieldValue() {
 		if (fProjectNameField == null) {
-			return ""; //$NON-NLS-1$
+			return IAntCoreConstants.EMPTY_STRING;
 		} 
 		return fProjectNameField.getText().trim();
 	}
@@ -268,7 +269,7 @@ public class AntNewJavaProjectPage extends WizardPage {
 	 */
 	private void handleBrowseButtonPressed() {
 		
-		String lastUsedPath= ""; //$NON-NLS-1$
+		String lastUsedPath= IAntCoreConstants.EMPTY_STRING;
 		FileDialog dialog = new FileDialog(getShell(), SWT.SINGLE);
 		dialog.setFilterExtensions(new String[] { "*.xml" }); //$NON-NLS-1$;
 		dialog.setFilterPath(lastUsedPath);
@@ -295,13 +296,13 @@ public class AntNewJavaProjectPage extends WizardPage {
 
 		String locationFieldContents = getProjectLocationFieldValue();
 
-		if (locationFieldContents.equals("")) { //$NON-NLS-1$
+		if (locationFieldContents.equals(IAntCoreConstants.EMPTY_STRING)) {
 			setErrorMessage(null);
 			setMessage(DataTransferMessages.AntNewJavaProjectPage_15);
 			return false;
 		}
 
-		IPath path = new Path(""); //$NON-NLS-1$
+		IPath path = new Path(IAntCoreConstants.EMPTY_STRING);
 		if (!path.isValidPath(locationFieldContents)) {
 			setErrorMessage(DataTransferMessages.AntNewJavaProjectPage_16);
 			return false;
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/AppletUtil.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/AppletUtil.java
index 5846e39..b6c8457 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/AppletUtil.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/AppletUtil.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2006 Richard Hoefter and others.
+ * Copyright (c) 2004, 2011 Richard Hoefter and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,6 +16,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import org.eclipse.ant.internal.core.IAntCoreConstants;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.debug.core.ILaunch;
@@ -59,7 +60,7 @@ public class AppletUtil
         b.append("        <applet code="); //$NON-NLS-1$
         b.append(getQuotedString(name + ".class")); //$NON-NLS-1$
         String appletName = configuration.getAttribute(
-                IJavaLaunchConfigurationConstants.ATTR_APPLET_NAME, ""); //$NON-NLS-1$
+                IJavaLaunchConfigurationConstants.ATTR_APPLET_NAME, IAntCoreConstants.EMPTY_STRING);
         if (appletName.length() != 0)
         {
             b.append(" name=\"" + appletName + "\""); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/BuildFileCreator.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/BuildFileCreator.java
index 46542a2..e14ae78 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/BuildFileCreator.java	
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/BuildFileCreator.java	
@@ -1,1331 +1,1333 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 Richard Hoefter and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Richard Hoefter (richard.hoefter at web.de) - initial API and implementation, bug 95297, bug 97051, bug 128103, bug 201180, bug 161354
- *     IBM Corporation - nlsing and incorporating into Eclipse, bug 108276, bug 124210, bug 161845, bug 177833
- *     Nikolay Metchev (N.Metchev at teamphone.com) - bug 108276
- *     Ryan Fong (rfong at trapezenetworks.com) - bug 201143
- *******************************************************************************/
-
-package org.eclipse.ant.internal.ui.datatransfer;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.TreeMap;
-import java.util.TreeSet;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-
-import org.eclipse.ant.internal.ui.AntUIPlugin;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Shell;
-import org.w3c.dom.Comment;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.ProcessingInstruction;
-import org.xml.sax.SAXException;
-
-/**
- * Creates build.xml file.
- */
-public class BuildFileCreator
-{
-    protected static final String IMPORT_BUILDFILE_PROCESSING_TARGET = "eclipse.ant.import"; //$NON-NLS-1$
-    protected static final String WARNING = " WARNING: Eclipse auto-generated file." + ExportUtil.NEWLINE + //$NON-NLS-1$
-                                            "              Any modifications will be overwritten."; //$NON-NLS-1$
-    protected static final String NOTE =    "              To include a user specific buildfile here, " + //$NON-NLS-1$
-                                            "simply create one in the same" + ExportUtil.NEWLINE + //$NON-NLS-1$
-                                            "              directory with the processing instruction " + //$NON-NLS-1$
-                                            "<?" +  IMPORT_BUILDFILE_PROCESSING_TARGET + "?>" + ExportUtil.NEWLINE + //$NON-NLS-1$ //$NON-NLS-2$
-                                            "              as the first entry and export the buildfile again. "; //$NON-NLS-1$
-
-    protected static String BUILD_XML = "build.xml"; //$NON-NLS-1$
-    protected static String JUNIT_OUTPUT_DIR = "junit"; //$NON-NLS-1$
-    protected static boolean CHECK_SOURCE_CYCLES = true;
-    protected static boolean CREATE_ECLIPSE_COMPILE_TARGET = true;
-    
-    private Document doc;
-    private Element root;
-    private IJavaProject project;
-    private String projectName;
-    private String projectRoot;
-    private Map variable2valueMap;
-    private Shell shell;
-    private Set visited = new TreeSet(); // record used subclasspaths
-    private Node classpathNode;
-    
-    /**
-     * Constructor. Please prefer {@link #createBuildFiles(Set, Shell, IProgressMonitor)} if
-     * you do not want call the various createXXX() methods yourself.
-     * 
-     * @param project    create buildfile for this project
-     * @param shell      parent instance for dialogs
-     */
-    public BuildFileCreator(IJavaProject project, Shell shell) throws ParserConfigurationException
-    {
-        this.project = project;
-        this.projectName = project.getProject().getName();
-        this.projectRoot = ExportUtil.getProjectRoot(project);
-