This commit was manufactured by cvs2svn to create branch 'R3_5_maintenance'. Sprout from master 2007-05-10 18:07:50 UTC DJ Houghton <dj> 'Update EEs.' Delete: aspects/bundles/build.ibm.oti/.classpath aspects/bundles/build.ibm.oti/.project aspects/bundles/build.ibm.oti/META-INF/MANIFEST.MF aspects/bundles/build.ibm.oti/build.properties aspects/bundles/build.ibm.oti/readme.txt aspects/bundles/build.ibm.oti/src/com/ibm/oti/shared/HelperAlreadyDefinedException.java aspects/bundles/build.ibm.oti/src/com/ibm/oti/shared/Shared.java aspects/bundles/build.ibm.oti/src/com/ibm/oti/shared/SharedClassHelperFactory.java aspects/bundles/build.ibm.oti/src/com/ibm/oti/shared/SharedClassURLHelper.java compendium/bundles/org.eclipse.equinox.autoconf/.classpath compendium/bundles/org.eclipse.equinox.autoconf/.project compendium/bundles/org.eclipse.equinox.autoconf/.settings/org.eclipse.jdt.core.prefs compendium/bundles/org.eclipse.equinox.autoconf/.settings/org.eclipse.pde.core.prefs compendium/bundles/org.eclipse.equinox.autoconf/META-INF/MANIFEST.MF compendium/bundles/org.eclipse.equinox.autoconf/build.properties compendium/bundles/org.eclipse.equinox.autoconf/doc/metatype070219-iy.patch compendium/bundles/org.eclipse.equinox.autoconf/doc/readme.txt compendium/bundles/org.eclipse.equinox.autoconf/lib/org.eclipse.equinox.metatype_1.0.0.20070219patched.jar compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/Activator.java compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/AliaspidToConfigPack.java compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/AutoconfResourceProcessor.java compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/AutoconfSession.java compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/ConfigPack.java compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/Log.java compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/ResourceToAliaspidToConfigPack.java compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/StoredConfigPack.java compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/StoredConfigPacks.java compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/Utils.java compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/parser/AutoconfDataParser.java compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/parser/AutoconfMetaTypeMsg.java compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/parser/ExternalMessages.properties compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/dp/DpConstants.java compendium/bundles/org.eclipse.equinox.deploymentadmin/.classpath compendium/bundles/org.eclipse.equinox.deploymentadmin/.cvsignore compendium/bundles/org.eclipse.equinox.deploymentadmin/.project compendium/bundles/org.eclipse.equinox.deploymentadmin/META-INF/MANIFEST.MF compendium/bundles/org.eclipse.equinox.deploymentadmin/build.properties compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/AbstractDeploymentSession.java compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/Activator.java compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/DeploymentAdminImpl.java compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/DeploymentPackageImpl.java compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/DeploymentSessionImpl.java compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/InstallDeploymentSession.java compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/UninstallDeploymentSession.java compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/VersionRange.java compendium/bundles/org.eclipse.equinox.log/.classpath compendium/bundles/org.eclipse.equinox.log/.cvsignore compendium/bundles/org.eclipse.equinox.log/.project compendium/bundles/org.eclipse.equinox.log/META-INF/MANIFEST.MF compendium/bundles/org.eclipse.equinox.log/build.properties compendium/bundles/org.eclipse.equinox.log/plugin.properties compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/ExtendedLogEntry.java compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/ExtendedLogReaderService.java compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/ExtendedLogService.java compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/LogFilter.java compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/Logger.java compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/Activator.java compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/ExtendedLogEntryImpl.java compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/ExtendedLogReaderServiceFactory.java compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/ExtendedLogServiceFactory.java compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/ExtendedLogServiceImpl.java compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/LogReaderServiceImpl.java compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/LoggerImpl.java components/bundles/org.eclipse.equinox.transforms.replace.images/.classpath components/bundles/org.eclipse.equinox.transforms.replace.images/.cvsignore components/bundles/org.eclipse.equinox.transforms.replace.images/.project components/bundles/org.eclipse.equinox.transforms.replace.images/.settings/org.eclipse.jdt.core.prefs components/bundles/org.eclipse.equinox.transforms.replace.images/.settings/org.eclipse.pde.core.prefs components/bundles/org.eclipse.equinox.transforms.replace.images/META-INF/MANIFEST.MF components/bundles/org.eclipse.equinox.transforms.replace.images/Replacement Transform Launch.launch components/bundles/org.eclipse.equinox.transforms.replace.images/about.html components/bundles/org.eclipse.equinox.transforms.replace.images/build.properties components/bundles/org.eclipse.equinox.transforms.replace.images/config.ini components/bundles/org.eclipse.equinox.transforms.replace.images/esmerelda.gif components/bundles/org.eclipse.equinox.transforms.replace.images/src/org/eclipse/equinox/transforms/replace/images/Activator.java components/bundles/org.eclipse.equinox.transforms.replace.images/transform.csv components/bundles/org.eclipse.equinox.transforms.replace/.classpath components/bundles/org.eclipse.equinox.transforms.replace/.cvsignore components/bundles/org.eclipse.equinox.transforms.replace/.project components/bundles/org.eclipse.equinox.transforms.replace/.settings/org.eclipse.jdt.core.prefs components/bundles/org.eclipse.equinox.transforms.replace/.settings/org.eclipse.pde.core.prefs components/bundles/org.eclipse.equinox.transforms.replace/META-INF/MANIFEST.MF components/bundles/org.eclipse.equinox.transforms.replace/about.html components/bundles/org.eclipse.equinox.transforms.replace/build.properties components/bundles/org.eclipse.equinox.transforms.replace/hookconfigurators.properties components/bundles/org.eclipse.equinox.transforms.replace/src/org/eclipse/equinox/transforms/replace/ReplaceBundleFile.java components/bundles/org.eclipse.equinox.transforms.replace/src/org/eclipse/equinox/transforms/replace/ReplaceTransformingBundleFileWrapperFactoryHook.java components/bundles/org.eclipse.equinox.transforms.sed.manifest/.classpath components/bundles/org.eclipse.equinox.transforms.sed.manifest/.cvsignore components/bundles/org.eclipse.equinox.transforms.sed.manifest/.project components/bundles/org.eclipse.equinox.transforms.sed.manifest/.settings/org.eclipse.jdt.core.prefs components/bundles/org.eclipse.equinox.transforms.sed.manifest/.settings/org.eclipse.pde.core.prefs components/bundles/org.eclipse.equinox.transforms.sed.manifest/META-INF/MANIFEST.MF components/bundles/org.eclipse.equinox.transforms.sed.manifest/Sed Transform Launch.launch components/bundles/org.eclipse.equinox.transforms.sed.manifest/about.html components/bundles/org.eclipse.equinox.transforms.sed.manifest/build.properties components/bundles/org.eclipse.equinox.transforms.sed.manifest/config.ini components/bundles/org.eclipse.equinox.transforms.sed.manifest/manifestCommands.sed components/bundles/org.eclipse.equinox.transforms.sed.manifest/propertyCommands.sed components/bundles/org.eclipse.equinox.transforms.sed.manifest/src/org/eclipse/equinox/transforms/sed/manifest/Activator.java components/bundles/org.eclipse.equinox.transforms.sed.manifest/transform.csv components/bundles/org.eclipse.equinox.transforms.sed/.classpath components/bundles/org.eclipse.equinox.transforms.sed/.cvsignore components/bundles/org.eclipse.equinox.transforms.sed/.project components/bundles/org.eclipse.equinox.transforms.sed/.settings/org.eclipse.jdt.core.prefs components/bundles/org.eclipse.equinox.transforms.sed/.settings/org.eclipse.pde.core.prefs components/bundles/org.eclipse.equinox.transforms.sed/META-INF/MANIFEST.MF components/bundles/org.eclipse.equinox.transforms.sed/about.html components/bundles/org.eclipse.equinox.transforms.sed/build.properties components/bundles/org.eclipse.equinox.transforms.sed/hookconfigurators.properties components/bundles/org.eclipse.equinox.transforms.sed/src/org/eclipse/equinox/transforms/sed/SedBundleFile.java components/bundles/org.eclipse.equinox.transforms.sed/src/org/eclipse/equinox/transforms/sed/SedTransformingBundleFileWrapperFactoryHook.java components/bundles/org.eclipse.equinox.transforms.xslt.plugin/.classpath components/bundles/org.eclipse.equinox.transforms.xslt.plugin/.cvsignore components/bundles/org.eclipse.equinox.transforms.xslt.plugin/.project components/bundles/org.eclipse.equinox.transforms.xslt.plugin/.settings/org.eclipse.jdt.core.prefs components/bundles/org.eclipse.equinox.transforms.xslt.plugin/.settings/org.eclipse.pde.core.prefs components/bundles/org.eclipse.equinox.transforms.xslt.plugin/META-INF/MANIFEST.MF components/bundles/org.eclipse.equinox.transforms.xslt.plugin/XSLT Transform Launch.launch components/bundles/org.eclipse.equinox.transforms.xslt.plugin/about.html components/bundles/org.eclipse.equinox.transforms.xslt.plugin/actionSetDefault.xslt components/bundles/org.eclipse.equinox.transforms.xslt.plugin/build.properties components/bundles/org.eclipse.equinox.transforms.xslt.plugin/config.ini components/bundles/org.eclipse.equinox.transforms.xslt.plugin/src/org/eclipse/equinox/transforms/xslt/plugin/Activator.java components/bundles/org.eclipse.equinox.transforms.xslt.plugin/transform.csv components/tests/org.eclipse.equinox.tests.standalone/.classpath components/tests/org.eclipse.equinox.tests.standalone/.cvsignore components/tests/org.eclipse.equinox.tests.standalone/.project components/tests/org.eclipse.equinox.tests.standalone/All Equinox Standalone Tests.launch components/tests/org.eclipse.equinox.tests.standalone/about.html components/tests/org.eclipse.equinox.tests.standalone/src/org/eclipse/equinox/test/internal/standalone/AllTests.java components/tests/org.eclipse.equinox.tests.standalone/src/org/eclipse/equinox/test/internal/standalone/ExtensionRegistryTest.java demos/app-model/org.eclipse.equinox.examples.app.selector/.classpath demos/app-model/org.eclipse.equinox.examples.app.selector/.cvsignore demos/app-model/org.eclipse.equinox.examples.app.selector/.project demos/app-model/org.eclipse.equinox.examples.app.selector/.settings/org.eclipse.jdt.core.prefs demos/app-model/org.eclipse.equinox.examples.app.selector/AppSelector.product demos/app-model/org.eclipse.equinox.examples.app.selector/META-INF/MANIFEST.MF demos/app-model/org.eclipse.equinox.examples.app.selector/build.properties demos/app-model/org.eclipse.equinox.examples.app.selector/config.ini demos/app-model/org.eclipse.equinox.examples.app.selector/demoAppSelector.launch demos/app-model/org.eclipse.equinox.examples.app.selector/plugin.xml demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/Activator.java demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/Application.java demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/ApplicationActionBarAdvisor.java demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/ApplicationInfo.java demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/ApplicationView.java demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/ApplicationWorkbenchAdvisor.java demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/ApplicationWorkbenchWindowAdvisor.java demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/Perspective.java demos/app-model/org.eclipse.equinox.examples.sharedisplay/.classpath demos/app-model/org.eclipse.equinox.examples.sharedisplay/.cvsignore demos/app-model/org.eclipse.equinox.examples.sharedisplay/.project demos/app-model/org.eclipse.equinox.examples.sharedisplay/.settings/org.eclipse.jdt.core.prefs demos/app-model/org.eclipse.equinox.examples.sharedisplay/.settings/org.eclipse.pde.core.prefs demos/app-model/org.eclipse.equinox.examples.sharedisplay/META-INF/MANIFEST.MF demos/app-model/org.eclipse.equinox.examples.sharedisplay/build.properties demos/app-model/org.eclipse.equinox.examples.sharedisplay/equinoxShareDisplay.launch demos/app-model/org.eclipse.equinox.examples.sharedisplay/plugin.xml demos/app-model/org.eclipse.equinox.examples.sharedisplay/src/org/eclipse/equinox/examples/sharedisplay/Application.java demos/app-model/org.eclipse.swt.examples.addressbook/.classpath demos/app-model/org.eclipse.swt.examples.addressbook/.cvsignore demos/app-model/org.eclipse.swt.examples.addressbook/.project demos/app-model/org.eclipse.swt.examples.addressbook/.settings/org.eclipse.jdt.core.prefs demos/app-model/org.eclipse.swt.examples.addressbook/.settings/org.eclipse.pde.core.prefs demos/app-model/org.eclipse.swt.examples.addressbook/META-INF/MANIFEST.MF demos/app-model/org.eclipse.swt.examples.addressbook/build.properties demos/app-model/org.eclipse.swt.examples.addressbook/plugin.xml demos/app-model/org.eclipse.swt.examples.addressbook/src/examples_addressbook.properties demos/app-model/org.eclipse.swt.examples.addressbook/src/org/eclipse/swt/examples/addressbook/AddressBook.java demos/app-model/org.eclipse.swt.examples.addressbook/src/org/eclipse/swt/examples/addressbook/Application.java demos/app-model/org.eclipse.swt.examples.addressbook/src/org/eclipse/swt/examples/addressbook/DataEntryDialog.java demos/app-model/org.eclipse.swt.examples.addressbook/src/org/eclipse/swt/examples/addressbook/FindListener.java demos/app-model/org.eclipse.swt.examples.addressbook/src/org/eclipse/swt/examples/addressbook/SearchDialog.java demos/app-model/org.eclipse.swt.examples.browserexample/.classpath demos/app-model/org.eclipse.swt.examples.browserexample/.cvsignore demos/app-model/org.eclipse.swt.examples.browserexample/.project demos/app-model/org.eclipse.swt.examples.browserexample/.settings/org.eclipse.jdt.core.prefs demos/app-model/org.eclipse.swt.examples.browserexample/.settings/org.eclipse.pde.core.prefs demos/app-model/org.eclipse.swt.examples.browserexample/META-INF/MANIFEST.MF demos/app-model/org.eclipse.swt.examples.browserexample/build.properties demos/app-model/org.eclipse.swt.examples.browserexample/plugin.xml demos/app-model/org.eclipse.swt.examples.browserexample/src/examples_browser.properties demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/Application.java demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/BrowserExample.java demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/document.gif demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse01.bmp demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse02.bmp demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse03.bmp demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse04.bmp demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse05.bmp demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse06.bmp demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse07.bmp demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse08.bmp demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse09.bmp demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse10.bmp demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse11.bmp demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse12.bmp demos/app-model/org.eclipse.swt.examples.clipboard/.classpath demos/app-model/org.eclipse.swt.examples.clipboard/.cvsignore demos/app-model/org.eclipse.swt.examples.clipboard/.project demos/app-model/org.eclipse.swt.examples.clipboard/.settings/org.eclipse.jdt.core.prefs demos/app-model/org.eclipse.swt.examples.clipboard/.settings/org.eclipse.pde.core.prefs demos/app-model/org.eclipse.swt.examples.clipboard/META-INF/MANIFEST.MF demos/app-model/org.eclipse.swt.examples.clipboard/build.properties demos/app-model/org.eclipse.swt.examples.clipboard/plugin.xml demos/app-model/org.eclipse.swt.examples.clipboard/src/org/eclipse/swt/examples/clipboard/Application.java demos/app-model/org.eclipse.swt.examples.clipboard/src/org/eclipse/swt/examples/clipboard/ClipboardExample.java demos/app-model/org.eclipse.swt.examples.clipboard/src/org/eclipse/swt/examples/clipboard/MyType.java demos/app-model/org.eclipse.swt.examples.clipboard/src/org/eclipse/swt/examples/clipboard/MyTypeTransfer.java demos/app-model/org.eclipse.swt.examples.graphics/.classpath demos/app-model/org.eclipse.swt.examples.graphics/.cvsignore demos/app-model/org.eclipse.swt.examples.graphics/.project demos/app-model/org.eclipse.swt.examples.graphics/.settings/org.eclipse.jdt.core.prefs demos/app-model/org.eclipse.swt.examples.graphics/.settings/org.eclipse.pde.core.prefs demos/app-model/org.eclipse.swt.examples.graphics/META-INF/MANIFEST.MF demos/app-model/org.eclipse.swt.examples.graphics/build.properties demos/app-model/org.eclipse.swt.examples.graphics/plugin.xml demos/app-model/org.eclipse.swt.examples.graphics/src/examples_graphics.properties demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/AdvancedGraphics.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/AlphaTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/AnimatedGraphicsTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/Application.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/BallTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/BlackHoleTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/CardsTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ColorListener.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ColorMenu.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/CountDownTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/CurvesSWTTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/CurvesTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/CustomAlphaTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/CustomFontTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/FontBounceTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/GradientDialog.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/GradientTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/GraphicAntialiasTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/GraphicsBackground.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/GraphicsExample.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/GraphicsTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ImageFlipTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ImageTransformTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/InterpolationTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/IntroTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/LineCapTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/LineJoinTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/LineStyleTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/LineTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/MazeTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/PathClippingAnimTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/PathClippingTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/PathTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/RGBTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/RegionClippingTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ShapesTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/SpiralTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/StarPolyTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/TextAntialiasTab.java demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ace_club.jpg demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ace_diamond.jpg demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ace_hearts.jpg demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ace_spade.jpg demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/alpha_img1.png demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/alpha_img2.png demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/back.gif demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/cube.png demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/db.gif demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/font.gif demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/help.gif demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/home_nav.gif demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/houses.png demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/irmaos.jpg demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/maze.bmp demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/next.gif demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ovals.png demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/pattern1.jpg demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/pattern2.jpg demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/pattern3.jpg demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/pause.gif demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/play.gif demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/swap.gif demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/swt.png demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/task.gif demos/app-model/org.eclipse.swt.examples.paint/.classpath demos/app-model/org.eclipse.swt.examples.paint/.cvsignore demos/app-model/org.eclipse.swt.examples.paint/.project demos/app-model/org.eclipse.swt.examples.paint/.settings/org.eclipse.jdt.core.prefs demos/app-model/org.eclipse.swt.examples.paint/.settings/org.eclipse.pde.core.prefs demos/app-model/org.eclipse.swt.examples.paint/META-INF/MANIFEST.MF demos/app-model/org.eclipse.swt.examples.paint/build.properties demos/app-model/org.eclipse.swt.examples.paint/plugin.xml demos/app-model/org.eclipse.swt.examples.paint/src/examples_paint.properties demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/AirbrushTool.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/Application.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/BasicPaintSession.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/ContainerFigure.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/ContinuousPaintSession.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/DragPaintSession.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/EllipseFigure.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/EllipseTool.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/Figure.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/FigureDrawContext.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/LineFigure.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/LineTool.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintExample.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintSession.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintSurface.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintTool.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PencilTool.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PointFigure.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PolyLineTool.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/RectangleFigure.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/RectangleTool.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/RoundedRectangleFigure.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/RoundedRectangleTool.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/SegmentedPaintSession.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/SolidEllipseFigure.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/SolidPolygonFigure.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/SolidRectangleFigure.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/SolidRoundedRectangleFigure.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/TextFigure.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/TextTool.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/Tool.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/ToolSettings.java demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/fill_none.gif demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/fill_outline.gif demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/fill_solid.gif demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/linestyle_dash.gif demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/linestyle_dashdot.gif demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/linestyle_dot.gif demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/linestyle_solid.gif demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/options_font.gif demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_airbrush.gif demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_ellipse.gif demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_line.gif demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_pencil.gif demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_polyline.gif demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_rectangle.gif demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_roundedrectangle.gif demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_text.gif demos/splash/org.eclipse.equinox.examples.splash.ui/.classpath demos/splash/org.eclipse.equinox.examples.splash.ui/.project demos/splash/org.eclipse.equinox.examples.splash.ui/META-INF/MANIFEST.MF demos/splash/org.eclipse.equinox.examples.splash.ui/build.properties demos/splash/org.eclipse.equinox.examples.splash.ui/configuration/config.ini demos/splash/org.eclipse.equinox.examples.splash.ui/content/debugging.html demos/splash/org.eclipse.equinox.examples.splash.ui/content/debugging.swf demos/splash/org.eclipse.equinox.examples.splash.ui/icons/alt_about.gif demos/splash/org.eclipse.equinox.examples.splash.ui/icons/alt_launcher.icns demos/splash/org.eclipse.equinox.examples.splash.ui/icons/alt_launcher.ico demos/splash/org.eclipse.equinox.examples.splash.ui/icons/alt_launcher.xpm demos/splash/org.eclipse.equinox.examples.splash.ui/icons/alt_window_16.gif demos/splash/org.eclipse.equinox.examples.splash.ui/icons/alt_window_32.gif demos/splash/org.eclipse.equinox.examples.splash.ui/plugin.xml demos/splash/org.eclipse.equinox.examples.splash.ui/splash.bmp demos/splash/org.eclipse.equinox.examples.splash.ui/splash.product demos/splash/org.eclipse.equinox.examples.splash.ui/src/org/eclipse/equinox/examples/splash/ui/Activator.java demos/splash/org.eclipse.equinox.examples.splash.ui/src/org/eclipse/equinox/examples/splash/ui/Application.java demos/splash/org.eclipse.equinox.examples.splash.ui/src/org/eclipse/equinox/examples/splash/ui/ApplicationActionBarAdvisor.java demos/splash/org.eclipse.equinox.examples.splash.ui/src/org/eclipse/equinox/examples/splash/ui/ApplicationWorkbenchAdvisor.java demos/splash/org.eclipse.equinox.examples.splash.ui/src/org/eclipse/equinox/examples/splash/ui/ApplicationWorkbenchWindowAdvisor.java demos/splash/org.eclipse.equinox.examples.splash.ui/src/org/eclipse/equinox/examples/splash/ui/Perspective.java demos/splash/org.eclipse.equinox.examples.splash.ui/src/org/eclipse/equinox/examples/splash/ui/SplashHandler.java demos/splash/org.eclipse.equinox.examples.splash.ui/ui.workbench.patch demos/splash/org.eclipse.equinox.examples.splash/.classpath demos/splash/org.eclipse.equinox.examples.splash/.project demos/splash/org.eclipse.equinox.examples.splash/META-INF/MANIFEST.MF demos/splash/org.eclipse.equinox.examples.splash/build.properties demos/splash/org.eclipse.equinox.examples.splash/splash.bmp demos/splash/org.eclipse.equinox.examples.splash/splash_early.bmp demos/splash/org.eclipse.equinox.examples.splash/src/org/eclipse/equinox/examples/splash/Activator.java demos/splash/org.eclipse.equinox.examples.splash/src/org/eclipse/equinox/examples/splash/Splash.java demos/splash/splash.zip framework/bundles/org.eclipse.equinox.initializer/.classpath framework/bundles/org.eclipse.equinox.initializer/.cvsignore framework/bundles/org.eclipse.equinox.initializer/.project framework/bundles/org.eclipse.equinox.initializer/.settings/org.eclipse.pde.core.prefs framework/bundles/org.eclipse.equinox.initializer/META-INF/MANIFEST.MF framework/bundles/org.eclipse.equinox.initializer/about.html framework/bundles/org.eclipse.equinox.initializer/build.properties framework/bundles/org.eclipse.equinox.initializer/plugin.properties framework/bundles/org.eclipse.equinox.initializer/plugin.xml framework/bundles/org.eclipse.equinox.initializer/schema/initializers.exsd framework/bundles/org.eclipse.equinox.initializer/src/org/eclipse/equinox/internal/initializer/Activator.java framework/bundles/org.eclipse.equinox.initializer/src/org/eclipse/equinox/internal/initializer/FileInitializer.java framework/bundles/org.eclipse.equinox.initializer/src/org/eclipse/equinox/internal/initializer/Initializer.java framework/bundles/org.eclipse.equinox.initializer/src/org/eclipse/equinox/internal/initializer/Messages.java framework/bundles/org.eclipse.equinox.initializer/src/org/eclipse/equinox/internal/initializer/messages.properties monitoring/bundles/net.sourceforge.mx4j/.project monitoring/bundles/net.sourceforge.mx4j/readme.txt monitoring/bundles/org.apache.xmlrpc/.classpath monitoring/bundles/org.apache.xmlrpc/.project monitoring/bundles/org.apache.xmlrpc/.settings/org.eclipse.jdt.core.prefs monitoring/bundles/org.apache.xmlrpc/LICENSE.txt monitoring/bundles/org.apache.xmlrpc/META-INF/MANIFEST.MF monitoring/bundles/org.apache.xmlrpc/about.html monitoring/bundles/org.apache.xmlrpc/build.properties monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/XmlRpcConfig.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/XmlRpcConfigImpl.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/XmlRpcException.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/XmlRpcHandler.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/XmlRpcRequest.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/XmlRpcRequestConfig.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/AsyncCallback.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/TimingOutCallback$TimeoutException.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/TimingOutCallback.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClient.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClientConfig.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClientConfigImpl.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClientException.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClientRequestImpl.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClientWorker$1.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClientWorker.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClientWorkerFactory.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcCommonsTransport$1$1.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcCommonsTransport$1$2.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcCommonsTransport$1.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcCommonsTransport.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcCommonsTransportFactory.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcHttpClientConfig.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcHttpTransport$ByteArrayReqWriter.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcHttpTransport.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLiteHttpTransport$1.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLiteHttpTransport.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLiteHttpTransportFactory.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLocalClientConfig.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLocalStreamTransport.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLocalStreamTransportFactory.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLocalTransport.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLocalTransportFactory.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcStreamTransport$GzipReqWriter.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcStreamTransport$ReqWriter.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcStreamTransport$ReqWriterImpl.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcStreamTransport.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcStreamTransportFactory.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcSunHttpTransport.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcSunHttpTransportFactory.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcTransport.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcTransportFactory.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcTransportFactoryImpl.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcTransportImpl.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/util/ClientFactory$1.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/util/ClientFactory.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/LocalStreamConnection$1.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/LocalStreamConnection$LocalServerStreamConnection.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/LocalStreamConnection.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/ServerStreamConnection.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverter.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactory.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$1.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$2.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$3.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$4.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$CastCheckingTypeConverter.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$IdentityTypeConverter.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$ListTypeConverter.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$PrimitiveTypeConverter.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeFactory.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeFactoryImpl$1.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeFactoryImpl$2.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeFactoryImpl.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcController.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcExtensionException.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcHttpConfig.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcHttpRequestConfig.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcHttpRequestConfigImpl.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcLoadException.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcNotAuthorizedException.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcRequestProcessor.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcRequestProcessorFactory.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcStreamConfig.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcStreamRequestConfig.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcStreamRequestProcessor.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcWorker.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcWorkerFactory.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/jaxb/JaxbParser.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/jaxb/JaxbSerializer$1.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/jaxb/JaxbSerializer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/jaxb/JaxbTypeFactory.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/metadata/ReflectiveXmlRpcMetaDataHandler.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/metadata/Util.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/metadata/XmlRpcListableHandlerMapping.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/metadata/XmlRpcMetaDataHandler.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/metadata/XmlRpcSystemImpl.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/AtomicParser.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/BigDecimalParser.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/BigIntegerParser.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/BooleanParser.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/ByteArrayParser$1.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/ByteArrayParser.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/CalendarParser.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/DateParser.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/DoubleParser.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/ExtParser.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/FloatParser.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/I1Parser.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/I2Parser.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/I4Parser.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/I8Parser.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/LongParser.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/MapParser.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/NodeParser.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/NullParser.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/ObjectArrayParser.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/RecursiveTypeParserImpl.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/SerializableParser.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/StringParser.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/TypeParser.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/TypeParserImpl.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/XmlRpcRequestParser.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/XmlRpcResponseParser.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/BaseXmlWriterFactory.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/BigDecimalSerializer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/BigIntegerSerializer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/BooleanSerializer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/ByteArraySerializer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/CalendarSerializer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/CharSetXmlWriterFactory.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/DateSerializer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/DefaultXMLWriterFactory.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/DoubleSerializer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/ExtSerializer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/FloatSerializer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/I1Serializer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/I2Serializer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/I4Serializer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/I8Serializer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/ListSerializer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/MapSerializer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/NodeSerializer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/NullSerializer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/ObjectArraySerializer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/SerializableSerializer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/StringSerializer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/TypeSerializer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/TypeSerializerImpl.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/XmlRpcWriter.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/XmlWriterFactory.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/AbstractReflectiveHandlerMapping$AuthenticationHandler.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/AbstractReflectiveHandlerMapping.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/PropertyHandlerMapping.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/ReflectiveXmlRpcHandler$MethodData.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/ReflectiveXmlRpcHandler.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/RequestProcessorFactoryFactory$RequestProcessorFactory.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/RequestProcessorFactoryFactory$RequestSpecificProcessorFactoryFactory$1.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/RequestProcessorFactoryFactory$RequestSpecificProcessorFactoryFactory.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/RequestProcessorFactoryFactory$StatelessProcessorFactoryFactory$1.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/RequestProcessorFactoryFactory$StatelessProcessorFactoryFactory.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/RequestProcessorFactoryFactory.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/ServerHttpConnection.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcHandlerMapping.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcHttpServer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcHttpServerConfig.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcLocalStreamServer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcNoSuchHandlerException.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcServer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcServerConfig.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcServerConfigImpl.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcServerWorker.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcServerWorkerFactory.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcStreamServer$1.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcStreamServer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/HttpUtil.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/LimitedInputStream.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/SAXParsers.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/ThreadPool$MyThread.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/ThreadPool$Task.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/ThreadPool.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/XmlRpcDateTimeDateFormat.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/XmlRpcDateTimeFormat.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/XmlRpcIOException.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/Connection$1.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/Connection$BadRequestException.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/Connection.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/ConnectionServer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/HttpServletRequestImpl$1.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/HttpServletRequestImpl$2.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/HttpServletRequestImpl.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/HttpServletResponseImpl.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/RequestData.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/ServletConnection.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/ServletWebServer$1$1.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/ServletWebServer$1.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/ServletWebServer$Exception.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/ServletWebServer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/WebServer$AddressMatcher.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/WebServer.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/XmlRpcServlet.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/XmlRpcServletServer$ServletStreamConnection.class monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/XmlRpcServletServer.class monitoring/bundles/org.eclipse.core.resources.jmx/.classpath monitoring/bundles/org.eclipse.core.resources.jmx/.cvsignore monitoring/bundles/org.eclipse.core.resources.jmx/.project monitoring/bundles/org.eclipse.core.resources.jmx/.settings/org.eclipse.jdt.core.prefs monitoring/bundles/org.eclipse.core.resources.jmx/.settings/org.eclipse.jdt.ui.prefs monitoring/bundles/org.eclipse.core.resources.jmx/META-INF/MANIFEST.MF monitoring/bundles/org.eclipse.core.resources.jmx/about.html monitoring/bundles/org.eclipse.core.resources.jmx/build.properties monitoring/bundles/org.eclipse.core.resources.jmx/icons/file.gif monitoring/bundles/org.eclipse.core.resources.jmx/icons/folder.gif monitoring/bundles/org.eclipse.core.resources.jmx/icons/project.gif monitoring/bundles/org.eclipse.core.resources.jmx/icons/resources.gif monitoring/bundles/org.eclipse.core.resources.jmx/plugin.xml monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/Activator.java monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/ContainerContribution.java monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/FileContribution.java monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/FolderContribution.java monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/Messages.java monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/ProjectContribution.java monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/ResourceContribution.java monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/ResourceContributionProvider.java monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/messages.properties monitoring/bundles/org.eclipse.equinox.jmx.client.feature/.project monitoring/bundles/org.eclipse.equinox.jmx.client.feature/about.html monitoring/bundles/org.eclipse.equinox.jmx.client.feature/build.properties monitoring/bundles/org.eclipse.equinox.jmx.client.feature/feature.xml monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/.classpath monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/.cvsignore monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/.project monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/.settings/org.eclipse.jdt.core.prefs monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/.settings/org.eclipse.jdt.ui.prefs monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/META-INF/MANIFEST.MF monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/about.html monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/build.properties monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/plugin.xml monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/src/org/eclipse/equinox/jmx/client/rmi/RMIConnectorProvider.java monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/.classpath monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/.cvsignore monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/.project monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/.settings/org.eclipse.jdt.core.prefs monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/.settings/org.eclipse.jdt.ui.prefs monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/META-INF/MANIFEST.MF monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/about.html monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/build.properties monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/plugin.xml monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/src/org/eclipse/equinox/jmx/client/internal/xmlrpc/ClientTransportProvider.java monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/src/org/eclipse/equinox/jmx/client/internal/xmlrpc/WebServerTransportProvider.java monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/src/org/eclipse/equinox/jmx/client/internal/xmlrpc/XMLRPCJMXConnector.java monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/src/org/eclipse/equinox/jmx/client/internal/xmlrpc/XMLRPCJMXConnectorProvider.java monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/src/org/eclipse/equinox/jmx/client/internal/xmlrpc/XMLRPCMBeanServerConnection.java monitoring/bundles/org.eclipse.equinox.jmx.client/.classpath monitoring/bundles/org.eclipse.equinox.jmx.client/.cvsignore monitoring/bundles/org.eclipse.equinox.jmx.client/.project monitoring/bundles/org.eclipse.equinox.jmx.client/.settings/org.eclipse.jdt.core.prefs monitoring/bundles/org.eclipse.equinox.jmx.client/.settings/org.eclipse.jdt.ui.prefs monitoring/bundles/org.eclipse.equinox.jmx.client/JMX Client.launch monitoring/bundles/org.eclipse.equinox.jmx.client/META-INF/MANIFEST.MF monitoring/bundles/org.eclipse.equinox.jmx.client/about.html monitoring/bundles/org.eclipse.equinox.jmx.client/build.properties monitoring/bundles/org.eclipse.equinox.jmx.client/icons/contribution_desc_view.gif monitoring/bundles/org.eclipse.equinox.jmx.client/icons/contributions_view.gif monitoring/bundles/org.eclipse.equinox.jmx.client/icons/perspective.gif monitoring/bundles/org.eclipse.equinox.jmx.client/plugin.properties monitoring/bundles/org.eclipse.equinox.jmx.client/plugin.xml monitoring/bundles/org.eclipse.equinox.jmx.client/schema/transport.exsd monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/client/IJMXConnectorProvider.java monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/client/remote/RemoteMBeanConnection.java monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/client/remote/RemoteNotificationHandler.java monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/Activator.java monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/MBeanServerProxy.java monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/ClientPerspectiveFactory.java monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/ClientUI.java monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/actions/ActionMessages.java monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/actions/ActionMessages.properties monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/actions/ConnectionSelectionDialog.java monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/actions/NewConnectionAction.java monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/contributionsview/BundleStatusLabelDecorator.java monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/contributionsview/ContributionContentProvider.java monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/contributionsview/ContributionLabelProvider.java monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/contributionsview/ContributionViewMessages.java monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/contributionsview/ContributionViewMessages.properties monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/contributionsview/ContributionsViewPart.java monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/invocationView/InvocationView.java monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/mbeaninfoview/MBeanInfoViewMessages.java monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/mbeaninfoview/MBeanInfoViewMessages.properties monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/mbeaninfoview/MBeanInfoViewPart.java monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/mbeaninfoview/MBeanOpTable.java monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/util/ByteImageRegistry.java monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/viewsupport/BundleImageDescriptor.java monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/viewsupport/ImageImageDescriptor.java monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/viewsupport/ImageRegistry.java monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/viewsupport/JMXPluginImages.java monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/viewsupport/ViewUtil.java monitoring/bundles/org.eclipse.equinox.jmx.common.feature/.project monitoring/bundles/org.eclipse.equinox.jmx.common.feature/about.html monitoring/bundles/org.eclipse.equinox.jmx.common.feature/build.properties monitoring/bundles/org.eclipse.equinox.jmx.common.feature/feature.xml monitoring/bundles/org.eclipse.equinox.jmx.server.feature/.project monitoring/bundles/org.eclipse.equinox.jmx.server.feature/about.html monitoring/bundles/org.eclipse.equinox.jmx.server.feature/build.properties monitoring/bundles/org.eclipse.equinox.jmx.server.feature/feature.xml monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/.classpath monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/.cvsignore monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/.project monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/.settings/org.eclipse.jdt.core.prefs monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/.settings/org.eclipse.jdt.ui.prefs monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/META-INF/MANIFEST.MF monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/about.html monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/build.properties monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/plugin.xml monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/server.policy monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/src/org/eclipse/equinox/jmx/internal/rmi/Activator.java monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/src/org/eclipse/equinox/jmx/internal/rmi/RMIServer.java monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/.classpath monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/.cvsignore monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/.project monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/.settings/org.eclipse.jdt.core.prefs monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/.settings/org.eclipse.jdt.ui.prefs monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/META-INF/MANIFEST.MF monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/about.html monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/build.properties monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/plugin.xml monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/src/org/eclipse/equinox/jmx/server/internal/xmlrpc/XMLRPCJMXConnectorServer.java monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/src/org/eclipse/equinox/jmx/server/internal/xmlrpc/XMLRPCMBeanServerAdapter.java monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/src/org/eclipse/equinox/jmx/server/internal/xmlrpc/XMLRPCServer.java monitoring/bundles/org.eclipse.equinox.jmx.server/.classpath monitoring/bundles/org.eclipse.equinox.jmx.server/.cvsignore monitoring/bundles/org.eclipse.equinox.jmx.server/.project monitoring/bundles/org.eclipse.equinox.jmx.server/.settings/org.eclipse.jdt.core.prefs monitoring/bundles/org.eclipse.equinox.jmx.server/.settings/org.eclipse.jdt.ui.prefs monitoring/bundles/org.eclipse.equinox.jmx.server/JMX Server n Client.launch monitoring/bundles/org.eclipse.equinox.jmx.server/JMX Server.launch monitoring/bundles/org.eclipse.equinox.jmx.server/META-INF/MANIFEST.MF monitoring/bundles/org.eclipse.equinox.jmx.server/about.html monitoring/bundles/org.eclipse.equinox.jmx.server/build.properties monitoring/bundles/org.eclipse.equinox.jmx.server/plugin.xml monitoring/bundles/org.eclipse.equinox.jmx.server/readme.txt monitoring/bundles/org.eclipse.equinox.jmx.server/schema/contribution.exsd monitoring/bundles/org.eclipse.equinox.jmx.server/schema/provider.exsd monitoring/bundles/org.eclipse.equinox.jmx.server/server-1.4.product monitoring/bundles/org.eclipse.equinox.jmx.server/server-1.5.product monitoring/bundles/org.eclipse.equinox.jmx.server/server-ppro.product monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/Activator.java monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/Application.java monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/ContributionMessages.java monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/ContributionMessages.properties monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/IJMXServer.java monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/JMXServerFactory.java monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/ServerExtensionManager.java monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/ServerMessages.java monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/ServerMessages.properties monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/UIStarter.java monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/server/Contribution.java monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/server/ContributionProvider.java monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/server/IJMXConnectorServerProvider.java monitoring/bundles/org.eclipse.equinox.jmx.vm/.classpath monitoring/bundles/org.eclipse.equinox.jmx.vm/.cvsignore monitoring/bundles/org.eclipse.equinox.jmx.vm/.project monitoring/bundles/org.eclipse.equinox.jmx.vm/.settings/org.eclipse.jdt.core.prefs monitoring/bundles/org.eclipse.equinox.jmx.vm/.settings/org.eclipse.jdt.ui.prefs monitoring/bundles/org.eclipse.equinox.jmx.vm/META-INF/MANIFEST.MF monitoring/bundles/org.eclipse.equinox.jmx.vm/about.html monitoring/bundles/org.eclipse.equinox.jmx.vm/build.properties monitoring/bundles/org.eclipse.equinox.jmx.vm/icons/classloading.gif monitoring/bundles/org.eclipse.equinox.jmx.vm/icons/compilation.gif monitoring/bundles/org.eclipse.equinox.jmx.vm/icons/memory.gif monitoring/bundles/org.eclipse.equinox.jmx.vm/icons/os.gif monitoring/bundles/org.eclipse.equinox.jmx.vm/icons/runtime.gif monitoring/bundles/org.eclipse.equinox.jmx.vm/icons/vmstats.gif monitoring/bundles/org.eclipse.equinox.jmx.vm/plugin.xml monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/Activator.java monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/ClassLoadingContribution.java monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/CompilationContribution.java monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/MemoryContribution.java monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/OperatingSystemContribution.java monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/RuntimeContribution.java monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/VMStatsMessages.java monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/VMStatsMessages.properties monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/VMStatsProvider.java monitoring/bundles/org.eclipse.equinox.preferences.jmx/.classpath monitoring/bundles/org.eclipse.equinox.preferences.jmx/.cvsignore monitoring/bundles/org.eclipse.equinox.preferences.jmx/.project monitoring/bundles/org.eclipse.equinox.preferences.jmx/.settings/org.eclipse.jdt.core.prefs monitoring/bundles/org.eclipse.equinox.preferences.jmx/.settings/org.eclipse.jdt.ui.prefs monitoring/bundles/org.eclipse.equinox.preferences.jmx/META-INF/MANIFEST.MF monitoring/bundles/org.eclipse.equinox.preferences.jmx/about.html monitoring/bundles/org.eclipse.equinox.preferences.jmx/build.properties monitoring/bundles/org.eclipse.equinox.preferences.jmx/icons/kvp.gif monitoring/bundles/org.eclipse.equinox.preferences.jmx/icons/node.gif monitoring/bundles/org.eclipse.equinox.preferences.jmx/icons/preferences.gif monitoring/bundles/org.eclipse.equinox.preferences.jmx/plugin.xml monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/Activator.java monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/KVP.java monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/KVPContributionProvider.java monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/KeyValuePairContribution.java monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/Messages.java monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/PreferenceContribution.java monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/PreferenceContributionProvider.java monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/messages.properties monitoring/bundles/org.eclipse.equinox.registry.jmx/.classpath monitoring/bundles/org.eclipse.equinox.registry.jmx/.cvsignore monitoring/bundles/org.eclipse.equinox.registry.jmx/.project monitoring/bundles/org.eclipse.equinox.registry.jmx/.settings/org.eclipse.jdt.core.prefs monitoring/bundles/org.eclipse.equinox.registry.jmx/.settings/org.eclipse.jdt.ui.prefs monitoring/bundles/org.eclipse.equinox.registry.jmx/META-INF/MANIFEST.MF monitoring/bundles/org.eclipse.equinox.registry.jmx/build.properties monitoring/bundles/org.eclipse.equinox.registry.jmx/icons/ext_point.gif monitoring/bundles/org.eclipse.equinox.registry.jmx/icons/extension.gif monitoring/bundles/org.eclipse.equinox.registry.jmx/icons/plugin_registry.gif monitoring/bundles/org.eclipse.equinox.registry.jmx/plugin.xml monitoring/bundles/org.eclipse.equinox.registry.jmx/src/org/eclipse/equinox/internal/registry/jmx/Activator.java monitoring/bundles/org.eclipse.equinox.registry.jmx/src/org/eclipse/equinox/internal/registry/jmx/ExtensionContribution.java monitoring/bundles/org.eclipse.equinox.registry.jmx/src/org/eclipse/equinox/internal/registry/jmx/ExtensionContributionProvider.java monitoring/bundles/org.eclipse.equinox.registry.jmx/src/org/eclipse/equinox/internal/registry/jmx/ExtensionPointContribution.java monitoring/bundles/org.eclipse.equinox.registry.jmx/src/org/eclipse/equinox/internal/registry/jmx/ExtensionPointContributionProvider.java monitoring/bundles/org.eclipse.equinox.registry.jmx/src/org/eclipse/equinox/internal/registry/jmx/ExtensionRegistryContribution.java monitoring/bundles/org.eclipse.equinox.registry.jmx/src/org/eclipse/equinox/internal/registry/jmx/ExtensionRegistryContributionProvider.java monitoring/bundles/org.eclipse.osgi.jmx/.classpath monitoring/bundles/org.eclipse.osgi.jmx/.cvsignore monitoring/bundles/org.eclipse.osgi.jmx/.project monitoring/bundles/org.eclipse.osgi.jmx/.settings/org.eclipse.jdt.core.prefs monitoring/bundles/org.eclipse.osgi.jmx/.settings/org.eclipse.jdt.ui.prefs monitoring/bundles/org.eclipse.osgi.jmx/META-INF/MANIFEST.MF monitoring/bundles/org.eclipse.osgi.jmx/about.html monitoring/bundles/org.eclipse.osgi.jmx/build.properties monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/bundle.gif monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/bundle_provider.gif monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/bundle_service.gif monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/component.gif monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/mbean_operation.gif monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/mbean_operation_none.gif monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/mbean_operations.gif monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/ovr_bundle_active.gif monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/ovr_bundle_resolved.gif monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/ovr_bundle_stopped.gif monitoring/bundles/org.eclipse.osgi.jmx/icons/services/bundle_reg_service.gif monitoring/bundles/org.eclipse.osgi.jmx/icons/services/bundle_reg_service.png monitoring/bundles/org.eclipse.osgi.jmx/icons/services/bundle_use_reg_service.gif monitoring/bundles/org.eclipse.osgi.jmx/icons/services/bundle_use_reg_service.png monitoring/bundles/org.eclipse.osgi.jmx/icons/services/bundle_use_service.gif monitoring/bundles/org.eclipse.osgi.jmx/icons/services/bundle_use_service.png monitoring/bundles/org.eclipse.osgi.jmx/icons/services/service.gif monitoring/bundles/org.eclipse.osgi.jmx/icons/services/service_provider.gif monitoring/bundles/org.eclipse.osgi.jmx/plugin.xml monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/Activator.java monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleContribution.java monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleContributionMessages.java monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleContributionMessages.properties monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleContributionProvider.java monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleMessages.java monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleMessages.properties monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundlePackagesProvider.java monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleRequiresProvider.java monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleUtils.java monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/ServiceContribution.java monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/ServiceContributionMessages.java monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/ServiceContributionMessages.properties monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/ServiceContributionProvider.java monitoring/bundles/org.eclipse.swt.jmx/.classpath monitoring/bundles/org.eclipse.swt.jmx/.cvsignore monitoring/bundles/org.eclipse.swt.jmx/.options monitoring/bundles/org.eclipse.swt.jmx/.project monitoring/bundles/org.eclipse.swt.jmx/.settings/org.eclipse.jdt.core.prefs monitoring/bundles/org.eclipse.swt.jmx/.settings/org.eclipse.jdt.ui.prefs monitoring/bundles/org.eclipse.swt.jmx/META-INF/MANIFEST.MF monitoring/bundles/org.eclipse.swt.jmx/about.html monitoring/bundles/org.eclipse.swt.jmx/build.properties monitoring/bundles/org.eclipse.swt.jmx/icons/sleak.png monitoring/bundles/org.eclipse.swt.jmx/plugin.xml monitoring/bundles/org.eclipse.swt.jmx/src/org/eclipse/swt/jmx/internal/Activator.java monitoring/bundles/org.eclipse.swt.jmx/src/org/eclipse/swt/jmx/internal/SleakContributionProvider.java monitoring/bundles/org.eclipse.swt.jmx/src/org/eclipse/swt/jmx/internal/SleakMessages.java monitoring/bundles/org.eclipse.swt.jmx/src/org/eclipse/swt/jmx/internal/SleakMessages.properties p2/bundles/org.eclipse.equinox.frameworkadmin.examples/.classpath p2/bundles/org.eclipse.equinox.frameworkadmin.examples/.project p2/bundles/org.eclipse.equinox.frameworkadmin.examples/.settings/org.eclipse.jdt.core.prefs p2/bundles/org.eclipse.equinox.frameworkadmin.examples/.settings/org.eclipse.pde.core.prefs p2/bundles/org.eclipse.equinox.frameworkadmin.examples/FwAdmin.launch p2/bundles/org.eclipse.equinox.frameworkadmin.examples/META-INF/MANIFEST.MF p2/bundles/org.eclipse.equinox.frameworkadmin.examples/build.properties p2/bundles/org.eclipse.equinox.frameworkadmin.examples/doc/readme.txt p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/Activator.java p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/EquinoxActivator.java p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/FelixActivator.java p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/InputStreamMonitorThread.java p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/KfActivator.java p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/Main.java p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/ShutdownHookForEquinox.java p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/setting.properties p2/bundles/org.eclipse.equinox.frameworkadmin.felix/.classpath p2/bundles/org.eclipse.equinox.frameworkadmin.felix/.project p2/bundles/org.eclipse.equinox.frameworkadmin.felix/.settings/org.eclipse.jdt.core.prefs p2/bundles/org.eclipse.equinox.frameworkadmin.felix/.settings/org.eclipse.pde.core.prefs p2/bundles/org.eclipse.equinox.frameworkadmin.felix/META-INF/MANIFEST.MF p2/bundles/org.eclipse.equinox.frameworkadmin.felix/build.properties p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/Activator.java p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/FelixConstants.java p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/FelixFrameworkAdminFactoryImpl.java p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/FelixFwAdminImpl.java p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/FelixFwConfigFileParser.java p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/FelixLauncherImpl.java p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/FelixManipulatorImpl.java p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/Log.java p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/felixBasic.properties p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/.classpath p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/.project p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/.settings/org.eclipse.jdt.core.prefs p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/.settings/org.eclipse.pde.core.prefs p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/META-INF/MANIFEST.MF p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/build.properties p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/KfConfigData.java p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/Activator.java p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/KfConstants.java p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/KfFrameworkAdminFactoryImpl.java p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/KfFwAdminImpl.java p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/KfFwConfigFileParser.java p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/KfLauncherImpl.java p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/KfManipulatorImpl.java p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/Log.java server-side/bundles/org.eclipse.equinox.http.helper/.classpath server-side/bundles/org.eclipse.equinox.http.helper/.cvsignore server-side/bundles/org.eclipse.equinox.http.helper/.project server-side/bundles/org.eclipse.equinox.http.helper/.settings/org.eclipse.jdt.core.prefs server-side/bundles/org.eclipse.equinox.http.helper/.settings/org.eclipse.jdt.ui.prefs server-side/bundles/org.eclipse.equinox.http.helper/.settings/org.eclipse.pde.core.prefs server-side/bundles/org.eclipse.equinox.http.helper/META-INF/MANIFEST.MF server-side/bundles/org.eclipse.equinox.http.helper/build.properties server-side/bundles/org.eclipse.equinox.http.helper/plugin.properties server-side/bundles/org.eclipse.equinox.http.helper/src/org/eclipse/equinox/http/helper/BundleEntryHttpContext.java server-side/bundles/org.eclipse.equinox.http.helper/src/org/eclipse/equinox/http/helper/ContextInitParametersServletAdaptor.java server-side/bundles/org.eclipse.equinox.http.helper/src/org/eclipse/equinox/http/helper/ContextListenerServletAdaptor.java server-side/bundles/org.eclipse.equinox.http.helper/src/org/eclipse/equinox/http/helper/ContextPathServletAdaptor.java server-side/bundles/org.eclipse.equinox.http.helper/src/org/eclipse/equinox/http/helper/FilterServletAdaptor.java server-side/bundles/org.eclipse.equinox.http.helper/src/org/eclipse/equinox/http/helper/ResourceServlet.java server-side/bundles/org.eclipse.equinox.servletbridge.feature/.project server-side/bundles/org.eclipse.equinox.servletbridge.feature/build.properties server-side/bundles/org.eclipse.equinox.servletbridge.feature/feature.xml

commit: 28de4dbf1688394ba8531e5bc6273f26b730ee7f [log] [tgz]
author: cvs2svn <platform-releng-dev@eclipse.org> Thu May 10 18:07:52 2007 +0000
committer: cvs2svn <platform-releng-dev@eclipse.org> Thu May 10 18:07:52 2007 +0000
tree: 66b33edbaf8ccf42e77f6169a3ec2a3bf570f25f
parent: 30a2d515484339d3bae287917fe24be251006dc3 [diff]
diff --git a/aspects/bundles/build.ibm.oti/.classpath b/aspects/bundles/build.ibm.oti/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/aspects/bundles/build.ibm.oti/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/aspects/bundles/build.ibm.oti/.project b/aspects/bundles/build.ibm.oti/.project
deleted file mode 100644
index b9548c2..0000000
--- a/aspects/bundles/build.ibm.oti/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>build.ibm.oti</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/aspects/bundles/build.ibm.oti/META-INF/MANIFEST.MF b/aspects/bundles/build.ibm.oti/META-INF/MANIFEST.MF
deleted file mode 100644
index 4f7bd9d..0000000
--- a/aspects/bundles/build.ibm.oti/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Shared Classes Plug-in
-Bundle-SymbolicName: build.ibm.oti
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Export-Package: com.ibm.oti.shared

diff --git a/aspects/bundles/build.ibm.oti/build.properties b/aspects/bundles/build.ibm.oti/build.properties
deleted file mode 100644
index 34d2e4d..0000000
--- a/aspects/bundles/build.ibm.oti/build.properties
+++ /dev/null

@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .

diff --git a/aspects/bundles/build.ibm.oti/readme.txt b/aspects/bundles/build.ibm.oti/readme.txt
deleted file mode 100644
index cad2f93..0000000
--- a/aspects/bundles/build.ibm.oti/readme.txt
+++ /dev/null

@@ -1,5 +0,0 @@
-This bundle allows us to build org.aspectj.osgi.service.caching.j9 in Eclipse
-and under headless PDE (for exporting bundles and building the update site)
-without the IBM JDK. You still need it to run the CachingTest. There appears
-no other way to persuade headless PDE to put the shared classes API on the 
-CLASSPATH.
\ No newline at end of file

diff --git a/aspects/bundles/build.ibm.oti/src/com/ibm/oti/shared/HelperAlreadyDefinedException.java b/aspects/bundles/build.ibm.oti/src/com/ibm/oti/shared/HelperAlreadyDefinedException.java
deleted file mode 100644
index 6e809da..0000000
--- a/aspects/bundles/build.ibm.oti/src/com/ibm/oti/shared/HelperAlreadyDefinedException.java
+++ /dev/null

@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Matthew Webster           initial implementation      
- *******************************************************************************/
-
-package com.ibm.oti.shared;
-
-public class HelperAlreadyDefinedException extends Exception {
-
-	public HelperAlreadyDefinedException (String s) {
-		super(s);
-	}
-}

diff --git a/aspects/bundles/build.ibm.oti/src/com/ibm/oti/shared/Shared.java b/aspects/bundles/build.ibm.oti/src/com/ibm/oti/shared/Shared.java
deleted file mode 100644
index 93400f5..0000000
--- a/aspects/bundles/build.ibm.oti/src/com/ibm/oti/shared/Shared.java
+++ /dev/null

@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Matthew Webster           initial implementation      
- *******************************************************************************/
-
-package com.ibm.oti.shared;
-
-public class Shared {
-
-	public static boolean isSharingEnabled () {
-		throw new UnsupportedOperationException();
-	}
-	
-	public static SharedClassHelperFactory getSharedClassHelperFactory () {
-		throw new UnsupportedOperationException();
-	}
-}

diff --git a/aspects/bundles/build.ibm.oti/src/com/ibm/oti/shared/SharedClassHelperFactory.java b/aspects/bundles/build.ibm.oti/src/com/ibm/oti/shared/SharedClassHelperFactory.java
deleted file mode 100644
index 6cb873a..0000000
--- a/aspects/bundles/build.ibm.oti/src/com/ibm/oti/shared/SharedClassHelperFactory.java
+++ /dev/null

@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Matthew Webster           initial implementation      
- *******************************************************************************/
-
-package com.ibm.oti.shared;
-
-public interface SharedClassHelperFactory {
-	
-	public SharedClassURLHelper getURLHelper(ClassLoader classLoader) throws HelperAlreadyDefinedException;
-	
-}

diff --git a/aspects/bundles/build.ibm.oti/src/com/ibm/oti/shared/SharedClassURLHelper.java b/aspects/bundles/build.ibm.oti/src/com/ibm/oti/shared/SharedClassURLHelper.java
deleted file mode 100644
index 689b140..0000000
--- a/aspects/bundles/build.ibm.oti/src/com/ibm/oti/shared/SharedClassURLHelper.java
+++ /dev/null

@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Matthew Webster           initial implementation      
- *******************************************************************************/
-
-package com.ibm.oti.shared;
-
-import java.net.URL;
-
-public interface SharedClassURLHelper {
-
-	public byte[] findSharedClass(String partition, URL sourceFileURL, String name);
-	
-	public boolean storeSharedClass(String partition, URL sourceFileURL, Class clazz);
-}

diff --git a/compendium/bundles/org.eclipse.equinox.autoconf/.classpath b/compendium/bundles/org.eclipse.equinox.autoconf/.classpath
deleted file mode 100644
index 1e88de9..0000000
--- a/compendium/bundles/org.eclipse.equinox.autoconf/.classpath
+++ /dev/null

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.eclipse.equinox.metatype_1.0.0.20070219patched.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/compendium/bundles/org.eclipse.equinox.autoconf/.project b/compendium/bundles/org.eclipse.equinox.autoconf/.project
deleted file mode 100644
index fc83308..0000000
--- a/compendium/bundles/org.eclipse.equinox.autoconf/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.autoconf</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/compendium/bundles/org.eclipse.equinox.autoconf/.settings/org.eclipse.jdt.core.prefs b/compendium/bundles/org.eclipse.equinox.autoconf/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 32466ae..0000000
--- a/compendium/bundles/org.eclipse.equinox.autoconf/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,12 +0,0 @@
-#Mon Feb 19 10:52:18 EST 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-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.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/compendium/bundles/org.eclipse.equinox.autoconf/.settings/org.eclipse.pde.core.prefs b/compendium/bundles/org.eclipse.equinox.autoconf/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 0f39160..0000000
--- a/compendium/bundles/org.eclipse.equinox.autoconf/.settings/org.eclipse.pde.core.prefs
+++ /dev/null

@@ -1,5 +0,0 @@
-#Mon Feb 19 09:37:44 EST 2007
-eclipse.preferences.version=1
-pluginProject.equinox=false
-pluginProject.extensions=false
-resolve.requirebundle=false

diff --git a/compendium/bundles/org.eclipse.equinox.autoconf/META-INF/MANIFEST.MF b/compendium/bundles/org.eclipse.equinox.autoconf/META-INF/MANIFEST.MF
deleted file mode 100644
index bd47914..0000000
--- a/compendium/bundles/org.eclipse.equinox.autoconf/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Auto Configuration Spec Implementation
-Bundle-SymbolicName: org.eclipse.equinox.autoconf.test
-Bundle-Version: 0.1.0
-Bundle-Vendor: Eclipse.org
-Import-Package: javax.xml.parsers,
- org.eclipse.osgi.util;version="1.0.0",
- org.osgi.framework;version="1.3.0",
- org.osgi.service.cm;version="1.2.0",
- org.osgi.service.condpermadmin;version="1.0.0",
- org.osgi.service.deploymentadmin,
- org.osgi.service.deploymentadmin.spi,
- org.osgi.service.log;version="1.3.0",
- org.osgi.service.metatype;version="1.1.0",
- org.osgi.service.permissionadmin;version="1.2.0",
- org.osgi.util.tracker;version="1.3.2",
- org.xml.sax,
- org.xml.sax.helpers
-Bundle-Activator: org.eclipse.equinox.autoconf.Activator
-Bundle-ClassPath: .,
- lib/org.eclipse.equinox.metatype_1.0.0.20070219patched.jar

diff --git a/compendium/bundles/org.eclipse.equinox.autoconf/build.properties b/compendium/bundles/org.eclipse.equinox.autoconf/build.properties
deleted file mode 100644
index 5aca73c..0000000
--- a/compendium/bundles/org.eclipse.equinox.autoconf/build.properties
+++ /dev/null

@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               bin/,\
-               lib/org.eclipse.equinox.metatype_1.0.0.20070219patched.jar
-jars.compile.order = .

diff --git a/compendium/bundles/org.eclipse.equinox.autoconf/doc/metatype070219-iy.patch b/compendium/bundles/org.eclipse.equinox.autoconf/doc/metatype070219-iy.patch
deleted file mode 100644
index 5bc8548..0000000
--- a/compendium/bundles/org.eclipse.equinox.autoconf/doc/metatype070219-iy.patch
+++ /dev/null

@@ -1,53 +0,0 @@
-### Eclipse Workspace Patch 1.0
-#P org.eclipse.equinox.metatype
-Index: .settings/org.eclipse.jdt.core.prefs
-===================================================================
-RCS file: /cvsroot/eclipse/org.eclipse.equinox.metatype/.settings/org.eclipse.jdt.core.prefs,v
-retrieving revision 1.1
-diff -u -r1.1 org.eclipse.jdt.core.prefs
---- .settings/org.eclipse.jdt.core.prefs	16 Dec 2005 15:22:21 -0000	1.1
-+++ .settings/org.eclipse.jdt.core.prefs	19 Feb 2007 20:17:43 -0000
-@@ -1,12 +1,21 @@
--#Fri Dec 16 09:20:40 CST 2005
-+#Mon Feb 19 11:03:24 EST 2007
- eclipse.preferences.version=1
-+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-+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.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.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.enumIdentifier=warning
- org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
- org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
- org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-@@ -47,3 +56,4 @@
- org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
- org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
- org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-+org.eclipse.jdt.core.compiler.source=1.3
-Index: src/org/eclipse/equinox/metatype/AttributeDefinitionImpl.java
-===================================================================
-RCS file: /cvsroot/eclipse/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/AttributeDefinitionImpl.java,v
-retrieving revision 1.3
-diff -u -r1.3 AttributeDefinitionImpl.java
---- src/org/eclipse/equinox/metatype/AttributeDefinitionImpl.java	10 May 2006 16:17:00 -0000	1.3
-+++ src/org/eclipse/equinox/metatype/AttributeDefinitionImpl.java	19 Feb 2007 20:17:43 -0000
-@@ -152,7 +152,7 @@
- 	/**
- 	 * Method to get the required flag of AttributeDefinition.
- 	 */
--	boolean isRequired() {
-+	public boolean isRequired() {
- 		return _isRequired;
- 	}
- 

diff --git a/compendium/bundles/org.eclipse.equinox.autoconf/doc/readme.txt b/compendium/bundles/org.eclipse.equinox.autoconf/doc/readme.txt
deleted file mode 100644
index 0d36ef3..0000000
--- a/compendium/bundles/org.eclipse.equinox.autoconf/doc/readme.txt
+++ /dev/null

@@ -1,21 +0,0 @@
-******************************************************************
-* Implementation of Auto Configuration Spec in R4 MEG.
-******************************************************************
-
-Current implementation is not sophicificated at all.
-
-The classes in the package org.eclipse.equinox.autoconf.parser
-are implemented referring org.eclipse.equinox.metatype plugin.
-This needs library of equinox.metatype plugin jar which a patch is applied
-to version 1.0.0 (as of 2007.Feb.19) in lib/ directory.
-The patch is stored in doc/ directory. 
-  
-This implementatin must be refined.
-
-Although the implementation passed TCK provided by OSGi alliance ( as of 2006 Oct 10th),
-remember that the TCK checks only several (5) tests for Auto Configuration
-(very simple ones).
-
-The initial implementation is inmature.
-
- 
\ No newline at end of file

diff --git a/compendium/bundles/org.eclipse.equinox.autoconf/lib/org.eclipse.equinox.metatype_1.0.0.20070219patched.jar b/compendium/bundles/org.eclipse.equinox.autoconf/lib/org.eclipse.equinox.metatype_1.0.0.20070219patched.jar
deleted file mode 100644
index dcefd09..0000000
--- a/compendium/bundles/org.eclipse.equinox.autoconf/lib/org.eclipse.equinox.metatype_1.0.0.20070219patched.jar
+++ /dev/null
Binary files differ

diff --git a/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/Activator.java b/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/Activator.java
deleted file mode 100644
index a285fb3..0000000
--- a/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/Activator.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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 http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.equinox.autoconf;
-
-import java.util.Dictionary;
-
-import org.osgi.framework.*;
-import org.osgi.service.deploymentadmin.spi.ResourceProcessor;
-import org.osgi.service.log.LogService;
-
-public class Activator implements BundleActivator {
-
-	ResourceProcessor processor;
-
-	BundleContext context;
-
-	ServiceRegistration registration;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		Log.init(context);
-		Log.log(LogService.LOG_INFO, this, "start(context)", "BEGIN");
-		this.context = context;
-		AutoconfResourceProcessor processor = new AutoconfResourceProcessor(context);
-
-		Dictionary properties = Utils.createHashtable(3);
-		properties.put(Constants.SERVICE_PID, "org.osgi.deployment.rp.autoconf");
-		properties.put(Constants.SERVICE_VENDOR, "Equinox Project, Eclipse Foundation");
-		properties.put(Constants.SERVICE_DESCRIPTION, "Implementation of Auto Configuration Specification 1.0");
-
-		registration = context.registerService(ResourceProcessor.class.getName(), processor, properties);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		Log.log(LogService.LOG_INFO, this, "stop(context)", "BEGIN");
-		registration.unregister();
-		context = null;
-	}
-
-}

diff --git a/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/AliaspidToConfigPack.java b/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/AliaspidToConfigPack.java
deleted file mode 100644
index 776db8d..0000000
--- a/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/AliaspidToConfigPack.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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 http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.equinox.autoconf;
-
-import java.io.Serializable;
-import java.util.*;
-
-import org.osgi.service.log.LogService;
-
-public class AliaspidToConfigPack implements Serializable {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 2715880699638761412L;
-
-	/* aliasPid (String) -> ConfigPack */
-	private Hashtable aliasPidToConfigPack;
-
-	public AliaspidToConfigPack(int size) {
-		aliasPidToConfigPack = Utils.createHashtable(size);
-	}
-
-	public void clear() {
-		aliasPidToConfigPack.clear();
-	}
-
-	public Enumeration keys() {
-		return aliasPidToConfigPack.keys();
-	}
-
-	public Enumeration elements() {
-		return aliasPidToConfigPack.elements();
-	}
-
-	public boolean isEmpty() {
-		return aliasPidToConfigPack.isEmpty();
-	}
-
-	public int size() {
-		return aliasPidToConfigPack.size();
-	}
-
-	public void printoutConfigPacks() {
-		System.out.println("\nprintoutConfigPacks()");
-		for (Enumeration enumeration = aliasPidToConfigPack.elements(); enumeration.hasMoreElements();) {
-			ConfigPack configPack = (ConfigPack) enumeration.nextElement();;
-			Dictionary aliasProps = configPack.getProps();
-			System.out.println(Utils.getMsgStOfConfiguration(aliasProps) + "\n");
-		}
-	}
-
-	public boolean containsKey(String pid) {
-		return aliasPidToConfigPack.containsKey(pid);
-	}
-
-	public boolean containsValue(StoredConfigPack configPack) {
-		return aliasPidToConfigPack.containsValue(configPack);
-	}
-
-	public StoredConfigPack getByAliasPid(String pid) {
-		return (StoredConfigPack) aliasPidToConfigPack.get(pid);
-	}
-
-	public StoredConfigPack put(String pid, StoredConfigPack configPack) {
-		return (StoredConfigPack) aliasPidToConfigPack.put(pid, configPack);
-	}
-
-	public StoredConfigPack remove(String pid) {
-		return (StoredConfigPack) aliasPidToConfigPack.remove(pid);
-	}
-
-	public AliaspidToConfigPack getOptimized() {
-		Log.log(LogService.LOG_DEBUG, this, "getOptimized()", " BEGIN");
-		AliaspidToConfigPack newTable = new AliaspidToConfigPack(this.size());
-		for (Enumeration enumeration = this.keys(); enumeration.hasMoreElements();) {
-			String aliasPid = (String) enumeration.nextElement();
-			StoredConfigPack oldConfigPack = (StoredConfigPack) this.getByAliasPid(aliasPid);
-			StoredConfigPack newConfigPack = new StoredConfigPack(oldConfigPack);
-			newTable.put(aliasPid, newConfigPack);
-		}
-		return newTable;
-	}
-
-}

diff --git a/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/AutoconfResourceProcessor.java b/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/AutoconfResourceProcessor.java
deleted file mode 100644
index 3f9c75e..0000000
--- a/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/AutoconfResourceProcessor.java
+++ /dev/null

@@ -1,550 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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 http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.equinox.autoconf;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.PrivilegedActionException;
-import java.util.*;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.eclipse.equinox.autoconf.parser.AutoconfDataParser;
-import org.eclipse.equinox.autoconf.parser.AutoconfMetaTypeMsg;
-import org.eclipse.equinox.autoconf.parser.AutoconfDataParser.AttributeHandler;
-import org.eclipse.equinox.autoconf.parser.AutoconfDataParser.DesignateHandler;
-import org.eclipse.equinox.dp.DpConstants;
-import org.eclipse.osgi.util.NLS;
-import org.osgi.framework.*;
-import org.osgi.service.cm.ConfigurationAdmin;
-import org.osgi.service.deploymentadmin.DeploymentPackage;
-import org.osgi.service.deploymentadmin.spi.*;
-import org.osgi.service.log.LogService;
-import org.osgi.service.metatype.*;
-import org.osgi.util.tracker.ServiceTracker;
-import org.xml.sax.SAXException;
-
-public class AutoconfResourceProcessor implements ResourceProcessor {
-	private static final boolean DEBUG = false;
-
-	private static final String ERROR_MSG_NOACTIVESESSION = "ERROR:There is no active session, because it's closed or begin() failed to retrieve PersistentData.";
-
-	private ServiceTracker parserTracker;
-
-	private AutoconfSession activeSession = null;
-
-	private BundleContext context = null;
-
-	private ServiceTracker cmTracker = null;
-
-	private ConfigurationAdmin cmAdmin = null;
-
-	private ServiceTracker metaTypeTracker = null;
-
-	AutoconfResourceProcessor(BundleContext context) {
-		super();
-		this.context = context;
-
-		cmTracker = new ServiceTracker(context, ConfigurationAdmin.class.getName(), null);
-
-		parserTracker = new ServiceTracker(context, DpConstants.SAXFACTORYNAME, null);
-		metaTypeTracker = new ServiceTracker(context, MetaTypeService.class.getName(), null);
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.osgi.service.deploymentadmin.spi.ResourceProcessor#begin(org.osgi.service.deploymentadmin.spi.DeploymentSession)
-	 */
-	public void begin(DeploymentSession session) {
-		try {
-			Log.log(LogService.LOG_INFO, this, "begin(session)", "BEGIN");
-			if (activeSession != null)
-				/*
-				 * According to the Spec, it never
-				 * happens.
-				 */
-				Log.log(LogService.LOG_ERROR, "ERROR:Multiple sessions  have started");
-			cmTracker.open();
-			parserTracker.open();
-			this.activeSession = new AutoconfSession(context, session);
-
-		} catch (PrivilegedActionException e) {
-			close();
-			Log.log(LogService.LOG_ERROR, this, "begin(session) ", "UNKNOWN_ERROR in AutoconfSession()", e);
-		}
-		Utils.printoutConditionalPermissions(context);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.osgi.service.deploymentadmin.spi.ResourceProcessor#cancel()
-	 */
-	public void cancel() {
-		try {
-			Log.log(LogService.LOG_INFO, this, "cancel", " BEGIN");
-			if (activeSession == null || !activeSession.isActive()) {
-				Log.log(LogService.LOG_ERROR, ERROR_MSG_NOACTIVESESSION);
-				return;
-			}
-			close();
-		} catch (RuntimeException ex) {
-			ex.printStackTrace();
-			throw ex;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.osgi.service.deploymentadmin.spi.ResourceProcessor#commit()
-	 */
-	public void commit() {
-		try {
-			Log.log(LogService.LOG_INFO, this, "commit()", " BEGIN");
-
-			if (activeSession == null || !activeSession.isActive()) {
-				Log.log(LogService.LOG_ERROR, ERROR_MSG_NOACTIVESESSION);
-				return;
-			}
-			printoutCmBundle();
-
-			activeSession.deleteConfigObjects();
-			activeSession.createConfigObjects();
-			try {
-				activeSession.flushStoredConfigPacks();
-			} catch (IOException e) {
-				Log.log(LogService.LOG_ERROR, "AutoconfResourceProcessor#commit(): Fail to flush ConfigPacks.", e);
-			}
-			close();
-			Log.log(LogService.LOG_INFO, this, "commit()", " END");
-		} catch (RuntimeException ex) {
-			ex.printStackTrace();
-			throw ex;
-		}
-	}
-
-	private void printoutCmBundle() {
-		Bundle[] bundles = context.getBundles();
-		if (bundles != null)
-			for (int i = 0; i < bundles.length; i++)
-				if (Utils.getBundleLocationDoPrivileged(bundles[i]).indexOf("impl.service.cm.jar") != -1) {
-					System.out.println(bundles[i] + ":" + bundles[i].getState());
-					ServiceReference[] refs = bundles[i].getRegisteredServices();
-					for (int j = 0; j < refs.length; j++) {
-						System.out.println("refs[" + j + "]=" + refs[j]);
-					}
-				}
-	}
-
-	private void close() {
-		try {
-			this.close(false);
-		} catch (Exception e) {
-			Log.log(LogService.LOG_ERROR, "UNEXPECTED EXCEPTION", e);
-		}
-	}
-
-	private void close(boolean rollback) throws ResourceProcessorException {
-		Log.log(LogService.LOG_INFO, this, "close()", " BEGIN");
-		if (activeSession != null)
-			activeSession.close(rollback);
-		activeSession = null;
-	}
-
-	public static void printoutServices(BundleContext context, String clazz, boolean all) {
-		ServiceReference[] refs = null;
-		try {
-			if (all) {
-				System.out.println("\ngetAllServiceReference(" + clazz + ")");
-				refs = context.getAllServiceReferences(clazz, null);
-
-			} else {
-				System.out.println("\ngetServiceReference(" + clazz + ")");
-				refs = context.getAllServiceReferences(clazz, null);
-			}
-			if (refs != null)
-				for (int i = 0; i < refs.length; i++)
-					System.out.println(refs[i]);
-			else
-				System.out.println("refs==null");
-		} catch (InvalidSyntaxException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.osgi.service.deploymentadmin.spi.ResourceProcessor#dropAllResources()
-	 */
-	public void dropAllResources() throws ResourceProcessorException {
-
-		Log.log(LogService.LOG_INFO, this, "dropAllResources()", " BEGIN");
-		if (activeSession == null || !activeSession.isActive()) {
-			Log.log(LogService.LOG_ERROR, ERROR_MSG_NOACTIVESESSION);
-			return;
-		}
-		setConfigurationAdmin();
-		for (Enumeration keys = activeSession.getCurResourceToAliaspidConfigPack().keys(); keys.hasMoreElements();) {
-			String resourceName = (String) keys.nextElement();
-			this.dropped(resourceName);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.osgi.service.deploymentadmin.spi.ResourceProcessor#dropped(java.lang.String)
-	 */
-	public void dropped(String resource) throws ResourceProcessorException {
-		Log.log(LogService.LOG_INFO, this, "dropped(" + resource + ")", "BEGIN");
-		if (activeSession == null || !activeSession.isActive())
-			Utils.errorHandler(false, ERROR_MSG_NOACTIVESESSION);
-		activeSession.setToBeDeleted(resource);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.osgi.service.deploymentadmin.spi.ResourceProcessor#prepare()
-	 */
-	public void prepare() throws ResourceProcessorException {
-		try {
-			Log.log(LogService.LOG_INFO, this, "prepare()", " BEGIN");
-			if (activeSession == null || !activeSession.isActive())
-				Utils.errorHandler(false, ERROR_MSG_NOACTIVESESSION);
-
-			// TODO Should we check no duplicate Configuration objects to set ?
-		} catch (RuntimeException ex) {
-			ex.printStackTrace();
-			throw ex;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.osgi.service.deploymentadmin.spi.ResourceProcessor#process(java.lang.String,
-	 *      java.io.InputStream)
-	 */
-	public void process(String name, InputStream stream) throws ResourceProcessorException {
-		try {
-			Log.log(LogService.LOG_INFO, this, "process(" + name + ")", " BEGIN");
-
-			if (activeSession == null || !activeSession.isActive())
-				Utils.errorHandler(false, ERROR_MSG_NOACTIVESESSION);
-
-			SAXParserFactory parserFactory = (SAXParserFactory) parserTracker.getService();
-			if (parserFactory == null) {
-				String msg = "SAXParserFactory cannot be found.";
-				if (DEBUG) {
-					Log.log(LogService.LOG_ERROR, "parserFactory == null");
-					printoutServices(context, DpConstants.SAXFACTORYNAME, false);
-					System.out.println("\n&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&\n");
-					printoutServices(context, DpConstants.SAXFACTORYNAME, true);
-				}
-				throw new ResourceProcessorException(ResourceProcessorException.CODE_OTHER_ERROR, msg);
-				// } else {
-				// Log.log(LogService.LOG_DEBUG, "parserFactory != null");
-			}
-			parserFactory.setValidating(true);
-			parserFactory.setNamespaceAware(true);
-
-			DeploymentPackage sourceDp = activeSession.getSourceDeploymentPackage();
-
-			AutoconfDataParser parser = new AutoconfDataParser(context, sourceDp, stream, parserFactory, metaTypeTracker);
-			Vector designateHandlers = null;
-			try {
-				designateHandlers = parser.doParse();
-			} catch (ParserConfigurationException pce) {
-				throw new ResourceProcessorException(ResourceProcessorException.CODE_OTHER_ERROR, "Fail to parse", pce);
-			} catch (SAXException saxe) {
-				throw new ResourceProcessorException(ResourceProcessorException.CODE_OTHER_ERROR, "Fail to parse", saxe);
-			} catch (IOException ioe) {
-				throw new ResourceProcessorException(ResourceProcessorException.CODE_OTHER_ERROR, "Fail to parse", ioe);
-
-			}
-			setConfigurationAdmin();
-
-			createAliaspidToConfigPack(name, designateHandlers);
-			activeSession.setToBeDeletedAndToBeAdded(name);
-			Log.log(LogService.LOG_DEBUG, this, "process(" + name + ")", " END");
-		} catch (ResourceProcessorException ex) {
-			ex.printStackTrace();
-			throw ex;
-		} catch (RuntimeException ex) {
-			ex.printStackTrace();
-			throw ex;
-		}
-	}
-
-	private void setConfigurationAdmin() throws ResourceProcessorException {
-		cmAdmin = (ConfigurationAdmin) cmTracker.getService();
-		if (cmAdmin == null) {
-			if (DEBUG) {
-				Log.log(LogService.LOG_ERROR, this, "setConfigurationAdmin()", "There is no ConfigurationAdmin service.");
-				printoutServices(context, ConfigurationAdmin.class.getName(), false);
-				System.out.println("\n&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&\n");
-				printoutServices(context, ConfigurationAdmin.class.getName(), true);
-			}
-			throw new ResourceProcessorException(ResourceProcessorException.CODE_OTHER_ERROR, "Fail to get ConfigurationAdmin service");
-		}
-		activeSession.setCmAdmin(cmAdmin);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.osgi.service.deploymentadmin.spi.ResourceProcessor#rollback()
-	 */
-	public void rollback() {
-
-		Log.log(LogService.LOG_INFO, this, "rolleback()", " BEGIN");
-		if (activeSession == null || !activeSession.isActive()) {
-			Log.log(LogService.LOG_ERROR, "ERROR:There is no active session");
-			return;
-		}
-
-		try {
-			// delete newly created objects in process, if exists.
-			close(true);
-		} catch (ResourceProcessorException e) {
-			Log.log(LogService.LOG_ERROR, this, "rollback", "Fail to close(true)", e);
-		}
-	}
-
-	private void createAliaspidToConfigPack(String resource, Vector designateHandlers) throws ResourceProcessorException {
-		/*
-		 * Autoconf Resource Processor must process each Designate elament in
-		 * ofrder of appearnce.
-		 */
-		AliaspidToConfigPack aliaspidToConfigPacks = new AliaspidToConfigPack(designateHandlers.size());
-		for (Enumeration enumeration = designateHandlers.elements(); enumeration.hasMoreElements();) {
-			DesignateHandler designateHandler = (DesignateHandler) enumeration.nextElement();
-			String pid = designateHandler.getPid();
-			String fpid = designateHandler.getFpid();
-			String bundleLocation = designateHandler.getBundleLocation();
-			boolean merge = designateHandler.isMerge();
-			boolean optional = designateHandler.isOptional();
-			if (DEBUG) {
-				System.out.println("pid=" + pid);
-				System.out.println("fpid=" + fpid);
-				System.out.println("bundleLocation=" + bundleLocation);
-			}
-
-			Vector attributeHandlers = designateHandler.getAttributeHandlers();
-			Dictionary props = new Hashtable(Utils.createHashtable(attributeHandlers.size()));
-			setAttributes(designateHandler, optional, attributeHandlers, props);
-			props.put(ConfigurationAdmin.SERVICE_BUNDLELOCATION, bundleLocation);
-			// props.put(Constants.SERVICE_PID, pid);
-			String bundleSymbolicName = bundleLocation.substring(DpConstants.DP_LOCATION_PREFIX.length());
-			DeploymentPackage sourceDp = activeSession.getSourceDeploymentPackage();
-			boolean isIncludedInDp = Utils.getBundleFromDpDoPrivileged(sourceDp, bundleSymbolicName) != null ? true : false;
-			if (fpid != null) {
-				props.put(ConfigurationAdmin.SERVICE_FACTORYPID, fpid);
-			} else {
-				if (!isIncludedInDp)
-					Utils.errorHandler(optional, "Although bundleLocation specified in this Object is NOT included in the same DP," + "FactoryConfiguration is not specified. That is not what OSGi Spec v1.0 allows !!");
-			}
-			StoredConfigPack configPack = new ConfigPack(resource, pid, props, merge, optional);
-			aliaspidToConfigPacks.put(configPack.getAliasPid(), configPack);
-		}
-		if (DEBUG)
-			aliaspidToConfigPacks.printoutConfigPacks();
-		activeSession.setAliaspidToConfigPack(resource, aliaspidToConfigPacks);
-	}
-
-	/**
-	 * @param designateHandler
-	 * @param optional
-	 * @param attributeHandlers
-	 * @param props
-	 * @throws ResourceProcessorException
-	 */
-	private void setAttributes(DesignateHandler designateHandler, boolean optional, Vector attributeHandlers, Dictionary props) throws ResourceProcessorException {
-		for (int i = 0; i < attributeHandlers.size(); i++) {
-			AttributeHandler attributeHandler = (AttributeHandler) attributeHandlers.get(i);
-			String attrAdref = attributeHandler.getAdref();
-			String attrKey = attributeHandler.getKey();
-			String attrVal = attributeHandler.getContent();
-			Vector attrVec = attributeHandler.getValues();
-			ObjectClassDefinition ocd = designateHandler.getOcd();
-			if (ocd == null) {
-				Utils.errorHandler(optional, NLS.bind(AutoconfMetaTypeMsg.INVALID_SYNTAX, "While content is set, cardinality is not 0"));
-
-			}
-			AttributeDefinition[] ads = ocd.getAttributeDefinitions(ObjectClassDefinition.ALL);
-
-			// To check cardinality.
-			int cardinality = 0;
-			int type = -1;
-			for (int j = 0; j < ads.length; j++)
-				if (ads[j].getID().equals(attrAdref)) {
-					cardinality = ads[j].getCardinality();
-					type = ads[j].getType();
-					break;
-				}
-			/* Check */
-			if (type == -1)
-				Utils.errorHandler(optional, NLS.bind(AutoconfMetaTypeMsg.INVALID_SYNTAX, "There is no AttributeDefinitions whose ID equals pid"));
-
-			if (DEBUG) {
-				System.out.println("attrAdref=" + attrAdref);
-				System.out.println("\tocd.getName()=" + ocd.getName());
-				System.out.println("\tocd.getID()=" + ocd.getID());
-				System.out.println("\tocd.getDescription()=" + ocd.getDescription());
-				System.out.println("\tattrKey=" + attrKey);
-				for (int j = 0; j < ads.length; j++) {
-					System.out.println("\t\tads[" + j + "].getID()=" + ads[j].getID());
-					System.out.println("\t\tads[" + j + "].getName()=" + ads[j].getName());
-
-					System.out.println("\t\tads[" + j + "].getType()=" + getTypeSt(ads[j].getType()));
-					System.out.println("\t\tads[" + j + "].getDescription()=" + ads[j].getDescription());
-					System.out.println("\t\tads[" + j + "].getCardinality()=" + ads[j].getCardinality());
-				}
-			}
-
-			if (attrVec == null) {
-				if (cardinality != 0)
-					Utils.errorHandler(optional, NLS.bind(AutoconfMetaTypeMsg.INVALID_SYNTAX, "While content is set, cardinality is not 0"));
-				props.put(attrKey, getValueObj(type, attrVal));
-			} else {
-				if (cardinality == 0)
-					Utils.errorHandler(optional, NLS.bind(AutoconfMetaTypeMsg.INVALID_SYNTAX, "While content is not set, cardinality is 0."));
-				setVectorOrArrayTpProps(props, attrKey, attrVec, cardinality, type);
-			}
-		}
-	}
-
-	/**
-	 * @param aliasConfig
-	 * @param attrKey
-	 * @param attrVec
-	 * @param cardinality
-	 * @param type
-	 */
-	private void setVectorOrArrayTpProps(Dictionary aliasConfig, String attrKey, Vector attrVec, int cardinality, int type) {
-		if (cardinality < 0) { // Vector
-			Vector newVector = new Vector(attrVec.size());
-			for (int k = 0; k < attrVec.size(); k++)
-				newVector.add(getValueObj(type, (String) attrVec.get(k)));
-			aliasConfig.put(attrKey, newVector);
-		} else { // Array
-			Object[] newArray = getEmptyArray(type, attrVec.size());
-			for (int k = 0; k < attrVec.size(); k++)
-				newArray[k] = getValueObj(type, (String) attrVec.get(k));
-			aliasConfig.put(attrKey, newArray);
-			if (DEBUG) {
-				System.err.println("newArray.length=" + newArray.length);
-				for (int k = 0; k < attrVec.size(); k++) {
-					System.err.println("k=" + k);
-					Object obj = getValueObj(type, (String) attrVec.get(k));
-					System.err.println("obj=" + obj + ":" + obj.getClass().getName());
-					System.err.println("newArray[]:" + newArray.toString());
-				}
-			}
-		}
-	}
-
-	private static String getTypeSt(int type) {
-		switch (type) {
-			case AttributeDefinition.BOOLEAN :
-				return Boolean.class.getName();
-			case AttributeDefinition.BYTE :
-				return Byte.class.getName();
-			case AttributeDefinition.CHARACTER :
-				return Character.class.getName();
-			case AttributeDefinition.DOUBLE :
-				return Double.class.getName();
-			case AttributeDefinition.FLOAT :
-				return Float.class.getName();
-			case AttributeDefinition.INTEGER :
-				return Integer.class.getName();
-			case AttributeDefinition.LONG :
-				return Long.class.getName();
-			case AttributeDefinition.SHORT :
-				return Short.class.getName();
-			case AttributeDefinition.STRING :
-				return String.class.getName();
-			default :
-				// TODO error
-				return null;
-		}
-	}
-
-	private static Object[] getEmptyArray(int type, int size) {
-		// System.err.println("type=" + type + ", size=" + size);
-		Object[] array = null;
-		switch (type) {
-			case AttributeDefinition.BOOLEAN :
-				array = new Boolean[size];
-				break;
-			case AttributeDefinition.BYTE :
-				array = new Byte[size];
-				break;
-			case AttributeDefinition.CHARACTER :
-				array = new Character[size];
-				break;
-			case AttributeDefinition.DOUBLE :
-				array = new Double[size];
-				break;
-			case AttributeDefinition.FLOAT :
-				array = new Float[size];
-				break;
-			case AttributeDefinition.INTEGER :
-				array = new Integer[size];
-				break;
-			case AttributeDefinition.LONG :
-				array = new Long[size];
-				break;
-			case AttributeDefinition.SHORT :
-				array = new Short[size];
-				break;
-			case AttributeDefinition.STRING :
-				array = new String[size];
-				break;
-			default :
-		}
-		return array;
-	}
-
-	private static Object getValueObj(int type, String valueSt) {
-		// System.err.println("type=" + type + ", valueSt=" + valueSt);
-		switch (type) {
-			case AttributeDefinition.BOOLEAN :
-				return Boolean.valueOf(valueSt);
-			case AttributeDefinition.BYTE :
-				return Byte.valueOf(valueSt);
-			case AttributeDefinition.CHARACTER :
-				return new Character(valueSt.charAt(0));
-			case AttributeDefinition.DOUBLE :
-				return Double.valueOf(valueSt);
-			case AttributeDefinition.FLOAT :
-				return Float.valueOf(valueSt);
-			case AttributeDefinition.INTEGER :
-				return Integer.valueOf(valueSt);
-			case AttributeDefinition.LONG :
-				return Long.valueOf(valueSt);
-			case AttributeDefinition.SHORT :
-				return new Short(Short.parseShort(valueSt));
-				// return .valueOf(valueSt);
-				// return Short.valueOf(valueSt);
-			case AttributeDefinition.STRING :
-				return valueSt;
-			default :
-				return null;
-		}
-	}
-
-}

diff --git a/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/AutoconfSession.java b/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/AutoconfSession.java
deleted file mode 100644
index e0cea8d..0000000
--- a/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/AutoconfSession.java
+++ /dev/null

@@ -1,369 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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 http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.equinox.autoconf;
-
-import java.io.IOException;
-import java.security.*;
-import java.util.*;
-
-import org.osgi.framework.*;
-import org.osgi.service.cm.Configuration;
-import org.osgi.service.cm.ConfigurationAdmin;
-import org.osgi.service.deploymentadmin.DeploymentPackage;
-import org.osgi.service.deploymentadmin.spi.DeploymentSession;
-import org.osgi.service.deploymentadmin.spi.ResourceProcessorException;
-import org.osgi.service.log.LogService;
-
-public class AutoconfSession {
-	private final DeploymentSession session;
-
-	/* resourceName->AliaspidToConfigPack */
-	private StoredConfigPacks curStoredConfigPacks = null;
-
-	/*
-	 * This table contains infos retrieved from resource processed in source Dp.
-	 * Caution : the values to be actually set in Configuration objects will be
-	 * not same as them, because of FactoryConfiguration or "merge" option.
-	 * resourceName->AliaspidToConfigPack
-	 */
-	private ResourceToAliaspidToConfigPack newConfigPacks = new ResourceToAliaspidToConfigPack();
-
-	/*
-	 * List of ConfigPacks to be deleted in next commit(). This object will be
-	 * set in dropped(), droppedAllResources(). In addition, process() might
-	 * change this list.
-	 */
-	private List toBeDeletedConfigPacks = new Vector();
-
-	/*
-	 * List of ConfigPacks to be added in next commit(). In addition, process()
-	 * changes this list.
-	 */
-	private List toBeAddedConfigPacks = new Vector();
-
-	private final int operationTypes;
-
-	public static final int INSTALL = 0;
-
-	public static final int UPDATE = 1;
-
-	public static final int UNINSTALL = 2;
-
-	private boolean active = false;
-
-	private ConfigurationAdmin cmAdmin = null;
-
-	AutoconfSession(BundleContext context, DeploymentSession session) throws PrivilegedActionException {
-		super();
-		this.session = session;
-		DeploymentPackage targetDp = session.getTargetDeploymentPackage();
-		DeploymentPackage sourceDp = session.getSourceDeploymentPackage();
-
-		if (sourceDp.getVersion().equals(Version.emptyVersion)) {
-			if (!targetDp.getVersion().equals(Version.emptyVersion))
-				this.operationTypes = UNINSTALL;
-			else {
-				Log.log(LogService.LOG_ERROR, "Both of Source & Target DP has emptyVersion");
-				this.operationTypes = UNINSTALL;
-			}
-		} else if (targetDp.getVersion().equals(Version.emptyVersion))
-			this.operationTypes = INSTALL;
-		else
-			this.operationTypes = UPDATE;
-		active = true;
-
-		/* open File and retrieve data of the DP. */
-		final BundleContext bc = context;
-		final DeploymentSession se = session;
-
-		curStoredConfigPacks = (StoredConfigPacks) AccessController.doPrivileged(new PrivilegedExceptionAction() {
-			public java.lang.Object run() throws Exception {
-				return new StoredConfigPacks(bc, se);
-			}
-		});
-
-	}
-
-	public void deactivate() {
-		active = false;
-	}
-
-	public DeploymentSession getSession() {
-		return session;
-	}
-
-	public void setAliaspidToConfigPack(String resource, AliaspidToConfigPack configPacks) {
-		this.newConfigPacks.put(resource, configPacks);
-	}
-
-	/**
-	 * @param resource
-	 * @throws ResourceProcessorException
-	 */
-	public void setToBeDeletedAndToBeAdded(String resource) throws ResourceProcessorException {
-		AliaspidToConfigPack curAliaspidToConfigPack = curStoredConfigPacks.getByResourceName(resource);
-		AliaspidToConfigPack newAliaspidToConfigPack = newConfigPacks.getByResourceName(resource);
-		/*
-		 * Configuration objects, which was included in a resource of
-		 * TargetPackage (old) but not in the same resource of SourcePackage,
-		 * should be deleted in commit().
-		 */
-		if (curAliaspidToConfigPack != null)
-			for (Enumeration enumeration = curAliaspidToConfigPack.elements(); enumeration.hasMoreElements();) {
-				StoredConfigPack curStoredConfigPack = (StoredConfigPack) enumeration.nextElement();
-				String curAliasPid = curStoredConfigPack.getAliasPid();
-				StoredConfigPack newConfigPack = (StoredConfigPack) newAliaspidToConfigPack.getByAliasPid(curAliasPid);
-				if (newConfigPack == null) {
-					String curActualPid = curStoredConfigPack.getActualPid();
-					String bundleLocation = curStoredConfigPack.getBundleLocation();
-					Configuration configuration = null;
-					try {
-						configuration = cmAdmin.getConfiguration(curActualPid, bundleLocation);
-					} catch (Exception e) {
-						// Log.log(LogService.LOG_DEBUG, null, e);
-						String msg = "Fail to cmAdmin.getConfiguration.";
-						Utils.errorHandler(curStoredConfigPack.isOptional(), msg, e);
-						continue;
-					}
-					ConfigPack configPack = new ConfigPack(resource, curStoredConfigPack);
-					configPack.setConfiguration(configuration);
-					toBeDeletedConfigPacks.add(configPack);
-				}
-			}
-		/*
-		 * To list up Configuration objects, which whould be added or updated in
-		 * commit().
-		 */
-
-		if (newAliaspidToConfigPack != null)
-			for (Enumeration enumeration = newAliaspidToConfigPack.elements(); enumeration.hasMoreElements();) {
-				ConfigPack newConfigPack = (ConfigPack) enumeration.nextElement();
-				Configuration configuration = null;
-				String fpid = newConfigPack.getFpid();
-				String newAliasPid = newConfigPack.getAliasPid();
-				String bundleLocation = newConfigPack.getBundleLocation();
-				if (fpid != null) {// FactoryConfiguration
-					StoredConfigPack curConfigPack = null;
-					if (curAliaspidToConfigPack != null)
-						curConfigPack = curAliaspidToConfigPack.getByAliasPid(newAliasPid);
-					if (curConfigPack == null) {
-						// a first-time installation of the factory
-						// configuration.
-						try {
-							configuration = cmAdmin.createFactoryConfiguration(fpid, bundleLocation);
-							newConfigPack.setConfiguration(configuration);
-							newConfigPack.setCreated(true);
-						} catch (Exception e) {
-							String msg = "Fail to cmAdmin.createConfiguration.";
-							Utils.errorHandler(curConfigPack.isOptional(), msg, e);
-							continue;
-						}
-					} else {
-						// The factory configuration already exists from a
-						// previous Autoconf resource installation.
-						String curActualPid = curConfigPack.getActualPid();
-						try {
-							configuration = cmAdmin.getConfiguration(curActualPid, bundleLocation);
-							newConfigPack.setConfiguration(configuration);
-							newConfigPack.setCreated(false);
-						} catch (Exception e) {
-							String msg = "Fail to cmAdmin.getConfiguration.";
-							Utils.errorHandler(curConfigPack.isOptional(), msg, e);
-							continue;
-						}
-					}
-				} else { // not FactoryConfiguration
-					try {
-						configuration = cmAdmin.getConfiguration(newAliasPid, bundleLocation);
-						newConfigPack.setConfiguration(configuration);
-						String filterSt = "(&(" + Constants.SERVICE_PID + "=" + newAliasPid + ")(" + ConfigurationAdmin.SERVICE_BUNDLELOCATION + "=" + bundleLocation + "))";
-						boolean newCreated = cmAdmin.listConfigurations(filterSt) == null ? true : false;
-						newConfigPack.setCreated(newCreated);
-					} catch (Exception e) {
-						String msg = "Fail to cmAdmin.getConfiguration.";
-						Utils.errorHandler(newConfigPack.isOptional(), msg, e);
-						continue;
-					}
-				}
-				toBeAddedConfigPacks.add(newConfigPack);
-			}
-	}
-
-	public void setToBeDeleted(String resource) throws ResourceProcessorException {
-		AliaspidToConfigPack aliaspidToConfigPack = curStoredConfigPacks.getByResourceName(resource);
-
-		if (aliaspidToConfigPack == null) {
-			Log.log(LogService.LOG_WARNING, "AutoconfSession#setToBeDeleted(" + resource + "): There is no such resource to be removed.");
-			return;
-		}
-		for (Enumeration enumeration = aliaspidToConfigPack.keys(); enumeration.hasMoreElements();) {
-			StoredConfigPack storedConfigPack = aliaspidToConfigPack.getByAliasPid((String) enumeration.nextElement());
-			String curActualPid = storedConfigPack.getActualPid();
-			String bundleLocation = storedConfigPack.getBundleLocation();
-			Configuration configuration = null;
-			try {
-				configuration = cmAdmin.getConfiguration(curActualPid, bundleLocation);
-			} catch (Exception e) {
-				String msg = "Fail to getConfiguration.";
-				Utils.errorHandler(storedConfigPack.isOptional(), msg, e);
-				continue;
-			}
-			ConfigPack configPack = new ConfigPack(resource, storedConfigPack);
-			configPack.setConfiguration(configuration);
-			toBeDeletedConfigPacks.add(configPack);
-		}
-	}
-
-	public void deleteConfigObjects() {
-		// First, delete Configuration objects to be removed.
-		for (Iterator it = toBeDeletedConfigPacks.listIterator(); it.hasNext();) {
-			ConfigPack configPack = (ConfigPack) it.next();
-			String resource = configPack.getResource();
-			Configuration conf = configPack.getConfiguration();
-			try {
-				conf.delete();
-			} catch (IOException e) {
-				/*
-				 * XXX: conf.delete() might be failed. But rp.commit() cannot
-				 * throw RPException. It means, AutoConfiguration rp might act
-				 * depending on its optional flag.
-				 * 
-				 * Therefore, conf.delete() might be called in
-				 * process(),dropAllresources() or prepared(). In that case,
-				 * rollback will be more complicated.
-				 */
-				Log.log(LogService.LOG_ERROR, "Fail to delete Configuration", e);
-			}
-			// remove elements regarding deleted objects
-			AliaspidToConfigPack curAliaspidToConfigPack = curStoredConfigPacks.getByResourceName(resource);
-			if (curAliaspidToConfigPack != null) {
-				curAliaspidToConfigPack.remove(configPack.getAliasPid());
-			}
-		}
-		toBeDeletedConfigPacks.clear();
-	}
-
-	/**
-	 * This method is called only from commit(). Therefore, all Exceptions must
-	 * be not thrown but logged, and this method should keep on going as
-	 * possible.
-	 * 
-	 * @param dpToResourceAliaspidConfigPacks
-	 * @throws IOException
-	 */
-	public void createConfigObjects() {
-		for (int i = 0; i < toBeAddedConfigPacks.size(); i++) {
-			ConfigPack configPack = (ConfigPack) toBeAddedConfigPacks.get(i);
-			Configuration conf = configPack.getConfiguration();
-			try {
-				Dictionary aliasProps = configPack.getProps();
-				if (configPack.isMerge()) {
-					Dictionary currentProps = conf.getProperties();
-
-					/*
-					 * add properties that do not exist in the current
-					 * configuration object's properties.
-					 */
-					for (Enumeration enumeration = aliasProps.keys(); enumeration.hasMoreElements();) {
-						String key = (String) enumeration.nextElement();
-						if (currentProps.get(key) == null) {
-							currentProps.put(key, aliasProps.get(key));
-						}
-					}
-					conf.update(currentProps);
-					configPack.setProps(currentProps);
-				} else {
-					/* replace all properties of configuration object. */
-					conf.update(aliasProps);
-				}
-				AliaspidToConfigPack curAliasToConfigPack = curStoredConfigPacks.getByResourceName(configPack.getResource());
-				if (curAliasToConfigPack == null) {
-					curAliasToConfigPack = new AliaspidToConfigPack(4);
-					curStoredConfigPacks.put(configPack.getResource(), curAliasToConfigPack);
-				}
-				curAliasToConfigPack.put(configPack.getAliasPid(), configPack);
-			} catch (IOException e) {
-				/*
-				 * XXX: conf.delete() might be failed. But rp.commit() cannot
-				 * throw RPException. It means, AutoConfiguration rp might act
-				 * depending on its optional flag.
-				 * 
-				 * Therefore, conf.delete() might be called in
-				 * process(),dropAllresources() or prepared(). In that case,
-				 * rollback will be more complicated.
-				 */
-				Log.log(LogService.LOG_ERROR, "Fail to update Configuration", e);
-			}
-		}
-		toBeAddedConfigPacks.clear();
-	}
-
-	public void close(boolean rollback) throws ResourceProcessorException {
-		if (rollback)
-			for (Iterator it = toBeAddedConfigPacks.iterator(); it.hasNext();) {
-				ConfigPack configPack = (ConfigPack) it.next();
-				if (configPack.isCreated())
-					try {
-						configPack.getConfiguration().delete();
-					} catch (IOException e) {
-						Utils.errorHandler(configPack.isOptional(), "Fail to Configuration.delete()", e);
-						continue;
-					}
-			}
-
-		newConfigPacks.clear();
-		toBeAddedConfigPacks.clear();
-		toBeDeletedConfigPacks.clear();
-		active = false;
-	}
-
-	public DeploymentPackage getTargetDeploymentPackage() {
-		return this.session.getTargetDeploymentPackage();
-	}
-
-	public DeploymentPackage getSourceDeploymentPackage() {
-		return this.session.getSourceDeploymentPackage();
-	}
-
-	public void setCmAdmin(ConfigurationAdmin cmAdmin) {
-		this.cmAdmin = cmAdmin;
-	}
-
-	public int getOperationTypes() {
-		return operationTypes;
-	}
-
-	public boolean isActive() {
-		return active;
-	}
-
-	public StoredConfigPacks getCurResourceToAliaspidConfigPack() {
-		return curStoredConfigPacks;
-	}
-
-	public void flushStoredConfigPacks() throws IOException {
-		try {
-			AccessController.doPrivileged(new PrivilegedExceptionAction() {
-				public java.lang.Object run() throws Exception {
-					curStoredConfigPacks.flush(session);
-					return null;
-				}
-			});
-		} catch (PrivilegedActionException pae) {
-			active = false;
-			Exception e = pae.getException();
-			if (e instanceof IOException)
-				throw (IOException) e;
-			if (e instanceof RuntimeException)
-				throw (RuntimeException) e;
-			Log.log(LogService.LOG_WARNING, "Unexpected wrapped exception; not either IOException or RuntimeException", pae);
-		}
-	}
-
-}
\ No newline at end of file

diff --git a/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/ConfigPack.java b/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/ConfigPack.java
deleted file mode 100644
index cd86946..0000000
--- a/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/ConfigPack.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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 http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.equinox.autoconf;
-
-import java.util.Dictionary;
-
-import org.osgi.framework.Constants;
-import org.osgi.service.cm.Configuration;
-import org.osgi.service.cm.ConfigurationAdmin;
-
-public class ConfigPack extends StoredConfigPack {
-
-	private static final long serialVersionUID = 0L;
-
-	private Dictionary props;
-
-	private final String resource;
-
-	private final boolean merge;
-
-	private Configuration configuration; // Configuration object to be updated. It might be newlyF created.
-
-	private boolean created = false;// if configuration was newly created, true; This flag will be used in rollback.
-
-	public ConfigPack(String resource, String aliasPid, Dictionary props, boolean merge, boolean optional) {
-		super(aliasPid, (String) props.get(Constants.SERVICE_PID), (String) props.get(ConfigurationAdmin.SERVICE_FACTORYPID), (String) props.get(ConfigurationAdmin.SERVICE_BUNDLELOCATION), optional);
-		this.resource = resource;
-		this.props = props;
-		this.merge = merge;
-	}
-
-	public ConfigPack(String resource, StoredConfigPack configPack) {
-		super(configPack.aliasPid, configPack.actualPid, configPack.fpid, configPack.bundleLocation, configPack.optional);
-		this.resource = resource;
-		this.props = null;
-		this.merge = true;
-	}
-
-	public Dictionary getProps() {
-		return props;
-	}
-
-	public boolean isMerge() {
-		return merge;
-	}
-
-	public String getResource() {
-		return resource;
-	}
-
-	public void setProps(Dictionary aliasProps) {
-		this.props = aliasProps;
-	}
-
-	public Configuration getConfiguration() {
-		return configuration;
-	}
-
-	public void setConfiguration(Configuration configuration) {
-		this.configuration = configuration;
-		actualPid = configuration.getPid();
-	}
-
-	public boolean isCreated() {
-		return created;
-	}
-
-	public void setCreated(boolean created) {
-		this.created = created;
-	}
-
-}

diff --git a/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/Log.java b/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/Log.java
deleted file mode 100644
index 3ff0f09..0000000
--- a/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/Log.java
+++ /dev/null

@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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 http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.equinox.autoconf;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.service.log.LogService;
-import org.osgi.util.tracker.ServiceTracker;
-
-/**
- * Utility class with static methods for logging to LogService, if available
- */
-public class Log {
-	static private ServiceTracker logTracker;
-
-	private Log() {
-	};
-
-	static void init(BundleContext bc) {
-		logTracker = new ServiceTracker(bc, LogService.class.getName(), null);
-		logTracker.open();
-	}
-
-	static void dispose() {
-		if (logTracker != null) {
-			logTracker.close();
-		}
-		logTracker = null;
-	}
-
-	public static void log(int level, String message) {
-		log(level, null, null, message, null);
-	}
-
-	public static void log(int level, String message, Throwable e) {
-		log(level, null, null, message, e);
-	}
-
-	public static void log(int level, String method, String message) {
-		log(level, null, method, message, null);
-	}
-
-	public static void log(int level, Object obj, String method, String message) {
-		log(level, obj, method, message, null);
-	}
-
-	public static void log(int level, Object obj, String method, String message, Throwable e) {
-		// LogService logService = (LogService) logTracker.getService();
-		LogService logService = null;
-		String msg = null;
-		if (method == null)
-			if (obj == null)
-				msg = message;
-			else
-				msg = "(" + obj.getClass().getName() + ")";
-		else if (obj == null)
-			msg = "[" + method + "]" + message;
-		else
-			msg = "[" + method + "]" + message + "(" + obj.getClass().getName() + ")";
-
-		if (logService != null) {
-			logService.log(level, msg, e);
-		} else {
-			String levelSt = null;
-			if (level == LogService.LOG_DEBUG)
-				levelSt = "DEBUG";
-			else if (level == LogService.LOG_INFO)
-				levelSt = "INFO";
-			else if (level == LogService.LOG_WARNING)
-				levelSt = "WARNING";
-			else if (level == LogService.LOG_ERROR)
-				levelSt = "ERROR";
-
-			System.out.println("[" + levelSt + "]" + msg);
-			if (e != null)
-				System.out.println(e);
-		}
-	}
-}
\ No newline at end of file

diff --git a/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/ResourceToAliaspidToConfigPack.java b/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/ResourceToAliaspidToConfigPack.java
deleted file mode 100644
index 36ddb07..0000000
--- a/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/ResourceToAliaspidToConfigPack.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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 http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.equinox.autoconf;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-public class ResourceToAliaspidToConfigPack {
-
-	/**
-	 * resource -> AliaspidToConfigPack
-	 */
-	protected Hashtable resourceToTable = null;
-
-	public ResourceToAliaspidToConfigPack() {
-		resourceToTable = new Hashtable(4);
-	}
-
-	public AliaspidToConfigPack put(String resource, AliaspidToConfigPack configPacks) {
-		return (AliaspidToConfigPack) resourceToTable.put(resource, configPacks);
-	}
-
-	public AliaspidToConfigPack getByResourceName(String resource) {
-		return (AliaspidToConfigPack) resourceToTable.get(resource);
-	}
-
-	public AliaspidToConfigPack remove(String resource) {
-		return (AliaspidToConfigPack) resourceToTable.remove(resource);
-	}
-
-	public void clear() {
-		resourceToTable.clear();
-	}
-
-	public Enumeration keys() {
-		return this.resourceToTable.keys();
-	}
-}

diff --git a/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/StoredConfigPack.java b/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/StoredConfigPack.java
deleted file mode 100644
index 2ac4f84..0000000
--- a/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/StoredConfigPack.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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 http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.equinox.autoconf;
-
-import java.io.Serializable;
-
-/**
- * @author iyamasak
- * 
- */
-public class StoredConfigPack implements Serializable {
-
-	protected static final long serialVersionUID = 1082820421820641930L;
-
-	protected final String aliasPid;
-
-	protected String actualPid;
-
-	protected final String fpid;
-
-	protected final String bundleLocation;
-
-	protected final boolean optional;
-
-	public StoredConfigPack(String aliasPid, String actualPid, String fpid, String bundleLocation, boolean optional) {
-		this.aliasPid = aliasPid;
-		this.actualPid = actualPid;
-		this.fpid = fpid;
-		this.bundleLocation = bundleLocation;
-		this.optional = optional;
-	}
-
-	public StoredConfigPack(StoredConfigPack oldConfigPack) {
-		this.aliasPid = oldConfigPack.aliasPid;
-		this.actualPid = oldConfigPack.actualPid;
-		this.fpid = oldConfigPack.fpid;
-		this.bundleLocation = oldConfigPack.bundleLocation;
-		this.optional = oldConfigPack.optional;
-	}
-
-	public String getAliasPid() {
-		return aliasPid;
-	}
-
-	public String getFpid() {
-		return fpid;
-	}
-
-	public String getBundleLocation() {
-		return bundleLocation;
-	}
-
-	public String getActualPid() {
-		return this.actualPid;
-	}
-
-	public boolean isOptional() {
-		return optional;
-	}
-}

diff --git a/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/StoredConfigPacks.java b/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/StoredConfigPacks.java
deleted file mode 100644
index 85b21d6..0000000
--- a/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/StoredConfigPacks.java
+++ /dev/null

@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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 http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.equinox.autoconf;
-
-import java.io.*;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.equinox.dp.DpConstants;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Version;
-import org.osgi.service.deploymentadmin.DeploymentPackage;
-import org.osgi.service.deploymentadmin.spi.DeploymentSession;
-import org.osgi.service.log.LogService;
-
-public class StoredConfigPacks extends ResourceToAliaspidToConfigPack {
-
-	private final BundleContext context;
-
-	public StoredConfigPacks(BundleContext context, DeploymentSession session) throws StreamCorruptedException, IOException, ClassNotFoundException {
-		this.context = context;
-		DeploymentPackage targetDp = session.getTargetDeploymentPackage();
-
-		if (targetDp.getVersion().equals(Version.emptyVersion)) {
-			Log.log(LogService.LOG_DEBUG, this, "Constructor", "new DpInstallation");
-			super.resourceToTable = new Hashtable(4);
-		} else {
-			File inFile = context.getDataFile(getFilePath(targetDp));
-			ObjectInputStream ois = null;
-			try {
-				FileInputStream fis = new FileInputStream(inFile);
-				ois = new ObjectInputStream(fis);
-				super.resourceToTable = (Hashtable) ois.readObject();
-				Log.log(LogService.LOG_INFO, this, "Constructor", "Read data from:" + inFile);
-			} catch (FileNotFoundException e) {
-				Log.log(LogService.LOG_WARNING, "session file(" + inFile + ") was not found.", e);
-				super.resourceToTable = new Hashtable(4);
-			} finally {
-				if (ois != null)
-					ois.close();
-			}
-		}
-	}
-
-	public void refresh() {
-		for (Enumeration enumeration = resourceToTable.keys(); enumeration.hasMoreElements();) {
-			String resource = (String) enumeration.nextElement();
-			Hashtable table = (Hashtable) resourceToTable.get(resource);
-			if (table.size() == 0) {
-				this.remove(resource);
-			}
-		}
-	}
-
-	private static String getFilePath(DeploymentPackage dp) {
-		return DpConstants.DP_LOCATION_PREFIX + dp.getName();
-	}
-
-	public void flush(DeploymentSession session) throws IOException {
-		Log.log(LogService.LOG_DEBUG, this, "flush(session)", " BEGIN");
-		DeploymentPackage sourceDp = session.getSourceDeploymentPackage();
-		if (!sourceDp.getVersion().equals(Version.emptyVersion)) {
-			File outFile = context.getDataFile(getFilePath(sourceDp));
-			ObjectOutputStream oos = null;
-			try {
-				FileOutputStream fos = new FileOutputStream(outFile);
-				oos = new ObjectOutputStream(fos);
-				oos.writeObject(getOptimizedTable());
-			} finally {
-				if (oos != null)
-					oos.close();
-			}
-			return;
-		}
-		DeploymentPackage targetDp = session.getTargetDeploymentPackage();
-		if (!targetDp.getVersion().equals(Version.emptyVersion))
-			this.clearOldData(context.getDataFile(getFilePath(targetDp)));
-	}
-
-	private void clearOldData(File file) {
-		super.clear();
-		if (file != null)
-			file.delete();
-	}
-
-	private Hashtable getOptimizedTable() {
-		Log.log(LogService.LOG_DEBUG, this, "getOptimizedTable)", " BEGIN");
-		Hashtable newTable = Utils.createHashtable(resourceToTable.size());
-		for (Enumeration enumeration = resourceToTable.keys(); enumeration.hasMoreElements();) {
-			Object resource = enumeration.nextElement();
-			AliaspidToConfigPack aliaspitToConfigPack = (AliaspidToConfigPack) resourceToTable.get(resource);
-			newTable.put(resource, aliaspitToConfigPack.getOptimized());
-		}
-		return newTable;
-	}
-}

diff --git a/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/Utils.java b/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/Utils.java
deleted file mode 100644
index d2a288c..0000000
--- a/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/Utils.java
+++ /dev/null

@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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 http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.equinox.autoconf;
-
-import java.io.File;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.*;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.condpermadmin.*;
-import org.osgi.service.deploymentadmin.DeploymentPackage;
-import org.osgi.service.deploymentadmin.spi.ResourceProcessorException;
-import org.osgi.service.log.LogService;
-import org.osgi.service.permissionadmin.PermissionInfo;
-import org.osgi.util.tracker.ServiceTracker;
-
-public class Utils {
-
-	//private static boolean DOPRIVILEGED = false;
-
-	public static void printoutConditionalPermissions(BundleContext context) {
-		ServiceTracker cpTracker = new ServiceTracker(context, ConditionalPermissionAdmin.class.getName(), null);
-		cpTracker.open();
-		ConditionalPermissionAdmin cpAdmin = (ConditionalPermissionAdmin) cpTracker.getService();
-		System.out.println("\n$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n");
-		if (cpAdmin == null) {
-			System.out.println("cpAdmin==null. It might be caused by lack of required Permission");
-			return;
-		}
-		System.out.println("BEGIN printoutConditionalPermissions()");
-		try {
-			for (Enumeration enumeration = cpAdmin.getConditionalPermissionInfos(); enumeration.hasMoreElements();) {
-				ConditionalPermissionInfo cpInfo = (ConditionalPermissionInfo) enumeration.nextElement();
-				System.out.println("condtionpermissionInfo:\n\tname=" + cpInfo.getName());
-				ConditionInfo[] cInfos = cpInfo.getConditionInfos();
-				for (int i = 0; i < cInfos.length; i++)
-					System.out.println("\tcondtionInfo[" + i + "]=" + cInfos[i]);
-				PermissionInfo[] pInfos = cpInfo.getPermissionInfos();
-				for (int i = 0; i < pInfos.length; i++)
-					System.out.println("\tpermInfo[" + i + "]=" + pInfos[i]);
-			}
-		} catch (SecurityException se) {
-			se.printStackTrace();
-		}
-		System.out.println("END printoutConditionalPermissions()\n" + "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n");
-
-	}
-
-	public static Bundle getBundleFromDpDoPrivileged(DeploymentPackage deploymentPackage, String bundleSymbolicName) {
-		final DeploymentPackage dp = deploymentPackage;
-		final String bsn = bundleSymbolicName;
-		return (Bundle) AccessController.doPrivileged(new PrivilegedAction() {
-			public java.lang.Object run() {
-				return dp.getBundle(bsn);
-			}
-		});
-	}
-
-	public static String getBundleLocationDoPrivileged(Bundle bundle) {
-		final Bundle b = bundle;
-		return (String) AccessController.doPrivileged(new PrivilegedAction() {
-			public java.lang.Object run() {
-				return b.getLocation();
-			}
-		});
-	}
-
-	public static File getDataFileDoPrivileged(BundleContext context, String filePath) {
-		final BundleContext bc = context;
-		final String path = filePath;
-		return (File) AccessController.doPrivileged(new PrivilegedAction() {
-			public java.lang.Object run() {
-				return bc.getDataFile(path);
-			}
-		});
-	}
-
-	public static String getMsgStOfConfiguration(Dictionary props) {
-		StringBuffer sb = new StringBuffer(10);
-		for (Enumeration enumeration = props.keys(); enumeration.hasMoreElements();) {
-			String key = (String) enumeration.nextElement();
-			Object value = props.get(key);
-			if (value instanceof Object[]) {
-				Object[] array = (Object[]) value;
-				sb.append("\t{" + key + ",<");
-				for (int j = 0; j < array.length; j++) {
-					if (j != 0)
-						sb.append(",");
-					sb.append(array[j]);
-				}
-				sb.append(">:" + value.getClass().getName() + "}\n");
-			} else
-				sb.append("\t{" + key + "," + value + ":" + value.getClass().getName() + "}\n");
-		}
-		return sb.toString();
-	}
-
-	public static void errorHandler(boolean optional, String msg) throws ResourceProcessorException {
-		errorHandler(optional, msg, null);
-	}
-
-	public static void errorHandler(boolean optional, Exception ex) throws ResourceProcessorException {
-		errorHandler(optional, null, ex);
-	}
-
-	public static void errorHandler(boolean optional, String msg, Exception ex) throws ResourceProcessorException {
-		if (optional) {
-			Log.log(LogService.LOG_ERROR, msg, ex);
-			return;
-		}
-		// Log.log(LogService.LOG_WARNING, msg, ex);
-		throw new ResourceProcessorException(ResourceProcessorException.CODE_OTHER_ERROR, msg, ex);
-	}
-
-	public static Hashtable createHashtable(int size) {
-		return new Hashtable((int) Math.ceil((double) size / 0.75));
-	}
-}

diff --git a/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/parser/AutoconfDataParser.java b/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/parser/AutoconfDataParser.java
deleted file mode 100644
index 5d5c85a..0000000
--- a/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/parser/AutoconfDataParser.java
+++ /dev/null

@@ -1,1279 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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 http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.equinox.autoconf.parser;
-
-import java.io.*;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.*;
-
-import javax.xml.parsers.*;
-
-import org.eclipse.equinox.autoconf.Log;
-import org.eclipse.equinox.autoconf.Utils;
-import org.eclipse.equinox.dp.DpConstants;
-import org.eclipse.equinox.metatype.AttributeDefinitionImpl;
-import org.eclipse.equinox.metatype.ObjectClassDefinitionImpl;
-import org.eclipse.osgi.util.NLS;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.deploymentadmin.DeploymentPackage;
-import org.osgi.service.deploymentadmin.spi.ResourceProcessorException;
-import org.osgi.service.log.LogService;
-import org.osgi.service.metatype.*;
-import org.osgi.util.tracker.ServiceTracker;
-import org.xml.sax.*;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * Meta XML Data Parser
- * 
- * TODO Refine the implementation.
- * 
- * The classes in this package are implemented referring
- * org.eclipse.equinox.metatype plugin.  This needs library of 
- * equinox.metatype plugin jar which a patch is applied to version 1.0.0
- * (as of 2007.Feb.19) in lib/ directory. The patch is stored in doc/ directory.
- * This implementatin must be refined.
- *  
- */
-public class AutoconfDataParser {
-	private static final boolean DEBUG = false;
-
-	protected static final String METADATA = "MetaData"; //$NON-NLS-1$
-
-	protected static final String LOCALIZATION = "localization"; //$NON-NLS-1$
-
-	protected static final String OCD = "OCD"; //$NON-NLS-1$
-
-	protected static final String ICON = "Icon"; //$NON-NLS-1$
-
-	protected static final String AD = "AD"; //$NON-NLS-1$
-
-	protected static final String CARDINALITY = "cardinality"; //$NON-NLS-1$
-
-	protected static final String OPTION = "Option"; //$NON-NLS-1$
-
-	protected static final String LABEL = "label"; //$NON-NLS-1$
-
-	protected static final String VALUE = "value"; //$NON-NLS-1$
-
-	protected static final String MIN = "min"; //$NON-NLS-1$
-
-	protected static final String MAX = "max"; //$NON-NLS-1$
-
-	protected static final String TYPE = "type"; //$NON-NLS-1$
-
-	protected static final String SIZE = "size"; //$NON-NLS-1$
-
-	protected static final String ID = "id"; //$NON-NLS-1$
-
-	protected static final String NAME = "name"; //$NON-NLS-1$
-
-	protected static final String DESCRIPTION = "description"; //$NON-NLS-1$
-
-	protected static final String RESOURCE = "resource"; //$NON-NLS-1$
-
-	protected static final String PID = "pid"; //$NON-NLS-1$
-
-	protected static final String DEFAULT = "default"; //$NON-NLS-1$
-
-	protected static final String ADREF = "adref"; //$NON-NLS-1$
-
-	protected static final String CONTENT = "content"; //$NON-NLS-1$
-
-	protected static final String FACTORY = "factoryPid"; //$NON-NLS-1$
-
-	protected static final String BUNDLE = "bundle"; //$NON-NLS-1$
-
-	protected static final String OPTIONAL = "optional"; //$NON-NLS-1$
-
-	protected static final String OBJECT = "Object"; //$NON-NLS-1$
-
-	protected static final String OCDREF = "ocdref"; //$NON-NLS-1$
-
-	protected static final String ATTRIBUTE = "Attribute"; //$NON-NLS-1$
-
-	protected static final String DESIGNATE = "Designate"; //$NON-NLS-1$
-
-	protected static final String MERGE = "merge"; //$NON-NLS-1$
-
-	protected static final String REQUIRED = "required"; //$NON-NLS-1$
-
-	protected static final String INTEGER = "Integer"; //$NON-NLS-1$
-
-	protected static final String STRING = "String"; //$NON-NLS-1$
-
-	protected static final String FLOAT = "Float"; //$NON-NLS-1$
-
-	protected static final String DOUBLE = "Double"; //$NON-NLS-1$
-
-	protected static final String BYTE = "Byte"; //$NON-NLS-1$
-
-	protected static final String LONG = "Long"; //$NON-NLS-1$
-
-	protected static final String CHAR = "Char"; //$NON-NLS-1$
-
-	protected static final String BOOLEAN = "Boolean"; //$NON-NLS-1$
-
-	protected static final String SHORT = "Short"; //$NON-NLS-1$
-
-	// protected Bundle _dp_bundle;
-	// protected URL _dp_url;
-	protected SAXParserFactory parserFactory;
-
-	private final ServiceTracker metaTypeTracker;
-
-	protected XMLReader xmlReader;
-
-	// DesignateHanders in DataParser class
-	Vector designateHandlers = new Vector(7);
-
-	// ObjectClassDefinitions in DataParser class w/ corresponding reference
-	// keys
-	// OCD_ID to OCDImpl
-	Hashtable ocdIdToOCDimpl = new Hashtable(7);
-
-	// // pid to ObjectClassDefinitions in DataParser class as a Hashtable
-	// protected Hashtable _dp_pid_to_OCDs_ = new Hashtable(7);
-	// Localization in DataParser class
-	String localization;
-
-	InputStream inputStream;
-
-	BundleContext context = null;
-
-	DeploymentPackage sourceDp = null;
-
-	/*
-	 * Constructor of class DataParser.
-	 */
-	public AutoconfDataParser(BundleContext context, DeploymentPackage sourceDp, InputStream inputStream, SAXParserFactory parserFactory, ServiceTracker metaTypeTracker) {
-		this.context = context;
-		this.sourceDp = sourceDp;
-		this.inputStream = inputStream;
-		this.parserFactory = parserFactory;
-		this.metaTypeTracker = metaTypeTracker;
-		parserFactory.setValidating(false);
-	}
-
-	/**
-	 * Main method to parse specific MetaData file.
-	 * 
-	 * @return Vector of designatedHandlers, which includes OCDs retrieved from
-	 *         MetaTypeService.
-	 * @throws SAXException
-	 * @throws ParserConfigurationException
-	 * @throws IOException
-	 */
-	public Vector doParse() throws ParserConfigurationException, SAXException, IOException {
-
-		SAXParser saxParser = parserFactory.newSAXParser();
-		xmlReader = saxParser.getXMLReader();
-		xmlReader.setContentHandler(new RootHandler());
-		xmlReader.setErrorHandler(new MyErrorHandler(System.err));
-		// InputStream is = _dp_url.openStream();
-		InputSource isource = new InputSource(inputStream);
-		// Log.log(LogService.LOG_INFO, "Starting to parse " + _dp_url);
-		// //$NON-NLS-1$
-		xmlReader.parse(isource);
-
-		return designateHandlers;
-	}
-
-	/*
-	 * Convert String for expected data type.
-	 */
-	static Object convert(String value, int type) {
-
-		if (value == null) {
-			return null;
-		}
-
-		switch (type) {
-			case AttributeDefinition.STRING :
-				// Both the min and max of STRING are Integers.
-				return new Integer(value);
-			case AttributeDefinition.LONG :
-				return new Long(value);
-			case AttributeDefinition.INTEGER :
-				return new Integer(value);
-			case AttributeDefinition.SHORT :
-				return new Short(value);
-			case AttributeDefinition.CHARACTER :
-				return new Character(value.charAt(0));
-			case AttributeDefinition.BYTE :
-				return new Byte(value);
-			case AttributeDefinition.DOUBLE :
-				return new Double(value);
-			case AttributeDefinition.FLOAT :
-				return new Float(value);
-			case AttributeDefinition.BIGINTEGER :
-				try {
-					Class bigIntClazz = Class.forName("java.math.BigInteger");//$NON-NLS-1$
-					Constructor bigIntConstructor = bigIntClazz.getConstructor(new Class[] {String.class});
-					return bigIntConstructor.newInstance(new Object[] {value});
-				} catch (ClassNotFoundException e) {
-					e.printStackTrace();
-					return null;
-				} catch (SecurityException e) {
-					e.printStackTrace();
-					return null;
-				} catch (NoSuchMethodException e) {
-					e.printStackTrace();
-					return null;
-				} catch (IllegalArgumentException e) {
-					e.printStackTrace();
-					return null;
-				} catch (InstantiationException e) {
-					e.printStackTrace();
-					return null;
-				} catch (IllegalAccessException e) {
-					e.printStackTrace();
-					return null;
-				} catch (InvocationTargetException e) {
-					e.printStackTrace();
-					return null;
-				}
-			case AttributeDefinition.BIGDECIMAL :
-				try {
-					Class bigDecimalClazz = Class.forName("java.math.BigDecimal");//$NON-NLS-1$
-					Constructor bigDecimalConstructor = bigDecimalClazz.getConstructor(new Class[] {String.class});
-					return bigDecimalConstructor.newInstance(new Object[] {value});
-				} catch (ClassNotFoundException e) {
-					e.printStackTrace();
-					return null;
-				} catch (SecurityException e) {
-					e.printStackTrace();
-					return null;
-				} catch (NoSuchMethodException e) {
-					e.printStackTrace();
-					return null;
-				} catch (IllegalArgumentException e) {
-					e.printStackTrace();
-					return null;
-				} catch (InstantiationException e) {
-					e.printStackTrace();
-					return null;
-				} catch (IllegalAccessException e) {
-					e.printStackTrace();
-					return null;
-				} catch (InvocationTargetException e) {
-					e.printStackTrace();
-					return null;
-				}
-			case AttributeDefinition.BOOLEAN :
-				return new Boolean(value);
-			default :
-				// Unknown data type
-				return null;
-		}
-	}
-
-	/**
-	 * Abstract of all Handlers.
-	 */
-	protected class AbstractHandler extends DefaultHandler {
-
-		protected ContentHandler docHandler;
-
-		protected boolean parsedDataValid = true;
-
-		public AbstractHandler(ContentHandler parentHandler) {
-
-			this.docHandler = parentHandler;
-			xmlReader.setContentHandler(this);
-		}
-
-		public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
-
-			throw new SAXException(NLS.bind(AutoconfMetaTypeMsg.UNEXPECTED_ELEMENT, qName));
-		}
-
-		public void characters(char[] buf, int start, int end) throws SAXException {
-
-			String s = new String(buf, start, end).trim();
-			if (s.length() > 0) {
-				throw new SAXException(NLS.bind(AutoconfMetaTypeMsg.UNEXPECTED_TEXT, s));
-			}
-		}
-
-		/**
-		 * Called when this element and all elements nested into it have been
-		 * handled.
-		 */
-		protected void finished() throws SAXException {
-			// do nothing by default
-		}
-
-		public void endElement(String namespaceURI, String localName, String qName) throws SAXException {
-
-			finished();
-			// Let parent resume handling SAX events
-			xmlReader.setContentHandler(docHandler);
-		}
-	}
-
-	/**
-	 * Handler for the root element.
-	 */
-	protected class RootHandler extends DefaultHandler {
-
-		public RootHandler() {
-			super();
-		}
-
-		public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
-
-			if (DEBUG)
-				Log.log(LogService.LOG_DEBUG, "BEGIN RootHandler:startElement():" //$NON-NLS-1$
-						+ qName);
-			String name = getName(localName, qName);
-			if (name.equalsIgnoreCase(METADATA)) {
-				new MetaDataHandler(this).init(name, attributes);
-			} else {
-				Log.log(LogService.LOG_WARNING, NLS.bind(AutoconfMetaTypeMsg.UNEXPECTED_ELEMENT, name));
-			}
-			if (DEBUG)
-				Log.log(LogService.LOG_DEBUG, "END   RootHandler:startElement():" //$NON-NLS-1$
-						+ qName);
-		}
-
-		public void setDocumentLocator(Locator locator) {
-			// do nothing
-		}
-	}
-
-	/**
-	 * Handler for the MetaData element.
-	 */
-	protected class MetaDataHandler extends AbstractHandler {
-
-		public MetaDataHandler(ContentHandler handler) {
-			super(handler);
-			if (DEBUG)
-				Log.log(LogService.LOG_DEBUG, "Here is MetaDataHandler():MetaDataHandler(ContentHandler handler)"); //$NON-NLS-1$
-
-		}
-
-		public void init(String name, Attributes attributes) throws SAXException {
-
-			if (DEBUG)
-				Log.log(LogService.LOG_DEBUG, "Here is MetaDataHandler():init()"); //$NON-NLS-1$
-			localization = attributes.getValue(LOCALIZATION);
-			if (localization == null) {
-				// Not a problem, because LOCALIZATION is an optional attribute.
-			}
-			// The global variable "_dp_localization" will be used within
-			// OcdHandler and AttributeDefinitionHandler later.
-		}
-
-		public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
-
-			if (DEBUG)
-				Log.log(LogService.LOG_DEBUG, "Here is MetaDataHandler:startElement():" //$NON-NLS-1$
-						+ qName);
-			String name = getName(localName, qName);
-			if (name.equalsIgnoreCase(DESIGNATE)) {
-				DesignateHandler designateHandler = new DesignateHandler(this);
-				designateHandler.init(name, atts);
-				if (designateHandler.parsedDataValid) {
-					designateHandlers.addElement(designateHandler);
-				}
-			} else if (name.equalsIgnoreCase(OCD)) {
-				OcdHandler ocdHandler = new OcdHandler(this);
-				ocdHandler.init(name, atts, ocdIdToOCDimpl);
-			} else {
-				Log.log(LogService.LOG_WARNING, NLS.bind(AutoconfMetaTypeMsg.UNEXPECTED_ELEMENT, name));
-			}
-		}
-
-		protected void finished() throws SAXException {
-
-			if (DEBUG)
-				Log.log(LogService.LOG_DEBUG, "Here is MetaDataHandler():finished()"); //$NON-NLS-1$
-			if (designateHandlers.size() == 0) {
-				// Schema defines at least one DESIGNATE is required.
-				parsedDataValid = false;
-				Log.log(LogService.LOG_ERROR, this, "finished()", //$NON-NLS-1$
-						NLS.bind(AutoconfMetaTypeMsg.MISSING_ELEMENT, DESIGNATE));
-				return;
-			}
-			Enumeration designateHandlerKeys = designateHandlers.elements();
-			while (designateHandlerKeys.hasMoreElements()) {
-				DesignateHandler designateHandler = (DesignateHandler) designateHandlerKeys.nextElement();
-
-				ObjectClassDefinitionImpl aocd = (ObjectClassDefinitionImpl) ocdIdToOCDimpl.get(designateHandler.getOcdRef());
-				if (aocd != null) {
-					designateHandler.ocd = aocd;//					
-					// if (designateHandler.fpid == null) {
-					// aocd.setType(ObjectClassDefinitionImpl.PID);
-					// _dp_pid_to_OCDs_.put(designateHandler.pid, aocd);
-					// } else {
-					// aocd.setType(ObjectClassDefinitionImpl.FPID);
-					// _dp_pid_to_OCDs_.put(designateHandler.fpid, aocd);
-					// }
-				} else {
-					// TODO try to get MetaTypeService and get OCD from it.
-					metaTypeTracker.open();
-					MetaTypeService metaType = (MetaTypeService) metaTypeTracker.getService();
-					if (metaType != null) {
-						ObjectClassDefinition ocd;
-						ocd = getOcdFromMetatype(designateHandler, metaType);
-						if (ocd != null) {
-							designateHandler.ocd = aocd;
-							// if (designateHandler.fpid == null) {
-							// aocd = new ObjectClassDefinitionImpl(ocd,
-							// ObjectClassDefinitionImpl.PID);
-							// _dp_pid_to_OCDs_.put(designateHandler.pid, aocd);
-							// } else {
-							// aocd = new ObjectClassDefinitionImpl(ocd,
-							// ObjectClassDefinitionImpl.FPID);
-							// _dp_pid_to_OCDs_.put(designateHandler.fpid,
-							// aocd);
-							// }
-							return;
-						}
-					}
-					Log.log(LogService.LOG_ERROR, this, "finished()", //$NON-NLS-1$
-							NLS.bind(AutoconfMetaTypeMsg.OCD_ID_NOT_FOUND, designateHandler.getOcdRef()));
-				}
-			}
-		}
-
-		/**
-		 * @param designateHandler
-		 * @param metaType
-		 * @throws ResourceProcessorException
-		 */
-		private ObjectClassDefinition getOcdFromMetatype(DesignateHandler designateHandler, MetaTypeService metaType) {
-			// retrieve of OCD by using MetaTypeService.
-			String bundleLocation = designateHandler.bundleLocation;
-			Bundle targetBundle = null;
-			if (designateHandler.fpid == null) { // Search among bundles in
-				// the same DP.
-				if (!bundleLocation.startsWith(DpConstants.DP_LOCATION_PREFIX)) {
-					Log.log(LogService.LOG_ERROR, "BundleLocation (=" + bundleLocation + ") must start with " + DpConstants.DP_LOCATION_PREFIX);
-					return null;
-				}
-				String bundleSymbolicName = bundleLocation.substring(DpConstants.DP_LOCATION_PREFIX.length());
-				targetBundle = Utils.getBundleFromDpDoPrivileged(sourceDp, bundleSymbolicName);
-			} else { // Search among bundles in the same DP.
-				Bundle[] bundles = context.getBundles();
-				for (int i = 0; i < bundles.length; i++) {
-					String location = Utils.getBundleLocationDoPrivileged(bundles[i]);
-					if (location.equals(bundleLocation)) {
-						targetBundle = bundles[i];
-						break;
-					}
-				}
-			}
-			MetaTypeInformation metaInfo = metaType.getMetaTypeInformation(targetBundle);
-			if (metaInfo != null) {
-				String[] pids = metaInfo.getPids();
-				// String[] fpids = metaInfo.getFactoryPids();
-				// String[] locales = metaInfo.getLocales();
-				for (int i = 0; i < pids.length; i++) {
-					ObjectClassDefinition ocd = metaInfo.getObjectClassDefinition(pids[i], null);
-					if (ocd.getID().equals(designateHandler.getOcdRef())) {
-						return ocd;
-					}
-				}
-			}
-			return null;
-		}
-	}
-
-	/**
-	 * Handler for the ObjectClassDefinition element.
-	 */
-	protected class OcdHandler extends AbstractHandler {
-
-		Hashtable _parent_OCDs_hashtable;
-
-		// This ID "_refID" is only used for reference by Designate element,
-		// not the PID or FPID of this OCD.
-		String _refID;
-
-		ObjectClassDefinitionImpl _ocd;
-
-		Vector _ad_vector = new Vector(7);
-
-		public OcdHandler(ContentHandler handler) {
-			super(handler);
-		}
-
-		public void init(String name, Attributes atts, Hashtable ocds_hashtable) throws SAXException {
-
-			if (DEBUG)
-				Log.log(LogService.LOG_DEBUG, "Here is OcdHandler():init()"); //$NON-NLS-1$
-			_parent_OCDs_hashtable = ocds_hashtable;
-
-			String ocd_name_val = atts.getValue(NAME);
-			// if (ocd_name_val == null) {
-			// _isParsedDataValid = false;
-			// Log.log(LogService.LOG_ERROR, this, "init(String, Attributes,
-			// Hashtable)", //$NON-NLS-1$
-			// NLS.bind(MetaTypeMsg.MISSING_ATTRIBUTE, NAME, name));
-			// return;
-			// }
-
-			String ocd_description_val = atts.getValue(DESCRIPTION);
-			if (ocd_description_val == null) {
-				// Not a problem, because DESCRIPTION is an optional
-				// attribute.
-			}
-
-			_refID = atts.getValue(ID);
-			if (_refID == null) {
-				parsedDataValid = false;
-				Log.log(LogService.LOG_ERROR, this, "init(String, Attributes, Hashtable)", //$NON-NLS-1$
-						NLS.bind(AutoconfMetaTypeMsg.MISSING_ATTRIBUTE, ID, name));
-				return;
-			}
-
-			_ocd = new ObjectClassDefinitionImpl(ocd_name_val, ocd_description_val, _refID, localization);
-
-		}
-
-		public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
-
-			if (DEBUG)
-				Log.log(LogService.LOG_DEBUG, "Here is OcdHandler:startElement():" //$NON-NLS-1$
-						+ qName);
-			if (!parsedDataValid)
-				return;
-
-			String name = getName(localName, qName);
-			if (name.equalsIgnoreCase(AD)) {
-				AttributeDefinitionHandler attributeDefHandler = new AttributeDefinitionHandler(this);
-				attributeDefHandler.init(name, atts, _ad_vector);
-				// } else if (name.equalsIgnoreCase(ICON)) {
-				// IconHandler iconHandler = new IconHandler(this);
-				// iconHandler.init(name, atts);
-				// if (iconHandler._isParsedDataValid) {
-				// // Because XML schema allows at most one icon for
-				// // one OCD, if more than one icons are read from
-				// // MetaData, then only the final icon will be kept.
-				// _ocd.setIcon(iconHandler._icon);
-				// }
-			} else {
-				Log.log(LogService.LOG_WARNING, NLS.bind(AutoconfMetaTypeMsg.UNEXPECTED_ELEMENT, name));
-			}
-
-		}
-
-		protected void finished() throws SAXException {
-
-			if (DEBUG)
-				Log.log(LogService.LOG_DEBUG, "BEGIN OcdHandler():finished()"); //$NON-NLS-1$
-			if (!parsedDataValid)
-				return;
-
-			if (_ad_vector.size() == 0) {
-				// Schema defines at least one AD is required.
-				parsedDataValid = false;
-				Log.log(LogService.LOG_ERROR, this, "finished()", //$NON-NLS-1$
-						NLS.bind(AutoconfMetaTypeMsg.MISSING_ELEMENT, AD, _refID));
-				return;
-			}
-			// OCD gets all parsed ADs.
-			Enumeration adKey = _ad_vector.elements();
-			while (adKey.hasMoreElements()) {
-				AttributeDefinitionImpl ad = (AttributeDefinitionImpl) adKey.nextElement();
-				_ocd.addAttributeDefinition(ad, ad.isRequired());
-			}
-
-			_parent_OCDs_hashtable.put(_refID, _ocd);
-			if (DEBUG)
-				Log.log(LogService.LOG_DEBUG, "END   OcdHandler():finished()"); //$NON-NLS-1$
-
-		}
-	}
-
-	// /**
-	// * Handler for the Icon element.
-	// */
-	// protected class IconHandler extends AbstractHandler {
-	//
-	// Icon _icon;
-	//
-	// public IconHandler(ContentHandler handler) {
-	// super(handler);
-	// }
-	//
-	// public void init(String name, Attributes atts) throws SAXException {
-	//
-	// Log.log(LogService.LOG_DEBUG, "Here is IconHandler:init()");
-	// //$NON-NLS-1$
-	// String icon_resource_val = atts.getValue(RESOURCE);
-	// if (icon_resource_val == null) {
-	// _isParsedDataValid = false;
-	// Log.log(LogService.LOG_ERROR, this, "init(String, Attributes)",
-	// //$NON-NLS-1$
-	// NLS.bind(MetaTypeMsg.MISSING_ATTRIBUTE, RESOURCE, name));
-	// return;
-	// }
-	//
-	// String icon_size_val = atts.getValue(SIZE);
-	// if (icon_size_val == null) {
-	// // Not a problem, because SIZE is an optional attribute.
-	// icon_size_val = "0"; //$NON-NLS-1$
-	// } else if (icon_size_val.equalsIgnoreCase("")) { //$NON-NLS-1$
-	// icon_size_val = "0"; //$NON-NLS-1$
-	// }
-	//
-	// _icon = new Icon(icon_resource_val, Integer.parseInt(icon_size_val),
-	// _dp_bundle);
-	// }
-	// }
-
-	/**
-	 * Handler for the Attribute element.
-	 */
-	protected class AttributeDefinitionHandler extends AbstractHandler {
-
-		AttributeDefinition ad;
-
-		int dataType;
-
-		Vector parentADsVector;
-
-		Vector optionLabelVector = new Vector(7);
-
-		Vector optionValueVector = new Vector(7);
-
-		public AttributeDefinitionHandler(ContentHandler handler) {
-			super(handler);
-		}
-
-		public void init(String name, Attributes atts, Vector ad_vector) throws SAXException {
-
-			if (DEBUG)
-				Log.log(LogService.LOG_DEBUG, "Here is AttributeDefinitionHandler():init()"); //$NON-NLS-1$
-			parentADsVector = ad_vector;
-
-			String ad_name_val = atts.getValue(NAME);
-			if (ad_name_val == null) {
-				// Not a problem, because NAME is an optional attribute.
-			}
-
-			String ad_description_val = atts.getValue(DESCRIPTION);
-			if (ad_description_val == null) {
-				// Not a problem, because DESCRIPTION is an optional attribute.
-			}
-
-			String ad_id_val = atts.getValue(ID);
-			if (ad_id_val == null) {
-				parsedDataValid = false;
-				Log.log(LogService.LOG_ERROR, this, "init(String, Attributes, Vector)", //$NON-NLS-1$
-						NLS.bind(AutoconfMetaTypeMsg.MISSING_ATTRIBUTE, ID, name));
-				return;
-			}
-
-			String ad_type_val = atts.getValue(TYPE);
-			if (ad_type_val.equalsIgnoreCase(STRING)) {
-				dataType = AttributeDefinition.STRING;
-			} else if (ad_type_val.equalsIgnoreCase(LONG)) {
-				dataType = AttributeDefinition.LONG;
-			} else if (ad_type_val.equalsIgnoreCase(DOUBLE)) {
-				dataType = AttributeDefinition.DOUBLE;
-			} else if (ad_type_val.equalsIgnoreCase(FLOAT)) {
-				dataType = AttributeDefinition.FLOAT;
-			} else if (ad_type_val.equalsIgnoreCase(INTEGER)) {
-				dataType = AttributeDefinition.INTEGER;
-			} else if (ad_type_val.equalsIgnoreCase(BYTE)) {
-				dataType = AttributeDefinition.BYTE;
-			} else if (ad_type_val.equalsIgnoreCase(CHAR)) {
-				dataType = AttributeDefinition.CHARACTER;
-			} else if (ad_type_val.equalsIgnoreCase(BOOLEAN)) {
-				dataType = AttributeDefinition.BOOLEAN;
-			} else if (ad_type_val.equalsIgnoreCase(SHORT)) {
-				dataType = AttributeDefinition.SHORT;
-			} else {
-				parsedDataValid = false;
-				Log.log(LogService.LOG_ERROR, this, "init(String, Attributes, Vector)", //$NON-NLS-1$
-						NLS.bind(AutoconfMetaTypeMsg.MISSING_ATTRIBUTE, TYPE, name));
-				return;
-
-			}
-
-			String ad_cardinality_str = atts.getValue(CARDINALITY);
-			int ad_cardinality_val = 0;
-			if (ad_cardinality_str == null) {
-				// Not a problem, because CARDINALITY is an optional attribute.
-				// And the default value is 0.
-			} else {
-				ad_cardinality_val = Integer.parseInt(ad_cardinality_str);
-			}
-
-			String ad_min_val = atts.getValue(MIN);
-			if (ad_min_val == null) {
-				// Not a problem, because MIN is an optional attribute.
-			}
-
-			String ad_max_val = atts.getValue(MAX);
-			if (ad_max_val == null) {
-				// Not a problem, because MAX is an optional attribute.
-			}
-
-			String ad_defaults_str = atts.getValue(DEFAULT);
-			if (ad_defaults_str == null) {
-				// For AutoConfiguration, default value can be null.
-				// // Not a problem, because DEFAULT is an optional attribute.
-				// if (ad_cardinality_val == 0) {
-				// // But when it is not assigned, CARDINALITY cannot be '0'.
-				// parsedDataValid = false;
-				// Log.log(LogService.LOG_ERROR, this, "init(String, Attributes,
-				// Vector)", //$NON-NLS-1$
-				// AutoconfMetaTypeMsg.NULL_DEFAULTS);
-				// return;
-				// }
-			}
-
-			String ad_required_val = atts.getValue(REQUIRED);
-			if (ad_required_val == null) {
-				// Not a problem, because REQUIRED is an optional attribute.
-				// And the default value is 'true'.
-				ad_required_val = Boolean.TRUE.toString();
-			}
-
-			ad = new AttributeDefinitionImpl(ad_id_val, ad_name_val, ad_description_val, dataType, ad_cardinality_val, convert(ad_min_val, dataType), convert(ad_max_val, dataType), Boolean.valueOf(ad_required_val).booleanValue(), localization);
-			//
-			// if (ad_cardinality_val == 0) {
-			// // Attribute DEFAULT has one and only one occurance.
-			// _ad.setDefaultValue(new String[] {ad_defaults_str}, false);
-			// } else {
-			// // Attribute DEFAULT is a comma delimited list.
-			// _ad.setDefaultValue(ad_defaults_str, false);
-			// }
-		}
-
-		public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
-
-			if (DEBUG)
-				Log.log(LogService.LOG_DEBUG, "Here is AttributeDefinitionHandler:startElement():" //$NON-NLS-1$
-						+ qName);
-			if (!parsedDataValid)
-				return;
-
-			String name = getName(localName, qName);
-			// if (name.equalsIgnoreCase(OPTION)) {
-			// OptionHandler optionHandler = new OptionHandler(this);
-			// optionHandler.init(name, atts);
-			// if (optionHandler._isParsedDataValid) {
-			// // Only add valid Option
-			// _optionLabel_vector.addElement(optionHandler._label_val);
-			// _optionValue_vector.addElement(optionHandler._value_val);
-			// }
-			// } else {
-			if (name != null && name.length() != 0)
-				Log.log(LogService.LOG_WARNING, NLS.bind(AutoconfMetaTypeMsg.UNEXPECTED_ELEMENT, name));
-
-		}
-
-		protected void finished() throws SAXException {
-
-			if (DEBUG)
-				Log.log(LogService.LOG_DEBUG, "BEGIN is AttributeDefinitionHandler():finished()"); //$NON-NLS-1$
-			if (!parsedDataValid)
-				return;
-
-			// _ad.setOption(_optionLabel_vector, _optionValue_vector, true);
-			parentADsVector.addElement(ad);
-		}
-	}
-
-	// /**
-	// * Handler for the Option element.
-	// */
-	// protected class OptionHandler extends AbstractHandler {
-	//
-	// String _label_val;
-	// String _value_val;
-	//
-	// public OptionHandler(ContentHandler handler) {
-	// super(handler);
-	// }
-	//
-	// public void init(String name, Attributes atts) throws SAXException {
-	//
-	// Log.log(LogService.LOG_DEBUG, "Here is OptionHandler:init()");
-	// //$NON-NLS-1$
-	// _label_val = atts.getValue(LABEL);
-	// if (_label_val == null) {
-	// _isParsedDataValid = false;
-	// Log.log(LogService.LOG_ERROR, this, "init(String, Attributes)",
-	// //$NON-NLS-1$
-	// NLS.bind(MetaTypeMsg.MISSING_ATTRIBUTE, LABEL, name));
-	// return;
-	// }
-	//
-	// _value_val = atts.getValue(VALUE);
-	// if (_value_val == null) {
-	// _isParsedDataValid = false;
-	// Log.log(LogService.LOG_ERROR, this, "init(String, Attributes)",
-	// //$NON-NLS-1$
-	// NLS.bind(MetaTypeMsg.MISSING_ATTRIBUTE, VALUE, name));
-	// return;
-	// }
-	// }
-	// }
-
-	/**
-	 * Handler for the Designate element.
-	 */
-	public class DesignateHandler extends AbstractHandler {
-
-		String pid = null;
-
-		String fpid = null;
-
-		String bundleLocation = null;
-
-		boolean optional = false;
-
-		boolean merge = false;
-
-		// String ocdref;
-
-		ObjectHandler objectHandler;
-
-		ObjectClassDefinition ocd;
-
-		public DesignateHandler(ContentHandler handler) {
-			super(handler);
-		}
-
-		public void init(String name, Attributes atts) throws SAXException {
-
-			if (DEBUG)
-				Log.log(LogService.LOG_DEBUG, "Here is DesignateHandler():init()"); //$NON-NLS-1$
-			pid = atts.getValue(PID);
-			if (pid == null) {
-				parsedDataValid = false;
-				Log.log(LogService.LOG_ERROR, this, "init(String, Attributes)", //$NON-NLS-1$
-						NLS.bind(AutoconfMetaTypeMsg.MISSING_ATTRIBUTE, PID, name));
-				return;
-			}
-			fpid = atts.getValue(FACTORY);
-
-			bundleLocation = atts.getValue(BUNDLE);
-			if (bundleLocation == null) {
-				// For Autoconfig, bundlelocation is mandatory
-				parsedDataValid = false;
-				Log.log(LogService.LOG_ERROR, this, "init(String, Attributes)", //$NON-NLS-1$
-						NLS.bind(AutoconfMetaTypeMsg.MISSING_ATTRIBUTE, BUNDLE, name));
-				return;
-			}
-
-			String optional_str = atts.getValue(OPTIONAL);
-			if (optional_str == null) {
-				// Not a problem, because OPTIONAL is an optional attribute.
-				// The default value is "false".
-				optional = false;
-			} else {
-				optional = Boolean.valueOf(optional_str).booleanValue();
-			}
-
-			String merge_str = atts.getValue(MERGE);
-			if (merge_str == null) {
-				// Not a problem, because MERGE is an optional attribute.
-				// The default value is "false".
-				merge = false;
-			} else {
-				merge = Boolean.valueOf(merge_str).booleanValue();
-			}
-		}
-
-		public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
-
-			if (DEBUG)
-				Log.log(LogService.LOG_DEBUG, "Here is DesignateHandler:startElement():" //$NON-NLS-1$
-						+ qName);
-			if (!parsedDataValid)
-				return;
-
-			String name = getName(localName, qName);
-			if (name.equalsIgnoreCase(OBJECT)) {
-				ObjectHandler objectHandler = new ObjectHandler(this);
-				objectHandler.init(name, atts);
-				if (objectHandler.parsedDataValid) {
-					// ocdref = objectHandler.ocdref;
-					this.objectHandler = objectHandler;
-				}
-			} else {
-				Log.log(LogService.LOG_WARNING, NLS.bind(AutoconfMetaTypeMsg.UNEXPECTED_ELEMENT, name));
-			}
-		}
-
-		public String getPid() {
-			return pid;
-		}
-
-		public String getFpid() {
-			return fpid;
-		}
-
-		public Vector getAttributeHandlers() {
-			return objectHandler.attributeHandlers;
-		}
-
-		public String getBundleLocation() {
-			return bundleLocation;
-		}
-
-		public boolean isMerge() {
-			return merge;
-		}
-
-		public boolean isOptional() {
-			return optional;
-		}
-
-		public String getOcdRef() {
-			return objectHandler.ocdref;
-		}
-
-		public ObjectClassDefinition getOcd() {
-			return ocd;
-		}
-	}
-
-	/**
-	 * Handler for the Object element.
-	 */
-	protected class ObjectHandler extends AbstractHandler {
-
-		// Referenced OCD ID
-		String ocdref;
-
-		Vector attributeHandlers;
-
-		public ObjectHandler(ContentHandler handler) {
-			super(handler);
-		}
-
-		public void init(String name, Attributes atts) throws SAXException {
-
-			if (DEBUG)
-				Log.log(LogService.LOG_DEBUG, "Here is ObjectHandler():init()"); //$NON-NLS-1$
-			ocdref = atts.getValue(OCDREF);
-			if (ocdref == null) {
-				parsedDataValid = false;
-				Log.log(LogService.LOG_ERROR, this, "init(String, Attributes)", //$NON-NLS-1$
-						NLS.bind(AutoconfMetaTypeMsg.MISSING_ATTRIBUTE, OCDREF, name));
-				return;
-			}
-		}
-
-		public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
-
-			if (DEBUG)
-				Log.log(LogService.LOG_DEBUG, "Here is ObjectHandler:startElement():" //$NON-NLS-1$
-						+ qName);
-			if (!parsedDataValid)
-				return;
-
-			String name = getName(localName, qName);
-			if (DEBUG)
-				Log.log(LogService.LOG_DEBUG, "Here is ObjectHandler:startElement():name=" //$NON-NLS-1$
-						+ name);
-			if (name.equalsIgnoreCase(ATTRIBUTE)) {
-				if (DEBUG)
-					Log.log(LogService.LOG_DEBUG, "Here is ObjectHandler:startElement():Attribute matched" //$NON-NLS-1$
-							+ qName);
-				AttributeHandler attributeHandler = new AttributeHandler(this);
-				attributeHandler.init(name, atts);
-				if (attributeHandler.parsedDataValid) {
-					if (attributeHandlers == null)
-						attributeHandlers = new Vector(3);
-					attributeHandlers.addElement(attributeHandler);
-				}
-			} else {
-				Log.log(LogService.LOG_WARNING, NLS.bind(AutoconfMetaTypeMsg.UNEXPECTED_ELEMENT, name));
-			}
-		}
-	}
-
-	/**
-	 * Handler for the Attribute element.
-	 * 
-	 * This Handler is only used by RFC94.
-	 */
-	public class AttributeHandler extends AbstractHandler {
-
-		String adref;
-
-		String content;
-
-		/** keyToSetProp will be used as a key of Properties for Configuration. */
-		String keyToSetProp;
-
-		/**
-		 * values will be used as a value of Properties for Configuration. It
-		 * might be an Object, a Vector, an Array according to referring OCD's
-		 * AD.
-		 */
-		Vector valueHandlers;
-
-		public AttributeHandler(ContentHandler handler) {
-			super(handler);
-		}
-
-		public void init(String name, Attributes atts) throws SAXException {
-
-			if (DEBUG)
-				Log.log(LogService.LOG_DEBUG, "Here is AttributeHandler():init()"); //$NON-NLS-1$
-			adref = atts.getValue(ADREF);
-			if (adref == null) {
-				parsedDataValid = false;
-				Log.log(LogService.LOG_ERROR, this, "init(String, Attributes)", //$NON-NLS-1$
-						NLS.bind(AutoconfMetaTypeMsg.MISSING_ATTRIBUTE, ADREF, name));
-				return;
-			}
-
-			content = atts.getValue(CONTENT);
-			if (content != null)
-				Log.log(LogService.LOG_DEBUG, "Here is AttributeHandler:init():content=" //$NON-NLS-1$
-						+ content);
-
-			String attrName = atts.getValue(NAME);
-
-			if (content == null && attrName != null) {
-				parsedDataValid = false;
-				Log.log(LogService.LOG_ERROR, this, "init(String, Attributes)", //$NON-NLS-1$
-						"content == null && name != null");
-				return;
-				// } else if (content != null && keyToSetProp == null) {
-				// parsedDataValid = false;
-				// Log.log(LogService.LOG_ERROR, this, "init(String,
-				// Attributes)", //$NON-NLS-1$
-				// "content != null && name == null");
-				// return;
-			}
-			if (attrName != null)
-				keyToSetProp = attrName;
-			else
-				keyToSetProp = adref;
-			if (DEBUG)
-				Log.log(LogService.LOG_DEBUG, "Here is AttributeHandler:init():key=" //$NON-NLS-1$
-						+ keyToSetProp);
-
-		}
-
-		public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
-
-			if (DEBUG)
-				Log.log(LogService.LOG_DEBUG, "Here is AttributeHandler:startElement():" //$NON-NLS-1$
-						+ qName);
-			if (!parsedDataValid)
-				return;
-
-			String name = getName(localName, qName);
-			if (name.equalsIgnoreCase(VALUE)) {
-				if (DEBUG)
-					Log.log(LogService.LOG_DEBUG, "Here is AttributeHandler:startElement():value matched" //$NON-NLS-1$
-							+ qName);
-				if (valueHandlers == null)
-					valueHandlers = new Vector(3);
-				SimpleValueHandler valueHandler = new SimpleValueHandler(this);
-				valueHandler.init(name, atts, valueHandlers);
-			} else {
-				Log.log(LogService.LOG_WARNING, NLS.bind(AutoconfMetaTypeMsg.UNEXPECTED_ELEMENT, name));
-			}
-		}
-
-		protected void finished() throws SAXException {
-
-			if (DEBUG)
-				Log.log(LogService.LOG_DEBUG, "Here is AttributeHandler():finished()"); //$NON-NLS-1$
-			if (!parsedDataValid)
-				return;
-
-			if (content != null && valueHandlers != null) {
-				parsedDataValid = false;
-				Log.log(LogService.LOG_ERROR, this, "init(String, Attributes)", //$NON-NLS-1$
-						NLS.bind(AutoconfMetaTypeMsg.INVALID_SYNTAX, "Both content and values are set."));
-				return;
-			}
-
-			if (adref == null) {
-				parsedDataValid = false;
-				// Schema defines at least one OBJECT is required.
-				Log.log(LogService.LOG_ERROR, this, "finished()", //$NON-NLS-1$
-						NLS.bind(AutoconfMetaTypeMsg.MISSING_ELEMENT, OBJECT, adref));
-				return;
-			}
-
-			// if(_valueHandlers != null){
-			// Enumeration enum = _valueHandlers.elements();
-			// while(enum.hasMoreElements()){
-			// ValueHandler handler = (ValueHandler) enum.nextElement();
-			// handler._value_val;
-			// }
-			// }
-		}
-
-		public String getAdref() {
-			return adref;
-		}
-
-		public String getContent() {
-			return content;
-		}
-
-		public String getKey() {
-			return keyToSetProp;
-		}
-
-		public Vector getValues() {
-			return valueHandlers;
-		}
-	}
-
-	/**
-	 * Handler for the Simple Value element.
-	 */
-	private class SimpleValueHandler extends AbstractHandler {
-
-		StringBuffer buffer = new StringBuffer();
-
-		Vector parentValueVector;
-
-		String elementName;
-
-		public SimpleValueHandler(ContentHandler handler) {
-			super(handler);
-		}
-
-		public void init(String name, Attributes atts, Vector valueVector) throws SAXException {
-
-			if (DEBUG)
-				Log.log(LogService.LOG_DEBUG, "Here is SimpleValueHandler():init()"); //$NON-NLS-1$
-			elementName = name;
-			parentValueVector = valueVector;
-		}
-
-		protected void finished() throws SAXException {
-
-			if (DEBUG)
-				Log.log(LogService.LOG_DEBUG, "Here is SimpleValueHandler():finished()"); //$NON-NLS-1$
-			if (parentValueVector != null) {
-				parentValueVector.addElement(buffer.toString());
-			}
-		}
-
-		public void characters(char buf[], int offset, int len) throws SAXException {
-
-			if (DEBUG)
-				Log.log(LogService.LOG_DEBUG, "Here is SimpleValueHandler(" //$NON-NLS-1$
-						+ elementName + "):characters():[" //$NON-NLS-1$
-						+ new String(buf, offset, len) + "]"); //$NON-NLS-1$
-			buffer.append(new String(buf, offset, len));
-		}
-	}
-
-	// /**
-	// * Handler for the Value element.
-	// */
-	// protected class ValueHandler extends AbstractHandler {
-	// String _value_val;
-	//
-	// public ValueHandler(ContentHandler handler) {
-	// super(handler);
-	// }
-	//
-	// public void init(String name, Attributes atts) throws SAXException {
-	//
-	// Log.log(LogService.LOG_DEBUG, "Here is ValueHandler():init()");
-	// //$NON-NLS-1$
-	// if (atts != null && atts.getLength() != 0) {
-	// _isParsedDataValid = false;
-	// /*TODO*/
-	// Log.log(LogService.LOG_ERROR, this, "init(String, Attributes)",
-	// //$NON-NLS-1$
-	// MetaTypeMsg.INVALID_ATTRIBUTE);
-	// return;
-	// }
-	// }
-	//
-	// public void startElement(String uri, String localName, String qName,
-	// Attributes atts) throws SAXException {
-	//
-	// Log.log(LogService.LOG_DEBUG, "Here is ValueHandler:startElement():"
-	// //$NON-NLS-1$
-	// + qName);
-	// if (!_isParsedDataValid)
-	// return;
-	// _value_val = atts.getValue(0);
-	// Log.log(LogService.LOG_DEBUG, "ValueHandler:startElement(): value="
-	// //$NON-NLS-1$
-	// + _value_val);
-	// }
-	// }
-
-	/**
-	 * Error Handler to report errors and warnings
-	 */
-	protected static class MyErrorHandler implements ErrorHandler {
-
-		/** Error handler output goes here */
-		private PrintStream _out;
-
-		public MyErrorHandler(PrintStream out) {
-			this._out = out;
-		}
-
-		/**
-		 * Returns a string describing parse exception details
-		 */
-		private String getParseExceptionInfo(SAXParseException spe) {
-			String systemId = spe.getSystemId();
-			if (systemId == null) {
-				systemId = "null"; //$NON-NLS-1$
-			}
-			String info = "URI=" + systemId + //$NON-NLS-1$
-					" Line=" + spe.getLineNumber() + //$NON-NLS-1$
-					": " + spe.getMessage(); //$NON-NLS-1$
-
-			return info;
-		}
-
-		// The following methods are standard SAX ErrorHandler methods.
-		// See SAX documentation for more info.
-
-		public void warning(SAXParseException spe) throws SAXException {
-			_out.println("Warning: " + getParseExceptionInfo(spe)); //$NON-NLS-1$
-		}
-
-		public void error(SAXParseException spe) throws SAXException {
-			String message = "Error: " + getParseExceptionInfo(spe); //$NON-NLS-1$
-			throw new SAXException(message);
-		}
-
-		public void fatalError(SAXParseException spe) throws SAXException {
-			String message = "Fatal Error: " + getParseExceptionInfo(spe); //$NON-NLS-1$
-			throw new SAXException(message);
-		}
-	}
-
-	public static String getName(String localName, String qName) {
-		if (localName != null && localName.length() > 0) {
-			return localName;
-		}
-
-		int nameSpaceIndex = qName.indexOf(":"); //$NON-NLS-1$
-		return nameSpaceIndex == -1 ? qName : qName.substring(nameSpaceIndex + 1);
-	}
-
-	public Vector get_dp_designateHandlers() {
-		return designateHandlers;
-	}
-}

diff --git a/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/parser/AutoconfMetaTypeMsg.java b/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/parser/AutoconfMetaTypeMsg.java
deleted file mode 100644
index b1e5f35..0000000
--- a/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/parser/AutoconfMetaTypeMsg.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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 http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.equinox.autoconf.parser;
-
-import org.eclipse.equinox.metatype.MetaTypeMsg;
-import org.eclipse.osgi.util.NLS;
-
-public class AutoconfMetaTypeMsg extends MetaTypeMsg {
-	private static final String BUNDLE_NAME = "org.eclipse.equinox.dp.rp.autoconf.parser.ExternalMessages"; //$NON-NLS-1$
-
-	public static String INVALID_SYNTAX;
-	public static String FAILED_CONFIGADMIN;
-
-	static {
-		// initialize resource bundles
-		NLS.initializeMessages(BUNDLE_NAME, AutoconfMetaTypeMsg.class);
-	}
-}
\ No newline at end of file

diff --git a/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/parser/ExternalMessages.properties b/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/parser/ExternalMessages.properties
deleted file mode 100644
index b2cae6e..0000000
--- a/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/autoconf/parser/ExternalMessages.properties
+++ /dev/null

@@ -1,35 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation.
-# 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
-###############################################################################
-#External Messages for EN locale
-SERVICE_DESCRIPTION=OSGi Metatype Service - IBM Implementation
-
-UNEXPECTED_ELEMENT=Unexpected element {0}.
-UNEXPECTED_TEXT=Unexpected text {0}.
-MISSING_ATTRIBUTE=Missing attribute {0} in tag {1}.
-OCD_ID_NOT_FOUND=Object Class Definition ID not found {0}.
-NULL_DEFAULTS=Default value cannot be null when cardinality is zero.
-MISSING_ELEMENT=Missing element {0} (Reference ID = {1}.
-
-EXCEPTION_MESSAGE=Unexpected exception {0} with message {1}.
-NULL_IS_INVALID=Cannot validate a null.
-VALUE_OUT_OF_RANGE=Value {0} is out of range.
-VALUE_OUT_OF_OPTION=Value {0} is out of Option.
-TOO_MANY_VALUES=Found too many values in {0} when expecting {1} values.
-NULL_OPTIONS=Cannot set Option labels or values as null.
-INCONSISTENT_OPTIONS=Labels and Values of Option have different sizes.
-INVALID_OPTIONS=Option value {0} is invalid because of {1}.
-INVALID_DEFAULTS=Dafaults value {0} is invalid because of {1}.
-
-METADATA_NOT_FOUND=Bundle(ID=\"{0}\", name=\"{1}\") has no MetaData file.
-ASK_INVALID_LOCALE=OCD(ID=\"{0}\") cannot support this locale \"{1}\".
-TOKENIZER_GOT_INVALID_DATA=The Tokenizer got invalid data.
-
-INVALID_SYNTAX=Invalid syntax: {0}.
\ No newline at end of file

diff --git a/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/dp/DpConstants.java b/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/dp/DpConstants.java
deleted file mode 100644
index 2b1d9e6..0000000
--- a/compendium/bundles/org.eclipse.equinox.autoconf/src/org/eclipse/equinox/dp/DpConstants.java
+++ /dev/null

@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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 http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.equinox.dp;
-
-public class DpConstants {
-	public static final String DP_FIXPACK = "DeploymentPackage-FixPack";
-	public static final String DP_MISSING = "DeploymentPackage-Missing";
-	public static final String DP_LOCATION_PREFIX = "osgi-dp:";
-	/** The SAX factory name */
-	public static final String SAXFACTORYNAME = "javax.xml.parsers.SAXParserFactory";
-	public static final String PERSISTENT_FILE_PATH_PREFIX = "AutoconfDataStorage-";
-}

diff --git a/compendium/bundles/org.eclipse.equinox.deploymentadmin/.classpath b/compendium/bundles/org.eclipse.equinox.deploymentadmin/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/compendium/bundles/org.eclipse.equinox.deploymentadmin/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/compendium/bundles/org.eclipse.equinox.deploymentadmin/.cvsignore b/compendium/bundles/org.eclipse.equinox.deploymentadmin/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/compendium/bundles/org.eclipse.equinox.deploymentadmin/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/compendium/bundles/org.eclipse.equinox.deploymentadmin/.project b/compendium/bundles/org.eclipse.equinox.deploymentadmin/.project
deleted file mode 100644
index 10e4e38..0000000
--- a/compendium/bundles/org.eclipse.equinox.deploymentadmin/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.deploymentadmin</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/compendium/bundles/org.eclipse.equinox.deploymentadmin/META-INF/MANIFEST.MF b/compendium/bundles/org.eclipse.equinox.deploymentadmin/META-INF/MANIFEST.MF
deleted file mode 100644
index 29ab14c..0000000
--- a/compendium/bundles/org.eclipse.equinox.deploymentadmin/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Deploymentadmin Plug-in
-Bundle-SymbolicName: org.eclipse.equinox.deploymentadmin
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.equinox.deploymentadmin.Activator
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework;version="1.3.0",
- org.osgi.service.deploymentadmin,
- org.osgi.service.deploymentadmin.spi

diff --git a/compendium/bundles/org.eclipse.equinox.deploymentadmin/build.properties b/compendium/bundles/org.eclipse.equinox.deploymentadmin/build.properties
deleted file mode 100644
index aaefddf..0000000
--- a/compendium/bundles/org.eclipse.equinox.deploymentadmin/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               bin/

diff --git a/compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/AbstractDeploymentSession.java b/compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/AbstractDeploymentSession.java
deleted file mode 100644
index 6d6678c..0000000
--- a/compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/AbstractDeploymentSession.java
+++ /dev/null

@@ -1,57 +0,0 @@
-package org.eclipse.equinox.deploymentadmin;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-import org.osgi.framework.Bundle;
-import org.osgi.service.deploymentadmin.DeploymentException;
-import org.osgi.service.deploymentadmin.DeploymentPackage;
-
-public abstract class AbstractDeploymentSession {
-
-	private DeploymentPackage sourceDeploymentPackage;
-	private DeploymentPackage targetDeploymentPackage;
-
-	public File getDataFile(Bundle bundle) {
-	
-		final Bundle dataBundle = bundle;
-		
-		return (File) AccessController.doPrivileged(new PrivilegedAction() {
-			public Object run() {
-				try {
-					Method getBundleData = dataBundle.getClass().getMethod("getBundleData", null); //$NON-NLS-1$
-					Object bundleData = getBundleData.invoke(dataBundle, null);
-					
-					Method getDataFile = bundleData.getClass().getMethod("getDataFile", new Class[] {String[].class}); //$NON-NLS-1$
-					return getDataFile.invoke(bundleData, new Object[] {""}); //$NON-NLS-1$
-				} catch (Exception e) {
-					throw new IllegalStateException(e.getMessage());
-				}
-			}
-		});
-	}
-
-	public DeploymentPackage getSourceDeploymentPackage() {
-		return sourceDeploymentPackage;
-	}
-
-	public void setSourceDeploymentPackage(DeploymentPackage sourceDeploymentPackage) {
-		this.sourceDeploymentPackage = sourceDeploymentPackage;
-	}
-
-	public DeploymentPackage getTargetDeploymentPackage() {
-		return targetDeploymentPackage;
-	}
-	
-	public void setTargetDeploymentPackage(DeploymentPackage targetDeploymentPackage) {
-		this.targetDeploymentPackage = targetDeploymentPackage;
-	}
-	
-	abstract void begin() throws DeploymentException, IOException;
-	abstract void prepare() throws DeploymentException;
-	abstract void rollback() throws DeploymentException;
-	abstract void commit() throws DeploymentException;	
-}
\ No newline at end of file

diff --git a/compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/Activator.java b/compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/Activator.java
deleted file mode 100644
index 34d1d60..0000000
--- a/compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/Activator.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Cognos Incorporated
- * 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:
- *     Cognos Incorporated - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.deploymentadmin;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.deploymentadmin.DeploymentAdmin;
-
-public class Activator implements BundleActivator {
-
-	private ServiceRegistration registration;
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		registration = context.registerService( DeploymentAdmin.class.getName(), new DeploymentAdminImpl(), null );
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		registration.unregister();
-	}
-
-}

diff --git a/compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/DeploymentAdminImpl.java b/compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/DeploymentAdminImpl.java
deleted file mode 100644
index c41c19c..0000000
--- a/compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/DeploymentAdminImpl.java
+++ /dev/null

@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Cognos Incorporated
- * 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:
- *     Cognos Incorporated - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.deploymentadmin;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.jar.Attributes;
-import java.util.jar.JarEntry;
-import java.util.jar.JarInputStream;
-import java.util.jar.Manifest;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.Constants;
-import org.osgi.framework.Version;
-import org.osgi.service.deploymentadmin.BundleInfo;
-import org.osgi.service.deploymentadmin.DeploymentAdmin;
-import org.osgi.service.deploymentadmin.DeploymentException;
-import org.osgi.service.deploymentadmin.DeploymentPackage;
-import org.osgi.service.deploymentadmin.spi.DeploymentSession;
-
-public class DeploymentAdminImpl implements DeploymentAdmin {
-
-	private Map deploymentPackagesMap = new HashMap();
-
-	public boolean cancel() {
-		return false;
-	}
-
-	public DeploymentPackage getDeploymentPackage(String symbName) {
-		return getDeploymentPackageImpl(symbName);
-	}
-
-	DeploymentPackageImpl getDeploymentPackageImpl(String symbName) {
-		return (DeploymentPackageImpl) deploymentPackagesMap.get(symbName);
-	}
-	
-	public DeploymentPackage getDeploymentPackage(Bundle bundle) {
-		if (! bundle.getLocation().startsWith("osgi-dp:"))
-			return null;
-		
-		return getDeploymentPackage(bundle.getSymbolicName(), new Version((String) bundle.getHeaders().get(Constants.BUNDLE_VERSION)));
-	}
-	
-	protected DeploymentPackage getDeploymentPackage(String bsn, Version version) {
-		for( Iterator it = deploymentPackagesMap.values().iterator(); it.hasNext();) {
-			DeploymentPackage deploymentPackage = (DeploymentPackage) it.next();
-			BundleInfo[] bundleInfos = deploymentPackage.getBundleInfos();
-			for (int i=0;i<bundleInfos.length;i++)
-				if (bundleInfos[i].getSymbolicName().equals(bsn) && bundleInfos[i].getVersion().equals(version))
-					return deploymentPackage;
-		}
-		return null;
-	}	
-
-	public DeploymentPackage installDeploymentPackage(InputStream in) throws DeploymentException {
-		InstallDeploymentSession session = new InstallDeploymentSession(in, this);
-		
-		try {
-			session.begin();
-			session.prepare();
-			session.commit();
-		} catch (Throwable t) {
-			try {
-				session.rollback();
-			} catch (Throwable traceOnly) {
-				traceOnly.printStackTrace();
-			}
-			throw (t instanceof DeploymentException) ? (DeploymentException) t : new DeploymentException(DeploymentException.CODE_OTHER_ERROR, t.getMessage(), t); 
-		}		
-		return session.getTargetDeploymentPackage();
-	}
-
-	public DeploymentPackage[] listDeploymentPackages() {
-		Collection deploymentPackages = deploymentPackagesMap.values();	
-		return (DeploymentPackage[]) deploymentPackages.toArray(new DeploymentPackage[deploymentPackages.size()]);
-	}
-
-	void add(DeploymentPackageImpl impl) {
-		deploymentPackagesMap.put(impl.getName(), impl);
-	}
-	
-	void remove(DeploymentPackageImpl impl) {
-		deploymentPackagesMap.remove(impl.getName());
-	}
-
-}

diff --git a/compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/DeploymentPackageImpl.java b/compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/DeploymentPackageImpl.java
deleted file mode 100644
index 36d9534..0000000
--- a/compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/DeploymentPackageImpl.java
+++ /dev/null

@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Cognos Incorporated
- * 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:
- *     Cognos Incorporated - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.deploymentadmin;
-
-import java.util.Set;
-import java.util.jar.Manifest;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.Version;
-import org.osgi.service.deploymentadmin.BundleInfo;
-import org.osgi.service.deploymentadmin.DeploymentException;
-import org.osgi.service.deploymentadmin.DeploymentPackage;
-
-public class DeploymentPackageImpl implements DeploymentPackage {
-
-	public static final DeploymentPackage EMPTY = new DeploymentPackage (){
-
-		public Bundle getBundle(String symbolicName) {
-			return null;
-		}
-
-		public BundleInfo[] getBundleInfos() {
-			return new BundleInfo[0];
-		}
-
-		public String getHeader(String header) {
-			if (header.equals(("DeploymentPackage-SymbolicName")))
-				return "";
-			else if (header.equals(("DeploymentPackage-Version")))
-				return "0.0.0";
-			else
-				return null;
-		}
-
-		public String getName() {
-			return "";
-		}
-
-		public String getResourceHeader(String resource, String header) {
-			return null;
-		}
-
-		public ServiceReference getResourceProcessor(String resource) {
-			return null;
-		}
-
-		public String[] getResources() {
-			return new String[0];
-		}
-
-		public Version getVersion() {
-			return new Version("0.0.0");
-		}
-
-		public boolean isStale() {
-			return true;
-		}
-
-		public void uninstall() throws DeploymentException {
-			throw new IllegalStateException();
-		}
-
-		public void uninstallForced() throws DeploymentException {
-			throw new IllegalStateException();
-		}
-		
-	};
-	private String name;
-	private Manifest manifest;
-	private Version version;
-	DeploymentAdminImpl admin;
-
-	public DeploymentPackageImpl(Manifest manifest) throws DeploymentException {
-		manifest = this.manifest;
-		name = manifest.getMainAttributes().getValue("DeploymentPackage-SymbolicName"); //$NON-NLS-1$
-		version = new Version(manifest.getMainAttributes().getValue("DeploymentPackage-Version")); //$NON-NLS-1$
-			
-		if (name == null || version == null)
-			throw new DeploymentException(DeploymentException.CODE_MISSING_HEADER);
-	}
-
-	public Bundle getBundle(String symbolicName) {
-		return null;
-	}
-
-	public BundleInfo[] getBundleInfos() {
-		return null;
-	}
-
-	public String getHeader(String header) {
-		return manifest.getMainAttributes().getValue(header);
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public String getResourceHeader(String resource, String header) {
-		return manifest.getAttributes(resource).getValue(header);
-	}
-
-	public ServiceReference getResourceProcessor(String resource) {
-		return null;
-	}
-
-	public String[] getResources() {
-		Set resourceNamesSet = manifest.getEntries().keySet();		
-		return (String[]) resourceNamesSet.toArray(new String[resourceNamesSet.size()]);
-	}
-
-	public Version getVersion() {
-		return version;
-	}
-
-	public boolean isStale() {
-		return false;
-	}
-
-	public void uninstall() throws DeploymentException {
-		admin.remove(this);
-	}
-
-	public void uninstallForced() throws DeploymentException {
-		admin.remove(this);
-	}
-
-	public void stopBundles() {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void startBundles() {
-		// TODO Auto-generated method stub
-		
-	}
-}

diff --git a/compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/DeploymentSessionImpl.java b/compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/DeploymentSessionImpl.java
deleted file mode 100644
index 4640dc9..0000000
--- a/compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/DeploymentSessionImpl.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Cognos Incorporated
- * 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:
- *     Cognos Incorporated - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.deploymentadmin;
-
-import java.io.File;
-
-import org.osgi.framework.Bundle;
-import org.osgi.service.deploymentadmin.DeploymentPackage;
-import org.osgi.service.deploymentadmin.spi.DeploymentSession;
-
-public class DeploymentSessionImpl implements DeploymentSession {
-
-	public File getDataFile(Bundle bundle) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public DeploymentPackage getSourceDeploymentPackage() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public DeploymentPackage getTargetDeploymentPackage() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-}

diff --git a/compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/InstallDeploymentSession.java b/compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/InstallDeploymentSession.java
deleted file mode 100644
index f41ab81..0000000
--- a/compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/InstallDeploymentSession.java
+++ /dev/null

@@ -1,183 +0,0 @@
-package org.eclipse.equinox.deploymentadmin;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
-import java.util.jar.Attributes;
-import java.util.jar.JarEntry;
-import java.util.jar.JarInputStream;
-import java.util.jar.Manifest;
-
-import org.osgi.framework.Constants;
-import org.osgi.framework.Version;
-import org.osgi.service.deploymentadmin.DeploymentAdmin;
-import org.osgi.service.deploymentadmin.DeploymentException;
-import org.osgi.service.deploymentadmin.DeploymentPackage;
-import org.osgi.service.deploymentadmin.spi.DeploymentSession;
-
-public class InstallDeploymentSession extends AbstractDeploymentSession  implements DeploymentSession {
-
-	private InputStream in;
-	private DeploymentAdminImpl admin;
-
-	InstallDeploymentSession(InputStream in, DeploymentAdminImpl admin) {
-		if (in == null)
-			throw new IllegalArgumentException("InputStream must not be null"); //$NON-NLS-1$
-		this.in = in;
-		this.admin = admin;
-	}
-	
-	
-	void begin() throws IOException, DeploymentException {
-		JarInputStream jis = null;
-		try {
-			jis = new JarInputStream(in);
-		} catch (IOException e) {
-			throw new DeploymentException(DeploymentException.CODE_NOT_A_JAR);
-		}		
-		
-		Manifest manifest = jis.getManifest();
-		if (manifest == null)
-			throw new DeploymentException(DeploymentException.CODE_ORDER_ERROR);
-		
-		validateManifest(manifest);
-		
-		DeploymentPackageImpl source = new DeploymentPackageImpl(manifest);
-		DeploymentPackageImpl target = admin.getDeploymentPackageImpl(source.getName());
-		if (target != null)
-			target.stopBundles();
-
-		JarEntry currentEntry = jis.getNextJarEntry();
-		while (currentEntry != null && processSignatureFile(currentEntry))
-				currentEntry = jis.getNextJarEntry();
-		
-		String bundleLocalization = source.getHeader("Bundle-Localization");
-		while (currentEntry != null && processLocalizationFile(bundleLocalization, currentEntry))
-			currentEntry = jis.getNextJarEntry();
-		
-		while (currentEntry != null && processBundle(currentEntry))
-			currentEntry = jis.getNextJarEntry();
-
-		startCustomizers();
-		
-		while (currentEntry != null && processResource(currentEntry))
-			currentEntry = jis.getNextJarEntry();
-	
-		dropStaleResources();
-		uninstallStaleBundles();		
-	}
-
-	void commit() {
-		// TODO Auto-generated method stub
-		
-	}
-
-	void prepare() {
-		// TODO Auto-generated method stub
-		
-	}
-	
-	private void uninstallStaleBundles() {
-	}
-
-	private void dropStaleResources() {
-	}
-
-	private void startCustomizers() {
-	}
-
-
-	void rollback() {
-		// TODO Auto-generated method stub
-		
-	}
-
-	private void validateManifest(Manifest manifest) throws DeploymentException{
-		
-		Attributes mainAttributes = manifest.getMainAttributes();
-		String symbolicName = mainAttributes.getValue("DeploymentPackage-SymbolicName");
-		if (symbolicName == null)
-			throw new DeploymentException(DeploymentException.CODE_MISSING_HEADER);
-				
-		String version = mainAttributes.getValue("DeploymentPackage-Version");
-		if (version == null)
-			throw new DeploymentException(DeploymentException.CODE_MISSING_HEADER);
-		
-		try {
-			if (Version.parseVersion(version).equals(Version.emptyVersion))
-				throw new DeploymentException(DeploymentException.CODE_BAD_HEADER);
-		} catch (IllegalArgumentException e) {
-			throw new DeploymentException(DeploymentException.CODE_BAD_HEADER);
-		}
-
-		DeploymentPackage target = admin.getDeploymentPackage(symbolicName);
-		
-		String fixPack = mainAttributes.getValue("DeploymentPackage-FixPack");
-		boolean isFixPack = (fixPack != null);
-		if (isFixPack) {
-			VersionRange fixPackVersionRange = null;
-			try {
-				fixPackVersionRange = new VersionRange(fixPack);
-			} catch (IllegalArgumentException e) {
-				throw new DeploymentException(DeploymentException.CODE_BAD_HEADER);
-			}
-			
-			if (target == null || fixPackVersionRange.isIncluded(target.getVersion()))
-				throw new DeploymentException(DeploymentException.CODE_MISSING_FIXPACK_TARGET);
-		}
-
-		for (Iterator it = manifest.getEntries().values().iterator(); it.hasNext();) {
-			Attributes attributes = (Attributes) it.next();
-			String missing = attributes.getValue("DeploymentPackage-Missing");
-			if (!isFixPack && missing != null)
-				throw new DeploymentException(DeploymentException.CODE_BAD_HEADER);
-			
-			boolean isMissing = new Boolean(missing).booleanValue();
-			
-			String bsn = attributes.getValue("Bundle-SymbolicName");
-			if (bsn == null)
-				continue;
-			
-			DeploymentPackage bundleDeploymentPackage = admin.getDeploymentPackage(bsn);
-			if (isMissing && bundleDeploymentPackage != target)
-				throw new DeploymentException(DeploymentException.CODE_MISSING_BUNDLE);
-			
-			if (bundleDeploymentPackage != null && bundleDeploymentPackage != target)
-				throw new DeploymentException(DeploymentException.CODE_BUNDLE_SHARING_VIOLATION);
-		}	
-	}
-	
-	private boolean processLocalizationFile(String bundleLocalization, JarEntry currentEntry) {
-		String name = currentEntry.getName();
-		if(name.startsWith(bundleLocalization)) {
-			return true;			
-		}
-		return false;
-	}
-
-	private boolean processSignatureFile(JarEntry currentEntry) {
-		String name = currentEntry.getName();
-		if(name.startsWith("META-INF/")) {
-			if (name.endsWith(".SF")) {
-				return true;
-			} else if (name.endsWith("*.DSA")) {
-				return true;
-			} else if (name.endsWith("*.RS")) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	private boolean processResource(JarEntry currentEntry) {
-		return true;
-	}
-
-	private boolean processBundle(JarEntry currentEntry) throws IOException {
-		String bsn = currentEntry.getAttributes().getValue(Constants.BUNDLE_SYMBOLICNAME);
-		if(bsn != null) {
-			return true;			
-		}
-		return false;
-	}
-}

diff --git a/compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/UninstallDeploymentSession.java b/compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/UninstallDeploymentSession.java
deleted file mode 100644
index 3558332..0000000
--- a/compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/UninstallDeploymentSession.java
+++ /dev/null

@@ -1,28 +0,0 @@
-package org.eclipse.equinox.deploymentadmin;
-
-import java.io.IOException;
-
-import org.osgi.service.deploymentadmin.DeploymentException;
-
-public class UninstallDeploymentSession  extends AbstractDeploymentSession {
-
-	void begin() throws DeploymentException, IOException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	void commit() throws DeploymentException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	void prepare() throws DeploymentException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	void rollback() throws DeploymentException {
-		// TODO Auto-generated method stub
-		
-	}
-}

diff --git a/compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/VersionRange.java b/compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/VersionRange.java
deleted file mode 100644
index 85e8cb3..0000000
--- a/compendium/bundles/org.eclipse.equinox.deploymentadmin/src/org/eclipse/equinox/deploymentadmin/VersionRange.java
+++ /dev/null

@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.equinox.deploymentadmin;
-
-import org.osgi.framework.Version;
-
-/**
- * NOTE: This is Temporary -- this is a copy of org.eclipse.osgi.service.resolver.VersionRange
- * This class represents a version range.
- * @since 3.1
- */
-public class VersionRange {
-	private static final Version versionMax = new Version(Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE);
-	/**
-	 * An empty version
-	 */
-	public static final VersionRange emptyRange = new VersionRange(null);
-
-	private Version minVersion;
-	private boolean includeMin; 
-	private Version maxVersion;
-	private boolean includeMax;
-
-	/**
-	 * Constructs a VersionRange with the specified minVersion and maxVersion.
-	 * @param minVersion the minimum version of the range
-	 * @param maxVersion the maximum version of the range
-	 */
-	public VersionRange(Version minVersion, boolean includeMin, Version maxVersion, boolean includeMax) {
-		this.minVersion = minVersion;
-		this.includeMin = includeMin;
-		this.maxVersion = maxVersion;
-		this.includeMax = includeMax;
-	}
-
-	/**
-	 * Constructs a VersionRange from the given versionRange String.
-	 * @param versionRange a version range String that specifies a range of
-	 * versions.
-	 */
-	public VersionRange(String versionRange) {
-		if (versionRange == null || versionRange.length() == 0) {
-			minVersion = Version.emptyVersion;
-			includeMin = true;
-			maxVersion = VersionRange.versionMax;
-			includeMax = true;
-			return;
-		}
-		versionRange = versionRange.trim();
-		if (versionRange.charAt(0) == '[' || versionRange.charAt(0) == '(') {
-			int comma = versionRange.indexOf(',');
-			if (comma < 0)
-				throw new IllegalArgumentException();
-			char last = versionRange.charAt(versionRange.length() - 1);
-			if (last != ']' && last != ')')
-				throw new IllegalArgumentException();
-
-			minVersion = Version.parseVersion(versionRange.substring(1, comma).trim());
-			includeMin = versionRange.charAt(0) == '[';
-			maxVersion = Version.parseVersion(versionRange.substring(comma + 1, versionRange.length() - 1).trim());
-			includeMax = last == ']';
-		} else {
-			minVersion = Version.parseVersion(versionRange.trim());
-			includeMin = true;
-			maxVersion = VersionRange.versionMax;
-			includeMax = true;
-		}
-	}
-
-	/**
-	 * Returns the minimum Version of this VersionRange
-	 * @return the minimum Version of this VersionRange
-	 */
-	public Version getMinimum() {
-		return minVersion;
-	}
-
-	/**
-	 * Indicates if the minimum version is included in the version range.
-	 * @return true if the minimum version is included in the version range;
-	 * otherwise false is returned
-	 */
-	public boolean getIncludeMinimum() {
-		return includeMin;
-	}
-
-	/**
-	 * Returns the maximum Version of this VersionRange
-	 * @return the maximum Version of this VersionRange
-	 */
-	public Version getMaximum() {
-		return maxVersion;
-	}
-
-	/**
-	 * Indicates if the maximum version is included in the version range.
-	 * @return true if the maximum version is included in the version range;
-	 * otherwise false is returned
-	 */
-	public boolean getIncludeMaximum() {
-		return includeMax;
-	}
-
-	/**
-	 * Returns whether the given version is included in this VersionRange.
-	 * This will depend on the minimum and maximum versions of this VersionRange
-	 * and the given version.
-	 * 
-	 * @param version a version to be tested for inclusion in this VersionRange. 
-	 * (may be <code>null</code>)
-	 * @return <code>true</code> if the version is include, 
-	 * <code>false</code> otherwise 
-	 */
-	public boolean isIncluded(Version version) {
-		Version minRequired = getMinimum();
-		if (minRequired == null)
-			return true;
-		if (version == null)
-			return false;
-		Version maxRequired = getMaximum() == null ? VersionRange.versionMax : getMaximum();
-		int minCheck = includeMin ? 0 : 1;
-		int maxCheck = includeMax ? 0 : -1;
-		return version.compareTo(minRequired) >= minCheck && version.compareTo(maxRequired) <= maxCheck;
-
-	}
-
-	public boolean equals(Object object) {
-		if (!(object instanceof VersionRange))
-			return false;
-		VersionRange vr = (VersionRange) object;
-		if (minVersion != null && vr.getMinimum() != null) {
-			if (minVersion.equals(vr.getMinimum()) && includeMin == vr.includeMin)
-				if (maxVersion != null && vr.getMaximum() != null) {
-					if (maxVersion.equals(vr.getMaximum()) && includeMax == vr.includeMax)
-						return true;
-				}
-				else
-					return maxVersion == vr.getMaximum();
-		}
-		else {
-			return minVersion == vr.getMinimum();
-		}
-		return false;
-	}
-
-	public String toString() {
-		if (minVersion == null)
-			return Version.emptyVersion.toString();
-		if (VersionRange.versionMax.equals(maxVersion))
-			return minVersion.toString();
-		StringBuffer result = new StringBuffer();
-		result.append(includeMin ? '[' : '(');
-		result.append(minVersion);
-		result.append(',');
-		result.append(maxVersion);
-		result.append(includeMax ? ']' : ')');
-		return result.toString();
-	}
-}

diff --git a/compendium/bundles/org.eclipse.equinox.log/.classpath b/compendium/bundles/org.eclipse.equinox.log/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/compendium/bundles/org.eclipse.equinox.log/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/compendium/bundles/org.eclipse.equinox.log/.cvsignore b/compendium/bundles/org.eclipse.equinox.log/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/compendium/bundles/org.eclipse.equinox.log/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/compendium/bundles/org.eclipse.equinox.log/.project b/compendium/bundles/org.eclipse.equinox.log/.project
deleted file mode 100644
index bc6c96b..0000000
--- a/compendium/bundles/org.eclipse.equinox.log/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.log</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/compendium/bundles/org.eclipse.equinox.log/META-INF/MANIFEST.MF b/compendium/bundles/org.eclipse.equinox.log/META-INF/MANIFEST.MF
deleted file mode 100644
index 7ada58e..0000000
--- a/compendium/bundles/org.eclipse.equinox.log/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %bundleName
-Bundle-SymbolicName: org.eclipse.equinox.log
-Bundle-Version: 1.1.0.qualifier
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework;version="1.3.0",
- org.osgi.service.log;version="1.3.0"
-Bundle-Vendor: %providerName
-Bundle-Activator: org.eclipse.equinox.log.internal.Activator
-Export-Package: org.eclipse.equinox.log

diff --git a/compendium/bundles/org.eclipse.equinox.log/build.properties b/compendium/bundles/org.eclipse.equinox.log/build.properties
deleted file mode 100644
index aa1a008..0000000
--- a/compendium/bundles/org.eclipse.equinox.log/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.properties

diff --git a/compendium/bundles/org.eclipse.equinox.log/plugin.properties b/compendium/bundles/org.eclipse.equinox.log/plugin.properties
deleted file mode 100644
index e433a2f..0000000
--- a/compendium/bundles/org.eclipse.equinox.log/plugin.properties
+++ /dev/null

@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bundleName = Log Service Bundle
-providerName = Eclipse.org
-
-

diff --git a/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/ExtendedLogEntry.java b/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/ExtendedLogEntry.java
deleted file mode 100644
index 8b147d3..0000000
--- a/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/ExtendedLogEntry.java
+++ /dev/null

@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Cognos Incorporated.
- * 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
- *******************************************************************************/
-package org.eclipse.equinox.log;
-
-import org.osgi.service.log.LogEntry;
-
-public interface ExtendedLogEntry extends LogEntry {
-	String getLoggerName();
-
-	Object getContext();
-
-	long getThreadID();
-
-	long getSequenceNumber();
-}

diff --git a/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/ExtendedLogReaderService.java b/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/ExtendedLogReaderService.java
deleted file mode 100644
index a12ba12..0000000
--- a/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/ExtendedLogReaderService.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package org.eclipse.equinox.log;
-
-import org.osgi.service.log.LogListener;
-import org.osgi.service.log.LogReaderService;
-
-public interface ExtendedLogReaderService extends LogReaderService {
-
-	public void addLogListener(LogListener listener, LogFilter filter);
-}

diff --git a/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/ExtendedLogService.java b/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/ExtendedLogService.java
deleted file mode 100644
index a049db1..0000000
--- a/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/ExtendedLogService.java
+++ /dev/null

@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Cognos Incorporated.
- * 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
- *******************************************************************************/
-package org.eclipse.equinox.log;
-
-import org.osgi.service.log.LogService;
-
-public interface ExtendedLogService extends LogService, Logger {
-
-	public Logger getLogger(String loggerName);
-}

diff --git a/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/LogFilter.java b/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/LogFilter.java
deleted file mode 100644
index 8447096..0000000
--- a/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/LogFilter.java
+++ /dev/null

@@ -1,14 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Cognos Incorporated.
- * 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
- *******************************************************************************/
-package org.eclipse.equinox.log;
-
-import org.osgi.framework.Bundle;
-
-public interface LogFilter {
-	boolean isLoggable(Bundle b, String loggerName, int logLevel);
-}

diff --git a/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/Logger.java b/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/Logger.java
deleted file mode 100644
index 062be0c..0000000
--- a/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/Logger.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Cognos Incorporated.
- * 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
- *******************************************************************************/
-package org.eclipse.equinox.log;
-
-import org.osgi.framework.ServiceReference;
-
-public interface Logger {
-	public void log(int level, String message);
-
-	public void log(int level, String message, Throwable exception);
-
-	public void log(ServiceReference sr, int level, String message);
-
-	public void log(ServiceReference sr, int level, String message, Throwable exception);
-
-	// new methods
-	public void log(Object context, int level, String message);
-
-	public void log(Object context, int level, String message, Throwable exception);
-
-	public boolean isLoggable(int level);
-
-	public String getName();
-}

diff --git a/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/Activator.java b/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/Activator.java
deleted file mode 100644
index 56bb38f..0000000
--- a/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/Activator.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Cognos Incorporated.
- * 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
- *******************************************************************************/
-package org.eclipse.equinox.log.internal;
-
-import org.eclipse.equinox.log.ExtendedLogReaderService;
-import org.eclipse.equinox.log.ExtendedLogService;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.log.LogReaderService;
-import org.osgi.service.log.LogService;
-
-public class Activator implements BundleActivator {
-
-	private static final String[] LOGSERVICE_CLASSES = {LogService.class.getName(), ExtendedLogService.class.getName()};
-	private static final String[] LOGREADERSERVICE_CLASSES = {LogReaderService.class.getName(), ExtendedLogReaderService.class.getName()};
-	
-	private ServiceRegistration logReaderServiceRegistration;
-	private ServiceRegistration logServiceRegistration;
-
-	public void start(BundleContext context) throws Exception {
-		ExtendedLogReaderServiceFactory logReaderServiceFactory = new ExtendedLogReaderServiceFactory();
-		ExtendedLogServiceFactory logServiceFactory = new ExtendedLogServiceFactory(logReaderServiceFactory);
-		
-		logReaderServiceRegistration = context.registerService(LOGREADERSERVICE_CLASSES, logReaderServiceFactory, null);
-		logServiceRegistration = context.registerService(LOGSERVICE_CLASSES, logServiceFactory, null);
-	}
-
-	public void stop(BundleContext context) throws Exception {
-		logServiceRegistration.unregister();
-		logServiceRegistration = null;
-		logReaderServiceRegistration.unregister();
-		logReaderServiceRegistration = null;
-	}
-
-}

diff --git a/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/ExtendedLogEntryImpl.java b/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/ExtendedLogEntryImpl.java
deleted file mode 100644
index cd547bb..0000000
--- a/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/ExtendedLogEntryImpl.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Cognos Incorporated.
- * 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
- *******************************************************************************/
-package org.eclipse.equinox.log.internal;
-
-import java.util.Map;
-import java.util.WeakHashMap;
-
-import org.eclipse.equinox.log.ExtendedLogEntry;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.ServiceReference;
-
-public class ExtendedLogEntryImpl implements ExtendedLogEntry {
-
-	private static int nextThreadID = 1;
-	private static long nextSequenceNumber = 1;
-	private static Map threadIDs = new WeakHashMap();
-
-	private String loggerName;
-	private Bundle bundle;
-	private int level;
-	private String message;
-	private Throwable throwable;
-	private Object contextObject;
-	private long time;
-	private long threadID;
-	private long sequenceNumber;
-
-	private static synchronized int getID(Thread thread) {
-		Integer threadID = (Integer) threadIDs.get(thread);
-		if (threadID == null) {
-			threadID = new Integer(nextThreadID++);
-			threadIDs.put(thread, threadID);
-		}
-		return threadID.intValue();
-	}
-		public ExtendedLogEntryImpl(Bundle bundle, String loggerName, Object contextObject, int level, String message, Throwable throwable) {
-		this.loggerName = loggerName;
-		this.bundle = bundle;
-		this.level = level;
-		this.message = message;
-		this.throwable = throwable;
-		this.contextObject = contextObject;
-
-		synchronized (ExtendedLogEntryImpl.class) {
-			this.sequenceNumber = nextSequenceNumber++;
-			this.threadID = getID(Thread.currentThread());
-		}
-	}
-
-	public String getLoggerName() {
-		return loggerName;
-	}
-
-	public long getSequenceNumber() {
-		return sequenceNumber;
-	}
-
-	public long getThreadID() {
-		return threadID;
-	}
-
-	public Bundle getBundle() {
-		return bundle;
-	}
-
-	public Throwable getException() {
-		return throwable;
-	}
-
-	public int getLevel() {
-		return level;
-	}
-
-	public String getMessage() {
-		return message;
-	}
-
-	public ServiceReference getServiceReference() {
-		if (contextObject != null && contextObject instanceof ServiceReference)
-			return (ServiceReference) contextObject;
-
-		return null;
-	}
-
-	public long getTime() {
-		return time;
-	}
-
-	public Object getContext() {
-		return contextObject;
-	}
-}

diff --git a/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/ExtendedLogReaderServiceFactory.java b/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/ExtendedLogReaderServiceFactory.java
deleted file mode 100644
index 71cf50a..0000000
--- a/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/ExtendedLogReaderServiceFactory.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Cognos Incorporated.
- * 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
- *******************************************************************************/
-package org.eclipse.equinox.log.internal;
-
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.eclipse.equinox.log.LogFilter;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.ServiceFactory;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.log.LogEntry;
-import org.osgi.service.log.LogListener;
-
-public class ExtendedLogReaderServiceFactory implements ServiceFactory {
-
-	private Map listeners = new HashMap();
-
-	public Object getService(Bundle bundle, ServiceRegistration registration) {
-		return new LogReaderServiceImpl(this);
-	}
-
-	public void ungetService(Bundle bundle, ServiceRegistration registration, Object service) {
-		LogReaderServiceImpl readerService = (LogReaderServiceImpl) service;
-		readerService.shutdown();
-	}
-
-	public boolean isLoggable(Bundle bundle, String name, int level) {		
-		for (Iterator it = listeners.values().iterator(); it.hasNext();) {
-			LogFilter filter = (LogFilter) it.next();
-			if (filter.isLoggable(bundle, name, level))
-				return true;
-		}		
-		return false;		
-	}
-
-	public void log(Bundle bundle, String name, Object context, int level, String message, Throwable exception) {
-		LogEntry logEntry = new ExtendedLogEntryImpl(bundle, name, context, level, message, exception);
-		for (Iterator it = listeners.entrySet().iterator(); it.hasNext();) {
-			Entry entry = (Entry) it.next();
-			LogFilter filter = (LogFilter) entry.getValue();
-			if (filter.isLoggable(bundle, name, level)) {
-				LogListener listener = (LogListener) entry.getKey();
-				// should be sent asych
-				listener.logged(logEntry);
-			}
-		}				
-	}
-
-	public void addLogListener(LogListener listener, LogFilter filter) {
-		listeners.put(listener, filter);
-	}
-
-	public void removeLogListener(LogListener listener) {
-		listeners.remove(listener);
-	}
-
-	public Enumeration getLog() {
-		return new Enumeration() {
-			public boolean hasMoreElements() {
-				return false;
-			}
-
-			public Object nextElement() {
-				return null;
-			}
-		};
-	}
-}

diff --git a/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/ExtendedLogServiceFactory.java b/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/ExtendedLogServiceFactory.java
deleted file mode 100644
index 4b484bb..0000000
--- a/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/ExtendedLogServiceFactory.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Cognos Incorporated.
- * 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
- *******************************************************************************/
-package org.eclipse.equinox.log.internal;
-
-import org.eclipse.equinox.log.Logger;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.ServiceFactory;
-import org.osgi.framework.ServiceRegistration;
-
-public class ExtendedLogServiceFactory implements ServiceFactory {
-	private ExtendedLogReaderServiceFactory logReaderServiceFactory;
-	
-	public ExtendedLogServiceFactory(ExtendedLogReaderServiceFactory logReaderServiceFactory) {
-		this.logReaderServiceFactory = logReaderServiceFactory;
-	}
-
-	public Object getService(Bundle bundle, ServiceRegistration registration) {
-		return new ExtendedLogServiceImpl(this, bundle);
-	}
-
-	public void ungetService(Bundle bundle, ServiceRegistration registration, Object service) {
-		// do nothing
-	}
-
-	public Logger getLogger(Bundle bundle, String name) {
-		return new LoggerImpl(this, bundle, name);
-	}
-
-	public boolean isLoggable(Bundle bundle, String name, int level) {
-		return logReaderServiceFactory.isLoggable(bundle, name, level);
-	}
-
-	public void log(Bundle bundle, String name, Object context, int level, String message, Throwable exception) {
-		logReaderServiceFactory.log(bundle, name, context, level, message, exception);		
-	}
-}

diff --git a/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/ExtendedLogServiceImpl.java b/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/ExtendedLogServiceImpl.java
deleted file mode 100644
index 73c1184..0000000
--- a/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/ExtendedLogServiceImpl.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Cognos Incorporated.
- * 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
- *     Cognos Incorporated - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.log.internal;
-
-import org.eclipse.equinox.log.ExtendedLogService;
-import org.eclipse.equinox.log.Logger;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.ServiceReference;
-
-public class ExtendedLogServiceImpl implements ExtendedLogService {
-
-	private ExtendedLogServiceFactory factory;
-	private Bundle bundle;
-
-	public ExtendedLogServiceImpl(ExtendedLogServiceFactory factory, Bundle bundle) {
-		this.factory = factory;
-		this.bundle = bundle;
-	}
-
-	public void log(int level, String message) {
-		log(null, level, message, null);
-	}
-
-	public void log(int level, String message, Throwable exception) {
-		log(null, level, message, exception);
-	}
-
-	public void log(ServiceReference sr, int level, String message) {
-		log(sr, level, message, null);
-	}
-
-	public void log(ServiceReference sr, int level, String message, Throwable exception) {
-		getLogger(null).log(sr, level, message, exception);
-	}
-
-	public void log(Object context, int level, String message) {
-		log(context, level, message, null);
-	}
-
-	public void log(Object context, int level, String message, Throwable exception) {
-		getLogger(null).log(context, level, message, exception);
-	}
-
-	public Logger getLogger(String name) {
-		return factory.getLogger(bundle, name);
-	}
-
-	public String getName() {
-		return getLogger(null).getName();
-	}
-
-	public boolean isLoggable(int level) {
-		return getLogger(null).isLoggable(level);
-	}
-}

diff --git a/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/LogReaderServiceImpl.java b/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/LogReaderServiceImpl.java
deleted file mode 100644
index 3a8b7b9..0000000
--- a/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/LogReaderServiceImpl.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Cognos Incorporated.
- * 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
- *******************************************************************************/
-package org.eclipse.equinox.log.internal;
-
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.equinox.log.ExtendedLogReaderService;
-import org.eclipse.equinox.log.LogFilter;
-import org.osgi.framework.Bundle;
-import org.osgi.service.log.LogListener;
-
-public class LogReaderServiceImpl implements ExtendedLogReaderService {
-
-	private ExtendedLogReaderServiceFactory factory;
-	private Set listeners = new HashSet();
-	private static final LogFilter NULL_LOGGER_FILTER = new LogFilter() {
-		public boolean isLoggable(Bundle b, String loggerName, int logLevel) {
-			return (loggerName == null);
-		}		
-	};	
-
-	public LogReaderServiceImpl(ExtendedLogReaderServiceFactory factory) {
-		this.factory = factory;
-	}
-
-	public void addLogListener(LogListener listener, LogFilter filter) {
-		listeners.add(listener);
-		factory.addLogListener(listener, filter);
-	}
-
-	public synchronized void addLogListener(LogListener listener) {
-		addLogListener(listener, NULL_LOGGER_FILTER);
-	}
-
-	public Enumeration getLog() {
-		return factory.getLog();
-	}
-
-	public synchronized void removeLogListener(LogListener listener) {
-		factory.removeLogListener(listener);
-	}
-
-	public synchronized void shutdown() {
-		for(Iterator it = listeners.iterator(); it.hasNext();) {
-			factory.removeLogListener((LogListener) it.next());
-		}
-		listeners.clear();
-	}
-
-}

diff --git a/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/LoggerImpl.java b/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/LoggerImpl.java
deleted file mode 100644
index c6a52c0..0000000
--- a/compendium/bundles/org.eclipse.equinox.log/src/org/eclipse/equinox/log/internal/LoggerImpl.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 Cognos Incorporated.
- * 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:
- *     Cognos Incorporated - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.log.internal;
-
-import org.eclipse.equinox.log.Logger;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.ServiceReference;
-
-public class LoggerImpl implements Logger {
-
-	private ExtendedLogServiceFactory factory;
-	private Bundle bundle; 
-	private String name;
-
-	public LoggerImpl(ExtendedLogServiceFactory factory, Bundle bundle, String name) {
-		this.factory = factory;
-		this.bundle = bundle;
-		this.name = name;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public boolean isLoggable(int level) {
-		return factory.isLoggable(bundle, name, level);
-	}
-
-	public void log(int level, String message) {
-		log(null, level, message, null);
-	}
-
-	public void log(int level, String message, Throwable exception) {
-		log(null, level, message, exception);
-	}
-
-	public void log(ServiceReference sr, int level, String message) {
-		log(sr, level, message, null);
-	}
-
-	public void log(ServiceReference sr, int level, String message, Throwable exception) {
-		factory.log(bundle, name, sr, level, message, exception);
-	}
-
-	public void log(Object context, int level, String message) {
-		log(context, level, message, null);
-	}
-	
-	public void log(Object context, int level, String message, Throwable exception) {
-		factory.log(bundle, name, context, level, message, exception);
-	}
-}

diff --git a/components/bundles/org.eclipse.equinox.transforms.replace.images/.classpath b/components/bundles/org.eclipse.equinox.transforms.replace.images/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.replace.images/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/components/bundles/org.eclipse.equinox.transforms.replace.images/.cvsignore b/components/bundles/org.eclipse.equinox.transforms.replace.images/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.replace.images/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/components/bundles/org.eclipse.equinox.transforms.replace.images/.project b/components/bundles/org.eclipse.equinox.transforms.replace.images/.project
deleted file mode 100644
index e937a6e..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.replace.images/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.transforms.replace.images</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/components/bundles/org.eclipse.equinox.transforms.replace.images/.settings/org.eclipse.jdt.core.prefs b/components/bundles/org.eclipse.equinox.transforms.replace.images/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 3d84d51..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.replace.images/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,12 +0,0 @@
-#Tue Nov 28 08:02:52 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-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.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/components/bundles/org.eclipse.equinox.transforms.replace.images/.settings/org.eclipse.pde.core.prefs b/components/bundles/org.eclipse.equinox.transforms.replace.images/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 8a06f72..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.replace.images/.settings/org.eclipse.pde.core.prefs
+++ /dev/null

@@ -1,4 +0,0 @@
-#Wed Nov 22 15:34:13 EST 2006
-eclipse.preferences.version=1
-pluginProject.extensions=false
-resolve.requirebundle=false

diff --git a/components/bundles/org.eclipse.equinox.transforms.replace.images/META-INF/MANIFEST.MF b/components/bundles/org.eclipse.equinox.transforms.replace.images/META-INF/MANIFEST.MF
deleted file mode 100644
index a8de0b8..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.replace.images/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Image Replacement Transforms Bundle
-Bundle-SymbolicName: org.eclipse.equinox.transforms.replace.images
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.equinox.transforms.replace.images.Activator
-Import-Package: org.osgi.framework;version="1.3.0"
-Eclipse-LazyStart: true
-Require-Bundle: org.eclipse.equinox.transforms.replace,
- system.bundle

diff --git a/components/bundles/org.eclipse.equinox.transforms.replace.images/Replacement Transform Launch.launch b/components/bundles/org.eclipse.equinox.transforms.replace.images/Replacement Transform Launch.launch
deleted file mode 100644
index cc1d6be..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.replace.images/Replacement Transform Launch.launch
+++ /dev/null

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="usefeatures" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<booleanAttribute key="useProduct" value="true"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.ui.tests,org.eclipse.core.tests.harness,org.eclipse.equinox.transforms.sed.manifest,org.eclipse.equinox.transforms.xslt.plugin,org.eclipse.equinox.registry,org.eclipse.equinox.transforms.sed,org.eclipse.equinox.transforms.xslt,org.eclipse.test.performance,org.eclipse.ui.tests.harness,org.aspectj.osgi,org.eclipse.jdt.ui.supplemental"/>
-<booleanAttribute key="tracing" value="false"/>
-<stringAttribute key="pde.version" value="3.2a"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.framework.extensions=org.eclipse.equinox.transforms,org.eclipse.equinox.transforms.replace"/>
-<stringAttribute key="templateConfig" value="/Users/kim/Documents/eclipse/workspaces/xslt-workspace/org.eclipse.equinox.transforms.replace.images/config.ini"/>
-<booleanAttribute key="default" value="false"/>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu,org.apache.ant,org.apache.lucene,org.apache.xerces,org.eclipse.ant.core,org.eclipse.ant.ui,org.eclipse.compare,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.expressions,org.eclipse.core.filebuffers,org.eclipse.core.filesystem,org.eclipse.core.filesystem.macosx,org.eclipse.core.jobs,org.eclipse.core.resources,org.eclipse.core.resources.compatibility,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.core.variables,org.eclipse.debug.core,org.eclipse.debug.ui,org.eclipse.equinox.common,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.help.appserver,org.eclipse.help.base,org.eclipse.help.ui,org.eclipse.jdt.core,org.eclipse.jdt.core.manipulation,org.eclipse.jdt.debug,org.eclipse.jdt.debug.ui,org.eclipse.jdt.junit,org.eclipse.jdt.junit.runtime,org.eclipse.jdt.launching,org.eclipse.jdt.ui,org.eclipse.jface,org.eclipse.jface.text,org.eclipse.ltk.core.refactoring,org.eclipse.ltk.ui.refactoring,org.eclipse.pde.build,org.eclipse.pde.core,org.eclipse.pde.runtime,org.eclipse.pde.ui,org.eclipse.sdk,org.eclipse.search,org.eclipse.swt,org.eclipse.swt.carbon.macosx,org.eclipse.team.core,org.eclipse.team.ui,org.eclipse.text,org.eclipse.ui,org.eclipse.ui.carbon,org.eclipse.ui.cheatsheets,org.eclipse.ui.console,org.eclipse.ui.editors,org.eclipse.ui.externaltools,org.eclipse.ui.forms,org.eclipse.ui.ide,org.eclipse.ui.intro,org.eclipse.ui.navigator,org.eclipse.ui.navigator.resources,org.eclipse.ui.views,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.workbench,org.eclipse.ui.workbench.texteditor,org.eclipse.update.configurator,org.eclipse.update.core,org.eclipse.update.ui,org.junit"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useDefaultConfig" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="askclear" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../replacement_transform_workspace"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="configLocation" value=""/>
-</launchConfiguration>

diff --git a/components/bundles/org.eclipse.equinox.transforms.replace.images/about.html b/components/bundles/org.eclipse.equinox.transforms.replace.images/about.html
deleted file mode 100755
index 18dee67..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.replace.images/about.html
+++ /dev/null

@@ -1,28 +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>November 28, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/components/bundles/org.eclipse.equinox.transforms.replace.images/build.properties b/components/bundles/org.eclipse.equinox.transforms.replace.images/build.properties
deleted file mode 100644
index 4d9def7..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.replace.images/build.properties
+++ /dev/null

@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               actionSetDefault.xslt,\
-               transform.csv

diff --git a/components/bundles/org.eclipse.equinox.transforms.replace.images/config.ini b/components/bundles/org.eclipse.equinox.transforms.replace.images/config.ini
deleted file mode 100644
index 9a58551..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.replace.images/config.ini
+++ /dev/null

@@ -1,5 +0,0 @@
-osgi.bundles=org.eclipse.equinox.common@2\:start,org.eclipse.update.configurator@3\:start,org.eclipse.core.runtime@start,org.eclipse.equinox.transforms.replace.images@1:\start
-osgi.bundles.defaultStartLevel=4
-osgi.framework=org.eclipse.osgi
-osgi.configuration.cascaded=false
-osgi.splashPath=org.eclipse.platform
\ No newline at end of file

diff --git a/components/bundles/org.eclipse.equinox.transforms.replace.images/esmerelda.gif b/components/bundles/org.eclipse.equinox.transforms.replace.images/esmerelda.gif
deleted file mode 100644
index 93f803b..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.replace.images/esmerelda.gif
+++ /dev/null
Binary files differ

diff --git a/components/bundles/org.eclipse.equinox.transforms.replace.images/src/org/eclipse/equinox/transforms/replace/images/Activator.java b/components/bundles/org.eclipse.equinox.transforms.replace.images/src/org/eclipse/equinox/transforms/replace/images/Activator.java
deleted file mode 100644
index 1ecbed3..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.replace.images/src/org/eclipse/equinox/transforms/replace/images/Activator.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.equinox.transforms.replace.images;
-
-import org.eclipse.equinox.transforms.CSVTransformingBundleFile;
-import org.eclipse.equinox.transforms.replace.ReplaceTransformingBundleFileWrapperFactoryHook;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-
-public class Activator implements BundleActivator {
-
-	private ServiceRegistration registration;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		registration = CSVTransformingBundleFile.register(context, context
-				.getBundle().getEntry("/transform.csv"),
-				ReplaceTransformingBundleFileWrapperFactoryHook.class.getName());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		if (registration != null)
-			registration.unregister();
-	}
-}

diff --git a/components/bundles/org.eclipse.equinox.transforms.replace.images/transform.csv b/components/bundles/org.eclipse.equinox.transforms.replace.images/transform.csv
deleted file mode 100644
index 6ac3548..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.replace.images/transform.csv
+++ /dev/null

@@ -1,2 +0,0 @@
-#Bundle ID regex, Resource Path regex, resource path
-org\.eclipse\.ui,icons/.*/new_wiz.gif,/esmerelda.gif
\ No newline at end of file

diff --git a/components/bundles/org.eclipse.equinox.transforms.replace/.classpath b/components/bundles/org.eclipse.equinox.transforms.replace/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.replace/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/components/bundles/org.eclipse.equinox.transforms.replace/.cvsignore b/components/bundles/org.eclipse.equinox.transforms.replace/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.replace/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/components/bundles/org.eclipse.equinox.transforms.replace/.project b/components/bundles/org.eclipse.equinox.transforms.replace/.project
deleted file mode 100644
index b51e37b..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.replace/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.transforms.replace</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/components/bundles/org.eclipse.equinox.transforms.replace/.settings/org.eclipse.jdt.core.prefs b/components/bundles/org.eclipse.equinox.transforms.replace/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 759bcfe..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.replace/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,12 +0,0 @@
-#Tue Nov 28 08:02:25 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-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.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/components/bundles/org.eclipse.equinox.transforms.replace/.settings/org.eclipse.pde.core.prefs b/components/bundles/org.eclipse.equinox.transforms.replace/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 0ab4011..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.replace/.settings/org.eclipse.pde.core.prefs
+++ /dev/null

@@ -1,4 +0,0 @@
-#Thu Nov 23 14:48:19 EST 2006
-eclipse.preferences.version=1
-pluginProject.extensions=false
-resolve.requirebundle=false

diff --git a/components/bundles/org.eclipse.equinox.transforms.replace/META-INF/MANIFEST.MF b/components/bundles/org.eclipse.equinox.transforms.replace/META-INF/MANIFEST.MF
deleted file mode 100644
index f3ce2c7..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.replace/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Replacement Transform Extension
-Bundle-SymbolicName: org.eclipse.equinox.transforms.replace
-Bundle-Version: 1.0.0
-Import-Package: org.osgi.framework;version="1.3.0"
-Eclipse-LazyStart: true
-Require-Bundle: system.bundle
-Export-Package: org.eclipse.equinox.transforms.replace

diff --git a/components/bundles/org.eclipse.equinox.transforms.replace/about.html b/components/bundles/org.eclipse.equinox.transforms.replace/about.html
deleted file mode 100755
index 18dee67..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.replace/about.html
+++ /dev/null

@@ -1,28 +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>November 28, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/components/bundles/org.eclipse.equinox.transforms.replace/build.properties b/components/bundles/org.eclipse.equinox.transforms.replace/build.properties
deleted file mode 100644
index 3de1425..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.replace/build.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               hookconfigurators.properties

diff --git a/components/bundles/org.eclipse.equinox.transforms.replace/hookconfigurators.properties b/components/bundles/org.eclipse.equinox.transforms.replace/hookconfigurators.properties
deleted file mode 100644
index 490b1c6..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.replace/hookconfigurators.properties
+++ /dev/null

@@ -1,2 +0,0 @@
-hook.configurators= \
- org.eclipse.equinox.transforms.replace.ReplaceTransformingBundleFileWrapperFactoryHook

diff --git a/components/bundles/org.eclipse.equinox.transforms.replace/src/org/eclipse/equinox/transforms/replace/ReplaceBundleFile.java b/components/bundles/org.eclipse.equinox.transforms.replace/src/org/eclipse/equinox/transforms/replace/ReplaceBundleFile.java
deleted file mode 100644
index ec84232..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.replace/src/org/eclipse/equinox/transforms/replace/ReplaceBundleFile.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.equinox.transforms.replace;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import org.eclipse.equinox.transforms.CSVTransformingBundleFile;
-import org.eclipse.equinox.transforms.LazyInputStream;
-import org.eclipse.equinox.transforms.LazyInputStream.InputStreamProvider;
-import org.eclipse.osgi.baseadaptor.BaseData;
-import org.eclipse.osgi.baseadaptor.bundlefile.BundleFile;
-import org.osgi.framework.BundleContext;
-
-public class ReplaceBundleFile extends CSVTransformingBundleFile {
-
-	public ReplaceBundleFile(BundleContext context, BaseData data,
-			BundleFile delegate, TransformList transformList)
-			throws IOException {
-		super(context, data, delegate, transformList);
-	}
-
-	protected InputStream getInputStream(InputStream inputStream,
-			final URL transformerUrl) throws IOException {
-
-		return new LazyInputStream(new InputStreamProvider() {
-
-			public InputStream getInputStream() throws IOException {
-				return transformerUrl.openStream();
-			}
-		});
-	}
-}
\ No newline at end of file

diff --git a/components/bundles/org.eclipse.equinox.transforms.replace/src/org/eclipse/equinox/transforms/replace/ReplaceTransformingBundleFileWrapperFactoryHook.java b/components/bundles/org.eclipse.equinox.transforms.replace/src/org/eclipse/equinox/transforms/replace/ReplaceTransformingBundleFileWrapperFactoryHook.java
deleted file mode 100644
index ab7658e..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.replace/src/org/eclipse/equinox/transforms/replace/ReplaceTransformingBundleFileWrapperFactoryHook.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.equinox.transforms.replace;
-
-import java.io.IOException;
-
-import org.eclipse.equinox.transforms.TransformingBundleFileWrapperFactoryHook;
-import org.eclipse.equinox.transforms.CSVTransformingBundleFile.TransformList;
-import org.eclipse.osgi.baseadaptor.BaseData;
-import org.eclipse.osgi.baseadaptor.bundlefile.BundleFile;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.util.tracker.ServiceTracker;
-
-public class ReplaceTransformingBundleFileWrapperFactoryHook extends
-		TransformingBundleFileWrapperFactoryHook {
-
-	private TransformList transformList;
-
-	public BundleFile wrapBundleFile(BundleFile bundleFile, Object content,
-			BaseData data, boolean base) throws IOException {
-		if (transformList != null)
-			return new ReplaceBundleFile(getContext(), data, bundleFile,
-					transformList);
-		return null;
-	}
-
-	public void frameworkStart(BundleContext context) throws BundleException {
-		super.frameworkStart(context);
-		
-		try {
-			transformList = new TransformList(context,
-					ReplaceTransformingBundleFileWrapperFactoryHook.class.getName());
-			transformList.open();
-		} catch (InvalidSyntaxException e) {
-			e.printStackTrace();
-		}
-	}
-
-	public void frameworkStop(BundleContext context) throws BundleException {
-		super.frameworkStop(context);
-		transformList.close();
-	}
-}

diff --git a/components/bundles/org.eclipse.equinox.transforms.sed.manifest/.classpath b/components/bundles/org.eclipse.equinox.transforms.sed.manifest/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.sed.manifest/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/components/bundles/org.eclipse.equinox.transforms.sed.manifest/.cvsignore b/components/bundles/org.eclipse.equinox.transforms.sed.manifest/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.sed.manifest/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/components/bundles/org.eclipse.equinox.transforms.sed.manifest/.project b/components/bundles/org.eclipse.equinox.transforms.sed.manifest/.project
deleted file mode 100644
index f39cc2f..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.sed.manifest/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.transforms.sed.manifest</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/components/bundles/org.eclipse.equinox.transforms.sed.manifest/.settings/org.eclipse.jdt.core.prefs b/components/bundles/org.eclipse.equinox.transforms.sed.manifest/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c435289..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.sed.manifest/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,12 +0,0 @@
-#Tue Nov 28 08:02:33 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-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.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/components/bundles/org.eclipse.equinox.transforms.sed.manifest/.settings/org.eclipse.pde.core.prefs b/components/bundles/org.eclipse.equinox.transforms.sed.manifest/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 54f5f1e..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.sed.manifest/.settings/org.eclipse.pde.core.prefs
+++ /dev/null

@@ -1,4 +0,0 @@
-#Thu Nov 23 15:37:37 EST 2006
-eclipse.preferences.version=1
-pluginProject.extensions=false
-resolve.requirebundle=false

diff --git a/components/bundles/org.eclipse.equinox.transforms.sed.manifest/META-INF/MANIFEST.MF b/components/bundles/org.eclipse.equinox.transforms.sed.manifest/META-INF/MANIFEST.MF
deleted file mode 100644
index 4a263fd..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.sed.manifest/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Sed MANIFEST.MF Transforms Bundle
-Bundle-SymbolicName: org.eclipse.equinox.transforms.sed.manifest
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.equinox.transforms.sed.manifest.Activator
-Import-Package: org.osgi.framework;version="1.3.0"
-Eclipse-LazyStart: true
-Require-Bundle: org.eclipse.equinox.transforms.sed,
- system.bundle

diff --git a/components/bundles/org.eclipse.equinox.transforms.sed.manifest/Sed Transform Launch.launch b/components/bundles/org.eclipse.equinox.transforms.sed.manifest/Sed Transform Launch.launch
deleted file mode 100644
index ca6bec8..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.sed.manifest/Sed Transform Launch.launch
+++ /dev/null

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="usefeatures" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<booleanAttribute key="useProduct" value="true"/>
-<booleanAttribute key="tracing" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.ui.tests,org.eclipse.core.tests.harness,org.eclipse.equinox.transforms.replace.images,org.eclipse.equinox.transforms.xslt.plugin,org.eclipse.equinox.transforms.replace,org.eclipse.equinox.registry,org.eclipse.equinox.transforms.xslt,org.eclipse.test.performance,org.eclipse.ui.tests.harness,org.aspectj.osgi,org.eclipse.jdt.ui.supplemental"/>
-<stringAttribute key="pde.version" value="3.2a"/>
-<stringAttribute key="templateConfig" value="/Users/kim/Documents/eclipse/workspaces/xslt-workspace/org.eclipse.equinox.transforms.sed.manifest/config.ini"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.framework.extensions=org.eclipse.equinox.transforms,org.eclipse.equinox.transforms.sed"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu,org.apache.ant,org.apache.lucene,org.apache.xerces,org.eclipse.ant.core,org.eclipse.ant.ui,org.eclipse.compare,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.expressions,org.eclipse.core.filebuffers,org.eclipse.core.filesystem,org.eclipse.core.filesystem.macosx,org.eclipse.core.jobs,org.eclipse.core.resources,org.eclipse.core.resources.compatibility,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.core.variables,org.eclipse.debug.core,org.eclipse.debug.ui,org.eclipse.equinox.common,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.help.appserver,org.eclipse.help.base,org.eclipse.help.ui,org.eclipse.jdt.core,org.eclipse.jdt.core.manipulation,org.eclipse.jdt.debug,org.eclipse.jdt.debug.ui,org.eclipse.jdt.junit,org.eclipse.jdt.junit.runtime,org.eclipse.jdt.launching,org.eclipse.jdt.ui,org.eclipse.jface,org.eclipse.jface.text,org.eclipse.ltk.core.refactoring,org.eclipse.ltk.ui.refactoring,org.eclipse.pde.build,org.eclipse.pde.core,org.eclipse.pde.runtime,org.eclipse.pde.ui,org.eclipse.sdk,org.eclipse.search,org.eclipse.swt,org.eclipse.swt.carbon.macosx,org.eclipse.team.core,org.eclipse.team.ui,org.eclipse.text,org.eclipse.ui,org.eclipse.ui.carbon,org.eclipse.ui.cheatsheets,org.eclipse.ui.console,org.eclipse.ui.editors,org.eclipse.ui.externaltools,org.eclipse.ui.forms,org.eclipse.ui.ide,org.eclipse.ui.intro,org.eclipse.ui.navigator,org.eclipse.ui.navigator.resources,org.eclipse.ui.views,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.workbench,org.eclipse.ui.workbench.texteditor,org.eclipse.update.configurator,org.eclipse.update.core,org.eclipse.update.ui,org.junit"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useDefaultConfig" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="askclear" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../sed_transform_workspace"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="configLocation" value=""/>
-</launchConfiguration>

diff --git a/components/bundles/org.eclipse.equinox.transforms.sed.manifest/about.html b/components/bundles/org.eclipse.equinox.transforms.sed.manifest/about.html
deleted file mode 100755
index 18dee67..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.sed.manifest/about.html
+++ /dev/null

@@ -1,28 +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>November 28, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/components/bundles/org.eclipse.equinox.transforms.sed.manifest/build.properties b/components/bundles/org.eclipse.equinox.transforms.sed.manifest/build.properties
deleted file mode 100644
index 644787d..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.sed.manifest/build.properties
+++ /dev/null

@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               manifestCommands.sed,\
-               propertyCommands.sed,\
-               transform.csv

diff --git a/components/bundles/org.eclipse.equinox.transforms.sed.manifest/config.ini b/components/bundles/org.eclipse.equinox.transforms.sed.manifest/config.ini
deleted file mode 100644
index 303d23d..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.sed.manifest/config.ini
+++ /dev/null

@@ -1,5 +0,0 @@
-osgi.bundles=org.eclipse.equinox.common@2\:start,org.eclipse.update.configurator@3\:start,org.eclipse.core.runtime@start,org.eclipse.equinox.transforms.sed.manifest@1:\start
-osgi.bundles.defaultStartLevel=4
-osgi.framework=org.eclipse.osgi
-osgi.configuration.cascaded=false
-osgi.splashPath=org.eclipse.platform
\ No newline at end of file

diff --git a/components/bundles/org.eclipse.equinox.transforms.sed.manifest/manifestCommands.sed b/components/bundles/org.eclipse.equinox.transforms.sed.manifest/manifestCommands.sed
deleted file mode 100644
index 1dbd106..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.sed.manifest/manifestCommands.sed
+++ /dev/null

@@ -1 +0,0 @@
-s/^Bundle-Version:\(.*\)$/Bundle-Version: \1 _special/
\ No newline at end of file

diff --git a/components/bundles/org.eclipse.equinox.transforms.sed.manifest/propertyCommands.sed b/components/bundles/org.eclipse.equinox.transforms.sed.manifest/propertyCommands.sed
deleted file mode 100644
index 1ff7b89..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.sed.manifest/propertyCommands.sed
+++ /dev/null

@@ -1 +0,0 @@
-s/^packagesViewName=.*$/packagesViewName=Java Package Explorer/
\ No newline at end of file

diff --git a/components/bundles/org.eclipse.equinox.transforms.sed.manifest/src/org/eclipse/equinox/transforms/sed/manifest/Activator.java b/components/bundles/org.eclipse.equinox.transforms.sed.manifest/src/org/eclipse/equinox/transforms/sed/manifest/Activator.java
deleted file mode 100644
index f2ab5de..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.sed.manifest/src/org/eclipse/equinox/transforms/sed/manifest/Activator.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.equinox.transforms.sed.manifest;
-
-import org.eclipse.equinox.transforms.CSVTransformingBundleFile;
-import org.eclipse.equinox.transforms.sed.SedTransformingBundleFileWrapperFactoryHook;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-
-public class Activator implements BundleActivator {
-
-	private ServiceRegistration registration;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		registration = CSVTransformingBundleFile.register(context, context
-				.getBundle().getEntry("/transform.csv"),
-				SedTransformingBundleFileWrapperFactoryHook.class.getName());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		if (registration != null)
-			registration.unregister();
-	}
-}

diff --git a/components/bundles/org.eclipse.equinox.transforms.sed.manifest/transform.csv b/components/bundles/org.eclipse.equinox.transforms.sed.manifest/transform.csv
deleted file mode 100644
index 7c12b4a..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.sed.manifest/transform.csv
+++ /dev/null

@@ -1,3 +0,0 @@
-#Bundle ID regex, Resource Path regex, resource path
-org\.eclipse\.jdt\.ui,plugin\.properties,/propertyCommands.sed
-org\.eclipse\.jdt\.ui,META-INF/MANIFEST\.MF,/manifestCommands.sed
\ No newline at end of file

diff --git a/components/bundles/org.eclipse.equinox.transforms.sed/.classpath b/components/bundles/org.eclipse.equinox.transforms.sed/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.sed/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/components/bundles/org.eclipse.equinox.transforms.sed/.cvsignore b/components/bundles/org.eclipse.equinox.transforms.sed/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.sed/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/components/bundles/org.eclipse.equinox.transforms.sed/.project b/components/bundles/org.eclipse.equinox.transforms.sed/.project
deleted file mode 100644
index 86c882e..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.sed/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.transforms.sed</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/components/bundles/org.eclipse.equinox.transforms.sed/.settings/org.eclipse.jdt.core.prefs b/components/bundles/org.eclipse.equinox.transforms.sed/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 759bcfe..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.sed/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,12 +0,0 @@
-#Tue Nov 28 08:02:25 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-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.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/components/bundles/org.eclipse.equinox.transforms.sed/.settings/org.eclipse.pde.core.prefs b/components/bundles/org.eclipse.equinox.transforms.sed/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 0ab4011..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.sed/.settings/org.eclipse.pde.core.prefs
+++ /dev/null

@@ -1,4 +0,0 @@
-#Thu Nov 23 14:48:19 EST 2006
-eclipse.preferences.version=1
-pluginProject.extensions=false
-resolve.requirebundle=false

diff --git a/components/bundles/org.eclipse.equinox.transforms.sed/META-INF/MANIFEST.MF b/components/bundles/org.eclipse.equinox.transforms.sed/META-INF/MANIFEST.MF
deleted file mode 100644
index 88966b2..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.sed/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Sed Transform Extension
-Bundle-SymbolicName: org.eclipse.equinox.transforms.sed
-Bundle-Version: 1.0.0
-Import-Package: org.osgi.framework;version="1.3.0"
-Eclipse-LazyStart: true
-Require-Bundle: system.bundle
-Export-Package: org.eclipse.equinox.transforms.sed

diff --git a/components/bundles/org.eclipse.equinox.transforms.sed/about.html b/components/bundles/org.eclipse.equinox.transforms.sed/about.html
deleted file mode 100755
index 18dee67..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.sed/about.html
+++ /dev/null

@@ -1,28 +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>November 28, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/components/bundles/org.eclipse.equinox.transforms.sed/build.properties b/components/bundles/org.eclipse.equinox.transforms.sed/build.properties
deleted file mode 100644
index 3de1425..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.sed/build.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               hookconfigurators.properties

diff --git a/components/bundles/org.eclipse.equinox.transforms.sed/hookconfigurators.properties b/components/bundles/org.eclipse.equinox.transforms.sed/hookconfigurators.properties
deleted file mode 100644
index 41bdbd7..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.sed/hookconfigurators.properties
+++ /dev/null

@@ -1,2 +0,0 @@
-hook.configurators= \
- org.eclipse.equinox.transforms.sed.SedTransformingBundleFileWrapperFactoryHook

diff --git a/components/bundles/org.eclipse.equinox.transforms.sed/src/org/eclipse/equinox/transforms/sed/SedBundleFile.java b/components/bundles/org.eclipse.equinox.transforms.sed/src/org/eclipse/equinox/transforms/sed/SedBundleFile.java
deleted file mode 100644
index a08eb33..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.sed/src/org/eclipse/equinox/transforms/sed/SedBundleFile.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.equinox.transforms.sed;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-
-import org.eclipse.equinox.transforms.CSVTransformingBundleFile;
-import org.eclipse.equinox.transforms.ProcessPipeInputStream;
-import org.eclipse.osgi.baseadaptor.BaseData;
-import org.eclipse.osgi.baseadaptor.bundlefile.BundleFile;
-import org.eclipse.osgi.service.urlconversion.URLConverter;
-import org.osgi.framework.BundleContext;
-import org.osgi.util.tracker.ServiceTracker;
-
-public class SedBundleFile extends CSVTransformingBundleFile {
-
-	private ServiceTracker urlServiceTracker;
-
-	public SedBundleFile(BundleContext context, BaseData data,
-			BundleFile delegate, TransformList transformList,
-			ServiceTracker urlServiceTracker) throws IOException {
-		super(context, data, delegate, transformList);
-		this.urlServiceTracker = urlServiceTracker;
-	}
-
-	protected InputStream getInputStream(InputStream inputStream,
-			URL transformerUrl) throws IOException {
-
-		URLConverter converter = (URLConverter) urlServiceTracker.getService();
-		if (converter == null)
-			return null;
-
-		try {
-			URL convertedURL = converter.toFileURL(transformerUrl);
-			URI convertedURI = new URI(convertedURL.toExternalForm());
-			File commandFile = new File(convertedURI);
-
-			return new SedInputStream(inputStream, commandFile);
-		} catch (URISyntaxException e) {
-			e.printStackTrace();
-		}
-
-		return null;
-	}
-}
-
-class SedInputStream extends ProcessPipeInputStream {
-
-	private File commandFile;
-
-	public SedInputStream(InputStream original, File commandFile) {
-		super(original);
-		this.commandFile = commandFile;
-	}
-
-	protected String getCommandString() {
-		return "sed -f " + commandFile.getName();
-	}
-
-	protected File getWorkingDirectory() {
-		return commandFile.getParentFile();
-	}
-
-}

diff --git a/components/bundles/org.eclipse.equinox.transforms.sed/src/org/eclipse/equinox/transforms/sed/SedTransformingBundleFileWrapperFactoryHook.java b/components/bundles/org.eclipse.equinox.transforms.sed/src/org/eclipse/equinox/transforms/sed/SedTransformingBundleFileWrapperFactoryHook.java
deleted file mode 100644
index 9df80c5..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.sed/src/org/eclipse/equinox/transforms/sed/SedTransformingBundleFileWrapperFactoryHook.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.equinox.transforms.sed;
-
-import java.io.IOException;
-
-import org.eclipse.equinox.transforms.TransformingBundleFileWrapperFactoryHook;
-import org.eclipse.equinox.transforms.CSVTransformingBundleFile.TransformList;
-import org.eclipse.osgi.baseadaptor.BaseData;
-import org.eclipse.osgi.baseadaptor.bundlefile.BundleFile;
-import org.eclipse.osgi.service.urlconversion.URLConverter;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.Filter;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.util.tracker.ServiceTracker;
-
-public class SedTransformingBundleFileWrapperFactoryHook extends
-		TransformingBundleFileWrapperFactoryHook {
-
-	private TransformList transformList;
-	private ServiceTracker urlConverterServiceTracker;
-
-	public BundleFile wrapBundleFile(BundleFile bundleFile, Object content,
-			BaseData data, boolean base) throws IOException {
-		if (urlConverterServiceTracker != null && transformList != null)
-			return new SedBundleFile(getContext(), data, bundleFile,
-					transformList, urlConverterServiceTracker);
-		return null;
-	}
-
-	public void frameworkStart(BundleContext context) throws BundleException {
-		super.frameworkStart(context);
-		Filter filter;
-		try {
-			filter = context.createFilter("(objectClass="
-					+ URLConverter.class.getName() + ")");
-			urlConverterServiceTracker = new ServiceTracker(context, filter,
-					null);
-			urlConverterServiceTracker.open();
-		} catch (InvalidSyntaxException e1) {
-			e1.printStackTrace();
-		}
-
-		try {
-			transformList = new TransformList(context,
-					SedTransformingBundleFileWrapperFactoryHook.class.getName());
-			transformList.open();
-		} catch (InvalidSyntaxException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	public void frameworkStop(BundleContext context) throws BundleException {
-		super.frameworkStop(context);
-		urlConverterServiceTracker.close();
-		transformList.close();
-	}
-}

diff --git a/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/.classpath b/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/.cvsignore b/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/.project b/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/.project
deleted file mode 100644
index e86108e..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.transforms.xslt.plugin</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/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/.settings/org.eclipse.jdt.core.prefs b/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 3d84d51..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,12 +0,0 @@
-#Tue Nov 28 08:02:52 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-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.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/.settings/org.eclipse.pde.core.prefs b/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 8a06f72..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/.settings/org.eclipse.pde.core.prefs
+++ /dev/null

@@ -1,4 +0,0 @@
-#Wed Nov 22 15:34:13 EST 2006
-eclipse.preferences.version=1
-pluginProject.extensions=false
-resolve.requirebundle=false

diff --git a/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/META-INF/MANIFEST.MF b/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/META-INF/MANIFEST.MF
deleted file mode 100644
index 61a32b1..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: XSLT plugin.xml Transforms Bundle
-Bundle-SymbolicName: org.eclipse.equinox.transforms.xslt.plugin
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.equinox.transforms.xslt.plugin.Activator
-Import-Package: org.osgi.framework;version="1.3.0"
-Eclipse-LazyStart: true
-Require-Bundle: org.eclipse.equinox.transforms.xslt,
- system.bundle

diff --git a/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/XSLT Transform Launch.launch b/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/XSLT Transform Launch.launch
deleted file mode 100644
index 72cf3e4..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/XSLT Transform Launch.launch
+++ /dev/null

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="usefeatures" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<booleanAttribute key="useProduct" value="true"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.ui.tests,org.eclipse.core.tests.harness,org.eclipse.equinox.transforms.replace.images,org.eclipse.equinox.transforms.sed.manifest,org.eclipse.equinox.transforms.replace,org.eclipse.equinox.registry,org.eclipse.equinox.transforms.sed,org.eclipse.test.performance,org.eclipse.ui.tests.harness,org.aspectj.osgi,org.eclipse.jdt.ui.supplemental"/>
-<booleanAttribute key="tracing" value="false"/>
-<stringAttribute key="pde.version" value="3.2a"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.framework.extensions=org.eclipse.equinox.transforms,org.eclipse.equinox.transforms.xslt"/>
-<stringAttribute key="templateConfig" value="/Users/kim/Documents/eclipse/workspaces/xslt-workspace/org.eclipse.equinox.transforms.xslt.plugin/config.ini"/>
-<booleanAttribute key="default" value="false"/>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu,org.apache.ant,org.apache.lucene,org.apache.xerces,org.eclipse.ant.core,org.eclipse.ant.ui,org.eclipse.compare,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.expressions,org.eclipse.core.filebuffers,org.eclipse.core.filesystem,org.eclipse.core.filesystem.macosx,org.eclipse.core.jobs,org.eclipse.core.resources,org.eclipse.core.resources.compatibility,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.core.variables,org.eclipse.debug.core,org.eclipse.debug.ui,org.eclipse.equinox.common,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.help.appserver,org.eclipse.help.base,org.eclipse.help.ui,org.eclipse.jdt.core,org.eclipse.jdt.core.manipulation,org.eclipse.jdt.debug,org.eclipse.jdt.debug.ui,org.eclipse.jdt.junit,org.eclipse.jdt.junit.runtime,org.eclipse.jdt.launching,org.eclipse.jdt.ui,org.eclipse.jface,org.eclipse.jface.text,org.eclipse.ltk.core.refactoring,org.eclipse.ltk.ui.refactoring,org.eclipse.pde.build,org.eclipse.pde.core,org.eclipse.pde.runtime,org.eclipse.pde.ui,org.eclipse.sdk,org.eclipse.search,org.eclipse.swt,org.eclipse.swt.carbon.macosx,org.eclipse.team.core,org.eclipse.team.ui,org.eclipse.text,org.eclipse.ui,org.eclipse.ui.carbon,org.eclipse.ui.cheatsheets,org.eclipse.ui.console,org.eclipse.ui.editors,org.eclipse.ui.externaltools,org.eclipse.ui.forms,org.eclipse.ui.ide,org.eclipse.ui.intro,org.eclipse.ui.navigator,org.eclipse.ui.navigator.resources,org.eclipse.ui.views,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.workbench,org.eclipse.ui.workbench.texteditor,org.eclipse.update.configurator,org.eclipse.update.core,org.eclipse.update.ui,org.junit"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useDefaultConfig" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="askclear" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../xslt_transform_workspace"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="configLocation" value=""/>
-</launchConfiguration>

diff --git a/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/about.html b/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/about.html
deleted file mode 100755
index 18dee67..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/about.html
+++ /dev/null

@@ -1,28 +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>November 28, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/actionSetDefault.xslt b/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/actionSetDefault.xslt
deleted file mode 100644
index 83f74bd..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/actionSetDefault.xslt
+++ /dev/null

@@ -1,13 +0,0 @@
- <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-     <xsl:template match="actionSet[@id='org.eclipse.ui.WorkingSetActionSet']">
-     	 <actionSet>
-		     <xsl:attribute name="visible">false</xsl:attribute>
-		     <xsl:copy-of select="node()|@*[not(name()='visible')]" />
-	     </actionSet>
-     </xsl:template>
-     <xsl:template match="node()|@*">
-         <xsl:copy>
-             <xsl:apply-templates select="node()|@*"/>
-         </xsl:copy>
-     </xsl:template>
- </xsl:stylesheet>
\ No newline at end of file

diff --git a/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/build.properties b/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/build.properties
deleted file mode 100644
index 4d9def7..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/build.properties
+++ /dev/null

@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               actionSetDefault.xslt,\
-               transform.csv

diff --git a/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/config.ini b/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/config.ini
deleted file mode 100644
index 1a14611..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/config.ini
+++ /dev/null

@@ -1,5 +0,0 @@
-osgi.bundles=org.eclipse.equinox.common@2\:start,org.eclipse.update.configurator@3\:start,org.eclipse.core.runtime@start,org.eclipse.equinox.transforms.xslt.plugin@1:\start
-osgi.bundles.defaultStartLevel=4
-osgi.framework=org.eclipse.osgi
-osgi.configuration.cascaded=false
-osgi.splashPath=org.eclipse.platform
\ No newline at end of file

diff --git a/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/src/org/eclipse/equinox/transforms/xslt/plugin/Activator.java b/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/src/org/eclipse/equinox/transforms/xslt/plugin/Activator.java
deleted file mode 100644
index 85642de..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/src/org/eclipse/equinox/transforms/xslt/plugin/Activator.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.equinox.transforms.xslt.plugin;
-
-import org.eclipse.equinox.transforms.CSVTransformingBundleFile;
-import org.eclipse.equinox.transforms.xslt.XSLTTransformingBundleFileWrapperFactoryHook;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-
-public class Activator implements BundleActivator {
-
-	private ServiceRegistration registration;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		registration = CSVTransformingBundleFile.register(context, context
-				.getBundle().getEntry("/transform.csv"),
-				XSLTTransformingBundleFileWrapperFactoryHook.class.getName());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		if (registration != null)
-			registration.unregister();
-	}
-}

diff --git a/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/transform.csv b/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/transform.csv
deleted file mode 100644
index dd8fa69..0000000
--- a/components/bundles/org.eclipse.equinox.transforms.xslt.plugin/transform.csv
+++ /dev/null

@@ -1,2 +0,0 @@
-#Bundle ID regex, Resource Path regex, resource path
-org\.eclipse\.ui\.ide,plugin\.xml,/actionSetDefault.xslt
\ No newline at end of file

diff --git a/components/tests/org.eclipse.equinox.tests.standalone/.classpath b/components/tests/org.eclipse.equinox.tests.standalone/.classpath
deleted file mode 100644
index 7410ae7..0000000
--- a/components/tests/org.eclipse.equinox.tests.standalone/.classpath
+++ /dev/null

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.equinox.registry"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.equinox.supplement"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/components/tests/org.eclipse.equinox.tests.standalone/.cvsignore b/components/tests/org.eclipse.equinox.tests.standalone/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/components/tests/org.eclipse.equinox.tests.standalone/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/components/tests/org.eclipse.equinox.tests.standalone/.project b/components/tests/org.eclipse.equinox.tests.standalone/.project
deleted file mode 100644
index 891e410..0000000
--- a/components/tests/org.eclipse.equinox.tests.standalone/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.tests.standalone</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/components/tests/org.eclipse.equinox.tests.standalone/All Equinox Standalone Tests.launch b/components/tests/org.eclipse.equinox.tests.standalone/All Equinox Standalone Tests.launch
deleted file mode 100644
index c021522..0000000
--- a/components/tests/org.eclipse.equinox.tests.standalone/All Equinox Standalone Tests.launch
+++ /dev/null

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.equinox.test.internal.standalone.AllTests"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.equinox.tests.standalone"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.equinox.tests.standalone/src/org/eclipse/equinox/test/internal/standalone/AllTests.java"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
-</launchConfiguration>

diff --git a/components/tests/org.eclipse.equinox.tests.standalone/about.html b/components/tests/org.eclipse.equinox.tests.standalone/about.html
deleted file mode 100644
index 9889c9e..0000000
--- a/components/tests/org.eclipse.equinox.tests.standalone/about.html
+++ /dev/null

@@ -1,29 +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>March 20, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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>
-
-<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>
-
-</body>
-</html>

diff --git a/components/tests/org.eclipse.equinox.tests.standalone/src/org/eclipse/equinox/test/internal/standalone/AllTests.java b/components/tests/org.eclipse.equinox.tests.standalone/src/org/eclipse/equinox/test/internal/standalone/AllTests.java
deleted file mode 100644
index 3158d5a..0000000
--- a/components/tests/org.eclipse.equinox.tests.standalone/src/org/eclipse/equinox/test/internal/standalone/AllTests.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.test.internal.standalone;
-
-import junit.framework.*;
-
-public class AllTests extends TestCase {
-
-	public AllTests() {
-		super(null);
-	}
-
-	public AllTests(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite(AllTests.class.getName());
-		suite.addTest(ExtensionRegistryTest.suite());
-		return suite;
-	}
-}

diff --git a/components/tests/org.eclipse.equinox.tests.standalone/src/org/eclipse/equinox/test/internal/standalone/ExtensionRegistryTest.java b/components/tests/org.eclipse.equinox.tests.standalone/src/org/eclipse/equinox/test/internal/standalone/ExtensionRegistryTest.java
deleted file mode 100644
index 7af461c..0000000
--- a/components/tests/org.eclipse.equinox.tests.standalone/src/org/eclipse/equinox/test/internal/standalone/ExtensionRegistryTest.java
+++ /dev/null

@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.test.internal.standalone;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.spi.RegistryStrategy;
-
-/**
- * Tests if the extenesion registry can be run without OSGi. 
- */
-public class ExtensionRegistryTest extends TestCase {
-
-	final private static String xmlContribution = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + //$NON-NLS-1$ 
-			"<plugin id=\"RegistryTest\" version=\"1.0.0\">" + //$NON-NLS-1$
-			"<extension-point id=\"point1\" name=\"Test extension point\" schema=\"schema/schema.exsd\"/>" + //$NON-NLS-1$ 
-			"<extension point=\"point1\" id=\"extension1\">" + //$NON-NLS-1$
-			"</extension></plugin>"; //$NON-NLS-1$
-
-	final private static String contributorID = "RegistryTest"; //$NON-NLS-1$
-	final private static String extPointID = contributorID + ".point1"; //$NON-NLS-1$
-	final private static String extensionID = contributorID + ".extension1"; //$NON-NLS-1$
-	final private static String extPointLable = "Test extension point"; //$NON-NLS-1$
-
-	private IContributor contributor = null;
-	private IExtensionRegistry registry = null;
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		contributor = ContributorFactorySimple.createContributor(contributorID);
-		// to store contributions in the registry cache pass file location to the RegistryStrategy
-		registry = RegistryFactory.createRegistry(new RegistryStrategy(null, null), null, null);
-	}
-
-	public void testStandAlone() {
-		// fill registry with an extension point and an extension
-		InputStream is = new ByteArrayInputStream(xmlContribution.getBytes());
-		assertTrue(registry.addContribution(is, contributor, false, null, null, null));
-
-		// check the extension point
-		IExtensionPoint extensionPoint = registry.getExtensionPoint(extPointID);
-		assertNotNull(extensionPoint);
-		String extPointLabel = extensionPoint.getLabel();
-		assertTrue(extPointLable.equals(extPointLabel));
-
-		// check the extension
-		IExtension[] extensions = extensionPoint.getExtensions();
-		assertNotNull(extensions);
-		assertTrue(extensions.length == 1);
-		String extensionId = extensions[0].getUniqueIdentifier();
-		assertTrue(extensionID.equals(extensionId));
-	}
-
-	public static Test suite() {
-		return new TestSuite(ExtensionRegistryTest.class);
-	}
-
-}

diff --git a/demos/app-model/org.eclipse.equinox.examples.app.selector/.classpath b/demos/app-model/org.eclipse.equinox.examples.app.selector/.classpath
deleted file mode 100644
index ce73933..0000000
--- a/demos/app-model/org.eclipse.equinox.examples.app.selector/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<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 kind="output" path="bin"/>
-</classpath>

diff --git a/demos/app-model/org.eclipse.equinox.examples.app.selector/.cvsignore b/demos/app-model/org.eclipse.equinox.examples.app.selector/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/demos/app-model/org.eclipse.equinox.examples.app.selector/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/demos/app-model/org.eclipse.equinox.examples.app.selector/.project b/demos/app-model/org.eclipse.equinox.examples.app.selector/.project
deleted file mode 100644
index 40f4a51..0000000
--- a/demos/app-model/org.eclipse.equinox.examples.app.selector/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.examples.app.selector</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/demos/app-model/org.eclipse.equinox.examples.app.selector/.settings/org.eclipse.jdt.core.prefs b/demos/app-model/org.eclipse.equinox.examples.app.selector/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 49fae88..0000000
--- a/demos/app-model/org.eclipse.equinox.examples.app.selector/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Tue Mar 20 12:26:45 CDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/demos/app-model/org.eclipse.equinox.examples.app.selector/AppSelector.product b/demos/app-model/org.eclipse.equinox.examples.app.selector/AppSelector.product
deleted file mode 100644
index 60782c8..0000000
--- a/demos/app-model/org.eclipse.equinox.examples.app.selector/AppSelector.product
+++ /dev/null

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.1"?>
-
-<product name="App Selector" id="org.eclipse.equinox.examples.app.selector.product" application="org.eclipse.equinox.examples.app.selector.application" useFeatures="false">
-
-   <configIni use="custom" path="/org.eclipse.equinox.examples.app.selector/config.ini"/>
-
-   <launcherArgs>
-   </launcherArgs>
-
-   <windowImages/>
-
-   <launcher>
-      <solaris/>
-      <win useIco="false">
-         <bmp/>
-      </win>
-   </launcher>
-
-   <vm>
-   </vm>
-
-   <plugins>
-      <plugin id="com.ibm.icu"/>
-      <plugin id="org.eclipse.core.commands"/>
-      <plugin id="org.eclipse.core.contenttype"/>
-      <plugin id="org.eclipse.core.databinding"/>
-      <plugin id="org.eclipse.core.expressions"/>
-      <plugin id="org.eclipse.core.jobs"/>
-      <plugin id="org.eclipse.core.runtime"/>
-      <plugin id="org.eclipse.core.runtime.compatibility.auth"/>
-      <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
-      <plugin id="org.eclipse.equinox.app"/>
-      <plugin id="org.eclipse.equinox.common"/>
-      <plugin id="org.eclipse.equinox.examples.app.selector"/>
-      <plugin id="org.eclipse.equinox.preferences"/>
-      <plugin id="org.eclipse.equinox.registry"/>
-      <plugin id="org.eclipse.help"/>
-      <plugin id="org.eclipse.jface"/>
-      <plugin id="org.eclipse.jface.databinding"/>
-      <plugin id="org.eclipse.osgi"/>
-      <plugin id="org.eclipse.osgi.services"/>
-      <plugin id="org.eclipse.swt"/>
-      <plugin id="org.eclipse.swt.examples.addressbook"/>
-      <plugin id="org.eclipse.swt.examples.browserexample"/>
-      <plugin id="org.eclipse.swt.examples.clipboard"/>
-      <plugin id="org.eclipse.swt.examples.graphics"/>
-      <plugin id="org.eclipse.swt.examples.paint"/>
-      <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
-      <plugin id="org.eclipse.ui"/>
-      <plugin id="org.eclipse.ui.workbench"/>
-      <plugin id="org.eclipse.update.configurator"/>
-   </plugins>
-
-</product>

diff --git a/demos/app-model/org.eclipse.equinox.examples.app.selector/META-INF/MANIFEST.MF b/demos/app-model/org.eclipse.equinox.examples.app.selector/META-INF/MANIFEST.MF
deleted file mode 100644
index a7d3122..0000000
--- a/demos/app-model/org.eclipse.equinox.examples.app.selector/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Selector Plug-in
-Bundle-SymbolicName: org.eclipse.equinox.examples.app.selector;singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.equinox.examples.app.selector.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4

diff --git a/demos/app-model/org.eclipse.equinox.examples.app.selector/build.properties b/demos/app-model/org.eclipse.equinox.examples.app.selector/build.properties
deleted file mode 100644
index 2b0d95b..0000000
--- a/demos/app-model/org.eclipse.equinox.examples.app.selector/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .

diff --git a/demos/app-model/org.eclipse.equinox.examples.app.selector/config.ini b/demos/app-model/org.eclipse.equinox.examples.app.selector/config.ini
deleted file mode 100644
index bac9e87..0000000
--- a/demos/app-model/org.eclipse.equinox.examples.app.selector/config.ini
+++ /dev/null

@@ -1,4 +0,0 @@
-eclipse.application.registerDescriptors=true
-eclipse.product=org.eclipse.equinox.examples.app.selector.product
-osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.core.runtime@start
-osgi.bundles.defaultStartLevel=4
\ No newline at end of file

diff --git a/demos/app-model/org.eclipse.equinox.examples.app.selector/demoAppSelector.launch b/demos/app-model/org.eclipse.equinox.examples.app.selector/demoAppSelector.launch
deleted file mode 100644
index 091f644..0000000
--- a/demos/app-model/org.eclipse.equinox.examples.app.selector/demoAppSelector.launch
+++ /dev/null

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="automaticAdd" value="false"/>
-<stringAttribute key="location" value="${workspace_loc}/ws/rcpapp"/>
-<booleanAttribute key="askclear" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.application.registerDescriptors=true"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="useProduct" value="false"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-console"/>
-<stringAttribute key="configLocation" value=""/>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.databinding,org.eclipse.core.expressions,org.eclipse.core.jobs,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.equinox.app,org.eclipse.equinox.common,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.jface,org.eclipse.jface.databinding,org.eclipse.osgi,org.eclipse.osgi.services,org.eclipse.swt,org.eclipse.swt.win32.win32.x86,org.eclipse.ui,org.eclipse.ui.workbench,org.eclipse.update.configurator"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.jface.snippets,cbg.article.treeviewer,com.opnworks.tableviewer.example,workbench.view,rcp.view,org.eclipse.equinox.examples.sharedisplay"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.swt.examples.paint,org.eclipse.swt.examples.clipboard,org.eclipse.swt.examples.browserexample,org.eclipse.swt.examples.graphics,org.eclipse.swt.examples.addressbook,org.eclipse.equinox.examples.app.selector"/>
-<stringAttribute key="application" value="org.eclipse.equinox.examples.app.selector.application"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="usefeatures" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-</launchConfiguration>

diff --git a/demos/app-model/org.eclipse.equinox.examples.app.selector/plugin.xml b/demos/app-model/org.eclipse.equinox.examples.app.selector/plugin.xml
deleted file mode 100644
index 88eb0e0..0000000
--- a/demos/app-model/org.eclipse.equinox.examples.app.selector/plugin.xml
+++ /dev/null

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
-   <extension
-         id="application"
-         point="org.eclipse.core.runtime.applications">
-      <application
-            cardinality="1"
-            thread="main">
-         <run
-               class="org.eclipse.equinox.examples.app.selector.Application">
-         </run>
-      </application>
-   </extension>
-   <extension
-         point="org.eclipse.ui.perspectives">
-      <perspective
-            name="AppPerspective"
-            class="org.eclipse.equinox.examples.app.selector.Perspective"
-            id="org.eclipse.equinox.app.selector.perspective">
-      </perspective>
-   </extension>
-   <extension
-         point="org.eclipse.ui.views">
-      <view
-            name="AppView"
-            class="org.eclipse.equinox.examples.app.selector.ApplicationView"
-            id="org.eclipse.equinox.app.selector.appview">
-      </view>
-   </extension>
-   <extension
-         id="product"
-         point="org.eclipse.core.runtime.products">
-      <product
-            application="org.eclipse.equinox.examples.app.selector.application"
-            name="App Selector">
-         <property
-               name="appName"
-               value="App Selector">
-         </property>
-      </product>
-   </extension>
-
-</plugin>

diff --git a/demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/Activator.java b/demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/Activator.java
deleted file mode 100644
index 0729048..0000000
--- a/demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/Activator.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.examples.app.selector;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.equinox.app.selector";
-
-	// The shared instance
-	private static Activator plugin;
-	static BundleContext context;
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-		Activator.context = context;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-		Activator.context = null;
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-}

diff --git a/demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/Application.java b/demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/Application.java
deleted file mode 100644
index be822f3..0000000
--- a/demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/Application.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.examples.app.selector;
-
-import org.eclipse.equinox.app.IApplication;
-import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This class controls all aspects of the application's execution
- */
-public class Application implements IApplication {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
-	 */
-	public Object start(IApplicationContext context) {
-		Display display = PlatformUI.createDisplay();
-		try {
-			int returnCode = PlatformUI.createAndRunWorkbench(display, new ApplicationWorkbenchAdvisor());
-			if (returnCode == PlatformUI.RETURN_RESTART) {
-				return IApplication.EXIT_RESTART;
-			}
-			return IApplication.EXIT_OK;
-		} finally {
-			display.dispose();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.app.IApplication#stop()
-	 */
-	public void stop() {
-		final IWorkbench workbench = PlatformUI.getWorkbench();
-		if (workbench == null)
-			return;
-		final Display display = workbench.getDisplay();
-		display.syncExec(new Runnable() {
-			public void run() {
-				if (!display.isDisposed())
-					workbench.close();
-			}
-		});
-	}
-}

diff --git a/demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/ApplicationActionBarAdvisor.java b/demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/ApplicationActionBarAdvisor.java
deleted file mode 100644
index 9f30ba7..0000000
--- a/demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/ApplicationActionBarAdvisor.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.examples.app.selector;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
-import org.eclipse.ui.application.ActionBarAdvisor;
-import org.eclipse.ui.application.IActionBarConfigurer;
-
-/**
- * An action bar advisor is responsible for creating, adding, and disposing of
- * the actions added to a workbench window. Each window will be populated with
- * new actions.
- */
-public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
-
-	// Actions - important to allocate these only in makeActions, and then use
-	// them
-	// in the fill methods. This ensures that the actions aren't recreated
-	// when fillActionBars is called with FILL_PROXY.
-	private IWorkbenchAction exitAction;
-
-	public ApplicationActionBarAdvisor(IActionBarConfigurer configurer) {
-		super(configurer);
-	}
-
-	protected void makeActions(final IWorkbenchWindow window) {
-		// Creates the actions and registers them.
-		// Registering is needed to ensure that key bindings work.
-		// The corresponding commands keybindings are defined in the plugin.xml
-		// file.
-		// Registering also provides automatic disposal of the actions when
-		// the window is closed.
-
-		exitAction = ActionFactory.QUIT.create(window);
-		register(exitAction);
-	}
-
-	protected void fillMenuBar(IMenuManager menuBar) {
-		MenuManager fileMenu = new MenuManager("&File",
-				IWorkbenchActionConstants.M_FILE);
-		menuBar.add(fileMenu);
-		fileMenu.add(exitAction);
-	}
-
-}

diff --git a/demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/ApplicationInfo.java b/demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/ApplicationInfo.java
deleted file mode 100644
index 31ae180..0000000
--- a/demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/ApplicationInfo.java
+++ /dev/null

@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.examples.app.selector;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Map;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.ui.PlatformUI;
-import org.osgi.framework.*;
-import org.osgi.service.application.*;
-import org.osgi.util.tracker.ServiceTracker;
-import org.osgi.util.tracker.ServiceTrackerCustomizer;
-
-public class ApplicationInfo {
-	private final ServiceReference appDescRef;
-	private ServiceTracker handle;
-	private final ApplicationView applicationView;
-
-	public ApplicationInfo(ServiceReference appDescRef, ApplicationView applicationView) {
-		this.appDescRef = appDescRef; 
-		try {
-			Filter handleFilter = Activator.context.createFilter("(" + ApplicationHandle.APPLICATION_DESCRIPTOR + "=" + appDescRef.getProperty(ApplicationDescriptor.APPLICATION_PID) + ")");
-			handle = new ServiceTracker(Activator.context, handleFilter, new HandleTracker());
-			handle.open();
-		} catch (InvalidSyntaxException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		this.applicationView = applicationView;
-	}
-	public String getAppName() {
-		ApplicationDescriptor appDesc = getApplication();
-		if (appDesc == null)
-			return null;
-		Map props = appDesc.getProperties(null);
-		String name = (String) props.get(ApplicationDescriptor.APPLICATION_NAME);
-		if (name == null || name.length() == 0)
-			name = appDesc.getApplicationId();
-		return name;
-	}
-
-	private ApplicationDescriptor getApplication() {
-		return (ApplicationDescriptor) Activator.context.getService(appDescRef);
-	}
-	public String toString() {
-		return getAppName();
-	}
-	public boolean isEnabled() {
-		Boolean launchable = (Boolean) appDescRef.getProperty(ApplicationDescriptor.APPLICATION_LAUNCHABLE);
-		Boolean locked = (Boolean) appDescRef.getProperty(ApplicationDescriptor.APPLICATION_LOCKED);
-		return launchable.booleanValue() && !locked.booleanValue();
-	}
-	public String getState() {
-		ServiceReference handleRef = handle.getServiceReference();
-		if (handleRef == null)
-			return "inactive";
-		return ((String) handleRef.getProperty(ApplicationHandle.APPLICATION_STATE)).toLowerCase();
-	}
-
-	public void launch() {
-		ApplicationDescriptor app = getApplication();
-		if (app != null)
-			try {
-				app.launch(null);
-			} catch (ApplicationException e) {
-				showMessage("Error while starting application:", e);
-			}
-	}
-	public void destroy() {
-		ApplicationHandle appHandle = (ApplicationHandle) handle.getService();
-		if (appHandle != null)
-			appHandle.destroy();
-	}
-	public void showMessage(String message, Throwable t) {
-		if (applicationView.getViewer() == null)
-			System.out.println(message);
-		if (t != null) {
-			StringWriter sw = new StringWriter();
-			PrintWriter pw = new PrintWriter(sw);
-			t.printStackTrace(pw);
-			String throwableText = new String(sw.getBuffer().toString());
-			message = message + '\n' + throwableText;
-		}
-		MessageDialog.openInformation(
-			applicationView.getViewer().getControl().getShell(),
-			"Sample View",
-			message);
-	}
-	class HandleTracker implements ServiceTrackerCustomizer {
-		public Object addingService(ServiceReference reference) {
-			return Activator.context.getService(reference);
-		}
-
-		public void modifiedService(ServiceReference reference, Object service) {
-			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					TableViewer viewer = applicationView.getViewer();
-					if (viewer != null)
-						applicationView.getViewer().update(ApplicationInfo.this, null);
-				}
-			});
-			
-		}
-
-		public void removedService(ServiceReference reference, Object service) {
-			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					TableViewer viewer = applicationView.getViewer();
-					if (viewer != null)
-						viewer.update(ApplicationInfo.this, null);
-				}
-			});
-		}	
-	}
-	public void close() {
-		destroy();
-		handle.close();
-	}
-}

diff --git a/demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/ApplicationView.java b/demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/ApplicationView.java
deleted file mode 100644
index cc82de7..0000000
--- a/demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/ApplicationView.java
+++ /dev/null

@@ -1,245 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.examples.app.selector;
-
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.part.ViewPart;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.application.ApplicationDescriptor;
-import org.osgi.util.tracker.ServiceTracker;
-import org.osgi.util.tracker.ServiceTrackerCustomizer;
-
-public class ApplicationView extends ViewPart implements ServiceTrackerCustomizer {
-	public static final String ID = "org.eclipse.equinox.app.selector.appview";
-
-	private TableViewer viewer;
-	private Action startAction;
-	private Action stopAction;
-	private ServiceTracker applications;
-
-	class ApplicationContentProvider implements IStructuredContentProvider {
-		public void inputChanged(Viewer v, Object oldInput, Object newInput) {
-		}
-		public void dispose() {
-		}
-		public Object[] getElements(Object parent){
-			return (Object[]) parent;
-		}
-	}
-	class ApplicationLabelProvider extends LabelProvider implements ITableLabelProvider {
-		public String getColumnText(Object obj, int index) {
-			switch (index) {
-			case 0:
-				return ((ApplicationInfo) obj).getAppName();
-			case 1:
-				return ((ApplicationInfo) obj).isEnabled() ? "yes" : "no";
-			case 2:
-				return ((ApplicationInfo) obj).getState();
-			default:
-				return null;
-			}
-		}
-		public Image getColumnImage(Object obj, int index) {
-			if (index == 0)
-				return getImage(obj);
-			return null;
-		}
-		public Image getImage(Object obj) {
-			return PlatformUI.getWorkbench().
-					getSharedImages().getImage(ISharedImages.IMG_OBJ_ELEMENT);
-		}
-	}
-	class NameSorter extends ViewerSorter {
-	}
-
-	/**
-	 * The constructor.
-	 */
-	public ApplicationView() {
-		applications = new ServiceTracker(Activator.context, ApplicationDescriptor.class.getName(), this);
-		applications.open();
-	}
-
-	/**
-	 * This is a callback that will allow us
-	 * to create the viewer and initialize it.
-	 */
-	public void createPartControl(Composite parent) {
-		TableViewer newViewer = new TableViewer(parent, SWT.BORDER|SWT.FULL_SELECTION);
-		newViewer.setContentProvider(new ApplicationContentProvider());
-		newViewer.setLabelProvider(new ApplicationLabelProvider());
-		newViewer.setSorter(new NameSorter());
-		newViewer.getTable().setLinesVisible(true);
-		newViewer.getTable().setHeaderVisible(true);
-		TableColumn column = new TableColumn(newViewer.getTable(),SWT.NONE);
-		column.setWidth(150);
-		column.setText("Application");
-		
-		column = new TableColumn(newViewer.getTable(),SWT.NONE);
-		column.setWidth(75);
-		column.setText("Enabled");
-
-		column = new TableColumn(newViewer.getTable(),SWT.NONE);
-		column.setWidth(75);
-		column.setText("State");
-		newViewer.setInput(applications.getServices());
-		viewer = newViewer;
-		makeActions();
-		hookContextMenu();
-		contributeToActionBars();
-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				ISelection selection = viewer.getSelection();
-				ApplicationInfo appInfo = (ApplicationInfo) ((IStructuredSelection) selection)
-						.getFirstElement();
-				startAction.setEnabled(appInfo.isEnabled());
-				stopAction.setEnabled(!appInfo.isEnabled());
-			}
-		});
-	}
-
-	private void hookContextMenu() {
-		MenuManager menuMgr = new MenuManager("#PopupMenu");
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager manager) {
-				ApplicationView.this.fillContextMenu(manager);
-			}
-		});
-		Menu menu = menuMgr.createContextMenu(viewer.getControl());
-		viewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(menuMgr, viewer);
-	}
-
-	private void contributeToActionBars() {
-		IActionBars bars = getViewSite().getActionBars();
-		fillLocalPullDown(bars.getMenuManager());
-		fillLocalToolBar(bars.getToolBarManager());
-	}
-
-	private void fillLocalPullDown(IMenuManager manager) {
-		manager.add(startAction);
-		manager.add(new Separator());
-		manager.add(stopAction);
-	}
-
-	private void fillContextMenu(IMenuManager manager) {
-		manager.add(startAction);
-		manager.add(stopAction);
-		// Other plug-ins can contribute there actions here
-		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-	}
-	
-	private void fillLocalToolBar(IToolBarManager manager) {
-		manager.add(startAction);
-		manager.add(stopAction);
-	}
-
-	private void makeActions() {
-		startAction = new Action() {
-			public void run() {
-				ISelection selection = viewer.getSelection();
-				ApplicationInfo appInfo = (ApplicationInfo) ((IStructuredSelection)selection).getFirstElement();
-				appInfo.launch();
-			}
-		};
-		startAction.setText("Start");
-		startAction.setToolTipText("Start Application");
-		startAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().
-			getImageDescriptor(ISharedImages.IMG_OBJS_INFO_TSK));
-		
-		stopAction = new Action() {
-			public void run() {
-				ISelection selection = viewer.getSelection();
-				ApplicationInfo appInfo = (ApplicationInfo) ((IStructuredSelection)selection).getFirstElement();
-				appInfo.destroy();
-			}
-		};
-		stopAction.setText("Stop");
-		stopAction.setToolTipText("Stop Application");
-		stopAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().
-				getImageDescriptor(ISharedImages.IMG_OBJS_INFO_TSK));
-	}
-
-	/**
-	 * Passing the focus request to the viewer's control.
-	 */
-	public void setFocus() {
-		viewer.getControl().setFocus();
-	}
-
-	public Object[] createModel() {
-		return applications.getServices();
-	}
-
-	public void dispose() {
-		viewer = null;
-		Object[] applicationInfos = applications.getServices();
-		if (applicationInfos != null) {
-			for (int i = 0; i < applicationInfos.length; i++)
-				((ApplicationInfo) applicationInfos[i]).close();
-		}
-		super.dispose();
-	}
-
-	public Object addingService(ServiceReference reference) {
-		if (!"any.thread".equals(reference.getProperty("eclipse.application.type")))
-			return null;
-			
-		final ApplicationInfo info = new ApplicationInfo(reference, this);
-		final TableViewer updateViewer = getViewer();
-		if (updateViewer != null) {
-			if (PlatformUI.getWorkbench().getDisplay().isDisposed())
-				return info;
-			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					updateViewer.add(info);
-				}
-			});
-		}
-		return info;
-	}
-
-	public void modifiedService(ServiceReference reference, final Object service) {
-		final TableViewer updateViewer = getViewer();
-		if (updateViewer == null)
-			return;
-		if (PlatformUI.getWorkbench().getDisplay().isDisposed())
-			return;
-		PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				updateViewer.update(service, null);
-			}
-		});
-	}
-
-	public void removedService(ServiceReference reference, final Object service) {
-		final TableViewer updateViewer = getViewer();
-		if (updateViewer == null)
-			return;
-		if (PlatformUI.getWorkbench().getDisplay().isDisposed())
-			return;
-		PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				updateViewer.remove(service);
-			}
-		});
-	}
-	
-	TableViewer getViewer() {
-		return viewer;
-	}
-}
\ No newline at end of file

diff --git a/demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/ApplicationWorkbenchAdvisor.java b/demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/ApplicationWorkbenchAdvisor.java
deleted file mode 100644
index 8391d27..0000000
--- a/demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/ApplicationWorkbenchAdvisor.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.examples.app.selector;
-
-import org.eclipse.ui.application.*;
-
-public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
-
-	private static final String PERSPECTIVE_ID = "org.eclipse.equinox.app.selector.perspective";
-
-	public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(
-			IWorkbenchWindowConfigurer configurer) {
-		return new ApplicationWorkbenchWindowAdvisor(configurer);
-	}
-
-	public String getInitialWindowPerspectiveId() {
-		return PERSPECTIVE_ID;
-	}
-
-}

diff --git a/demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/ApplicationWorkbenchWindowAdvisor.java b/demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/ApplicationWorkbenchWindowAdvisor.java
deleted file mode 100644
index 22c0f70..0000000
--- a/demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/ApplicationWorkbenchWindowAdvisor.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.examples.app.selector;
-
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.ui.application.*;
-
-public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
-
-	public ApplicationWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
-		super(configurer);
-	}
-
-	public ActionBarAdvisor createActionBarAdvisor(
-			IActionBarConfigurer configurer) {
-		return new ApplicationActionBarAdvisor(configurer);
-	}
-
-	public void preWindowOpen() {
-		IWorkbenchWindowConfigurer configurer = getWindowConfigurer();
-		configurer.setInitialSize(new Point(400, 300));
-		configurer.setShowCoolBar(false);
-		configurer.setShowStatusLine(false);
-		configurer.setTitle("Application Selector");
-	}
-}

diff --git a/demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/Perspective.java b/demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/Perspective.java
deleted file mode 100644
index 66c8fc0..0000000
--- a/demos/app-model/org.eclipse.equinox.examples.app.selector/src/org/eclipse/equinox/examples/app/selector/Perspective.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.examples.app.selector;
-
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-
-public class Perspective implements IPerspectiveFactory {
-	public static final String VIEW_ID = "org.eclipse.equinox.app.selector.appview";
-	public void createInitialLayout(IPageLayout layout) {
-		String editorArea = layout.getEditorArea();
-		layout.setEditorAreaVisible(false);
-		layout.setFixed(true);
-		
-		layout.addStandaloneView(VIEW_ID,  false, IPageLayout.LEFT, 1.0f, editorArea);
-	}
-
-}

diff --git a/demos/app-model/org.eclipse.equinox.examples.sharedisplay/.classpath b/demos/app-model/org.eclipse.equinox.examples.sharedisplay/.classpath
deleted file mode 100644
index ce73933..0000000
--- a/demos/app-model/org.eclipse.equinox.examples.sharedisplay/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<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 kind="output" path="bin"/>
-</classpath>

diff --git a/demos/app-model/org.eclipse.equinox.examples.sharedisplay/.cvsignore b/demos/app-model/org.eclipse.equinox.examples.sharedisplay/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/demos/app-model/org.eclipse.equinox.examples.sharedisplay/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/demos/app-model/org.eclipse.equinox.examples.sharedisplay/.project b/demos/app-model/org.eclipse.equinox.examples.sharedisplay/.project
deleted file mode 100644
index 688a2e0..0000000
--- a/demos/app-model/org.eclipse.equinox.examples.sharedisplay/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.examples.sharedisplay</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/demos/app-model/org.eclipse.equinox.examples.sharedisplay/.settings/org.eclipse.jdt.core.prefs b/demos/app-model/org.eclipse.equinox.examples.sharedisplay/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d69df45..0000000
--- a/demos/app-model/org.eclipse.equinox.examples.sharedisplay/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Tue Mar 20 12:27:54 CDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/demos/app-model/org.eclipse.equinox.examples.sharedisplay/.settings/org.eclipse.pde.core.prefs b/demos/app-model/org.eclipse.equinox.examples.sharedisplay/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 79d6572..0000000
--- a/demos/app-model/org.eclipse.equinox.examples.sharedisplay/.settings/org.eclipse.pde.core.prefs
+++ /dev/null

@@ -1,4 +0,0 @@
-#Tue Feb 20 09:06:47 CST 2007
-eclipse.preferences.version=1
-pluginProject.extensions=true
-resolve.requirebundle=false

diff --git a/demos/app-model/org.eclipse.equinox.examples.sharedisplay/META-INF/MANIFEST.MF b/demos/app-model/org.eclipse.equinox.examples.sharedisplay/META-INF/MANIFEST.MF
deleted file mode 100644
index e7aec4a..0000000
--- a/demos/app-model/org.eclipse.equinox.examples.sharedisplay/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Sharedisplay Plug-in
-Bundle-SymbolicName: org.eclipse.equinox.examples.sharedisplay;singleton:=true
-Bundle-Version: 1.0.0
-Import-Package: org.eclipse.equinox.app;version="1.0.0",
- org.eclipse.swt.graphics,
- org.eclipse.swt.widgets
-Bundle-RequiredExecutionEnvironment: J2SE-1.4

diff --git a/demos/app-model/org.eclipse.equinox.examples.sharedisplay/build.properties b/demos/app-model/org.eclipse.equinox.examples.sharedisplay/build.properties
deleted file mode 100644
index e9863e2..0000000
--- a/demos/app-model/org.eclipse.equinox.examples.sharedisplay/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml

diff --git a/demos/app-model/org.eclipse.equinox.examples.sharedisplay/equinoxShareDisplay.launch b/demos/app-model/org.eclipse.equinox.examples.sharedisplay/equinoxShareDisplay.launch
deleted file mode 100644
index 87b0e0e..0000000
--- a/demos/app-model/org.eclipse.equinox.examples.sharedisplay/equinoxShareDisplay.launch
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-console -application org.eclipse.equinox.examples.sharedisplay.application"/>
-<stringAttribute key="configLocation" value=""/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=false -Dosgi.noShutdown=false -Declipse.application.registerDescriptors=true"/>
-<booleanAttribute key="default_auto_start" value="false"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<intAttribute key="default_start_level" value="4"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="workspace_bundles" value="org.eclipse.equinox.examples.sharedisplay@default:default,org.eclipse.swt.examples.addressbook@default:default,org.eclipse.swt.examples.browserexample@default:default,org.eclipse.swt.examples.clipboard@default:default,org.eclipse.swt.examples.graphics@default:default,org.eclipse.swt.examples.paint@default:default"/>
-<stringAttribute key="checked" value="[NONE]"/>
-<stringAttribute key="target_bundles" value="org.eclipse.core.jobs@default:default,org.eclipse.core.runtime.compatibility.registry@default:default,org.eclipse.equinox.app@default:true,org.eclipse.equinox.common@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.osgi@:,org.eclipse.osgi.services@default:default,org.eclipse.swt@default:default,org.eclipse.swt.win32.win32.x86@default:default"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-</launchConfiguration>

diff --git a/demos/app-model/org.eclipse.equinox.examples.sharedisplay/plugin.xml b/demos/app-model/org.eclipse.equinox.examples.sharedisplay/plugin.xml
deleted file mode 100644
index 20ea0c1..0000000
--- a/demos/app-model/org.eclipse.equinox.examples.sharedisplay/plugin.xml
+++ /dev/null

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         id="application"
-         point="org.eclipse.core.runtime.applications">
-      <application
-            cardinality="singleton-scoped"
-            thread="main">
-         <run
-               class="org.eclipse.equinox.examples.sharedisplay.Application">
-         </run>
-      </application>
-   </extension>
-</plugin>

diff --git a/demos/app-model/org.eclipse.equinox.examples.sharedisplay/src/org/eclipse/equinox/examples/sharedisplay/Application.java b/demos/app-model/org.eclipse.equinox.examples.sharedisplay/src/org/eclipse/equinox/examples/sharedisplay/Application.java
deleted file mode 100644
index dda3255..0000000
--- a/demos/app-model/org.eclipse.equinox.examples.sharedisplay/src/org/eclipse/equinox/examples/sharedisplay/Application.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.examples.sharedisplay;
-
-import org.eclipse.equinox.app.IApplication;
-import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * A demo application that creates a default SWT display that 
- * uses the main thread as its event dispatcher.
- *
- */
-public class Application implements IApplication {
-	Display display;
-
-	public Object start(IApplicationContext context) throws Exception {
-		// here we assume that nobody has created the default display yet
-		// this will force the default display to be created using the main thread.
-		display = Display.getDefault();
-		// this brings down the splash screen
-		context.applicationRunning();
-		// do the standard SWT dispatching; we assume this is being called by the main thread
-		while (!display.isDisposed()) {
-			if (!display.readAndDispatch())
-				display.sleep();
-		}
-		return null;
-	}
-
-	public void stop() {
-		if (display == null)
-			return;
-		// this is likely not going to be called by the main thread
-		display.syncExec(new Runnable() {
-			public void run() {
-				// dispose all the shells still open for the display
-				Shell[] shells = display.getShells();
-				try {
-					if (shells == null || shells.length == 0)
-						return;
-					for (int i = 0; i < shells.length; i++)
-						if (!display.isDisposed() && !shells[i].isDisposed())
-							shells[i].close();
-				} finally {
-					display.dispose();
-				}
-			}
-		});
-	}
-
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.addressbook/.classpath b/demos/app-model/org.eclipse.swt.examples.addressbook/.classpath
deleted file mode 100644
index ce73933..0000000
--- a/demos/app-model/org.eclipse.swt.examples.addressbook/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<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 kind="output" path="bin"/>
-</classpath>

diff --git a/demos/app-model/org.eclipse.swt.examples.addressbook/.cvsignore b/demos/app-model/org.eclipse.swt.examples.addressbook/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/demos/app-model/org.eclipse.swt.examples.addressbook/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/demos/app-model/org.eclipse.swt.examples.addressbook/.project b/demos/app-model/org.eclipse.swt.examples.addressbook/.project
deleted file mode 100644
index 73b8ec1..0000000
--- a/demos/app-model/org.eclipse.swt.examples.addressbook/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.swt.examples.addressbook</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/demos/app-model/org.eclipse.swt.examples.addressbook/.settings/org.eclipse.jdt.core.prefs b/demos/app-model/org.eclipse.swt.examples.addressbook/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index cdad5e3..0000000
--- a/demos/app-model/org.eclipse.swt.examples.addressbook/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Tue Mar 20 12:28:12 CDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/demos/app-model/org.eclipse.swt.examples.addressbook/.settings/org.eclipse.pde.core.prefs b/demos/app-model/org.eclipse.swt.examples.addressbook/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 1ee8333..0000000
--- a/demos/app-model/org.eclipse.swt.examples.addressbook/.settings/org.eclipse.pde.core.prefs
+++ /dev/null

@@ -1,4 +0,0 @@
-#Tue Feb 20 08:46:59 CST 2007
-eclipse.preferences.version=1
-pluginProject.extensions=true
-resolve.requirebundle=false

diff --git a/demos/app-model/org.eclipse.swt.examples.addressbook/META-INF/MANIFEST.MF b/demos/app-model/org.eclipse.swt.examples.addressbook/META-INF/MANIFEST.MF
deleted file mode 100644
index 218ad20..0000000
--- a/demos/app-model/org.eclipse.swt.examples.addressbook/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Addressbook Example
-Bundle-SymbolicName: org.eclipse.swt.examples.addressbook;singleton:=true
-Bundle-Version: 1.0.0
-Import-Package: org.eclipse.equinox.app;version="1.0.0",
- org.eclipse.swt,
- org.eclipse.swt.events,
- org.eclipse.swt.graphics,
- org.eclipse.swt.layout,
- org.eclipse.swt.widgets
-Bundle-RequiredExecutionEnvironment: J2SE-1.4

diff --git a/demos/app-model/org.eclipse.swt.examples.addressbook/build.properties b/demos/app-model/org.eclipse.swt.examples.addressbook/build.properties
deleted file mode 100644
index e9863e2..0000000
--- a/demos/app-model/org.eclipse.swt.examples.addressbook/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml

diff --git a/demos/app-model/org.eclipse.swt.examples.addressbook/plugin.xml b/demos/app-model/org.eclipse.swt.examples.addressbook/plugin.xml
deleted file mode 100644
index ae0a689..0000000
--- a/demos/app-model/org.eclipse.swt.examples.addressbook/plugin.xml
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         id="app"
-         name="Address Book"
-         point="org.eclipse.core.runtime.applications">
-      <application
-            cardinality="1"
-            thread="any">
-         <run
-               class="org.eclipse.swt.examples.addressbook.Application">
-         </run>
-      </application>
-   </extension>
-
-</plugin>

diff --git a/demos/app-model/org.eclipse.swt.examples.addressbook/src/examples_addressbook.properties b/demos/app-model/org.eclipse.swt.examples.addressbook/src/examples_addressbook.properties
deleted file mode 100644
index 29252e1..0000000
--- a/demos/app-model/org.eclipse.swt.examples.addressbook/src/examples_addressbook.properties
+++ /dev/null

@@ -1,69 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 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
-###############################################################################
-Last_name = Last Name
-First_name = First Name
-Business_phone = Business Phone
-Home_phone = Home Phone
-Email = Email
-Fax = Fax
-Close_save = The address book contents have changed.\nDo you want to save the changes?
-New_title = Untitled
-Column = Column:
-Book_extension = .adr
-Book_filter_name = Address Books
-All_filter_name = All Files
-File = File 
-Does_not_exist = does not exist.
-File_not_found = File not found:
-IO_error_read = IO error reading text file:
-IO_error_write = IO error writing text file:
-IO_error_close = IO error closing text file:
-Title_bar = Address Book - 
-Save_as_title = Save As
-Query_overwrite = already exists.\nDo you want to replace it?
-File_menu_title = &File
-New_contact = &New Contact...\tCtrl+N
-Edit_contact = &Edit Contact...\tCtrl+E
-New_address_book = New Address &Book\tCtrl+B
-Open_address_book = &Open Address Book...\tCtrl+O
-Save_address_book = &Save Address Book\tCtrl+S
-Save_book_as = Save &Address Book As...\tCtrl+A
-Exit = E&xit
-Edit_menu_title = &Edit
-Edit = &Edit...\tCtrl+E
-Copy = &Copy\tCtrl+C
-Paste = &Paste\tCtrl+V
-Delete = De&lete\tDel
-Sort = &Sort
-Search_menu_title = &Search
-Find = &Find...\tCtrl+F
-Find_next = Find &Next...\tF3
-Pop_up_new = &New...
-Pop_up_edit = &Edit...
-Pop_up_copy = &Copy
-Pop_up_paste = &Paste
-Pop_up_delete = &Delete
-Pop_up_find = &Find...
-Help_menu_title = &Help
-About = &About Address Book...
-About_1 = About 
-About_2 = \nversion 1.0
-OK = OK
-Cancel = Cancel
-Search_dialog_title = Find
-Dialog_find_what = Fi&nd what:
-Dialog_match_case = Match &case
-Dialog_match_word = Match &whole word
-Dialog_direction = Direction
-Dialog_dir_up = &Up
-Dialog_dir_down = &Down
-Dialog_find = &Find
-Cannot_find = Cannot find 
\ No newline at end of file

diff --git a/demos/app-model/org.eclipse.swt.examples.addressbook/src/org/eclipse/swt/examples/addressbook/AddressBook.java b/demos/app-model/org.eclipse.swt.examples.addressbook/src/org/eclipse/swt/examples/addressbook/AddressBook.java
deleted file mode 100644
index 75ae42d..0000000
--- a/demos/app-model/org.eclipse.swt.examples.addressbook/src/org/eclipse/swt/examples/addressbook/AddressBook.java
+++ /dev/null

@@ -1,887 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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.swt.examples.addressbook;
-
-
-/* Imports */
-import java.io.*;
-import java.util.*;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * AddressBookExample is an example that uses <code>org.eclipse.swt</code> 
- * libraries to implement a simple address book.  This application has 
- * save, load, sorting, and searching functions common
- * to basic address books.
- */
-public class AddressBook {
-
-	private static ResourceBundle resAddressBook = ResourceBundle.getBundle("examples_addressbook");
-	private Shell shell;
-	
-	private Table table;
-	private SearchDialog searchDialog;
-	
-	private File file;
-	private boolean isModified;
-	
-	private String[] copyBuffer;
-
-	private int lastSortColumn= -1;
-	
-	private static final String DELIMITER = "\t";
-	private static final String[] columnNames = {resAddressBook.getString("Last_name"),
-												 resAddressBook.getString("First_name"),
-												 resAddressBook.getString("Business_phone"),
-												 resAddressBook.getString("Home_phone"),
-												 resAddressBook.getString("Email"),
-												 resAddressBook.getString("Fax")};
-	
-public static void main(String[] args) {
-	Display display = new Display();
-	Shell shell = runApplication(display);
-	while(!shell.isDisposed()){
-		if(!display.readAndDispatch())
-			display.sleep();
-	}
-	display.dispose();
-}
-
-public static Shell runApplication(Display display) {
-	AddressBook application = new AddressBook();
-	Shell shell = application.open(display);
-	return shell;
-}
-
-public Shell open(Display display) {
-	shell = new Shell(display);
-	shell.setLayout(new FillLayout());
-	shell.addShellListener(new ShellAdapter() {
-		public void shellClosed(ShellEvent e) {
-			e.doit = closeAddressBook();
-		}
-	});
-	
-	createMenuBar();
-
-	searchDialog = new SearchDialog(shell);
-	searchDialog.setSearchAreaNames(columnNames);
-	searchDialog.setSearchAreaLabel(resAddressBook.getString("Column"));
-	searchDialog.addFindListener(new FindListener () {
-		public boolean find() {
-			return findEntry();
-		}
-	});
-					
-	table = new Table(shell, SWT.SINGLE | SWT.BORDER | SWT.FULL_SELECTION);
-	table.setHeaderVisible(true);	
-	table.setMenu(createPopUpMenu());	
-	table.addSelectionListener(new SelectionAdapter() {
-		public void widgetDefaultSelected(SelectionEvent e) {
-			TableItem[] items = table.getSelection();
-			if (items.length > 0) editEntry(items[0]);
-		}
-	});
-	for(int i = 0; i < columnNames.length; i++) {
-		TableColumn column = new TableColumn(table, SWT.NONE);
-		column.setText(columnNames[i]);
-		column.setWidth(150);
-		final int columnIndex = i;
-		column.addSelectionListener(new SelectionAdapter() {		
-			public void widgetSelected(SelectionEvent e) {
-				sort(columnIndex);
-			}
-		});
-	}
-
-	newAddressBook();
-
-	shell.setSize(table.computeSize(SWT.DEFAULT, SWT.DEFAULT).x, 300);
-	shell.open();
-	return shell;
-}
-
-private boolean closeAddressBook() {
-	if(isModified) {
-		//ask user if they want to save current address book
-		MessageBox box = new MessageBox(shell, SWT.ICON_WARNING | SWT.YES | SWT.NO | SWT.CANCEL);
-		box.setText(shell.getText());
-		box.setMessage(resAddressBook.getString("Close_save"));
-	
-		int choice = box.open();
-		if(choice == SWT.CANCEL) {
-			return false;
-		} else if(choice == SWT.YES) {
-			if (!save()) return false;
-		}
-	}
-		
-	TableItem[] items = table.getItems();
-	for (int i = 0; i < items.length; i ++) {
-		items[i].dispose();
-	}
-	
-	return true;
-}
-/**
- * Creates the menu at the top of the shell where most
- * of the programs functionality is accessed.
- *
- * @return		The <code>Menu</code> widget that was created
- */
-private Menu createMenuBar() {
-	Menu menuBar = new Menu(shell, SWT.BAR);
-	shell.setMenuBar(menuBar);
-	
-	//create each header and subMenu for the menuBar
-	createFileMenu(menuBar);
-	createEditMenu(menuBar);
-	createSearchMenu(menuBar);
-	createHelpMenu(menuBar);
-	
-	return menuBar;
-}
-
-/**
- * Converts an encoded <code>String</code> to a String array representing a table entry.
- */
-private String[] decodeLine(String line) {
-	if(line == null) return null;
-	
-	String[] parsedLine = new String[table.getColumnCount()];
-	for(int i = 0; i < parsedLine.length - 1; i++) {
-		int index = line.indexOf(DELIMITER);
-		if (index > -1) {
-			parsedLine[i] = line.substring(0, index);
-			line = line.substring(index + DELIMITER.length(), line.length());
-		} else {
-			return null;
-		}
-	}
-	
-	if (line.indexOf(DELIMITER) != -1) return null;
-	
-	parsedLine[parsedLine.length - 1] = line;
-
-	return parsedLine;
-}
-private void displayError(String msg) {
-	MessageBox box = new MessageBox(shell, SWT.ICON_ERROR);
-	box.setMessage(msg);
-	box.open();
-}
-private void editEntry(TableItem item) {
-	DataEntryDialog dialog = new DataEntryDialog(shell);
-	dialog.setLabels(columnNames);
-	String[] values = new String[table.getColumnCount()];
-	for (int i = 0; i < values.length; i++) {
-		values[i] = item.getText(i);
-	}
-	dialog.setValues(values);
-	values = dialog.open();
-	if (values != null) {
-		item.setText(values);
-		isModified = true;
-	}
-}
-private String encodeLine(String[] tableItems) {
-	String line = "";
-	for (int i = 0; i < tableItems.length - 1; i++) {
-		line += tableItems[i] + DELIMITER;
-	}
-	line += tableItems[tableItems.length - 1] + "\n";
-	
-	return line;
-}
-private boolean findEntry() {
-	Cursor waitCursor = new Cursor(shell.getDisplay(), SWT.CURSOR_WAIT);
-	shell.setCursor(waitCursor);
-	
-	boolean matchCase = searchDialog.getMatchCase();
-	boolean matchWord = searchDialog.getMatchWord();
-	String searchString = searchDialog.getSearchString();
-	int column = searchDialog.getSelectedSearchArea();
-	
-	searchString = matchCase ? searchString : searchString.toLowerCase();
-	
-	boolean found = false;
-	if (searchDialog.getSearchDown()) {
-		for(int i = table.getSelectionIndex() + 1; i < table.getItemCount(); i++) {
-			if (found = findMatch(searchString, table.getItem(i), column, matchWord, matchCase)){
-				table.setSelection(i);
-				break;
-			}
-		}
-	} else {
-		for(int i = table.getSelectionIndex() - 1; i > -1; i--) {
-			if (found = findMatch(searchString, table.getItem(i), column, matchWord, matchCase)){
-				table.setSelection(i);
-				break;
-			}
-		}
-	}
-	
-	shell.setCursor(null);
-	waitCursor.dispose();
-		
-	return found;
-}
-private boolean findMatch(String searchString, TableItem item, int column, boolean matchWord, boolean matchCase) {
-	
-	String tableText = matchCase ? item.getText(column) : item.getText(column).toLowerCase();
-	if (matchWord) {
-		if (tableText != null && tableText.equals(searchString)) {
-			return true;
-		}
-		
-	} else {
-		if(tableText!= null && tableText.indexOf(searchString) != -1) {
-			return true;
-		}
-	}
-	return false;
-}
-private void newAddressBook() {	
-	shell.setText(resAddressBook.getString("Title_bar") + resAddressBook.getString("New_title"));
-	file = null;
-	isModified = false;
-}
-private void newEntry() {
-	DataEntryDialog dialog = new DataEntryDialog(shell);
-	dialog.setLabels(columnNames);
-	String[] data = dialog.open();
-	if (data != null) {
-		TableItem item = new TableItem(table, SWT.NONE);
-		item.setText(data);
-		isModified = true;
-	}
-}
-
-private void openAddressBook() {	
-	FileDialog fileDialog = new FileDialog(shell, SWT.OPEN);
-
-	fileDialog.setFilterExtensions(new String[] {"*.adr;", "*.*"});
-	fileDialog.setFilterNames(new String[] {resAddressBook.getString("Book_filter_name") + " (*.adr)", 
-											resAddressBook.getString("All_filter_name") + " (*.*)"});
-	String name = fileDialog.open();
-
-	if(name == null) return;
-	File file = new File(name);
-	if (!file.exists()) {
-		displayError(resAddressBook.getString("File")+file.getName()+" "+resAddressBook.getString("Does_not_exist")); 
-		return;
-	}
-	
-	Cursor waitCursor = new Cursor(shell.getDisplay(), SWT.CURSOR_WAIT);
-	shell.setCursor(waitCursor);
-	
-	FileReader fileReader = null;
-	BufferedReader bufferedReader = null;
-	String[] data = new String[0];
-	try {
-		fileReader = new FileReader(file.getAbsolutePath());
-		bufferedReader = new BufferedReader(fileReader);
-		String nextLine = bufferedReader.readLine();
-		while (nextLine != null){
-			String[] newData = new String[data.length + 1];
-			System.arraycopy(data, 0, newData, 0, data.length);
-			newData[data.length] = nextLine;
-			data = newData;
-			nextLine = bufferedReader.readLine();
-		}
-	} catch(FileNotFoundException e) {
-		displayError(resAddressBook.getString("File_not_found") + "\n" + file.getName());
-		return;
-	} catch (IOException e ) {
-		displayError(resAddressBook.getString("IO_error_read") + "\n" + file.getName());
-		return;
-	} finally {	
-		
-		shell.setCursor(null);
-		waitCursor.dispose();
-	
-		if(fileReader != null) {
-			try {
-				fileReader.close();
-			} catch(IOException e) {
-				displayError(resAddressBook.getString("IO_error_close") + "\n" + file.getName());
-				return;
-			}
-		}
-	}
-	
-	String[][] tableInfo = new String[data.length][table.getColumnCount()];
-	int writeIndex = 0;
-	for (int i = 0; i < data.length; i++) {
-		String[] line = decodeLine(data[i]);
-		if (line != null) tableInfo[writeIndex++] = line;
-	}
-	if (writeIndex != data.length) {
-		String[][] result = new String[writeIndex][table.getColumnCount()];
-		System.arraycopy(tableInfo, 0, result, 0, writeIndex);
-		tableInfo = result;
-	}
-	Arrays.sort(tableInfo, new RowComparator(0));
-
-	for (int i = 0; i < tableInfo.length; i++) {
-		TableItem item = new TableItem(table, SWT.NONE);
-		item.setText(tableInfo[i]);
-	}
-	shell.setText(resAddressBook.getString("Title_bar")+fileDialog.getFileName());
-	isModified = false;
-	this.file = file;
-}
-private boolean save() {
-	if(file == null) return saveAs();
-	
-	Cursor waitCursor = new Cursor(shell.getDisplay(), SWT.CURSOR_WAIT);
-	shell.setCursor(waitCursor);
-	
-	TableItem[] items = table.getItems();
-	String[] lines = new String[items.length];
-	for(int i = 0; i < items.length; i++) {
-		String[] itemText = new String[table.getColumnCount()];
-		for (int j = 0; j < itemText.length; j++) {
-			itemText[j] = items[i].getText(j);
-		}
-		lines[i] = encodeLine(itemText);
-	}
-		
-	FileWriter fileWriter = null;
-	try { 
-		fileWriter = new FileWriter(file.getAbsolutePath(), false);
-		for (int i = 0; i < lines.length; i++) {
-			fileWriter.write(lines[i]);
-		}
-	} catch(FileNotFoundException e) {
-		displayError(resAddressBook.getString("File_not_found") + "\n" + file.getName());
-		return false;
-	} catch(IOException e ) {
-		displayError(resAddressBook.getString("IO_error_write") + "\n" + file.getName());
-		return false;
-	} finally {
-		shell.setCursor(null);
-		waitCursor.dispose();
-		
-		if(fileWriter != null) {
-			try {
-				fileWriter.close();
-			} catch(IOException e) {
-				displayError(resAddressBook.getString("IO_error_close") + "\n" + file.getName());
-				return false;
-			}
-		}
-	}
-
-	shell.setText(resAddressBook.getString("Title_bar")+file.getName());
-	isModified = false;
-	return true;
-}
-private boolean saveAs() {
-		
-	FileDialog saveDialog = new FileDialog(shell, SWT.SAVE);
-	saveDialog.setFilterExtensions(new String[] {"*.adr;",  "*.*"});
-	saveDialog.setFilterNames(new String[] {"Address Books (*.adr)", "All Files "});
-	
-	saveDialog.open();
-	String name = saveDialog.getFileName();
-		
-	if(name.equals("")) return false;
-
-	if(name.indexOf(".adr") != name.length() - 4) {
-		name += ".adr";
-	}
-
-	File file = new File(saveDialog.getFilterPath(), name);
-	if(file.exists()) {
-		MessageBox box = new MessageBox(shell, SWT.ICON_WARNING | SWT.YES | SWT.NO);
-		box.setText(resAddressBook.getString("Save_as_title"));
-		box.setMessage(resAddressBook.getString("File") + file.getName()+" "+resAddressBook.getString("Query_overwrite"));
-		if(box.open() != SWT.YES) {
-			return false;
-		}
-	}
-	this.file = file;
-	return save();	
-}
-private void sort(int column) {
-	if(table.getItemCount() <= 1) return;
-
-	TableItem[] items = table.getItems();
-	String[][] data = new String[items.length][table.getColumnCount()];
-	for(int i = 0; i < items.length; i++) {
-		for(int j = 0; j < table.getColumnCount(); j++) {
-			data[i][j] = items[i].getText(j);
-		}
-	}
-	
-	Arrays.sort(data, new RowComparator(column));
-	
-	if (lastSortColumn != column) {
-		table.setSortColumn(table.getColumn(column));
-		table.setSortDirection(SWT.DOWN);
-		for (int i = 0; i < data.length; i++) {
-			items[i].setText(data[i]);
-		}
-		lastSortColumn = column;
-	} else {
-		// reverse order if the current column is selected again
-		table.setSortDirection(SWT.UP);
-		int j = data.length -1;
-		for (int i = 0; i < data.length; i++) {
-			items[i].setText(data[j--]);
-		}
-		lastSortColumn = -1;
-	}
-	
-}
-/**
- * Creates all the items located in the File submenu and
- * associate all the menu items with their appropriate
- * functions.
- *
- * @param	menuBar Menu
- *				the <code>Menu</code> that file contain
- *				the File submenu.
- */
-private void createFileMenu(Menu menuBar) {
-	//File menu.
-	MenuItem item = new MenuItem(menuBar, SWT.CASCADE);
-	item.setText(resAddressBook.getString("File_menu_title"));
-	Menu menu = new Menu(shell, SWT.DROP_DOWN);
-	item.setMenu(menu);
-	/** 
-	 * Adds a listener to handle enabling and disabling 
-	 * some items in the Edit submenu.
-	 */
-	menu.addMenuListener(new MenuAdapter() {
-		public void menuShown(MenuEvent e) {
-			Menu menu = (Menu)e.widget;
-			MenuItem[] items = menu.getItems();
-			items[1].setEnabled(table.getSelectionCount() != 0); // edit contact
-			items[5].setEnabled((file != null) && isModified); // save
-			items[6].setEnabled(table.getItemCount() != 0); // save as
-		}
-	});
-
-
-	//File -> New Contact
-	MenuItem subItem = new MenuItem(menu, SWT.NONE);
-	subItem.setText(resAddressBook.getString("New_contact"));
-	subItem.setAccelerator(SWT.MOD1 + 'N');
-	subItem.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			newEntry();
-		}
-	});
-	subItem = new MenuItem(menu, SWT.NONE);
-	subItem.setText(resAddressBook.getString("Edit_contact"));
-	subItem.setAccelerator(SWT.MOD1 + 'E');
-	subItem.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			TableItem[] items = table.getSelection();
-			if (items.length == 0) return;
-			editEntry(items[0]);
-		}
-	});
-
-	
-	new MenuItem(menu, SWT.SEPARATOR);
-	
-	//File -> New Address Book
-	subItem = new MenuItem(menu, SWT.NONE);
-	subItem.setText(resAddressBook.getString("New_address_book"));
-	subItem.setAccelerator(SWT.MOD1 + 'B');
-	subItem.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			if (closeAddressBook()) {
-				newAddressBook();
-			}
-		}
-	});
-
-	//File -> Open
-	subItem = new MenuItem(menu, SWT.NONE);
-	subItem.setText(resAddressBook.getString("Open_address_book"));
-	subItem.setAccelerator(SWT.MOD1 + 'O');
-	subItem.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			if (closeAddressBook()) {
-				openAddressBook();
-			}
-		}
-	});
-
-	//File -> Save.
-	subItem = new MenuItem(menu, SWT.NONE);
-	subItem.setText(resAddressBook.getString("Save_address_book"));
-	subItem.setAccelerator(SWT.MOD1 + 'S');
-	subItem.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			save();
-		}
-	});
-	
-	//File -> Save As.
-	subItem = new MenuItem(menu, SWT.NONE);
-	subItem.setText(resAddressBook.getString("Save_book_as"));
-	subItem.setAccelerator(SWT.MOD1 + 'A');
-	subItem.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			saveAs();
-		}
-	});
-
-		
-	new MenuItem(menu, SWT.SEPARATOR);
-	
-	//File -> Exit.
-	subItem = new MenuItem(menu, SWT.NONE);
-	subItem.setText(resAddressBook.getString("Exit"));
-	subItem.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			shell.close();
-		}
-	});
-}
-
-/**
- * Creates all the items located in the Edit submenu and
- * associate all the menu items with their appropriate
- * functions.
- *
- * @param	menuBar Menu
- *				the <code>Menu</code> that file contain
- *				the Edit submenu.
- *
- * @see	#createSortMenu()
- */
-private MenuItem createEditMenu(Menu menuBar) {
-	//Edit menu.
-	MenuItem item = new MenuItem(menuBar, SWT.CASCADE);
-	item.setText(resAddressBook.getString("Edit_menu_title"));
-	Menu menu = new Menu(shell, SWT.DROP_DOWN);
-	item.setMenu(menu);
-	
-	/** 
-	 * Add a listener to handle enabling and disabling 
-	 * some items in the Edit submenu.
-	 */
-	menu.addMenuListener(new MenuAdapter() {
-		public void menuShown(MenuEvent e) {
-			Menu menu = (Menu)e.widget;
-			MenuItem[] items = menu.getItems();
-			int count = table.getSelectionCount();
-			items[0].setEnabled(count != 0); // edit
-			items[1].setEnabled(count != 0); // copy
-			items[2].setEnabled(copyBuffer != null); // paste
-			items[3].setEnabled(count != 0); // delete
-			items[5].setEnabled(table.getItemCount() != 0); // sort
-		}
-	});
-	
-	//Edit -> Edit
-	MenuItem subItem = new MenuItem(menu, SWT.PUSH);
-	subItem.setText(resAddressBook.getString("Edit"));
-	subItem.setAccelerator(SWT.MOD1 + 'E');
-	subItem.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			TableItem[] items = table.getSelection();
-			if (items.length == 0) return;
-			editEntry(items[0]);
-		}
-	});
-
-	//Edit -> Copy
-	subItem = new MenuItem(menu, SWT.NONE);
-	subItem.setText(resAddressBook.getString("Copy"));
-	subItem.setAccelerator(SWT.MOD1 + 'C');
-	subItem.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			TableItem[] items = table.getSelection();
-			if (items.length == 0) return;
-			copyBuffer = new String[table.getColumnCount()];
-			for (int i = 0; i < copyBuffer.length; i++) {
-				copyBuffer[i] = items[0].getText(i);
-			}
-		}
-	});
-	
-	//Edit -> Paste
-	subItem = new MenuItem(menu, SWT.NONE);
-	subItem.setText(resAddressBook.getString("Paste"));
-	subItem.setAccelerator(SWT.MOD1 + 'V');
-	subItem.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			if (copyBuffer == null) return;
-			TableItem item = new TableItem(table, SWT.NONE);
-			item.setText(copyBuffer);
-			isModified = true;
-		}
-	});
-	
-	//Edit -> Delete
-	subItem = new MenuItem(menu, SWT.NONE);
-	subItem.setText(resAddressBook.getString("Delete"));
-	subItem.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			TableItem[] items = table.getSelection();
-			if (items.length == 0) return;
-			items[0].dispose();
-			isModified = true;		}
-	});
-	
-	new MenuItem(menu, SWT.SEPARATOR);
-	
-	//Edit -> Sort(Cascade)
-	subItem = new MenuItem(menu, SWT.CASCADE);
-	subItem.setText(resAddressBook.getString("Sort"));
-	Menu submenu = createSortMenu();
-	subItem.setMenu(submenu);
-	
-	return item;
-	
-}
-
-/**
- * Creates all the items located in the Sort cascading submenu and
- * associate all the menu items with their appropriate
- * functions.
- *
- * @return	Menu
- *			The cascading menu with all the sort menu items on it.
- */
-private Menu createSortMenu() {
-	Menu submenu = new Menu(shell, SWT.DROP_DOWN);
-	MenuItem subitem;
-	for(int i = 0; i < columnNames.length; i++) {
-		subitem = new MenuItem (submenu, SWT.NONE);
-		subitem.setText(columnNames [i]);
-		final int column = i;
-		subitem.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				sort(column);
-			}
-		});
-
-	}
-	
-	return submenu;
-}
-
-/**
- * Creates all the items located in the Search submenu and
- * associate all the menu items with their appropriate
- * functions.
- *
- * @param	menuBar	Menu
- *				the <code>Menu</code> that file contain
- *				the Search submenu.
- */
-private void createSearchMenu(Menu menuBar) {
-	//Search menu.
-	MenuItem item = new MenuItem(menuBar, SWT.CASCADE);
-	item.setText(resAddressBook.getString("Search_menu_title"));
-	Menu searchMenu = new Menu(shell, SWT.DROP_DOWN);
-	item.setMenu(searchMenu);
-
-	//Search -> Find...
-	item = new MenuItem(searchMenu, SWT.NONE);
-	item.setText(resAddressBook.getString("Find"));
-	item.setAccelerator(SWT.MOD1 + 'F');
-	item.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			searchDialog.setMatchCase(false);
-			searchDialog.setMatchWord(false);
-			searchDialog.setSearchDown(true);
-			searchDialog.setSearchString("");
-			searchDialog.setSelectedSearchArea(0);
-			searchDialog.open();
-		}
-	});
-
-	//Search -> Find Next
-	item = new MenuItem(searchMenu, SWT.NONE);
-	item.setText(resAddressBook.getString("Find_next"));
-	item.setAccelerator(SWT.F3);
-	item.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			searchDialog.open();
-		}
-	});
-}
-
-/** 
- * Creates all items located in the popup menu and associates
- * all the menu items with their appropriate functions.
- *
- * @return	Menu
- *			The created popup menu.
- */
-private Menu createPopUpMenu() {
-	Menu popUpMenu = new Menu(shell, SWT.POP_UP);
-
-	/** 
-	 * Adds a listener to handle enabling and disabling 
-	 * some items in the Edit submenu.
-	 */
-	popUpMenu.addMenuListener(new MenuAdapter() {
-		public void menuShown(MenuEvent e) {
-			Menu menu = (Menu)e.widget;
-			MenuItem[] items = menu.getItems();
-			int count = table.getSelectionCount();
-			items[2].setEnabled(count != 0); // edit
-			items[3].setEnabled(count != 0); // copy
-			items[4].setEnabled(copyBuffer != null); // paste
-			items[5].setEnabled(count != 0); // delete
-			items[7].setEnabled(table.getItemCount() != 0); // find
-		}
-	});
-
-	//New
-	MenuItem item = new MenuItem(popUpMenu, SWT.PUSH);
-	item.setText(resAddressBook.getString("Pop_up_new"));
-	item.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			newEntry();
-		}
-	});
-	
-	new MenuItem(popUpMenu, SWT.SEPARATOR);	
-	
-	//Edit
-	item = new MenuItem(popUpMenu, SWT.PUSH);
-	item.setText(resAddressBook.getString("Pop_up_edit"));
-	item.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			TableItem[] items = table.getSelection();
-			if (items.length == 0) return;
-			editEntry(items[0]);
-		}
-	});
-
-	//Copy
-	item = new MenuItem(popUpMenu, SWT.PUSH);
-	item.setText(resAddressBook.getString("Pop_up_copy"));
-	item.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			TableItem[] items = table.getSelection();
-			if (items.length == 0) return;
-			copyBuffer = new String[table.getColumnCount()];
-			for (int i = 0; i < copyBuffer.length; i++) {
-				copyBuffer[i] = items[0].getText(i);
-			}
-		}
-	});
-	
-	//Paste
-	item = new MenuItem(popUpMenu, SWT.PUSH);
-	item.setText(resAddressBook.getString("Pop_up_paste"));
-	item.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			if (copyBuffer == null) return;
-			TableItem item = new TableItem(table, SWT.NONE);
-			item.setText(copyBuffer);
-			isModified = true;
-		}
-	});
-	
-	//Delete
-	item = new MenuItem(popUpMenu, SWT.PUSH);
-	item.setText(resAddressBook.getString("Pop_up_delete"));
-	item.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			TableItem[] items = table.getSelection();
-			if (items.length == 0) return;
-			items[0].dispose();
-			isModified = true;
-		}
-	});
-	
-	new MenuItem(popUpMenu, SWT.SEPARATOR);	
-	
-	//Find...
-	item = new MenuItem(popUpMenu, SWT.PUSH);
-	item.setText(resAddressBook.getString("Pop_up_find"));
-	item.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			searchDialog.open();
-		}
-	});
-
-	return popUpMenu;
-}
-
-/**
- * Creates all the items located in the Help submenu and
- * associate all the menu items with their appropriate
- * functions.
- *
- * @param	menuBar	Menu
- *				the <code>Menu</code> that file contain
- *				the Help submenu.
- */
-private void createHelpMenu(Menu menuBar) {
-	
-	//Help Menu
-	MenuItem item = new MenuItem(menuBar, SWT.CASCADE);
-	item.setText(resAddressBook.getString("Help_menu_title"));	
-	Menu menu = new Menu(shell, SWT.DROP_DOWN);
-	item.setMenu(menu);
-	
-	//Help -> About Text Editor
-	MenuItem subItem = new MenuItem(menu, SWT.NONE);
-	subItem.setText(resAddressBook.getString("About"));
-	subItem.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			MessageBox box = new MessageBox(shell, SWT.NONE);
-			box.setText(resAddressBook.getString("About_1") + shell.getText());
-			box.setMessage(shell.getText() + resAddressBook.getString("About_2"));
-			box.open();		
-		}
-	});
-}
-
-/**
- * To compare entries (rows) by the given column
- */
-private class RowComparator implements Comparator {
-	private int column;
-	
-	/**
-	 * Constructs a RowComparator given the column index
-	 * @param col The index (starting at zero) of the column
-	 */
-	public RowComparator(int col) {
-		column = col;
-	}
-	
-	/**
-	 * Compares two rows (type String[]) using the specified
-	 * column entry.
-	 * @param obj1 First row to compare
-	 * @param obj2 Second row to compare
-	 * @return negative if obj1 less than obj2, positive if
-	 * 			obj1 greater than obj2, and zero if equal.
-	 */
-	public int compare(Object obj1, Object obj2) {
-		String[] row1 = (String[])obj1;
-		String[] row2 = (String[])obj2;
-		
-		return row1[column].compareTo(row2[column]);
-	}
-}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.addressbook/src/org/eclipse/swt/examples/addressbook/Application.java b/demos/app-model/org.eclipse.swt.examples.addressbook/src/org/eclipse/swt/examples/addressbook/Application.java
deleted file mode 100644
index 2abb727..0000000
--- a/demos/app-model/org.eclipse.swt.examples.addressbook/src/org/eclipse/swt/examples/addressbook/Application.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.examples.addressbook;
-
-import org.eclipse.equinox.app.IApplication;
-import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-public class Application implements IApplication {
-	Shell shell;
-
-	public Object start(IApplicationContext context) throws Exception {
-		final Display display = Display.getDefault();
-		display.syncExec(new Runnable() {
-			public void run() {
-				shell = AddressBook.runApplication(display);
-			}
-		});
-		context.applicationRunning();
-		while (!shell.isDisposed())
-			Thread.sleep(200);
-		return null;
-	}
-
-	public void stop() {
-		Display.getDefault().syncExec(new Runnable() {
-			public void run() {
-				if (shell != null && !shell.isDisposed())
-					shell.close();
-			}
-		});
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.addressbook/src/org/eclipse/swt/examples/addressbook/DataEntryDialog.java b/demos/app-model/org.eclipse.swt.examples.addressbook/src/org/eclipse/swt/examples/addressbook/DataEntryDialog.java
deleted file mode 100644
index bbf34c4..0000000
--- a/demos/app-model/org.eclipse.swt.examples.addressbook/src/org/eclipse/swt/examples/addressbook/DataEntryDialog.java
+++ /dev/null

@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 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.swt.examples.addressbook;
-
-
-/* Imports */
-import org.eclipse.swt.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import java.util.ResourceBundle;
-
-/**
- * DataEntryDialog class uses <code>org.eclipse.swt</code> 
- * libraries to implement a dialog that accepts basic personal information that
- * is added to a <code>Table</code> widget or edits a <code>TableItem</code> entry 
- * to represent the entered data.
- */
-public class DataEntryDialog {
-
-	private static ResourceBundle resAddressBook = ResourceBundle.getBundle("examples_addressbook");
-	
-	Shell shell;
-	String[] values;
-	String[] labels;
-	
-public DataEntryDialog(Shell parent) {
-	shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.PRIMARY_MODAL);
-	shell.setLayout(new GridLayout());		
-}
-
-private void addTextListener(final Text text) {
-	text.addModifyListener(new ModifyListener() {
-		public void modifyText(ModifyEvent e){
-			Integer index = (Integer)(text.getData("index"));
-			values[index.intValue()] = text.getText();
-		}
-	});
-}
-private void createControlButtons() {
-	Composite composite = new Composite(shell, SWT.NONE);
-	composite.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_CENTER));
-	GridLayout layout = new GridLayout();
-	layout.numColumns = 2;
-	composite.setLayout(layout);
-	
-	Button okButton = new Button(composite, SWT.PUSH);
-	okButton.setText(resAddressBook.getString("OK"));
-	okButton.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			shell.close();
-		}
-	});
-	
-	Button cancelButton = new Button(composite, SWT.PUSH);
-	cancelButton.setText(resAddressBook.getString("Cancel"));
-	cancelButton.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			values = null;
-			shell.close();
-		}
-	});
-	
-	shell.setDefaultButton(okButton);
-}
-
-private void createTextWidgets() {
-	if (labels == null) return;
-	
-	Composite composite = new Composite(shell, SWT.NONE);
-	composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-	GridLayout layout= new GridLayout();
-	layout.numColumns = 2;
-	composite.setLayout(layout);
-	
-	if (values == null)
-		values = new String[labels.length];
-	
-	for (int i = 0; i < labels.length; i++) {
-		Label label = new Label(composite, SWT.RIGHT);
-		label.setText(labels[i]);	
-		Text text = new Text(composite, SWT.BORDER);
-		GridData gridData = new GridData();
-		gridData.widthHint = 400;
-		text.setLayoutData(gridData);
-		if (values[i] != null) {
-			text.setText(values[i]);
-		}
-		text.setData("index", new Integer(i));
-		addTextListener(text);	
-	}
-}
-
-public String[] getLabels() {
-	return labels;
-}
-public String getTitle() {
-	return shell.getText();
-}
-/**
- * Returns the contents of the <code>Text</code> widgets in the dialog in a 
- * <code>String</code> array.
- *
- * @return	String[]	
- *			The contents of the text widgets of the dialog.
- *			May return null if all text widgets are empty.
- */ 
-public String[] getValues() {
-	return values;
-}
-/** 
- * Opens the dialog in the given state.  Sets <code>Text</code> widget contents 
- * and dialog behaviour accordingly.
- *
- * @param 	dialogState	int
- *					The state the dialog should be opened in.
- */
-public String[] open() {
-	createTextWidgets();
-	createControlButtons();
-	shell.pack();
-	shell.open();
-	Display display = shell.getDisplay();
-	while(!shell.isDisposed()){
-		if(!display.readAndDispatch())
-			display.sleep();
-	}
-	
-	return getValues();
-}
-public void setLabels(String[] labels) {
-	this.labels = labels;
-}
-public void setTitle(String title) {
-	shell.setText(title);
-}
-/**
- * Sets the values of the <code>Text</code> widgets of the dialog to
- * the values supplied in the parameter array.
- *
- * @param	itemInfo	String[]
- * 						The values to which the dialog contents will be set.
- */
-public void setValues(String[] itemInfo) {
-	if (labels == null) return;
-	
-	if (values == null)
-		values = new String[labels.length];
-
-	int numItems = Math.min(values.length, itemInfo.length);
-	for(int i = 0; i < numItems; i++) {
-		values[i] = itemInfo[i];
-	}	
-}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.addressbook/src/org/eclipse/swt/examples/addressbook/FindListener.java b/demos/app-model/org.eclipse.swt.examples.addressbook/src/org/eclipse/swt/examples/addressbook/FindListener.java
deleted file mode 100644
index 1732505..0000000
--- a/demos/app-model/org.eclipse.swt.examples.addressbook/src/org/eclipse/swt/examples/addressbook/FindListener.java
+++ /dev/null

@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 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.swt.examples.addressbook;
-
-
-public interface FindListener {
-
-public boolean find();
-
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.addressbook/src/org/eclipse/swt/examples/addressbook/SearchDialog.java b/demos/app-model/org.eclipse.swt.examples.addressbook/src/org/eclipse/swt/examples/addressbook/SearchDialog.java
deleted file mode 100644
index 24b66e2..0000000
--- a/demos/app-model/org.eclipse.swt.examples.addressbook/src/org/eclipse/swt/examples/addressbook/SearchDialog.java
+++ /dev/null

@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 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.swt.examples.addressbook;
-
-
-/* Imports */
-import org.eclipse.swt.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.events.*;
-import java.util.ResourceBundle;
-
-/**
- * SearchDialog is a simple class that uses <code>org.eclipse.swt</code> 
- * libraries to implement a basic search dialog.
- */
-public class SearchDialog {
-
-	private static ResourceBundle resAddressBook = ResourceBundle.getBundle("examples_addressbook");
-
-	Shell shell;
-	Text searchText;
-	Combo searchArea;
-	Label searchAreaLabel;
-	Button matchCase;
-	Button matchWord;
-	Button findButton;
-	Button down;
-	FindListener findHandler;
-
-/**
- * Class constructor that sets the parent shell and the table widget that
- * the dialog will search.
- *
- * @param parent	Shell 
- *			The shell that is the parent of the dialog.
- */
-public SearchDialog(Shell parent) {
-	shell = new Shell(parent, SWT.CLOSE | SWT.BORDER | SWT.TITLE);
-	GridLayout layout = new GridLayout();
-	layout.numColumns = 2;
-	shell.setLayout(layout);
-	shell.setText(resAddressBook.getString("Search_dialog_title"));
-	shell.addShellListener(new ShellAdapter(){
-		public void shellClosed(ShellEvent e) {
-			// don't dispose of the shell, just hide it for later use
-			e.doit = false;
-			shell.setVisible(false);
-		}
-	});
-		
-	Label label = new Label(shell, SWT.LEFT);
-	label.setText(resAddressBook.getString("Dialog_find_what"));	
-	searchText = new Text(shell, SWT.BORDER);
-	GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-	gridData.widthHint = 200;
-	searchText.setLayoutData(gridData);
-	searchText.addModifyListener(new ModifyListener() {
-		public void modifyText(ModifyEvent e) {
-			boolean enableFind = (searchText.getCharCount() != 0);
-			findButton.setEnabled(enableFind);
-		}
-	});
-
-	searchAreaLabel = new Label(shell, SWT.LEFT);
-	searchArea = new Combo(shell, SWT.DROP_DOWN | SWT.READ_ONLY);
-	gridData = new GridData(GridData.FILL_HORIZONTAL);
-	gridData.widthHint = 200;
-	searchArea.setLayoutData(gridData);
-	
-	matchCase = new Button(shell, SWT.CHECK);
-	matchCase.setText(resAddressBook.getString("Dialog_match_case"));
-	gridData = new GridData();
-	gridData.horizontalSpan = 2;
-	matchCase.setLayoutData(gridData);
-	
-	matchWord = new Button(shell, SWT.CHECK);
-	matchWord.setText(resAddressBook.getString("Dialog_match_word"));
-	gridData = new GridData();
-	gridData.horizontalSpan = 2;
-	matchWord.setLayoutData(gridData);
-	
-	Group direction = new Group(shell, SWT.NONE);
-	gridData = new GridData();
-	gridData.horizontalSpan = 2;
-	direction.setLayoutData(gridData);
-	direction.setLayout (new FillLayout ());	
-	direction.setText(resAddressBook.getString("Dialog_direction"));
-	
-	Button up = new Button(direction, SWT.RADIO);
-	up.setText(resAddressBook.getString("Dialog_dir_up"));
-	up.setSelection(false);
-		
-	down = new Button(direction, SWT.RADIO);
-	down.setText(resAddressBook.getString("Dialog_dir_down"));
-	down.setSelection(true);
-
-	Composite composite = new Composite(shell, SWT.NONE);
-	gridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-	gridData.horizontalSpan = 2;
-	composite.setLayoutData(gridData);
-	layout = new GridLayout();
-	layout.numColumns = 2;
-	layout.makeColumnsEqualWidth = true;
-	composite.setLayout(layout);
-	
-	findButton = new Button(composite, SWT.PUSH);
-	findButton.setText(resAddressBook.getString("Dialog_find"));
-	findButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-	findButton.setEnabled(false);
-	findButton.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			if (!findHandler.find()){
-				MessageBox box = new MessageBox(shell, SWT.ICON_INFORMATION | SWT.OK | SWT.PRIMARY_MODAL);
-				box.setText(shell.getText());
-				box.setMessage(resAddressBook.getString("Cannot_find") + "\"" + searchText.getText() + "\"");
-				box.open();	
-			}		
-		}
-	});
-			
-	Button cancelButton = new Button(composite, SWT.PUSH);
-	cancelButton.setText(resAddressBook.getString("Cancel"));
-	cancelButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-	cancelButton.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			shell.setVisible(false);
-		}
-	});
-	
-	shell.pack();
-}
-public String getSearchAreaLabel(String label) {
-	return searchAreaLabel.getText();
-}
-
-public String[] getsearchAreaNames() {
-	return searchArea.getItems();
-}
-public boolean getMatchCase() {
-	return matchCase.getSelection();
-}
-public boolean getMatchWord() {
-	return matchWord.getSelection();
-}
-public String getSearchString() {
-	return searchText.getText();
-}
-public boolean getSearchDown(){
-	return down.getSelection();
-}
-public int getSelectedSearchArea() {
-	return searchArea.getSelectionIndex();
-}
-public void open() {
-	if (shell.isVisible()) {
-		shell.setFocus();
-	} else {
-		shell.open();
-	}
-	searchText.setFocus();
-}
-public void setSearchAreaNames(String[] names) {
-	for (int i = 0; i < names.length; i++) {
-		searchArea.add(names[i]);
-	}
-	searchArea.select(0);
-}
-public void setSearchAreaLabel(String label) {
-	searchAreaLabel.setText(label);
-}
-public void setMatchCase(boolean match) {
-	matchCase.setSelection(match);
-}
-public void setMatchWord(boolean match) {
-	matchWord.setSelection(match);
-}
-public void setSearchDown(boolean searchDown){
-	down.setSelection(searchDown);
-}
-public void setSearchString(String searchString) {
-	searchText.setText(searchString);
-}
-
-public void setSelectedSearchArea(int index) {
-	searchArea.select(index);
-}
-public void addFindListener(FindListener listener) {
-	this.findHandler = listener;	
-}
-public void removeFindListener(FindListener listener) {
-	this.findHandler = null;
-}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.browserexample/.classpath b/demos/app-model/org.eclipse.swt.examples.browserexample/.classpath
deleted file mode 100644
index ce73933..0000000
--- a/demos/app-model/org.eclipse.swt.examples.browserexample/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<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 kind="output" path="bin"/>
-</classpath>

diff --git a/demos/app-model/org.eclipse.swt.examples.browserexample/.cvsignore b/demos/app-model/org.eclipse.swt.examples.browserexample/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/demos/app-model/org.eclipse.swt.examples.browserexample/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/demos/app-model/org.eclipse.swt.examples.browserexample/.project b/demos/app-model/org.eclipse.swt.examples.browserexample/.project
deleted file mode 100644
index 1824250..0000000
--- a/demos/app-model/org.eclipse.swt.examples.browserexample/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.swt.examples.browserexample</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/demos/app-model/org.eclipse.swt.examples.browserexample/.settings/org.eclipse.jdt.core.prefs b/demos/app-model/org.eclipse.swt.examples.browserexample/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7a9e1ca..0000000
--- a/demos/app-model/org.eclipse.swt.examples.browserexample/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Tue Mar 20 12:28:27 CDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/demos/app-model/org.eclipse.swt.examples.browserexample/.settings/org.eclipse.pde.core.prefs b/demos/app-model/org.eclipse.swt.examples.browserexample/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 4ed4211..0000000
--- a/demos/app-model/org.eclipse.swt.examples.browserexample/.settings/org.eclipse.pde.core.prefs
+++ /dev/null

@@ -1,4 +0,0 @@
-#Tue Feb 20 09:58:44 CST 2007
-eclipse.preferences.version=1
-pluginProject.extensions=true
-resolve.requirebundle=false

diff --git a/demos/app-model/org.eclipse.swt.examples.browserexample/META-INF/MANIFEST.MF b/demos/app-model/org.eclipse.swt.examples.browserexample/META-INF/MANIFEST.MF
deleted file mode 100644
index 0183a1e..0000000
--- a/demos/app-model/org.eclipse.swt.examples.browserexample/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Browserexample Plug-in
-Bundle-SymbolicName: org.eclipse.swt.examples.browserexample;singleton:=true
-Bundle-Version: 1.0.0
-Import-Package: org.eclipse.equinox.app;version="1.0.0",
- org.eclipse.swt,
- org.eclipse.swt.browser,
- org.eclipse.swt.events,
- org.eclipse.swt.graphics,
- org.eclipse.swt.layout,
- org.eclipse.swt.widgets
-Bundle-RequiredExecutionEnvironment: J2SE-1.4

diff --git a/demos/app-model/org.eclipse.swt.examples.browserexample/build.properties b/demos/app-model/org.eclipse.swt.examples.browserexample/build.properties
deleted file mode 100644
index e9863e2..0000000
--- a/demos/app-model/org.eclipse.swt.examples.browserexample/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml

diff --git a/demos/app-model/org.eclipse.swt.examples.browserexample/plugin.xml b/demos/app-model/org.eclipse.swt.examples.browserexample/plugin.xml
deleted file mode 100644
index fb9b370..0000000
--- a/demos/app-model/org.eclipse.swt.examples.browserexample/plugin.xml
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         id="app"
-         name="Browser"
-         point="org.eclipse.core.runtime.applications">
-      <application
-            cardinality="1"
-            thread="any">
-         <run
-               class="org.eclipse.swt.examples.browserexample.Application">
-         </run>
-      </application>
-   </extension>
-
-</plugin>

diff --git a/demos/app-model/org.eclipse.swt.examples.browserexample/src/examples_browser.properties b/demos/app-model/org.eclipse.swt.examples.browserexample/src/examples_browser.properties
deleted file mode 100644
index e977990..0000000
--- a/demos/app-model/org.eclipse.swt.examples.browserexample/src/examples_browser.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 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
-###############################################################################
-error.CouldNotLoadResources = Unable to load resources
-window.title = SWT Browser
-
-Back				= Back
-BrowserNotCreated	= Error - The Browser widget could not be instantiated. Please check the Browser widget is supported on this platform. Supported platforms and software requirements for the Browser widget are listed on the SWT FAQ web page.
-Forward				= Forward
-Stop				= Stop
-Refresh				= Refresh
-Go					= Go
-Startup				= http://www.eclipse.org

diff --git a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/Application.java b/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/Application.java
deleted file mode 100644
index fad1c95..0000000
--- a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/Application.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.examples.browserexample;
-
-import org.eclipse.equinox.app.IApplication;
-import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.swt.widgets.Display;
-
-public class Application implements IApplication {
-	BrowserExample app;
-
-	public Object start(IApplicationContext context) throws Exception {
-		final Display display = Display.getDefault();
-		display.syncExec(new Runnable() {
-			public void run() {
-				app = BrowserExample.runApplication(display);
-			}
-		});
-		context.applicationRunning();
-		while (!app.isDisposed())
-			Thread.sleep(200);
-		return null;
-	}
-
-	public void stop() {
-		Display.getDefault().syncExec(new Runnable() {
-			public void run() {
-				if (app != null && !app.isDisposed())
-					app.dispose();
-			}
-		});
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/BrowserExample.java b/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/BrowserExample.java
deleted file mode 100644
index 7961f78..0000000
--- a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/BrowserExample.java
+++ /dev/null

@@ -1,374 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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.swt.examples.browserexample;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.browser.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-import java.io.*;
-import java.util.*;
-
-public class BrowserExample {
-	static ResourceBundle resourceBundle = ResourceBundle.getBundle("examples_browser");
-	int index;
-	boolean busy;
-	Image images[];
-	Image icon = null;
-	boolean title = false;
-	Composite parent;
-	Text locationBar;
-	Browser browser;
-	ToolBar toolbar;
-	Canvas canvas;
-	ToolItem itemBack, itemForward;
-	Label status;
-	ProgressBar progressBar;
-	SWTError error = null;
-	private boolean disposed;
-
-	static final String[] imageLocations = {
-			"eclipse01.bmp", "eclipse02.bmp", "eclipse03.bmp", "eclipse04.bmp", "eclipse05.bmp",
-			"eclipse06.bmp", "eclipse07.bmp", "eclipse08.bmp", "eclipse09.bmp", "eclipse10.bmp",
-			"eclipse11.bmp", "eclipse12.bmp",};
-	static final String iconLocation = "document.gif";
-		
-	public BrowserExample(Composite parent, boolean top) {
-		this.parent = parent;
-		try {
-			browser = new Browser(parent, SWT.BORDER);
-		} catch (SWTError e) {
-			error = e;
-			/* Browser widget could not be instantiated */
-			parent.setLayout(new FillLayout());
-			Label label = new Label(parent, SWT.CENTER | SWT.WRAP);
-			label.setText(getResourceString("BrowserNotCreated"));
-			parent.layout(true);
-			return;
-		}
-		initResources();
-		final Display display = parent.getDisplay();
-		browser.setData("org.eclipse.swt.examples.browserexample.BrowserApplication", this);
-		browser.addOpenWindowListener(new OpenWindowListener() {
-			public void open(WindowEvent event) {
-				Shell shell = new Shell(display);
-				if (icon != null) shell.setImage(icon);
-				shell.setLayout(new FillLayout());
-				BrowserExample app = new BrowserExample(shell, false);
-				app.setShellDecoration(icon, true);
-				event.browser = app.getBrowser();
-			}
-		});
-		if (top) {
-			browser.setUrl(getResourceString("Startup"));
-			show(false, null, null, true, true, true, true);
-		} else {
-			browser.addVisibilityWindowListener(new VisibilityWindowListener() {
-				public void hide(WindowEvent e) {
-				}
-				public void show(WindowEvent e) {
-					Browser browser = (Browser)e.widget;
-					BrowserExample app = (BrowserExample)browser.getData("org.eclipse.swt.examples.browserexample.BrowserApplication");
-					app.show(true, e.location, e.size, e.addressBar, e.menuBar, e.statusBar, e.toolBar);
-				}
-			});
-			browser.addCloseWindowListener(new CloseWindowListener() {
-				public void close(WindowEvent event) {
-					Browser browser = (Browser)event.widget;
-					Shell shell = browser.getShell();
-					shell.close();
-				}
-			});
-		}
-	}
-
-	/**
-	 * Disposes of all resources associated with a particular
-	 * instance of the BrowserApplication.
-	 */	
-	public void dispose() {
-		parent.dispose();
-		freeResources();
-	}
-	
-	/**
-	 * Gets a string from the resource bundle.
-	 * We don't want to crash because of a missing String.
-	 * Returns the key if not found.
-	 */
-	static String getResourceString(String key) {
-		try {
-			return resourceBundle.getString(key);
-		} catch (MissingResourceException e) {
-			return key;
-		} catch (NullPointerException e) {
-			return "!" + key + "!";
-		}			
-	}
-	
-	public SWTError getError() { return error; }
-	
-	public Browser getBrowser() { return browser; }
-	
-	public void setShellDecoration(Image icon, boolean title) {
-		this.icon = icon;
-		this.title = title;
-	}
-	
-	void show(boolean owned, Point location, Point size, boolean addressBar, boolean menuBar, boolean statusBar, boolean toolBar) {
-		final Shell shell = browser.getShell();
-		if (owned) {
-			if (location != null) shell.setLocation(location);
-			if (size != null) shell.setSize(shell.computeSize(size.x, size.y));
-		}
-		FormData data = null;
-		if (toolBar) {
-			toolbar = new ToolBar(parent, SWT.NONE);
-			data = new FormData();
-			data.top = new FormAttachment(0, 5);
-			toolbar.setLayoutData(data);
-			itemBack = new ToolItem(toolbar, SWT.PUSH);
-			itemBack.setText(getResourceString("Back"));
-			itemForward = new ToolItem(toolbar, SWT.PUSH);
-			itemForward.setText(getResourceString("Forward"));
-			final ToolItem itemStop = new ToolItem(toolbar, SWT.PUSH);
-			itemStop.setText(getResourceString("Stop"));
-			final ToolItem itemRefresh = new ToolItem(toolbar, SWT.PUSH);
-			itemRefresh.setText(getResourceString("Refresh"));
-			final ToolItem itemGo = new ToolItem(toolbar, SWT.PUSH);
-			itemGo.setText(getResourceString("Go"));
-			
-			itemBack.setEnabled(browser.isBackEnabled());
-			itemForward.setEnabled(browser.isForwardEnabled());
-			Listener listener = new Listener() {
-				public void handleEvent(Event event) {
-					ToolItem item = (ToolItem)event.widget;
-					if (item == itemBack) browser.back(); 
-					else if (item == itemForward) browser.forward();
-					else if (item == itemStop) browser.stop();
-					else if (item == itemRefresh) browser.refresh();
-					else if (item == itemGo) browser.setUrl(locationBar.getText());
-				}
-			};
-			itemBack.addListener(SWT.Selection, listener);
-			itemForward.addListener(SWT.Selection, listener);
-			itemStop.addListener(SWT.Selection, listener);
-			itemRefresh.addListener(SWT.Selection, listener);
-			itemGo.addListener(SWT.Selection, listener);
-
-			canvas = new Canvas(parent, SWT.NO_BACKGROUND);
-			data = new FormData();
-			data.width = 24;
-			data.height = 24;
-			data.top = new FormAttachment(0, 5);
-			data.right = new FormAttachment(100, -5);
-			canvas.setLayoutData(data);
-			
-			final Rectangle rect = images[0].getBounds();
-			canvas.addListener(SWT.Paint, new Listener() {
-				public void handleEvent(Event e) {
-					Point pt = ((Canvas)e.widget).getSize();
-					e.gc.drawImage(images[index], 0, 0, rect.width, rect.height, 0, 0, pt.x, pt.y);			
-				}
-			});
-			canvas.addListener(SWT.MouseDown, new Listener() {
-				public void handleEvent(Event e) {
-					browser.setUrl(getResourceString("Startup"));
-				}
-			});
-			
-			final Display display = parent.getDisplay();
-			display.asyncExec(new Runnable() {
-				public void run() {
-					if (canvas.isDisposed()) return;
-					if (busy) {
-						index++;
-						if (index == images.length) index = 0;
-						canvas.redraw();
-					}
-					display.timerExec(150, this);
-				}
-			});
-		}
-		if (addressBar) {
-			locationBar = new Text(parent, SWT.BORDER);
-			data = new FormData();
-			if (toolbar != null) {
-				data.top = new FormAttachment(toolbar, 0, SWT.TOP);
-				data.left = new FormAttachment(toolbar, 5, SWT.RIGHT);
-				data.right = new FormAttachment(canvas, -5, SWT.DEFAULT);			
-			} else {
-				data.top = new FormAttachment(0, 0);
-				data.left = new FormAttachment(0, 0);
-				data.right = new FormAttachment(100, 0);			
-			}
-			locationBar.setLayoutData(data);
-			locationBar.addListener(SWT.DefaultSelection, new Listener() {
-				public void handleEvent(Event e) {
-					browser.setUrl(locationBar.getText());
-				}
-			});
-		}
-		if (statusBar) {
-			status = new Label(parent, SWT.NONE);
-			progressBar = new ProgressBar(parent, SWT.NONE);
-			
-			data = new FormData();
-			data.left = new FormAttachment(0, 5);
-			data.right = new FormAttachment(progressBar, 0, SWT.DEFAULT);
-			data.bottom = new FormAttachment(100, -5);
-			status.setLayoutData(data);
-			
-			data = new FormData();
-			data.right = new FormAttachment(100, -5);
-			data.bottom = new FormAttachment(100, -5);
-			progressBar.setLayoutData(data);
-			
-			browser.addStatusTextListener(new StatusTextListener() {
-				public void changed(StatusTextEvent event) {
-					status.setText(event.text);	
-				}
-			});
-		}
-		parent.setLayout(new FormLayout());
-
-		Control aboveBrowser = toolBar ? (Control)canvas : (addressBar ? (Control)locationBar : null);
-		data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.top = aboveBrowser != null ? new FormAttachment(aboveBrowser, 5, SWT.DEFAULT) : new FormAttachment(0, 0);
-		data.right = new FormAttachment(100, 0);
-		data.bottom = status != null ? new FormAttachment(status, -5, SWT.DEFAULT) : new FormAttachment(100, 0);
-		browser.setLayoutData(data);
-			
-		if (statusBar || toolBar) {
-			browser.addProgressListener(new ProgressListener() {
-				public void changed(ProgressEvent event) {
-					if (event.total == 0) return;                            
-					int ratio = event.current * 100 / event.total;
-					if (progressBar != null) progressBar.setSelection(ratio);
-					busy = event.current != event.total;
-					if (!busy) {
-						index = 0;
-						if (canvas != null) canvas.redraw();
-					}
-				}
-				public void completed(ProgressEvent event) {
-					if (progressBar != null) progressBar.setSelection(0);
-					busy = false;
-					index = 0;
-					if (canvas != null) {
-						itemBack.setEnabled(browser.isBackEnabled());
-						itemForward.setEnabled(browser.isForwardEnabled());
-						canvas.redraw();
-					}
-				}
-			});
-		}
-		if (addressBar || statusBar || toolBar) {
-			browser.addLocationListener(new LocationListener() {
-				public void changed(LocationEvent event) {
-					busy = true;
-					if (event.top && locationBar != null) locationBar.setText(event.location);
-				}
-				public void changing(LocationEvent event) {
-				}
-			});
-		}
-		if (title) {
-			browser.addTitleListener(new TitleListener() {
-				public void changed(TitleEvent event) {
-					shell.setText(event.title+" - "+getResourceString("window.title"));
-				}
-			});
-		}
-		parent.layout(true);
-		if (owned) shell.open();
-	}
-
-	/**
-	 * Grabs input focus
-	 */
-	public void focus() {
-		if (locationBar != null) locationBar.setFocus();
-		else if (browser != null) browser.setFocus();
-		else parent.setFocus();
-	}
-	
-	/**
-	 * Frees the resources
-	 */
-	void freeResources() {
-		if (icon != null)
-			icon.dispose();
-		if (images != null) {
-			for (int i = 0; i < images.length; ++i) {
-				final Image image = images[i];
-				if (image != null) image.dispose();
-			}
-			images = null;
-		}
-	}
-	
-	/**
-	 * Loads the resources
-	 */
-	void initResources() {
-		final Class clazz = this.getClass();
-		if (resourceBundle != null) {
-			try {
-				if (images == null) {
-					images = new Image[imageLocations.length];
-					for (int i = 0; i < imageLocations.length; ++i) {
-						InputStream sourceStream = clazz.getResourceAsStream(imageLocations[i]);
-						ImageData source = new ImageData(sourceStream);
-						ImageData mask = source.getTransparencyMask();
-						images[i] = new Image(null, source, mask);
-						try {
-							sourceStream.close();
-						} catch (IOException e) {
-							e.printStackTrace ();
-						}
-					}
-				}
-				return;
-			} catch (Throwable t) {
-			}
-		}
-		String error = (resourceBundle != null) ? getResourceString("error.CouldNotLoadResources") : "Unable to load resources";
-		freeResources();
-		throw new RuntimeException(error);
-	}
-	
-
-	public static BrowserExample runApplication(Display display) {
-		Shell shell = new Shell(display);
-		shell.setLayout(new FillLayout());
-		shell.setText(getResourceString("window.title"));
-		InputStream stream = BrowserExample.class.getResourceAsStream(iconLocation);
-		Image icon = new Image(display, stream);
-		shell.setImage(icon);
-		try {
-			stream.close();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		BrowserExample app = new BrowserExample(shell, true);
-		app.setShellDecoration(icon, true);
-		shell.open();
-		return app;
-	}
-
-	public boolean isDisposed() {
-		return parent.isDisposed();
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/document.gif b/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/document.gif
deleted file mode 100644
index 895e221..0000000
--- a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/document.gif
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse01.bmp b/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse01.bmp
deleted file mode 100644
index 43116e6..0000000
--- a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse01.bmp
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse02.bmp b/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse02.bmp
deleted file mode 100644
index 8db04ef..0000000
--- a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse02.bmp
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse03.bmp b/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse03.bmp
deleted file mode 100644
index 5fc7b10..0000000
--- a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse03.bmp
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse04.bmp b/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse04.bmp
deleted file mode 100644
index 2140654..0000000
--- a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse04.bmp
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse05.bmp b/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse05.bmp
deleted file mode 100644
index 7e45a99..0000000
--- a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse05.bmp
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse06.bmp b/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse06.bmp
deleted file mode 100644
index aaa888a..0000000
--- a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse06.bmp
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse07.bmp b/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse07.bmp
deleted file mode 100644
index 50e2222..0000000
--- a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse07.bmp
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse08.bmp b/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse08.bmp
deleted file mode 100644
index b1ac29d..0000000
--- a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse08.bmp
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse09.bmp b/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse09.bmp
deleted file mode 100644
index 561f830..0000000
--- a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse09.bmp
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse10.bmp b/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse10.bmp
deleted file mode 100644
index 6ae79b2..0000000
--- a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse10.bmp
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse11.bmp b/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse11.bmp
deleted file mode 100644
index a0c24a6..0000000
--- a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse11.bmp
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse12.bmp b/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse12.bmp
deleted file mode 100644
index 1cae71c..0000000
--- a/demos/app-model/org.eclipse.swt.examples.browserexample/src/org/eclipse/swt/examples/browserexample/eclipse12.bmp
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.clipboard/.classpath b/demos/app-model/org.eclipse.swt.examples.clipboard/.classpath
deleted file mode 100644
index ce73933..0000000
--- a/demos/app-model/org.eclipse.swt.examples.clipboard/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<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 kind="output" path="bin"/>
-</classpath>

diff --git a/demos/app-model/org.eclipse.swt.examples.clipboard/.cvsignore b/demos/app-model/org.eclipse.swt.examples.clipboard/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/demos/app-model/org.eclipse.swt.examples.clipboard/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/demos/app-model/org.eclipse.swt.examples.clipboard/.project b/demos/app-model/org.eclipse.swt.examples.clipboard/.project
deleted file mode 100644
index 8c0e4e7..0000000
--- a/demos/app-model/org.eclipse.swt.examples.clipboard/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.swt.examples.clipboard</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/demos/app-model/org.eclipse.swt.examples.clipboard/.settings/org.eclipse.jdt.core.prefs b/demos/app-model/org.eclipse.swt.examples.clipboard/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 285190d..0000000
--- a/demos/app-model/org.eclipse.swt.examples.clipboard/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Tue Mar 20 12:28:38 CDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/demos/app-model/org.eclipse.swt.examples.clipboard/.settings/org.eclipse.pde.core.prefs b/demos/app-model/org.eclipse.swt.examples.clipboard/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 388be22..0000000
--- a/demos/app-model/org.eclipse.swt.examples.clipboard/.settings/org.eclipse.pde.core.prefs
+++ /dev/null

@@ -1,4 +0,0 @@
-#Tue Feb 20 10:15:48 CST 2007
-eclipse.preferences.version=1
-pluginProject.extensions=true
-resolve.requirebundle=false

diff --git a/demos/app-model/org.eclipse.swt.examples.clipboard/META-INF/MANIFEST.MF b/demos/app-model/org.eclipse.swt.examples.clipboard/META-INF/MANIFEST.MF
deleted file mode 100644
index 28b9fea..0000000
--- a/demos/app-model/org.eclipse.swt.examples.clipboard/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Clipboard Plug-in
-Bundle-SymbolicName: org.eclipse.swt.examples.clipboard;singleton:=true
-Bundle-Version: 1.0.0
-Import-Package: org.eclipse.equinox.app;version="1.0.0",
- org.eclipse.swt,
- org.eclipse.swt.custom,
- org.eclipse.swt.dnd,
- org.eclipse.swt.events,
- org.eclipse.swt.graphics,
- org.eclipse.swt.layout,
- org.eclipse.swt.widgets
-Bundle-RequiredExecutionEnvironment: J2SE-1.4

diff --git a/demos/app-model/org.eclipse.swt.examples.clipboard/build.properties b/demos/app-model/org.eclipse.swt.examples.clipboard/build.properties
deleted file mode 100644
index e9863e2..0000000
--- a/demos/app-model/org.eclipse.swt.examples.clipboard/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml

diff --git a/demos/app-model/org.eclipse.swt.examples.clipboard/plugin.xml b/demos/app-model/org.eclipse.swt.examples.clipboard/plugin.xml
deleted file mode 100644
index 6dfac1e..0000000
--- a/demos/app-model/org.eclipse.swt.examples.clipboard/plugin.xml
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         id="app"
-         name="Clipboard"
-         point="org.eclipse.core.runtime.applications">
-      <application
-            cardinality="1"
-            thread="any">
-         <run
-               class="org.eclipse.swt.examples.clipboard.Application">
-         </run>
-      </application>
-   </extension>
-
-</plugin>

diff --git a/demos/app-model/org.eclipse.swt.examples.clipboard/src/org/eclipse/swt/examples/clipboard/Application.java b/demos/app-model/org.eclipse.swt.examples.clipboard/src/org/eclipse/swt/examples/clipboard/Application.java
deleted file mode 100644
index 9e44aed..0000000
--- a/demos/app-model/org.eclipse.swt.examples.clipboard/src/org/eclipse/swt/examples/clipboard/Application.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.examples.clipboard;
-
-import org.eclipse.equinox.app.IApplication;
-import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.swt.widgets.Display;
-
-public class Application implements IApplication {
-	ClipboardExample app;
-
-	public Object start(IApplicationContext context) throws Exception {
-		final Display display = Display.getDefault();
-		display.syncExec(new Runnable() {
-			public void run() {
-				app = new ClipboardExample();
-				app.open(display);
-			}
-		});
-		context.applicationRunning();
-		while (!app.isDisposed())
-			Thread.sleep(200);
-		Display.getDefault().syncExec(new Runnable() {
-			public void run() {
-				if (app != null && !app.isDisposed())
-					app.dispose();
-			}
-		});
-		return null;
-	}
-
-	public void stop() {
-		Display.getDefault().syncExec(new Runnable() {
-			public void run() {
-				if (app != null && !app.isDisposed())
-					app.dispose();
-			}
-		});
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.clipboard/src/org/eclipse/swt/examples/clipboard/ClipboardExample.java b/demos/app-model/org.eclipse.swt.examples.clipboard/src/org/eclipse/swt/examples/clipboard/ClipboardExample.java
deleted file mode 100644
index cc0c1b2..0000000
--- a/demos/app-model/org.eclipse.swt.examples.clipboard/src/org/eclipse/swt/examples/clipboard/ClipboardExample.java
+++ /dev/null

@@ -1,432 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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.swt.examples.clipboard;
- 
-import org.eclipse.swt.*;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.dnd.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-public class ClipboardExample {
-
-	Clipboard clipboard;
-	Shell shell;
-	Text copyText;
-	Text pasteText;
-	Text copyRtfText;
-	Text pasteRtfText;
-	Text copyHtmlText;
-	Text pasteHtmlText;
-	Table copyFileTable;
-	Table pasteFileTable;
-	Text text;
-	Combo combo;
-	StyledText styledText;
-	Label status;
-	static final int SIZE = 60;
-	
-public Shell open(Display display) {
-	clipboard = new Clipboard(display);
-	shell = new Shell (display);
-	shell.setText("SWT Clipboard");
-	shell.setLayout(new FillLayout());
-	
-	ScrolledComposite sc = new ScrolledComposite(shell, SWT.H_SCROLL | SWT.V_SCROLL);
-	Composite parent = new Composite(sc, SWT.NONE);
-	sc.setContent(parent);
-	parent.setLayout(new GridLayout(2, true));
-	
-	Group copyGroup = new Group(parent, SWT.NONE);
-	copyGroup.setText("Copy From:");
-	GridData data = new GridData(GridData.FILL_BOTH);
-	copyGroup.setLayoutData(data);
-	copyGroup.setLayout(new GridLayout(3, false));
-	
-	Group pasteGroup = new Group(parent, SWT.NONE);
-	pasteGroup.setText("Paste To:");
-	data = new GridData(GridData.FILL_BOTH);
-	pasteGroup.setLayoutData(data);
-	pasteGroup.setLayout(new GridLayout(3, false));
-	
-	Group controlGroup = new Group(parent, SWT.NONE);
-	controlGroup.setText("Control API:");
-	data = new GridData(GridData.FILL_BOTH);
-	data.horizontalSpan = 2;
-	controlGroup.setLayoutData(data);
-	controlGroup.setLayout(new GridLayout(5, false));
-	
-	Group typesGroup = new Group(parent, SWT.NONE);
-	typesGroup.setText("Available Types");
-	data = new GridData(GridData.FILL_BOTH);
-	data.horizontalSpan = 2;
-	typesGroup.setLayoutData(data);
-	typesGroup.setLayout(new GridLayout(2, false));
-	
-	status = new Label(parent, SWT.BORDER);
-	data = new GridData(GridData.FILL_HORIZONTAL);
-	data.horizontalSpan = 2;
-	data.heightHint = 60;
-	status.setLayoutData(data);
-	
-	createTextTransfer(copyGroup, pasteGroup);
-	createRTFTransfer(copyGroup, pasteGroup);
-	createHTMLTransfer(copyGroup, pasteGroup);
-	createFileTransfer(copyGroup, pasteGroup);
-	createMyTransfer(copyGroup, pasteGroup);
-	createControlTransfer(controlGroup);
-	createAvailableTypes(typesGroup);
-	
-	sc.setMinSize(parent.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-	sc.setExpandHorizontal(true);
-	sc.setExpandVertical(true);
-	
-	Point size = shell.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-	Rectangle monitorArea = shell.getMonitor().getClientArea();
-	shell.setSize(Math.min(size.x, monitorArea.width - 20), Math.min(size.y, monitorArea.height - 20));
-	shell.open();
-	return shell;
-}
-
-void dispose() {
-	if (shell != null)
-		shell.dispose();
-	if (clipboard != null)
-		clipboard.dispose();
-}
-
-void createTextTransfer(Composite copyParent, Composite pasteParent) {
-	
-	// TextTransfer
-	Label l = new Label(copyParent, SWT.NONE);
-	l.setText("TextTransfer:"); //$NON-NLS-1$
-	copyText = new Text(copyParent, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-	copyText.setText("some\nplain\ntext");
-	GridData data = new GridData(GridData.FILL_HORIZONTAL);
-	data.heightHint = data.widthHint = SIZE;
-	copyText.setLayoutData(data);
-	Button b = new Button(copyParent, SWT.PUSH);
-	b.setText("Copy");
-	b.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			String data = copyText.getText();
-			if (data.length() > 0) {
-				status.setText("");
-				clipboard.setContents(new Object[] {data}, new Transfer[] {TextTransfer.getInstance()});
-			} else {
-				status.setText("nothing to copy");
-			}
-		}
-	});
-	
-	l = new Label(pasteParent, SWT.NONE);
-	l.setText("TextTransfer:"); //$NON-NLS-1$
-	pasteText = new Text(pasteParent, SWT.READ_ONLY | SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-	data = new GridData(GridData.FILL_HORIZONTAL);
-	data.heightHint = data.widthHint = SIZE;
-	pasteText.setLayoutData(data);
-	b = new Button(pasteParent, SWT.PUSH);
-	b.setText("Paste");
-	b.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			String data = (String)clipboard.getContents(TextTransfer.getInstance());
-			if (data != null && data.length() > 0) {
-				status.setText("");
-				pasteText.setText("begin paste>"+data+"<end paste");
-			} else {
-				status.setText("nothing to paste");
-			}
-		}
-	});
-}
-void createRTFTransfer(Composite copyParent, Composite pasteParent){
-	//	RTF Transfer
-	Label l = new Label(copyParent, SWT.NONE);
-	l.setText("RTFTransfer:"); //$NON-NLS-1$
-	copyRtfText = new Text(copyParent, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-	copyRtfText.setText("some\nrtf\ntext");
-	GridData data = new GridData(GridData.FILL_HORIZONTAL);
-	data.heightHint = data.widthHint = SIZE;
-	copyRtfText.setLayoutData(data);
-	Button b = new Button(copyParent, SWT.PUSH);
-	b.setText("Copy");
-	b.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			String data = copyRtfText.getText();
-			if (data.length() > 0) {
-				status.setText("");
-				data = "{\\rtf1{\\colortbl;\\red255\\green0\\blue0;}\\uc1\\b\\i " + data + "}";
-				clipboard.setContents(new Object[] {data}, new Transfer[] {RTFTransfer.getInstance()});
-			} else {
-				status.setText("nothing to copy");
-			}
-		}
-	});
-	  
-	l = new Label(pasteParent, SWT.NONE);
-	l.setText("RTFTransfer:"); //$NON-NLS-1$
-	pasteRtfText = new Text(pasteParent, SWT.READ_ONLY | SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-	data = new GridData(GridData.FILL_HORIZONTAL);
-	data.heightHint = data.widthHint = SIZE;
-	pasteRtfText.setLayoutData(data);
-	b = new Button(pasteParent, SWT.PUSH);
-	b.setText("Paste");
-	b.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			String data = (String)clipboard.getContents(RTFTransfer.getInstance());
-			if (data != null && data.length() > 0) {
-				status.setText("");
-				pasteRtfText.setText("start paste>"+data+"<end paste");
-			} else {
-				status.setText("nothing to paste");
-			}
-		}
-	});
-}
-void createHTMLTransfer(Composite copyParent, Composite pasteParent){
-	//	HTML Transfer
-	Label l = new Label(copyParent, SWT.NONE);
-	l.setText("HTMLTransfer:"); //$NON-NLS-1$
-	copyHtmlText = new Text(copyParent, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-	copyHtmlText.setText("<b>Hello World</b>");
-	GridData data = new GridData(GridData.FILL_HORIZONTAL);
-	data.heightHint = data.widthHint = SIZE;
-	copyHtmlText.setLayoutData(data);
-	Button b = new Button(copyParent, SWT.PUSH);
-	b.setText("Copy");
-	b.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			String data = copyHtmlText.getText();
-			if (data.length() > 0) {
-				status.setText("");
-				clipboard.setContents(new Object[] {data}, new Transfer[] {HTMLTransfer.getInstance()});
-			} else {
-				status.setText("nothing to copy");
-			}
-		}
-	});
-	  
-	l = new Label(pasteParent, SWT.NONE);
-	l.setText("HTMLTransfer:"); //$NON-NLS-1$
-	pasteHtmlText = new Text(pasteParent, SWT.READ_ONLY | SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-	data = new GridData(GridData.FILL_HORIZONTAL);
-	data.heightHint = data.widthHint = SIZE;
-	pasteHtmlText.setLayoutData(data);
-	b = new Button(pasteParent, SWT.PUSH);
-	b.setText("Paste");
-	b.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			String data = (String)clipboard.getContents(HTMLTransfer.getInstance());
-			if (data != null && data.length() > 0) {
-				status.setText("");
-				pasteHtmlText.setText("start paste>"+data+"<end paste");
-			} else {
-				status.setText("nothing to paste");
-			}
-		}
-	});
-}
-void createFileTransfer(Composite copyParent, Composite pasteParent){
-	//File Transfer
-	Label l = new Label(copyParent, SWT.NONE);
-	l.setText("FileTransfer:"); //$NON-NLS-1$
-	
-	Composite c = new Composite(copyParent, SWT.NONE);
-	c.setLayout(new GridLayout(2, false));
-	GridData data = new GridData(GridData.FILL_HORIZONTAL);
-	c.setLayoutData(data);
-	
-	copyFileTable = new Table(c, SWT.MULTI | SWT.BORDER);
-	data = new GridData(GridData.FILL_HORIZONTAL);
-	data.heightHint = data.widthHint = SIZE;
-	data.horizontalSpan = 2;
-	copyFileTable.setLayoutData(data);
-	
-	Button b = new Button(c, SWT.PUSH);
-	b.setText("Select file(s)");
-	b.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			FileDialog dialog = new FileDialog(shell, SWT.OPEN | SWT.MULTI);
-			String result = dialog.open();
-			if (result != null && result.length() > 0){
-				//copyFileTable.removeAll();
-				String separator = System.getProperty("file.separator");
-				String path = dialog.getFilterPath();
-				String[] names = dialog.getFileNames();
-				for (int i = 0; i < names.length; i++) {
-					TableItem item = new TableItem(copyFileTable, SWT.NONE);
-					item.setText(path+separator+names[i]);
-				}
-			}
-		}
-	});
-	b = new Button(c, SWT.PUSH);
-	b.setText("Select directory");
-	b.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			DirectoryDialog dialog = new DirectoryDialog(shell, SWT.OPEN);
-			String result = dialog.open();
-			if (result != null && result.length() > 0){
-				//copyFileTable.removeAll();
-				TableItem item = new TableItem(copyFileTable, SWT.NONE);
-				item.setText(result);
-			}
-		}
-	});
-	
-	b = new Button(copyParent, SWT.PUSH);
-	b.setText("Copy");
-	b.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			TableItem[] items = copyFileTable.getItems();
-			if (items.length > 0){
-				status.setText("");
-				String[] data = new String[items.length];
-				for (int i = 0; i < data.length; i++) {
-					data[i] = items[i].getText();
-				}
-				clipboard.setContents(new Object[] {data}, new Transfer[] {FileTransfer.getInstance()});
-			} else {
-				status.setText("nothing to copy");
-			}
-		}
-	});
-	
-	l = new Label(pasteParent, SWT.NONE);
-	l.setText("FileTransfer:"); //$NON-NLS-1$
-	pasteFileTable = new Table(pasteParent, SWT.MULTI | SWT.BORDER);
-	data = new GridData(GridData.FILL_HORIZONTAL);
-	data.heightHint = data.widthHint = SIZE;
-	pasteFileTable.setLayoutData(data);
-	b = new Button(pasteParent, SWT.PUSH);
-	b.setText("Paste");
-	b.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			String[] data = (String[])clipboard.getContents(FileTransfer.getInstance());
-			if (data != null && data.length > 0) {
-				status.setText("");
-				pasteFileTable.removeAll();
-				for (int i = 0; i < data.length; i++) {
-					TableItem item = new TableItem(pasteFileTable, SWT.NONE);
-					item.setText(data[i]);
-				}
-			} else {
-				status.setText("nothing to paste");
-			}
-		}
-	});	 
-}
-void createMyTransfer(Composite copyParent, Composite pasteParent){
-	//	MyType Transfer
-	// TODO
-}
-void createControlTransfer(Composite parent){
-	Label l = new Label(parent, SWT.NONE);
-	l.setText("Text:");
-	Button b = new Button(parent, SWT.PUSH);
-	b.setText("Cut");
-	b.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			text.cut();
-		}
-	});
-	b = new Button(parent, SWT.PUSH);
-	b.setText("Copy");
-	b.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			text.copy();
-		}
-	});
-	b = new Button(parent, SWT.PUSH);
-	b.setText("Paste");
-	b.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			text.paste();
-		}
-	});
-	text = new Text(parent, SWT.BORDER | SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
-	GridData data = new GridData(GridData.FILL_HORIZONTAL);
-	data.heightHint = data.widthHint = SIZE;
-	text.setLayoutData(data);
-	
-	l = new Label(parent, SWT.NONE);
-	l.setText("Combo:");
-	b = new Button(parent, SWT.PUSH);
-	b.setText("Cut");
-	b.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			combo.cut();
-		}
-	});
-	b = new Button(parent, SWT.PUSH);
-	b.setText("Copy");
-	b.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			combo.copy();
-		}
-	});
-	b = new Button(parent, SWT.PUSH);
-	b.setText("Paste");
-	b.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			combo.paste();
-		}
-	});
-	combo = new Combo(parent, SWT.NONE);
-	combo.setItems(new String[] {"Item 1", "Item 2", "Item 3", "A longer Item"});
-	
-	l = new Label(parent, SWT.NONE);
-	l.setText("StyledText:");
-	l = new Label(parent, SWT.NONE);
-	l.setVisible(false);
-	b = new Button(parent, SWT.PUSH);
-	b.setText("Copy");
-	b.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			styledText.copy();
-		}
-	});
-	b = new Button(parent, SWT.PUSH);
-	b.setText("Paste");
-	b.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			styledText.paste();
-		}
-	});
-	styledText = new StyledText(parent, SWT.BORDER | SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
-	data = new GridData(GridData.FILL_HORIZONTAL);
-	data.heightHint = data.widthHint = SIZE;
-	styledText.setLayoutData(data);
-}
-void createAvailableTypes(Composite parent){
-	final List list = new List(parent, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-	GridData data = new GridData(GridData.FILL_BOTH);
-	data.heightHint = 100;
-	list.setLayoutData(data);
-	Button b = new Button(parent, SWT.PUSH);
-	b.setText("Get Available Types");
-	b.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			list.removeAll();
-			String[] names = clipboard.getAvailableTypeNames();
-			for (int i = 0; i < names.length; i++) {
-				list.add(names[i]);
-			}
-		}
-	});
-}
-
-public boolean isDisposed() {
-	return shell.isDisposed();
-}
-}
\ No newline at end of file

diff --git a/demos/app-model/org.eclipse.swt.examples.clipboard/src/org/eclipse/swt/examples/clipboard/MyType.java b/demos/app-model/org.eclipse.swt.examples.clipboard/src/org/eclipse/swt/examples/clipboard/MyType.java
deleted file mode 100644
index 94cdfcd..0000000
--- a/demos/app-model/org.eclipse.swt.examples.clipboard/src/org/eclipse/swt/examples/clipboard/MyType.java
+++ /dev/null

@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 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.swt.examples.clipboard;
-
-public class MyType {
-	String firstName;
-	String lastName;
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.clipboard/src/org/eclipse/swt/examples/clipboard/MyTypeTransfer.java b/demos/app-model/org.eclipse.swt.examples.clipboard/src/org/eclipse/swt/examples/clipboard/MyTypeTransfer.java
deleted file mode 100644
index 4d09e3f..0000000
--- a/demos/app-model/org.eclipse.swt.examples.clipboard/src/org/eclipse/swt/examples/clipboard/MyTypeTransfer.java
+++ /dev/null

@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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.swt.examples.clipboard;
-
-import java.io.*;
-import org.eclipse.swt.dnd.*;
-
-public class MyTypeTransfer extends ByteArrayTransfer {
-	
-	private static final String MYTYPENAME = "name_list"; //$NON-NLS-1$
-	private static final int MYTYPEID = registerType(MYTYPENAME);
-	private static MyTypeTransfer _instance = new MyTypeTransfer();
-	
-public static MyTypeTransfer getInstance () {
-	return _instance;
-}
-public void javaToNative (Object object, TransferData transferData) {
-	if (!checkMyType(object) || !isSupportedType(transferData)) {
-		DND.error(DND.ERROR_INVALID_DATA);
-	}
-	MyType[] myTypes = (MyType[]) object;	
-	try {
-		// write data to a byte array and then ask super to convert to pMedium
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		DataOutputStream writeOut = new DataOutputStream(out);
-		for (int i = 0, length = myTypes.length; i < length;  i++){
-			byte[] buffer = myTypes[i].firstName.getBytes();
-			writeOut.writeInt(buffer.length);
-			writeOut.write(buffer);
-			buffer = myTypes[i].firstName.getBytes();
-			writeOut.writeInt(buffer.length);
-			writeOut.write(buffer);
-		}
-		byte[] buffer = out.toByteArray();
-		writeOut.close();
-		super.javaToNative(buffer, transferData);	
-	} catch (IOException e) {
-	}
-}
-public Object nativeToJava(TransferData transferData){	
-	if (isSupportedType(transferData)) {
-		
-		byte[] buffer = (byte[])super.nativeToJava(transferData);
-		if (buffer == null) return null;
-		
-		MyType[] myData = new MyType[0];
-		try {
-			ByteArrayInputStream in = new ByteArrayInputStream(buffer);
-			DataInputStream readIn = new DataInputStream(in);
-			while(readIn.available() > 20) {
-				MyType datum = new MyType();
-				int size = readIn.readInt();
-				byte[] name = new byte[size];
-				readIn.read(name);
-				datum.firstName = new String(name);
-				size = readIn.readInt();
-				name = new byte[size];
-				readIn.read(name);
-				datum.lastName = new String(name);
-				MyType[] newMyData = new MyType[myData.length + 1];
-				System.arraycopy(myData, 0, newMyData, 0, myData.length);
-				newMyData[myData.length] = datum;
-				myData = newMyData;
-			}
-			readIn.close();
-		} catch (IOException ex) {
-			return null;
-		}
-		return myData;
-	}
-
-	return null;
-}
-protected String[] getTypeNames(){
-	return new String[]{MYTYPENAME};
-}
-protected int[] getTypeIds(){
-	return new int[] {MYTYPEID};
-}
-boolean checkMyType(Object object) {
-	if (object == null || !(object instanceof MyType[]) || ((MyType[])object).length == 0) return false;
-	MyType[] myTypes = (MyType[])object;
-	for (int i = 0; i < myTypes.length; i++) {
-		if (myTypes[i] == null || 
-			myTypes[i].firstName == null || 
-			myTypes[i].firstName.length() == 0 ||
-			myTypes[i].lastName == null ||
-			myTypes[i].lastName.length() == 0) return false;
-	}
-	return true;
-}
-protected boolean validate(Object object) {
-	return checkMyType(object);
-}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/.classpath b/demos/app-model/org.eclipse.swt.examples.graphics/.classpath
deleted file mode 100644
index ce73933..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<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 kind="output" path="bin"/>
-</classpath>

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/.cvsignore b/demos/app-model/org.eclipse.swt.examples.graphics/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/.project b/demos/app-model/org.eclipse.swt.examples.graphics/.project
deleted file mode 100644
index 22b323d..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.swt.examples.graphics</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/demos/app-model/org.eclipse.swt.examples.graphics/.settings/org.eclipse.jdt.core.prefs b/demos/app-model/org.eclipse.swt.examples.graphics/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6aef80c..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Tue Mar 20 12:28:47 CDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/.settings/org.eclipse.pde.core.prefs b/demos/app-model/org.eclipse.swt.examples.graphics/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 86880e5..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/.settings/org.eclipse.pde.core.prefs
+++ /dev/null

@@ -1,4 +0,0 @@
-#Tue Feb 20 10:32:40 CST 2007
-eclipse.preferences.version=1
-pluginProject.extensions=true
-resolve.requirebundle=false

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/META-INF/MANIFEST.MF b/demos/app-model/org.eclipse.swt.examples.graphics/META-INF/MANIFEST.MF
deleted file mode 100644
index 67f1e8c..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Graphics Plug-in
-Bundle-SymbolicName: org.eclipse.swt.examples.graphics;singleton:=true
-Bundle-Version: 1.0.0
-Import-Package: org.eclipse.equinox.app;version="1.0.0",
- org.eclipse.swt,
- org.eclipse.swt.events,
- org.eclipse.swt.graphics,
- org.eclipse.swt.layout,
- org.eclipse.swt.widgets
-Bundle-RequiredExecutionEnvironment: J2SE-1.4

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/build.properties b/demos/app-model/org.eclipse.swt.examples.graphics/build.properties
deleted file mode 100644
index e9863e2..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/plugin.xml b/demos/app-model/org.eclipse.swt.examples.graphics/plugin.xml
deleted file mode 100644
index ec9f6f5..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/plugin.xml
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         id="app"
-         name="Graphics"
-         point="org.eclipse.core.runtime.applications">
-      <application
-            cardinality="1"
-            thread="any">
-         <run
-               class="org.eclipse.swt.examples.graphics.Application">
-         </run>
-      </application>
-   </extension>
-
-</plugin>

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/examples_graphics.properties b/demos/app-model/org.eclipse.swt.examples.graphics/src/examples_graphics.properties
deleted file mode 100644
index bbe4b34..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/examples_graphics.properties
+++ /dev/null

@@ -1,164 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-###############################################################################
-AdvancedGraphics=Advanced Graphics
-SWTGraphics=SWT Graphics
-Warning=Warning
-LibNotFound=Advanced graphics library not found. Some examples will not display.
-Settings=Settings
-Play=Play
-Pause=Pause
-Background=Background
-DoubleBuffer=Double Buffer
-White=White
-Black=Black
-Red=Red
-Green=Green
-Blue=Blue
-Cyan=Cyan
-Yellow=Yellow	
-CustomColor=Custom Color
-CustomPattern=Custom Pattern
-Pattern1=Pink Losange
-Pattern2=Purple Checkers
-Pattern3=Blue Pentagon
-Animation=Animation
-StarPolygon=Star Polygon
-Line=Line
-BlackHole=Black Hole
-FillRule=Fill Rule:
-Polygons=Polygons
-Introduction=Introduction
-SWT=SWT
-Bounce=Bounce
-Font=Font
-Misc=Misc
-Countdown=Countdown
-LineWidth=Line Width
-Antialiasing=Antialiasing
-LineCap=Line Cap
-Spiral=Spiral
-Petals=Petals
-Gradient=Gradient
-GradImage=Gradient Image
-SwapColors=Swap Colors
-Curves=Curves
-Cubic=Cubic
-Quadratic=Quadratic
-Lines=Lines
-Flat=Flat
-Square=Square
-Round=Round
-LineStyles=Line Styles
-GradientDlgMsg=Please select two colors:
-GradientDlgButton1=Color 1
-GradientDlgButton2=Color 2
-GradientTabItem1=Color 1
-GradientTabItem2=Color 2
-Alpha=Alpha
-CustomFont=Custom Font
-Regular=Regular
-Italic=Italic
-Bold=Bold
-BoldItalic=Bold Italic
-FontFace=Face
-FontStyle=Style
-FontSize=Size
-Color=Color
-Clipping=Clipping
-PathClipping=Path Clipping
-Circles=Circles
-Rectangle=Rectangle
-Oval=Oval
-Word=Word
-Star=Star
-Triangles=Triangles
-Default=Default
-RegionClipping=Region Clipping
-Region1=Region 1
-Region2=Region 2
-Add=Add
-Sub=Substract
-Inter=Intersect
-Interpolation=Interpolation
-Image=Image
-OriginalImg=Original Image
-House=House
-Question=Question
-Task=Task
-Cube=Cube
-Ovals=Ovals
-None=None
-Low=Low
-Default=Default
-High=High
-Transform=Transform
-Cards=Cards
-Solid=Solid
-Dash=Dash
-Dot=Dot
-DashDot=Dash Dot
-DashDotDot=Dash Dot Dot
-LineJoin=Line Join
-bevel=BEVEL
-miter=MITER
-round=ROUND
-Ball=Ball
-CustomAlpha=Custom Alpha
-Maze=Maze
-rgb=RGB
-Graphics=Graphics
-Flip=Flip
-Rotate=Rotate
-xscale=X-Scale
-yscale=Y-Scale
-Invert=Invert
-Path=Path
-PathOper=Path Operations
-DrawPath=Draw Path
-FillPath=Fill Path
-ClosePath=Close Path
-FillColor=Fill Color
-Text=Text
-Shapes=Shapes
-Next=Next
-Back=Back
-AnimPathClipping=Animated Path Clipping
-##### ------------------ Tab Descriptions ------------------ #####
-AlphaDescription=This tab demonstrates alpha blending. It draws various shapes and images as alpha values change.
-BallDescription=This tab uses alpha blending to simulate \"ghosting\" of a ball in movement.
-BlackHoleDescription=This is a miscellaneous demonstration that makes use of the fillOval() operation to simulate a black hole.
-CardsDescription=This tab demonstrates various transformations, such as scaling, rotation, and translation.
-CountdownDescription=This miscellaneous tab presents a count down from 5 to 1, then displays SWT.
-CurvesSWTDescription=This tab presents cubic and quadratic curves that can be drawn.  As a demonstration, cubic and quadratic curves are used to spell out \"SWT\".  The user may reposition the cubic and quadratic handles.
-CurvesDescription=This tab presents cubic and quadratic curves that can be drawn.  The user may reposition the cubic and quadratic handles
-CustomAlphaDescription=This tab demonstrates the use of alpha blending.  It allows a user to specify a custom alpha value.
-CustomFontDescription=This tab demonstrates various text fonts.  It allows the user to specify font parameters such as face, style and size.
-FontBounceDescription=This tab is an animated graphic. It presents the word SWT in different fonts as it bounces around the screen.
-GradientImageDescription=This tab is an animated graphic. It presents the word SWT in different fonts as it bounces around the screen.
-AntialiasingGraphicsDesc=This tab demonstrates antialiasing for graphics. Antialiasing is used for smoothing jagged edges in graphics. This tab allows the user to see the effects of different antialiasing values.
-FlipDescription=This tab demonstrates how an image can be flipped in various fashions.
-TransformImgDescription=This tab demonstrates transformations, such as scaling, rotation, and invert.  It allows the user to specify values for scaling and rotation.
-ImageInterpolationDesc=This tab shows the effects of applying various interpolation algorithms to images that have been stretched or shrunk.
-IntroductionDescription=This is the introduction tab.  This demonstration makes use of a path clipping.
-LineCapDescription=This tab demonstrates various line caps applicable to a line.
-LineJoinDescription=This tab demonstrates various line joins. It allows a user to choose from bevel, miter and round.
-LineStylesDescription=This tab demonstrates line styles applicable to a line.  It shows the use of the setLineStyle() method.
-LineDescription=This tab draws two lines.
-MazeDescription=This is a miscellaneous demonstration.  Three objects move through the maze, each following a different path.  Only one of the three follows the correct path.
-AnimPathClippingDesc=This tab demonstrates the use of path clipping.  A clipping is the area onto which a drawing is made visible.  The default clipping is the entire canvas (all the space in the right panel).  However, one can set the clipping to be something different.  In this tab, the clipping is the set of triangles, rectangles and the circle.  When the blue rectangle is drawn, only the portions of the blue rectangle appearing in the clipping are visible.
-PathClippingDesc=This tab demonstrates the use of path clipping.  A clipping is the area onto which a drawing is made visible.  The default clipping is the entire canvas (all the space in the right panel).  However, one can set the clipping to be something different.
-PathOperDescription=This tab demonstrates the use of paths. It allows the user to see the differences between filling, drawing and closing paths.
-rgbDescription=Miscellaneous tab that demonstrates emerging colors from layering other colors.
-RegionClippingDescription=This tab demonstrates how to apply a region clipping and the effects of applying one.  It also demonstrates the operations that can be applied between two regions.
-ShapesDescription=This tab draws 3D shapes (in 2D) using various line styles.
-SpiralDescription=Miscellaneous tab that presents a spiral consisting of the number of petals specified.
-StarPolygonDescription=This tab draws a polygon and shows the effects of setting different fill rules: SWT.FILL_WINDING or SWT.FILL_EVEN_ODD
-AntialiasingTextDesc=This tab demonstrates antialiasing for text. Antialiasing is used for smoothing jagged edges in graphics. This tab allows the user to see the effects of different antialiasing values.

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/AdvancedGraphics.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/AdvancedGraphics.java
deleted file mode 100644
index a719c7c..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/AdvancedGraphics.java
+++ /dev/null

@@ -1,103 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.graphics;
-
-/* 
- * Drawing with transformations, paths and alpha blending
- *
- * For a list of all SWT example snippets see
- * http://www.eclipse.org/swt/snippets/
- */
-import java.io.*;
-import java.util.*;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.*;
-
-public class AdvancedGraphics {
-	
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle("examples_graphics");
-	private Shell shell;
-	static Image loadImage (Device device, Class clazz, String string) {
-		InputStream stream = clazz.getResourceAsStream (string);
-		if (stream == null) return null;
-		Image image = null;
-		try {
-			image = new Image (device, stream);
-		} catch (SWTException ex) {
-		} finally {
-			try {
-				stream.close ();
-			} catch (IOException ex) {}
-		}
-		return image;
-	}
-
-	public Shell open(final Display display) {
-		shell = new Shell(display);
-		shell.setText(RESOURCE_BUNDLE.getString("AdvancedGraphics")); //$NON-NLS-1$
-		try {
-			Path path = new Path(display);
-			path.dispose();
-		} catch (SWTException e) {
-			MessageBox dialog = new MessageBox(shell, SWT.ICON_WARNING | SWT.OK);
-			dialog.setText(RESOURCE_BUNDLE.getString("Warning")); //$NON-NLS-1$
-			dialog.setMessage(RESOURCE_BUNDLE.getString("LibNotFound")); //$NON-NLS-1$
-			dialog.open();
-			shell.dispose();
-			return null;
-		}
-		FontData fd = shell.getFont().getFontData()[0];
-		final Font font = new Font(display, fd.getName(), 96, SWT.BOLD | SWT.ITALIC);
-		final Image image = loadImage(display, AdvancedGraphics.class, "irmaos.jpg");
-		final Rectangle rect = image.getBounds();
-		shell.addListener(SWT.Paint, new Listener() {
-			public void handleEvent(Event event) {
-				GC gc = event.gc;				
-				Transform tr = new Transform(display);
-				tr.translate(rect.width / 4, rect.height / 2);
-				tr.rotate(-30);
-				if (image != null) {
-					gc.drawImage(image, 0, 0, rect.width, rect.height, 0, 0, rect.width, rect.height);
-				}
-				gc.setAlpha(100);
-				gc.setTransform(tr);
-				Path path = new Path(display);
-				path.addString("SWT", 0, 0, font);
-				gc.setBackground(display.getSystemColor(SWT.COLOR_GREEN));
-				gc.setForeground(display.getSystemColor(SWT.COLOR_BLUE));
-				gc.fillPath(path);
-				gc.drawPath(path);
-				tr.dispose();
-				path.dispose();
-			}			
-		});
-		shell.setSize(shell.computeSize(rect.width, rect.height));
-		shell.open();
-		shell.addListener(SWT.Dispose, new Listener() {
-			public void handleEvent(Event event) {
-				if (image != null) image.dispose();
-				font.dispose();
-			}
-		});	
-		return shell;
-	}
-	
-	public boolean isDisposed() {
-		return shell == null || shell.isDisposed();
-	}
-
-	public void dispose() {
-		if (shell != null)
-			shell.dispose();
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/AlphaTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/AlphaTab.java
deleted file mode 100644
index f2908ad..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/AlphaTab.java
+++ /dev/null

@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-
-/**
- * This tab demonstrates alpha blending. It draws various shapes and images as
- * alpha values change.
- */
-public class AlphaTab extends AnimatedGraphicsTab {
-	/**
-	 * Value used in setAlpha API call. Goes from 0 to 255 and then starts over.
-	 */
-	int alphaValue;
-	
-	/**
-	 * Value used in setAlpha API call. Goes from 0 to 255, then from 255 to 0
-	 * and then starts over.
-	 */
-	int alphaValue2;
-
-	boolean reachedMax = false;
-	int diameter;
-	
-	/** random numbers used for positioning "SWT" */
-	int randX, randY;
-	Image alphaImg1, alphaImg2;
-
-	public AlphaTab(GraphicsExample example) {
-		super(example);
-	}
-	
-	public String getCategory() {
-		return GraphicsExample.getResourceString("Alpha"); //$NON-NLS-1$
-	}
-
-	public String getText() {
-		return GraphicsExample.getResourceString("Alpha"); //$NON-NLS-1$
-	}
-	
-	public String getDescription() {
-		return GraphicsExample.getResourceString("AlphaDescription"); //$NON-NLS-1$
-	}
-	
-	public int getInitialAnimationTime() {
-		return 20;
-	}
-	
-	public void dispose() {
-		if (alphaImg1 != null) {
-			alphaImg1.dispose();
-			alphaImg1 = null;
-		}
-		if (alphaImg2 != null) {
-			alphaImg2.dispose();
-			alphaImg2 = null;
-		}
-	}
-
-	public void next(int width, int height) {
-		alphaValue = (alphaValue+5)%255;
-		
-		alphaValue2 = reachedMax ? alphaValue2 - 5 : alphaValue2 + 5;
-			
-		if (alphaValue2 == 255) {
-			reachedMax = true;
-		} else if (alphaValue2 == 0) {
-			reachedMax = false;
-		}
-		
-		diameter = (diameter + 10)%(width > height ? width : height);
-	}
-
-	/** 
-	 * Paint the receiver into the specified GC. 
-	 */
-	public void paint(GC gc, int width, int height) {
-		if (!example.checkAdvancedGraphics()) return;
-		Device device = gc.getDevice();
-
-		if (alphaImg1 == null) {
-			alphaImg1 = GraphicsExample.loadImage(device, GraphicsExample.class, "alpha_img1.png");
-			alphaImg2 = GraphicsExample.loadImage(device, GraphicsExample.class, "alpha_img2.png");	
-		}
-
-		Rectangle rect = alphaImg1.getBounds();
-		
-		gc.setAlpha(alphaValue);
-		gc.drawImage(alphaImg1, rect.x, rect.y, rect.width, rect.height, 
-				width/2, height/2, width/4, height/4);
-		
-		gc.drawImage(alphaImg1, rect.x, rect.y, rect.width, rect.height, 
-				0, 0, width/4, height/4);
-
-		gc.setAlpha(255-alphaValue);
-		gc.drawImage(alphaImg2, rect.x, rect.y, rect.width, rect.height, 
-				width/2, 0, width/4, height/4);
-		
-		gc.drawImage(alphaImg2, rect.x, rect.y, rect.width, rect.height, 
-				0, 3*height/4, width/4, height/4);
-		
-		// pentagon
-		gc.setBackground(device.getSystemColor(SWT.COLOR_DARK_MAGENTA));
-		gc.fillPolygon(new int [] {width/10, height/2, 3*width/10, height/2-width/6, 5*width/10, height/2, 
-				4*width/10, height/2+width/6, 2*width/10, height/2+width/6});
-
-		gc.setBackground(device.getSystemColor(SWT.COLOR_RED));
-
-		// square
-		gc.setAlpha(alphaValue);
-		gc.fillRectangle(width/2, height-75, 75, 75);
-		
-		// triangle
-		gc.setAlpha(alphaValue + 15);
-		gc.fillPolygon(new int[]{width/2+75, height-(2*75), width/2+75, height-75, width/2+(2*75), height-75});
-		
-		// triangle
-		gc.setAlpha(alphaValue + 30);
-		gc.fillPolygon(new int[]{width/2+80, height-(2*75), width/2+(2*75), height-(2*75), width/2+(2*75), height-80});
-		
-		// triangle
-		gc.setAlpha(alphaValue + 45);
-		gc.fillPolygon(new int[]{width/2+(2*75), height-(2*75), width/2+(3*75), height-(2*75), width/2+(3*75), height-(3*75)});
-		
-		// triangle
-		gc.setAlpha(alphaValue + 60);
-		gc.fillPolygon(new int[]{width/2+(2*75), height-((2*75)+5), width/2+(2*75), height-(3*75), width/2+((3*75)-5), height-(3*75)});
-		
-		// square
-		gc.setAlpha(alphaValue + 75);
-		gc.fillRectangle(width/2+(3*75), height-(4*75), 75, 75);
-		
-		gc.setBackground(device.getSystemColor(SWT.COLOR_GREEN));
-		
-		// circle in top right corner
-		gc.setAlpha(alphaValue2);
-		gc.fillOval(width-100, 0, 100, 100);
-		
-		// triangle
-		gc.setAlpha(alphaValue + 90);
-		gc.fillPolygon(new int[]{width-300, 10, width-100, 10, width-275, 50});
-	
-		// triangle
-		gc.setAlpha(alphaValue + 105);
-		gc.fillPolygon(new int[]{width-10, 100, width-10, 300, width-50, 275});
-		
-		// quadrilateral shape
-		gc.setAlpha(alphaValue + 120);
-		gc.fillPolygon(new int[]{width-100, 100, width-200, 150, width-200, 200, width-150, 200});
-		
-		// blue circles
-		gc.setBackground(device.getSystemColor(SWT.COLOR_BLUE));
-		int size = 50;
-		int alpha = 20;
-		for (int i = 0; i < 10; i++) {
-			gc.setAlpha(alphaValue + alpha);
-			if (i % 2 > 0) {
-				gc.fillOval(width-((i+1)*size), height-size, size, size);
-			} else {
-				gc.fillOval(width-((i+1)*size), height-(3*size/2), size, size);
-			}
-			alpha = alpha + 20;
-		}
-		
-		// SWT string appearing randomly
-		gc.setAlpha(alphaValue2);
-		String text = GraphicsExample.getResourceString("SWT");
-		Font font = createFont(device, 100, SWT.NONE);
-		gc.setFont(font);
-		
-		Point textSize = gc.stringExtent(text);
-		int textWidth = textSize.x;
-		int textHeight = textSize.y;
-		
-		if (alphaValue2 == 0){
-			randX = (int)(width*Math.random());
-			randY = (int)(height*Math.random());
-			randX = (randX > textWidth) ? randX - textWidth : randX;
-			randY = (randY > textHeight) ? randY - textHeight : randY;
-		}
-		
-		gc.drawString(text, randX, randY, true);
-		font.dispose();
-		
-		// gray donut
-		gc.setAlpha(100);
-		Path path = new Path(device);
-		path.addArc((width-diameter)/2, (height-diameter)/2, diameter, diameter, 0, 360);
-		path.close();
-		path.addArc((width-diameter+25)/2, (height-diameter+25)/2, diameter-25, diameter-25, 0, 360);
-		path.close();
-		gc.setBackground(device.getSystemColor(SWT.COLOR_GRAY));
-		gc.fillPath(path);
-		gc.drawPath(path);
-		path.dispose();
-	}
-	
-	/**
-	 * Creates a font using the specified arguments and returns it.
-	 * This method takes into account the resident platform.
-	 * 
-	 * @param face
-	 * 			The name of the font
-	 * @param points
-	 * 			The size of the font in point
-	 * @param style
-	 * 			The style to be applied to the font
-	 */
-	static Font createFont(Device device, int points, int style) {		
-		if(SWT.getPlatform() == "win32") {
-			return new Font(device, "Verdana", points, style);	
-		} else if (SWT.getPlatform() == "motif") {
-			return new Font(device, "Times", points, style);		
-		} else if (SWT.getPlatform() == "gtk") {
-			return new Font(device, "Baekmuk Batang", points, style);		
-		} else if (SWT.getPlatform() == "carbon") {
-			return new Font(device, "Verdana", points, style);
-		} else { // photon
-			return new Font(device, "Verdana", points, style);
-		}
-	}
-}
-

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/AnimatedGraphicsTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/AnimatedGraphicsTab.java
deleted file mode 100644
index 6c442f3..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/AnimatedGraphicsTab.java
+++ /dev/null

@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This class extends the GraphicsTab class to create animated graphics.
- * */
-public abstract class AnimatedGraphicsTab extends GraphicsTab {
-
-	ToolBar toolBar;
-	ToolItem playItem, pauseItem;
-	Spinner timerSpinner;		// to input the speed of the animation 
-	private boolean animate;	// flag that indicates whether or not to animate the graphic
-
-	public AnimatedGraphicsTab(GraphicsExample example) {
-		super(example);
-		animate = true;
-	}
-
-	/**
-	 * Sets the layout of the composite to RowLayout and creates the toolbar.
-	 * 
-	 * @see org.eclipse.swt.examples.graphics.GraphicsTab#createControlPanel(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControlPanel(Composite parent) {
-		
-		// setup layout
-		RowLayout layout = new RowLayout();
-		layout.wrap = true;
-		layout.spacing = 8;
-		parent.setLayout(layout);
-		
-		createToolBar(parent);
-	}
-	
-	/**
-	 * Creates the toolbar controls: play, pause and animation timer.
-	 * 
-	 * @param parent A composite
-	 */
-	void createToolBar(final Composite parent) {
-		final Display display = parent.getDisplay();
-				
-		toolBar = new ToolBar(parent, SWT.FLAT);
-		Listener toolBarListener = new Listener() {
-			public void handleEvent(Event event) {
-				switch (event.type) {
-					case SWT.Selection: {
-						if (event.widget == playItem) {
-							animate = true;
-							playItem.setEnabled(!animate);
-							pauseItem.setEnabled(animate);
-						} else if (event.widget == pauseItem) {
-							animate = false;
-							playItem.setEnabled(!animate);
-							pauseItem.setEnabled(animate);
-						}
-					}
-					break;
-				}
-			}
-		};
-		
-		// play tool item
-		playItem = new ToolItem(toolBar, SWT.PUSH);
-		playItem.setText(GraphicsExample.getResourceString("Play")); //$NON-NLS-1$
-		playItem.setImage(example.loadImage(display, "play.gif")); //$NON-NLS-1$
-		playItem.addListener(SWT.Selection, toolBarListener);
-		
-		// pause tool item
-		pauseItem = new ToolItem(toolBar, SWT.PUSH);
-		pauseItem.setText(GraphicsExample.getResourceString("Pause")); //$NON-NLS-1$
-		pauseItem.setImage(example.loadImage(display, "pause.gif")); //$NON-NLS-1$
-		pauseItem.addListener(SWT.Selection, toolBarListener);
-		
-		// timer spinner
-		Composite comp = new Composite(parent, SWT.NONE);
-		GridLayout gridLayout = new GridLayout(2, false);
-		comp.setLayout(gridLayout);
-
-		Label label = new Label(comp, SWT.CENTER);
-		label.setText(GraphicsExample.getResourceString("Animation")); //$NON-NLS-1$
-		timerSpinner = new Spinner(comp, SWT.BORDER | SWT.WRAP);
-		timerSpinner.setMaximum(1000);
-		
-		playItem.setEnabled(false);
-		animate = true;
-
-		timerSpinner.setSelection(getInitialAnimationTime());
-	}
-	
-	/**
-	 *  Answer whether the receiver's drawing should be double bufferer.
-	 */
-	public boolean getDoubleBuffered() {
-		return true;
-	}
-	
-	/**
-	 * Gets the initial animation time to be used by the tab. Animation time:
-	 * number of milliseconds between the current drawing and the next (the time
-	 * interval between calls to the next method). Should be overridden to
-	 * return a value that is more appropriate for the tab.
-	 */
-	public int getInitialAnimationTime() {
-		return 30;
-	}
-	
-	/**
-	 * Gets the animation time that is selected in the spinner. Animation time:
-	 * number of milliseconds between the current drawing and the next (the time
-	 * interval between calls to the next method). Should be overridden to
-	 * return a value that is more appropriate for the tab.
-	 */
-	public int getAnimationTime() {
-		return timerSpinner.getSelection();
-	}
-	
-	/**
-	 * Returns the true if the tab is currently animated; false otherwise.
-	 */
-	public boolean getAnimation() {
-		return animate;
-	}
-	
-	/**
-	 * Causes the animation to stop or start.
-	 * 
-	 * @param flag
-	 *            true starts the animation; false stops the animation.
-	 */
-	public void setAnimation(boolean flag) {
-		animate = flag;
-		playItem.setEnabled(!flag);
-		pauseItem.setEnabled(flag);
-	}
-
-	/**
-	 * Advance the animation.
-	 */
-	public abstract void next(int width, int height);
-	
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/Application.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/Application.java
deleted file mode 100644
index 07fc9cc..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/Application.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.equinox.app.IApplication;
-import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.swt.widgets.Display;
-
-public class Application implements IApplication {
-	AdvancedGraphics app;
-
-	public Object start(IApplicationContext context) throws Exception {
-		final Display display = Display.getDefault();
-		display.syncExec(new Runnable() {
-			public void run() {
-				app = new AdvancedGraphics();
-				app.open(display);
-			}
-		});
-		context.applicationRunning();
-		while (!app.isDisposed())
-			Thread.sleep(200);
-		app.dispose();
-		return null;
-	}
-
-	public void stop() {
-		Display.getDefault().syncExec(new Runnable() {
-			public void run() {
-				if (app != null && !app.isDisposed())
-					app.dispose();
-			}
-		});
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/BallTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/BallTab.java
deleted file mode 100644
index 404be71..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/BallTab.java
+++ /dev/null

@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import java.util.LinkedList;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Device;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Path;
-import org.eclipse.swt.graphics.Transform;
-
-/**
- * This tab uses alpha blending to simulate "ghosting" of a ball in movement.
- */
-public class BallTab extends AnimatedGraphicsTab {
-
-	BallCollection[] bc;
-
-	/**
-	 * This inner class serves as a container for the data needed to display a
-	 * collection of balls.
-	 */
-	static class BallCollection {
-		float x, y; // position of ball
-		float incX, incY; // values by which to move the ball
-		int ball_size; // size (diameter) of the ball
-		int capacity; // number of balls in the collection
-		LinkedList prevx, prevy; // collection of previous x and y positions
-								 // of ball
-		Color[] colors; // colors used for this ball collection
-
-		public BallCollection(float x, float y, float incX, float incY,
-				int ball_size, int capacity, Color[] colors) {
-			this.x = x;
-			this.y = y;
-			this.incX = incX;
-			this.incY = incY;
-			this.ball_size = ball_size;
-			this.capacity = capacity;
-			prevx = new LinkedList();
-			prevy = new LinkedList();
-			this.colors = colors;
-		}
-	}
-
-	public void dispose() {
-		bc[0] = bc[1] = bc[2] = bc[3] = bc[4] = null;
-	}
-
-	public BallTab(GraphicsExample example) {
-		super(example);
-		bc = new BallCollection[5];
-	}
-
-	public String getCategory() {
-		return GraphicsExample.getResourceString("Alpha"); //$NON-NLS-1$
-	}
-
-	public String getText() {
-		return GraphicsExample.getResourceString("Ball"); //$NON-NLS-1$
-	}
-
-	public String getDescription() {
-		return GraphicsExample.getResourceString("BallDescription"); //$NON-NLS-1$
-	}
-	
-	public int getInitialAnimationTime() {
-		return 10;
-	}
-
-	public void next(int width, int height) {
-		for (int i = 0; i < bc.length; i++) {
-			if (bc[i] == null) return;
-			if (bc[i].prevx.size() == 0) {
-				bc[i].prevx.addLast(new Float(bc[i].x));
-				bc[i].prevy.addLast(new Float(bc[i].y));
-			} else if (bc[i].prevx.size() == bc[i].capacity) {
-				bc[i].prevx.removeFirst();
-				bc[i].prevy.removeFirst();
-			}
-
-			bc[i].x += bc[i].incX;
-			bc[i].y += bc[i].incY;
-
-			float random = (float) Math.random();
-
-			// right
-			if (bc[i].x + bc[i].ball_size > width) {
-				bc[i].x = width - bc[i].ball_size;
-				bc[i].incX = random * -width / 16 - 1;
-			}
-			// left
-			if (bc[i].x < 0) {
-				bc[i].x = 0;
-				bc[i].incX = random * width / 16 + 1;
-			}
-			// bottom
-			if (bc[i].y + bc[i].ball_size > height) {
-				bc[i].y = (height - bc[i].ball_size) - 2;
-				bc[i].incY = random * -height / 16 - 1;
-			}
-			// top
-			if (bc[i].y < 0) {
-				bc[i].y = 0;
-				bc[i].incY = random * height / 16 + 1;
-			}
-			bc[i].prevx.addLast(new Float(bc[i].x));
-			bc[i].prevy.addLast(new Float(bc[i].y));
-		}
-	}
-
-	public void paint(GC gc, int width, int height) {
-		if (!example.checkAdvancedGraphics()) return;
-		Device device = gc.getDevice();
-
-		if (bc[0] == null) {
-			bc[0] = new BallCollection(0, 0, 5, 5, 20, 20, new Color[] { device
-					.getSystemColor(SWT.COLOR_GREEN) });
-			bc[1] = new BallCollection(50, 300, 10, -5, 50, 10,
-					new Color[] { device.getSystemColor(SWT.COLOR_BLUE) });
-			bc[2] = new BallCollection(250, 100, -5, 8, 25, 12,
-					new Color[] { device.getSystemColor(SWT.COLOR_RED) });
-			bc[3] = new BallCollection(150, 400, 5, 8, 35, 14,
-					new Color[] { device.getSystemColor(SWT.COLOR_BLACK) });
-			bc[4] = new BallCollection(100, 250, -5, -18, 100, 5,
-					new Color[] { device.getSystemColor(SWT.COLOR_MAGENTA) });
-		}
-
-		for (int j = 0; j < bc.length; j++) {
-			for (int i = 0; i < bc[j].prevx.size(); i++) {
-				Transform transform = new Transform(device);
-				transform.translate(((Float) bc[j].prevx.get(bc[j].prevx.size()
-						- (i + 1))).floatValue(), ((Float) bc[j].prevy
-						.get(bc[j].prevy.size() - (i + 1))).floatValue());
-				gc.setTransform(transform);
-				transform.dispose();
-
-				Path path = new Path(device);
-				path.addArc(0, 0, bc[j].ball_size, bc[j].ball_size, 0, 360);
-				gc.setAlpha(255 - i * (255 / bc[j].capacity));
-				gc.setBackground(bc[j].colors[0]);
-				gc.fillPath(path);
-				gc.drawPath(path);
-				path.dispose();
-			}
-		}
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/BlackHoleTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/BlackHoleTab.java
deleted file mode 100644
index efc29d0..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/BlackHoleTab.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-
-public class BlackHoleTab extends AnimatedGraphicsTab {
-	
-	int size = 1;
-	
-public BlackHoleTab(GraphicsExample example) {
-	super(example);
-}
-
-public String getText() {
-	return GraphicsExample.getResourceString("BlackHole"); //$NON-NLS-1$
-}
-
-public String getDescription() {
-	return GraphicsExample.getResourceString("BlackHoleDescription"); //$NON-NLS-1$
-}
-
-public void next(int width, int height) {
-	if (size > width * 3 / 2) size = 0;
-	else size += 10;
-}
-
-public void paint(GC gc, int width, int height) {
-	Device device = gc.getDevice();
-	gc.setBackground(device.getSystemColor(SWT.COLOR_BLACK));
-	gc.fillOval((width - size) / 2, (height - size) / 2, size, size);
-}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/CardsTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/CardsTab.java
deleted file mode 100644
index acf547d..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/CardsTab.java
+++ /dev/null

@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.swt.graphics.*;
-
-/**
- * This tab demonstrates various transformations, such as scaling, rotation, and
- * translation.
- */
-public class CardsTab extends AnimatedGraphicsTab {
-	
-	float movClubX, movClubY, movDiamondX, movDiamondY, movHeart, movSpade;
-	float inc_club = 5.0f;
-	float inc_diamond = 5.0f;
-	float inc_hearts = 5.0f;
-	float inc_spade = 5.0f;
-	float scale, scaleWidth;
-	int rotationAngle = 0;
-	float scaleArg = 0;
-	float heartScale = 0.5f;
-	float spadeScale = 0.333f;
-	int clubWidth, diamondWidth, heartWidth, spadeHeight; 
-	
-	Image ace_club, ace_spade, ace_diamond, ace_hearts;
-
-/**
- * Constructor
- * @param example A GraphicsExample
- */
-public CardsTab(GraphicsExample example) {
-	super(example);
-}
-
-public String getCategory() {
-	return GraphicsExample.getResourceString("Transform"); //$NON-NLS-1$
-}
-
-public String getText() {
-	return GraphicsExample.getResourceString("Cards"); //$NON-NLS-1$
-}
-
-public String getDescription() {
-	return GraphicsExample.getResourceString("CardsDescription"); //$NON-NLS-1$
-}
-
-public void dispose() {
-	if (ace_club != null) {
-		ace_club.dispose();
-		ace_club = null;
-		ace_spade.dispose();
-		ace_spade = null;
-		ace_diamond.dispose();
-		ace_diamond = null;
-		ace_hearts.dispose();
-		ace_hearts = null;
-	}
-}
-public void next(int width, int height) {
-	rotationAngle = (rotationAngle+10)%360;
-
-	// scaleVal goes from 0 to 1, then 1 to 0, then starts over
-	scaleArg = (float)((scaleArg == 1) ? scaleArg - 0.1 : scaleArg + 0.1);
-	scale = (float)Math.cos(scaleArg);
-	
-	movClubX += inc_club;
-	movDiamondX += inc_diamond;
-	movHeart += inc_hearts;
-	movSpade += inc_spade;
-	
-	scaleWidth = (float) ((movClubY/height)*0.35 + 0.15);
-	movClubY = 2*height/5 * (float)Math.sin(0.01*movClubX - 90) + 2*height/5;
-    movDiamondY = 2*height/5 * (float)Math.cos(0.01*movDiamondX) + 2*height/5;
-    
-    if (movClubX + clubWidth*scaleWidth > width) {
-    	movClubX = width - clubWidth*scaleWidth;
-        inc_club = -inc_club;
-    }
-    if (movClubX < 0) {
-        movClubX = 0;
-        inc_club = -inc_club;
-    }
-    if (movDiamondX + diamondWidth*scaleWidth > width) {
-	    movDiamondX = width - diamondWidth*scaleWidth;
-        inc_diamond = -inc_diamond;
-    }
-    if (movDiamondX < 0) {
-	    movDiamondX = 0;
-        inc_diamond = -inc_diamond;
-    }
-    if (movHeart + heartWidth*heartScale > width) {
-    	movHeart = width - heartWidth*heartScale;
-    	inc_hearts = -inc_hearts;
-    }
-    if (movHeart < 0) {
-    	movHeart = 0;
-    	inc_hearts = -inc_hearts;
-    }
-    if (movSpade + spadeHeight*spadeScale > height) {
-    	movSpade = height - spadeHeight*spadeScale;
-    	inc_spade = -inc_spade;
-    }
-    if (movSpade < 0) {
-    	movSpade = 0;
-    	inc_spade = -inc_spade;
-    }
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.swt.examples.graphics.GraphicsTab#paint(org.eclipse.swt.graphics.GC, int, int)
- */
-public void paint(GC gc, int width, int height) {
-	if (!example.checkAdvancedGraphics()) return;
-	Device device = gc.getDevice();
-	
-	if (ace_club == null) {
-		ace_club = GraphicsExample.loadImage(device, GraphicsExample.class, "ace_club.jpg");
-		ace_spade = GraphicsExample.loadImage(device, GraphicsExample.class, "ace_spade.jpg");
-		ace_diamond = GraphicsExample.loadImage(device, GraphicsExample.class, "ace_diamond.jpg");
-		ace_hearts = GraphicsExample.loadImage(device, GraphicsExample.class, "ace_hearts.jpg");
-	}
-	
-	clubWidth = ace_club.getBounds().width;
-	diamondWidth = ace_diamond.getBounds().width;
-	heartWidth = ace_hearts.getBounds().width;
-	spadeHeight = ace_spade.getBounds().height;
-
-	Transform transform;
-	
-	// ace of clubs		
-	transform = new Transform(device);
-	transform.translate((int)movClubX, (int)movClubY);	
-	transform.scale(scaleWidth, scaleWidth);
-	
-	// rotate on center of image
-	Rectangle rect = ace_club.getBounds();
-	transform.translate(rect.width/2, rect.height/2);
-	transform.rotate(rotationAngle);
-	transform.translate(-rect.width/2, -rect.height/2);
-
-	gc.setTransform(transform);
-	transform.dispose();
-	gc.drawImage(ace_club, 0, 0);
-	
-	// ace of diamonds
-	transform = new Transform(device);
-	transform.translate((int)movDiamondX, (int)movDiamondY);
-	transform.scale(scaleWidth, scaleWidth);
-	gc.setTransform(transform);
-	transform.dispose();
-	gc.drawImage(ace_diamond, 0, 0);
-
-	// ace of hearts
-	transform = new Transform(device);
-	transform.translate(movHeart, height/2);
-	transform.scale(heartScale, 0.5f*scale);
-	gc.setTransform(transform);
-	transform.dispose();
-	gc.drawImage(ace_hearts, 0, 0);
-	
-	// ace of spades
-	transform = new Transform(device);
-	transform.translate(movSpade, movSpade);
-	transform.scale(0.5f*scale, spadeScale);
-	gc.setTransform(transform);
-	transform.dispose();
-	gc.drawImage(ace_spade, 0, 0);
-}
-}
-

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ColorListener.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ColorListener.java
deleted file mode 100644
index a72d806..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ColorListener.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-/**
- * Used to perform an action after an item in a Menu has been selected.
- * 
- * @see org.eclipse.swt.examples.graphics.ColorMenu.java
- * @see org.eclipse.swt.examples.graphics.GraphicsBackground.java
- */
-public interface ColorListener {
-
-	public void setColor(GraphicsBackground gb);
-
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ColorMenu.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ColorMenu.java
deleted file mode 100644
index 2ded07c..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ColorMenu.java
+++ /dev/null

@@ -1,372 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import java.util.*;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This class utilizes the factory design pattern to create menus that may
- * contain color items, pattern items and gradient items. To create a menu:
- * first set the menu items that you wish to have appear in the menu by calling
- * the setters (setColorItems(), setPatternItems(), setGradientItems()), and
- * then call createMenu() to get an instance of a menu. By default, the menu
- * will contain color items.
- */
-public class ColorMenu {
-
-	boolean enableColorItems, enablePatternItems, enableGradientItems;
-	
-	public ColorMenu() {
-		enableColorItems = true;
-	}
-	
-	/**
-	 * Method used to specify whether or not the color menu items will appear in
-	 * the menu.
-	 * 
-	 * @param enable
-	 *            A boolean flag - true to make the color menu items visible in
-	 *            the menu; false otherwise.
-	 */
-	public void setColorItems(boolean enable) {
-		enableColorItems = enable;
-	}
-	
-	/**
-	 * @return true if color menu items are contained in the menu; false otherwise.
-	 * */
-	public boolean getColorItems() {
-		return enableColorItems;
-	}
-	
-	/**
-	 * Method used to specify whether or not the pattern menu items will appear
-	 * in the menu.
-	 * 
-	 * @param enable
-	 *            A boolean flag - true to make the pattern menu items visible
-	 *            in the menu; false otherwise.
-	 */
-	public void setPatternItems(boolean enable) {
-		enablePatternItems = enable;
-	}
-	
-	/**
-	 * @return true if pattern menu items are contained in the menu; false otherwise.
-	 * */
-	public boolean getPatternItems() {
-		return enablePatternItems;
-	}
-	
-	/**
-	 * Method used to specify whether or not the gradient menu items will appear
-	 * in the menu.
-	 * 
-	 * @param enable
-	 *            A boolean flag - true to make the gradient menu items visible
-	 *            in the menu; false otherwise.
-	 */
-	public void setGradientItems(boolean enable) {
-		enableGradientItems = enable;
-	}
-	
-	/**
-	 * @return true if gradient menu items are contained in the menu; false otherwise.
-	 */
-	public boolean getGradientItems() {
-		return enableGradientItems;
-	}
-	
-	/**
-	 * Creates and returns the menu based on the settings provided via
-	 * setColorItems(), setPatternItems() and setGradientItems()
-	 * 
-	 * @return A menu based on the settings
-	 */
-	public Menu createMenu(Control parent, ColorListener cl) {
-		Menu menu = new Menu(parent);
-	
-		MenuItemListener menuItemListener = createMenuItemListener(parent);
-		menu.addListener(SWT.Selection, menuItemListener);
-		menu.addListener(SWT.Dispose, menuItemListener);
-		menuItemListener.setColorListener(cl);
-
-		if (enableColorItems) {
-			addColorItems(menu, menuItemListener, menuItemListener.getMenuResources());
-		}
-		if (enablePatternItems) {
-			addPatternItems(menu, menuItemListener, menuItemListener.getMenuResources());
-		}
-		if (enableGradientItems) {
-			addGradientItems(menu, menuItemListener);
-		}
-		return menu;
-	}
-	
-	/** Adds the colors items to the menu. */
-	private void addColorItems(Menu menu, MenuItemListener menuListener,
-			ArrayList menuResources) {
-		Display display = menu.getDisplay();
-		
-		if (menu.getItemCount() != 0) {
-			new MenuItem(menu, SWT.SEPARATOR);
-		}
-		
-		// color names
-		String[] names = new String[]{
-			GraphicsExample.getResourceString("White"), //$NON-NLS-1$
-			GraphicsExample.getResourceString("Black"), //$NON-NLS-1$
-			GraphicsExample.getResourceString("Red"), //$NON-NLS-1$
-			GraphicsExample.getResourceString("Green"), //$NON-NLS-1$
-			GraphicsExample.getResourceString("Blue"), //$NON-NLS-1$
-			GraphicsExample.getResourceString("Yellow"), //$NON-NLS-1$
-			GraphicsExample.getResourceString("Cyan"), //$NON-NLS-1$
-		};
-		
-		// colors needed for the background menu
-		Color[] colors = new Color[]{
-			display.getSystemColor(SWT.COLOR_WHITE),
-			display.getSystemColor(SWT.COLOR_BLACK),
-			display.getSystemColor(SWT.COLOR_RED),
-			display.getSystemColor(SWT.COLOR_GREEN),
-			display.getSystemColor(SWT.COLOR_BLUE),
-			display.getSystemColor(SWT.COLOR_YELLOW),
-			display.getSystemColor(SWT.COLOR_CYAN),
-		};
-	
-		// add standard color items to menu
-		for (int i = 0; i < names.length; i++) {
-			MenuItem item = new MenuItem(menu, SWT.NONE);
-			item.setText(names[i]);
-			item.addListener(SWT.Selection, menuListener);
-			Color color = colors[i];
-			GraphicsBackground gb = new GraphicsBackground();
-			Image image = GraphicsExample.createImage(display, color);
-			gb.setBgColor1(color);
-			gb.setBgImage(image);
-			gb.setThumbNail(image);
-			menuResources.add(image);
-			item.setImage(image);
-			item.setData(gb);
-		}
-		
-		// add custom color item to menu
-		menuListener.customColorMI = new MenuItem(menu, SWT.NONE);
-		menuListener.customColorMI.setText(GraphicsExample.getResourceString("CustomColor")); //$NON-NLS-1$
-		menuListener.customColorMI.addListener(SWT.Selection, menuListener);
-		GraphicsBackground gb = new GraphicsBackground();
-		menuListener.customColorMI.setData(gb);		
-	}
-	
-	/** Adds the pattern items to the menu. */
-	private void addPatternItems(Menu menu, MenuItemListener menuListener,
-			ArrayList menuResources) {
-		Display display = menu.getDisplay();
-		
-		if (menu.getItemCount() != 0) {
-			new MenuItem(menu, SWT.SEPARATOR);
-		}
-		
-		// pattern names
-		String[] names = new String[]{
-			GraphicsExample.getResourceString("Pattern1"), //$NON-NLS-1$
-			GraphicsExample.getResourceString("Pattern2"), //$NON-NLS-1$
-			GraphicsExample.getResourceString("Pattern3"), //$NON-NLS-1$
-		};
-		
-		// pattern images
-		Image[] images = new Image[]{
-			loadImage(display, "pattern1.jpg", menuResources),	
-			loadImage(display, "pattern2.jpg", menuResources),
-			loadImage(display, "pattern3.jpg", menuResources),
-		};
-		
-		// add the pre-defined patterns to the menu
-		for (int i = 0; i < names.length; i++) {
-			MenuItem item = new MenuItem(menu, SWT.NONE);
-			item.setText(names[i]);
-			item.addListener(SWT.Selection, menuListener);
-			Image image = images[i];
-			GraphicsBackground gb = new GraphicsBackground();			
-			gb.setBgImage(image);
-			gb.setThumbNail(image);
-			item.setImage(image);
-			item.setData(gb);
-		}
-		
-		// add the custom pattern item	
-		menuListener.customPatternMI = new MenuItem(menu, SWT.NONE);
-		menuListener.customPatternMI.setText(GraphicsExample.getResourceString("CustomPattern")); //$NON-NLS-1$
-		menuListener.customPatternMI.addListener(SWT.Selection, menuListener);
-		GraphicsBackground gb = new GraphicsBackground();
-		menuListener.customPatternMI.setData(gb);			
-	}
-	
-	/** Adds the gradient menu item. */
-	private void addGradientItems(Menu menu, MenuItemListener menuListener) {
-		if (menu.getItemCount() != 0) {
-			new MenuItem(menu, SWT.SEPARATOR);
-		}
-		menuListener.customGradientMI = new MenuItem(menu, SWT.NONE);
-		menuListener.customGradientMI.setText(GraphicsExample.getResourceString("Gradient")); //$NON-NLS-1$
-		menuListener.customGradientMI.addListener(SWT.Selection, menuListener);
-		GraphicsBackground gb = new GraphicsBackground();
-		menuListener.customGradientMI.setData(gb);
-	}
-	
-	/** Creates and returns the listener for menu items. */
-	private MenuItemListener createMenuItemListener(final Control parent) {
-		return new MenuItemListener(parent);
-	}
-	
-	/**
-	 * Creates and returns an instance of Image using on the path of an image.
-	 * 
-	 * @param display
-	 *            A Display
-	 * @param name
-	 *            The path of the image file
-	 * @param resources
-	 *            The list of resources of the menu
-	 */
-	private Image loadImage(Display display, String name, ArrayList resources) {
-		Image image = GraphicsExample.loadImage(display, GraphicsExample.class, name);
-		if (image != null) resources.add(image);
-		return image;
-	}
-
-	/**
-	 * An inner class used as a listener for MenuItems added to the menu.
-	 */
-	static class MenuItemListener implements Listener {
-		MenuItem customColorMI, customPatternMI, customGradientMI;	// custom menu items
-		Control parent;
-		Image customImage, customImageThumb;
-		Color customColor;
-		GraphicsBackground background;	// used to store information about the background
-		ColorListener colorListener;
-		ArrayList resources;
-		
-		public MenuItemListener(Control parent){
-			this.parent = parent; 
-			resources = new ArrayList();
-		}
-		/**
-		 * Method used to set the ColorListener
-		 * 
-		 * @param cl
-		 *            A ColorListener
-		 * @see org.eclipse.swt.examples.graphics.ColorListener.java
-		 */
-		public void setColorListener(ColorListener cl) {
-			this.colorListener = cl;
-		}
-		
-		public ArrayList getMenuResources() {
-			return resources;
-		}
-
-		public void handleEvent(Event event) {
-			switch (event.type) {
-
-			case SWT.Dispose:
-				for (int i = 0; i < resources.size(); i++) {
-					((Resource) resources.get(i)).dispose();
-				}
-				resources = new ArrayList();
-				break;
-			case SWT.Selection:
-				Display display = event.display;
-				MenuItem item = (MenuItem) event.widget;
-				if (customColorMI == item) {
-					ColorDialog dialog = new ColorDialog(parent.getShell());
-					if (customColor != null && !customColor.isDisposed()) {
-						dialog.setRGB(customColor.getRGB());
-					}
-					RGB rgb = dialog.open();
-					if (rgb == null) return;
-					if (customColor != null) customColor.dispose();
-					customColor = new Color(display, rgb);
-					if (customPatternMI != null) customPatternMI.setImage(null);
-					if (customGradientMI != null) customGradientMI.setImage(null);
-					if (customImage != null) customImage.dispose();
-					customImage = GraphicsExample.createImage(display, customColor);
-					GraphicsBackground gb = new GraphicsBackground();
-					gb.setBgImage(customImage);
-					gb.setThumbNail(customImage);
-					gb.setBgColor1(customColor);
-					item.setData(gb);
-					item.setImage(customImage);
-					resources.add(customColor);
-					resources.add(customImage);
-				} else if (customPatternMI == item) {
-					FileDialog dialog = new FileDialog(parent.getShell());
-					dialog.setFilterExtensions(new String[] { "*.jpg", "*.gif",	"*.*" });
-					String name = dialog.open();
-					if (name == null) return;
-					if (customColorMI != null) customColorMI.setImage(null);
-					if (customGradientMI != null) customGradientMI.setImage(null);
-					if (customColor != null) customColor.dispose();
-					if (customImage != null) customImage.dispose();
-					if (customImageThumb != null) customImageThumb.dispose();
-					customImage = new Image(display, name);
-					customImageThumb = GraphicsExample.createThumbnail(display, name);
-					GraphicsBackground gb = new GraphicsBackground();
-					gb.setBgImage(customImage);
-					gb.setThumbNail(customImageThumb);
-					item.setData(gb);
-					item.setImage(customImageThumb);
-					resources.add(customImageThumb);
-				} else if (customGradientMI == item) {
-					GradientDialog dialog = new GradientDialog(parent.getShell());
-					if (background != null) {
-						if (background.getBgColor1() != null)
-							dialog.setFirstRGB(background.getBgColor1().getRGB());
-						if (background.getBgColor2() != null)
-							dialog.setSecondRGB(background.getBgColor2().getRGB());						
-					}					
-					if (dialog.open() != SWT.OK) return;
-					Color colorA = new Color(display, dialog.getFirstRGB());
-					Color colorB = new Color(display, dialog.getSecondRGB());
-					if (colorA == null || colorB == null) return;
-					if (customColorMI != null) customColorMI.setImage(null);
-					if (customPatternMI != null) customPatternMI.setImage(null);
-					if (customColor != null) customColor.dispose();
-					if (customImage != null) customImage.dispose();
-					customImage = GraphicsExample.createImage(display, colorA, 
-							colorB, 16, 16);
-					GraphicsBackground gb = new GraphicsBackground();
-					gb.setBgImage(customImage);
-					gb.setThumbNail(customImage);
-					gb.setBgColor1(colorA);
-					gb.setBgColor2(colorB);
-					item.setData(gb);
-					item.setImage(customImage);
-					resources.add(colorA);
-					resources.add(colorB);
-					resources.add(customImage);
-				} else {
-					if (customColorMI != null) customColorMI.setImage(null);
-					if (customPatternMI != null) customPatternMI.setImage(null);
-					if (customGradientMI != null) customGradientMI.setImage(null);
-				}
-				background = (GraphicsBackground) item.getData();
-				colorListener.setColor(background);
-				break;
-			}
-		}
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/CountDownTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/CountDownTab.java
deleted file mode 100644
index d483539..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/CountDownTab.java
+++ /dev/null

@@ -1,262 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This tab presents a count down from 5 to 1, then displays SWT.
- * */
-public class CountDownTab extends AnimatedGraphicsTab {
-
-	final int startNumber = 5;			// number at which to start the countdown
-	int nextNumber = startNumber;		// next number to be displayed
-	int angle = -90;					// angle used to rotate the bar
-
-	Spinner lineWidthSpinner;			// spinner for line width
-	Combo aliasCombo, lineCapCombo;		// combo for alias type and line cap
-	int antialias, lineCap;				// antialias and linecap values
-	int[] capValues = { SWT.CAP_FLAT, SWT.CAP_SQUARE, SWT.CAP_ROUND };
-	int[] aliasValues = { SWT.DEFAULT, SWT.OFF, SWT.ON };
-
-	/**
-	 * Constructor
-	 * 
-	 * @param example
-	 *            A GraphicsExample
-	 */
-	public CountDownTab(GraphicsExample example) {
-		super(example);
-	}
-
-	/**
-	 * This method creates the controls specific to the tab. The call to the
-	 * createControlPanel method in the super class create the controls that are
-	 * defined in the super class.
-	 * 
-	 * @param parent
-	 *            The parent composite
-	 */
-	public void createControlPanel(Composite parent) {
-		super.createControlPanel(parent);
-
-		if (nextNumber < 1)
-			nextNumber = startNumber;
-
-		// add selection listener to reset nextNumber after
-		// the sequence has completed
-		playItem.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				if (nextNumber < 1)
-					nextNumber = startNumber;
-			}
-		});
-
-		Composite comp;
-		GridLayout gridLayout = new GridLayout(2, false);
-
-		// create spinner for line width
-		comp = new Composite(parent, SWT.NONE);
-		comp.setLayout(gridLayout);
-		new Label(comp, SWT.CENTER).setText(GraphicsExample
-				.getResourceString("LineWidth")); //$NON-NLS-1$
-		lineWidthSpinner = new Spinner(comp, SWT.BORDER | SWT.WRAP);
-		lineWidthSpinner.setSelection(20);
-		lineWidthSpinner.setMinimum(1);
-		lineWidthSpinner.setMaximum(100);
-		lineWidthSpinner.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				if (!pauseItem.isEnabled()) {
-					example.redraw();
-				}
-			}
-		});
-
-		// create drop down combo for antialiasing
-		comp = new Composite(parent, SWT.NONE);
-		comp.setLayout(gridLayout);
-		new Label(comp, SWT.CENTER).setText(GraphicsExample
-				.getResourceString("Antialiasing")); //$NON-NLS-1$
-		aliasCombo = new Combo(comp, SWT.DROP_DOWN);
-		aliasCombo.add("DEFAULT");
-		aliasCombo.add("OFF");
-		aliasCombo.add("ON");
-		aliasCombo.select(0);
-		antialias = aliasValues[0];
-		aliasCombo.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				antialias = aliasValues[aliasCombo.getSelectionIndex()];
-				if (!pauseItem.isEnabled()) {
-					example.redraw();
-				}
-			}
-		});
-
-		// create drop down combo for line cap
-		comp = new Composite(parent, SWT.NONE);
-		comp.setLayout(gridLayout);
-		new Label(comp, SWT.CENTER).setText(GraphicsExample
-				.getResourceString("LineCap")); //$NON-NLS-1$
-		lineCapCombo = new Combo(comp, SWT.DROP_DOWN);
-		lineCapCombo.add("FLAT");
-		lineCapCombo.add("SQUARE");
-		lineCapCombo.add("ROUND");
-		lineCapCombo.select(0);
-		lineCap = capValues[0];
-		lineCapCombo.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				lineCap = capValues[lineCapCombo.getSelectionIndex()];
-				if (!pauseItem.isEnabled()) {
-					example.redraw();
-				}
-			}
-		});
-	}
-
-	public String getCategory() {
-		return GraphicsExample.getResourceString("Misc"); //$NON-NLS-1$
-	}
-
-	public String getText() {
-		return GraphicsExample.getResourceString("Countdown"); //$NON-NLS-1$
-	}
-	
-	public String getDescription() {
-		return GraphicsExample.getResourceString("CountdownDescription"); //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.examples.graphics.AnimatedGraphicsTab#getAnimationTime()
-	 */
-	public int getInitialAnimationTime() {
-		return 28;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.examples.graphics.AnimatedGraphicsTab#next(int, int)
-	 */
-	public void next(int width, int height) {
-
-		if (angle == 270) {
-			nextNumber--;
-			if (nextNumber < 1) {
-				// stop animation
-				setAnimation(false);
-			}
-			angle = -90;
-		}
-		angle += 10;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.examples.graphics.GraphicsTab#paint(org.eclipse.swt.graphics.GC,
-	 *      int, int)
-	 */
-	public void paint(GC gc, int width, int height) {
-		if (!example.checkAdvancedGraphics()) return;
-		Device device = gc.getDevice();
-
-		// diameter of the circle in pixels
-		int diameter = ((width < height) ? width - 25 : height - 25);
-
-		if (!getAnimation() && nextNumber == 0) {
-			Font font = new Font(device, getPlatformFontFace(1), diameter/2,
-					SWT.NONE);
-			gc.setFont(font);
-
-			// display "SWT"
-			gc.setForeground(device.getSystemColor(SWT.COLOR_DARK_BLUE));
-			gc.setTextAntialias(SWT.ON);
-
-			// determine the dimensions of the word
-			String text = GraphicsExample.getResourceString("SWT");
-			Point point = gc.stringExtent(text);
-			int textWidth = point.x;
-			int textHeight = point.y;
-			gc.drawString(text, (width-textWidth)/2,
-					(height-textHeight)/2, true);
-			font.dispose();
-
-		} else {
-
-			Font font = new Font(device, getPlatformFontFace(0),
-					6*diameter/10, SWT.NONE);
-			gc.setFont(font);
-
-			// set attributes from controls
-			gc.setLineWidth(lineWidthSpinner.getSelection());
-			gc.setLineCap(lineCap); // round line ends
-			gc.setAntialias(antialias); // smooth jagged edges
-			gc.setTextAntialias(antialias); // smooth jagged edges
-
-			// draw the circles
-			Path path = new Path(device);
-			path.addArc((width-diameter)/2, (height-diameter)/2,
-					diameter, diameter, 0, 360);
-			path.addArc((width-diameter+50)/2,
-					(height-diameter+50)/2, diameter-50, diameter-50,
-					0, 360);
-			gc.drawPath(path);
-			gc.setBackground(device.getSystemColor(SWT.COLOR_RED));
-			gc.fillPath(path);
-			path.dispose();
-
-			Point point = gc.stringExtent(new Integer(nextNumber).toString());
-			int textWidth = point.x;
-			int textHeight = point.y;
-
-			// draw the number
-			gc.drawString(new Integer(nextNumber).toString(),
-					(width-textWidth)/2, (height-textHeight)/2, true);
-
-			// draw the rotating arm
-			Transform transform = new Transform(device);
-			transform.translate(width/2, height/2);
-			transform.rotate(angle);
-			gc.setTransform(transform);
-			gc.setForeground(device.getSystemColor(SWT.COLOR_RED));
-			gc.drawLine(0, 0, diameter/2, 0);
-			transform.dispose();
-
-			font.dispose();
-		}
-	}
-
-	/**
-	 * Returns the name of a valid font for the resident platform.
-	 * 
-	 * @param index
-	 *            index is used to determine the appropriate font face
-	 */
-	static String getPlatformFontFace(int index) {
-		if (SWT.getPlatform() == "win32") {
-			return new String[] { "Courier", "Impact" }[index];
-		} else if (SWT.getPlatform() == "motif") {
-			return new String[] { "Courier", "URW Gothic L" }[index];
-		} else if (SWT.getPlatform() == "gtk") {
-			return new String[] { "Courier", "Baekmuk Headline" }[index];
-		} else if (SWT.getPlatform() == "carbon") {
-			return new String[] { "Courier", "Impact" }[index];
-		} else { // photon, etc ...
-			return new String[] { "Courier", "Verdana" }[index];
-		}
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/CurvesSWTTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/CurvesSWTTab.java
deleted file mode 100644
index 156e7aa..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/CurvesSWTTab.java
+++ /dev/null

@@ -1,389 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This tab presents cubic and quadratic curves that can be drawn. As a
- * demonstration, cubic and quadratic curves are used to spell out "SWT".
- * The user may reposition the cubic and quadratic handles. 
- */
-public class CurvesSWTTab extends GraphicsTab {
-	/** These rectangles represent the handles on the curves. */
-	private Rectangle sRect1, sRect2, wRect1, wRect2, tTopRect1, tTopRect2, 
-			tBottomRect1, tBottomRect2;
-	
-	/** These values represent the positions of the curves. */
-	private float sXPos, sYPos, wXPos, wYPos, topTXPos, topTYPos, 
-			botTXPos, botTYPos;
-	
-	/** These values represent the x and y displacement of each handle. */
-	private float sDiffX1, sDiffY1, sDiffX2, sDiffY2;
-	private float wDiffX1, wDiffY1, wDiffX2, wDiffY2;
-	private float tTopDiffX1, tTopDiffY1, tTopDiffX2, tTopDiffY2;
-	private float tBotDiffX1, tBotDiffY1, tBotDiffX2, tBotDiffY2;
-	
-	/** These are flags that indicate whether or not a handle has been moved. */
-	private boolean sLeftPtMoved, sRightPtMoved, wPt1Moved, wPt2Moved,
-			tTopPt1Moved, tTopPt2Moved, tBotPt1Moved, tBotPt2Moved;
-	
-	private MouseMoveListener mouseMoveListener;
-	private MouseListener mouseListener;
-	private Cursor cursor;
-	
-	/** true if hovering over a handle, false otherwise */
-	private boolean hovering = false;
-	
-	/** true if left mouse button is held down, false otherwise */
-	private boolean mouseDown = false;
-
-	
-public CurvesSWTTab(GraphicsExample example) {
-	super(example);
-	sRect1 = new Rectangle(-75, 50, 5, 5);
-	sRect2 = new Rectangle(75, 100, 5, 5);
-	sDiffX1 = sDiffY1 = 0;
-	sDiffX2 = sDiffY2 = 0;
-	wRect1 = new Rectangle(80, 300, 5, 5);
-	wRect2 = new Rectangle(120, 300, 5, 5);
-	wDiffX1 = wDiffY1 = wDiffX2 = wDiffY2 = 0;
-	tTopRect1 = new Rectangle(33, -20, 5, 5);
-	tTopRect2 = new Rectangle(66, 20, 5, 5);
-	tTopDiffX1 = tTopDiffY1 = tTopDiffX2 = tTopDiffY2 = 0;
-	tBottomRect1 = new Rectangle(-33, 50, 5, 5);
-	tBottomRect2 = new Rectangle(33, 100, 5, 5);
-	tBotDiffX1 = tBotDiffY1 = tBotDiffX2 = tBotDiffY2 = 0;
-}
-
-public String getCategory() {
-	return GraphicsExample.getResourceString("Curves"); //$NON-NLS-1$
-}
-
-public String getText() {
-	return GraphicsExample.getResourceString("SWT"); //$NON-NLS-1$
-}
-
-public String getDescription() {
-	return GraphicsExample.getResourceString("CurvesSWTDescription"); //$NON-NLS-1$
-}
-
-public boolean getDoubleBuffered() {
-	return true;
-}
-
-public void dispose() {
-	if (mouseListener != null)
-		example.canvas.removeMouseListener(mouseListener);
-	
-	if (mouseMoveListener != null)
-		example.canvas.removeMouseMoveListener(mouseMoveListener);
-	
-	if (cursor != null) {
-		cursor.dispose();
-		cursor = null;
-	}
-}
-
-	/**
-	 * This helper method determines whether or not the cursor is positioned
-	 * over a handle.
-	 * 
-	 * @param e
-	 *            A MouseEvent
-	 * @return true if cursor is positioned over a handle; false otherwise
-	 */
-private boolean isHovering(MouseEvent e) {
-	Rectangle r1 = new Rectangle(sRect1.x + (int)sXPos - 1, sRect1.y + (int)sYPos - 1, sRect1.width+2, sRect1.height+2);
-	Rectangle r2 = new Rectangle(sRect2.x + (int)sXPos - 1, sRect2.y + (int)sYPos - 1, sRect2.width+2, sRect2.height+2);
-	Rectangle w1 = new Rectangle(wRect1.x + (int)wXPos - 1, wRect1.y + (int)wYPos - 1, wRect1.width+2, wRect1.height+2);
-	Rectangle w2 = new Rectangle(wRect2.x + (int)wXPos - 1, wRect2.y + (int)wYPos - 1, wRect2.width+2, wRect2.height+2);
-	Rectangle tTop1 = new Rectangle(tTopRect1.x + (int)topTXPos - 1, tTopRect1.y + (int)topTYPos - 1, tTopRect1.width+2, tTopRect1.height+2);
-	Rectangle tTop2 = new Rectangle(tTopRect2.x + (int)topTXPos - 1, tTopRect2.y + (int)topTYPos - 1, tTopRect2.width+2, tTopRect2.height+2);
-	Rectangle tBot1 = new Rectangle(tBottomRect1.x + (int)botTXPos - 1, tBottomRect1.y + (int)botTYPos - 1, tBottomRect1.width+2, tBottomRect1.height+2);
-	Rectangle tBot2 = new Rectangle(tBottomRect2.x + (int)botTXPos - 1, tBottomRect2.y + (int)botTYPos - 1, tBottomRect2.width+2, tBottomRect2.height+2);
-	
-	return ( r1.contains(e.x, e.y) || r2.contains(e.x, e.y) 
-		 || w1.contains(e.x, e.y) || w2.contains(e.x, e.y) 
-		 || tTop1.contains(e.x, e.y) || tTop2.contains(e.x, e.y) 
-		 || tBot1.contains(e.x, e.y) || tBot2.contains(e.x, e.y) );
-}
-/** 
- * Creates the widgets used to control the drawing.
- */
-public void createControlPanel(Composite parent) {
-	if (cursor == null) { 
-		cursor = new Cursor(parent.getDisplay(), SWT.CURSOR_HAND);
-	}
-
-	mouseMoveListener = new MouseMoveListener() {
-		
-		public void mouseMove(MouseEvent e) {
-			if (hovering && mouseDown) {
-				example.canvas.setCursor(cursor);
-			} else if (isHovering(e)) {
-				example.canvas.setCursor(cursor);
-				hovering = true;
-			} else {
-				example.canvas.setCursor(null);
-				hovering = false;
-			}
-
-			if (sLeftPtMoved) {
-				sDiffX1 = sDiffX1 + e.x - (int)sXPos - sRect1.x;
-				sDiffY1 = sDiffY1 + e.y - (int)sYPos - sRect1.y;
-				sRect1.x = e.x - (int)sXPos;
-				sRect1.y = e.y - (int)sYPos;
-			} else if (sRightPtMoved) {
-				sDiffX2 = sDiffX2 + e.x - (int)sXPos - sRect2.x;
-				sDiffY2 = sDiffY2 + e.y - (int)sYPos - sRect2.y;
-				sRect2.x = e.x - (int)sXPos;
-				sRect2.y = e.y - (int)sYPos;
-			} else if (wPt1Moved) {
-				wDiffX1 = wDiffX1 + e.x - (int)wXPos - wRect1.x;
-				wDiffY1 = wDiffY1 + e.y - (int)wYPos - wRect1.y;
-				wRect1.x = e.x - (int)wXPos;
-				wRect1.y = e.y - (int)wYPos;				
-			} else if (wPt2Moved) {
-				wDiffX2 = wDiffX2 + e.x - (int)wXPos - wRect2.x;
-				wDiffY2 = wDiffY2 + e.y - (int)wYPos - wRect2.y;
-				wRect2.x = e.x - (int)wXPos;
-				wRect2.y = e.y - (int)wYPos;	
-			} else if (tTopPt1Moved) {
-				tTopDiffX1 = tTopDiffX1 + e.x - (int)topTXPos - tTopRect1.x;
-				tTopDiffY1 = tTopDiffY1 + e.y - (int)topTYPos - tTopRect1.y;
-				tTopRect1.x = e.x - (int)topTXPos;
-				tTopRect1.y = e.y - (int)topTYPos;	
-			} else if (tTopPt2Moved) {
-				tTopDiffX2 = tTopDiffX2 + e.x - (int)topTXPos - tTopRect2.x;
-				tTopDiffY2 = tTopDiffY2 + e.y - (int)topTYPos - tTopRect2.y;
-				tTopRect2.x = e.x - (int)topTXPos;
-				tTopRect2.y = e.y - (int)topTYPos;
-			} else if (tBotPt1Moved) {
-				tBotDiffX1 = tBotDiffX1 + e.x - (int)botTXPos - tBottomRect1.x;
-				tBotDiffY1 = tBotDiffY1 + e.y - (int)botTYPos - tBottomRect1.y;
-				tBottomRect1.x = e.x - (int)botTXPos;
-				tBottomRect1.y = e.y - (int)botTYPos;	
-			} else if (tBotPt2Moved) {
-				tBotDiffX2 = tBotDiffX2 + e.x - (int)botTXPos - tBottomRect2.x;
-				tBotDiffY2 = tBotDiffY2 + e.y - (int)botTYPos - tBottomRect2.y;
-				tBottomRect2.x = e.x - (int)botTXPos;
-				tBottomRect2.y = e.y - (int)botTYPos;
-			}
-			example.redraw();			
-		}
-	};
-	
-	mouseListener = new MouseListener() {
-
-		public void mouseDoubleClick(MouseEvent e) {}
-
-		/**
-		 * Sent when a mouse button is pressed.
-		 *
-		 * @param e an event containing information about the mouse button press
-		 */
-		public void mouseDown(MouseEvent e) {  
-			Rectangle r1 = new Rectangle(sRect1.x + (int)sXPos - 1, sRect1.y + (int)sYPos - 1, sRect1.width+2, sRect1.height+2);
-			Rectangle r2 = new Rectangle(sRect2.x + (int)sXPos - 1, sRect2.y + (int)sYPos - 1, sRect2.width+2, sRect2.height+2);
-			Rectangle w1 = new Rectangle(wRect1.x + (int)wXPos - 1, wRect1.y + (int)wYPos - 1, wRect1.width+2, wRect1.height+2);
-			Rectangle w2 = new Rectangle(wRect2.x + (int)wXPos - 1, wRect2.y + (int)wYPos - 1, wRect2.width+2, wRect2.height+2);
-			Rectangle tTop1 = new Rectangle(tTopRect1.x + (int)topTXPos - 1, tTopRect1.y + (int)topTYPos - 1, tTopRect1.width+2, tTopRect1.height+2);
-			Rectangle tTop2 = new Rectangle(tTopRect2.x + (int)topTXPos - 1, tTopRect2.y + (int)topTYPos - 1, tTopRect2.width+2, tTopRect2.height+2);
-			Rectangle tBot1 = new Rectangle(tBottomRect1.x + (int)botTXPos - 1, tBottomRect1.y + (int)botTYPos - 1, tBottomRect1.width+2, tBottomRect1.height+2);
-			Rectangle tBot2 = new Rectangle(tBottomRect2.x + (int)botTXPos - 1, tBottomRect2.y + (int)botTYPos - 1, tBottomRect2.width+2, tBottomRect2.height+2);
-
-			if (r1.contains(e.x, e.y)) {
-				sLeftPtMoved = true;
-				mouseDown = true;
-			} else if (r2.contains(e.x, e.y)) {
-				sRightPtMoved = true;
-				mouseDown = true;
-			} else if (w1.contains(e.x, e.y)) {
-				wPt1Moved = true;
-				mouseDown = true;
-			} else if (w2.contains(e.x, e.y)) {
-				wPt2Moved = true;
-				mouseDown = true;
-			} else if (tTop1.contains(e.x, e.y)) {
-				tTopPt1Moved = true;
-				mouseDown = true;
-			} else if (tTop2.contains(e.x, e.y)) {
-				tTopPt2Moved = true;
-				mouseDown = true;
-			} else if (tBot1.contains(e.x, e.y)) {
-				tBotPt1Moved = true;
-				mouseDown = true;
-			} else if (tBot2.contains(e.x, e.y)) {
-				tBotPt2Moved = true;
-				mouseDown = true;
-			}
-		}
-
-		/**
-		 * Sent when a mouse button is released.
-		 *
-		 * @param e an event containing information about the mouse button release
-		 */
-		public void mouseUp(MouseEvent e) {
-			mouseDown = false;
-			if (isHovering(e)) {
-				example.canvas.setCursor(cursor);
-			} else {
-				example.canvas.setCursor(null);
-			}
-			if (sLeftPtMoved)
-				sLeftPtMoved = false;
-			if (sRightPtMoved)
-				sRightPtMoved = false;
-			if (wPt1Moved)
-				wPt1Moved = false;
-			if (wPt2Moved)
-				wPt2Moved = false;
-			if (tTopPt1Moved)
-				tTopPt1Moved = false;	
-			if (tTopPt2Moved)
-				tTopPt2Moved = false;	
-			if (tBotPt1Moved)
-				tBotPt1Moved = false;	
-			if (tBotPt2Moved)
-				tBotPt2Moved = false;
-			
-			example.redraw();
-		}
-	};
-	example.canvas.addMouseMoveListener(mouseMoveListener);
-	example.canvas.addMouseListener(mouseListener);
-}
-
-public void paint(GC gc, int width, int height) {
-	if (!example.checkAdvancedGraphics()) return;
-	Device device = gc.getDevice();
-	
-	Font font = new Font(device, getPlatformFont(), 16, SWT.ITALIC);
-	gc.setFont(font);
-	gc.setLineWidth(2);
-	
-	Transform transform;
-	
-	// ----- letter s -----	
-	sXPos = 4*width/16;
-	sYPos = (height-150)/2;
-	
-	transform = new Transform(device);
-	transform.translate(sXPos, sYPos);
-	gc.setTransform(transform);
-	transform.dispose();
-
-	gc.setForeground(device.getSystemColor(SWT.COLOR_DARK_BLUE));
-	gc.drawString(GraphicsExample.getResourceString("Cubic"), 0, 175, true);
-	
-	Path path = new Path(device);
-	path.cubicTo(-200 + sDiffX1, 50 + sDiffY1, 200 + sDiffX2, 100 + sDiffY2, 0, 150);
-	gc.drawPath(path);
-	path.dispose();
-	
-	// draw the spline points
-	gc.setTransform(null);
-	gc.drawRectangle(sRect1.x + (int)sXPos, sRect1.y + (int)sYPos, sRect1.width, sRect1.height);
-	gc.drawRectangle(sRect2.x + (int)sXPos, sRect2.y + (int)sYPos, sRect2.width, sRect2.height);
-	
-	// ----- letter w -----
-	wXPos = 6*width/16;
-	wYPos = (height-150)/2;
-	
-	transform = new Transform(device);
-	transform.translate(wXPos, wYPos);
-	gc.setTransform(transform);
-	transform.dispose();
-	
-	gc.setForeground(device.getSystemColor(SWT.COLOR_GRAY));
-	gc.drawString(GraphicsExample.getResourceString("Quadratic"), 0, -50, true);
-	gc.drawString(GraphicsExample.getResourceString("Quadratic"), 110, -50, true);
-	
-	path = new Path(device);
-	path.quadTo(100 + wDiffX1, 300 + wDiffY1, 100, 0);
-	path.quadTo(100+wDiffX2, 300+wDiffY2, 200, 0);
-	gc.drawPath(path);
-	path.dispose();
-	
-	gc.setTransform(null);	
-	gc.drawRectangle(wRect1.x + (int)wXPos, wRect1.y + (int)wYPos, wRect1.width, wRect1.height);
-	gc.drawRectangle(wRect2.x + (int)wXPos, wRect2.y + (int)wYPos, wRect2.width, wRect2.height);
-	
-	
-	// ----- top of letter t -----
-	topTXPos = 11*width/16;
-	topTYPos = (height-150)/2;
-	
-	transform = new Transform(device);
-	transform.translate(topTXPos, topTYPos);
-	gc.setTransform(transform);
-	transform.dispose();
-	
-	gc.setForeground(device.getSystemColor(SWT.COLOR_YELLOW));
-	gc.drawString(GraphicsExample.getResourceString("Cubic"), 25, -50, true);
-	
-	path = new Path(device);
-	path.cubicTo(33 + tTopDiffX1, -20 + tTopDiffY1, 66 + tTopDiffX2, 20 + tTopDiffY2, 100, 0);
-	gc.drawPath(path);
-	path.dispose();
-
-	gc.setTransform(null);
-	gc.drawRectangle(tTopRect1.x + (int)topTXPos, tTopRect1.y + (int)topTYPos, tTopRect1.width, tTopRect1.height);
-	gc.drawRectangle(tTopRect2.x + (int)topTXPos, tTopRect2.y + (int)topTYPos, tTopRect2.width, tTopRect2.height);
-	
-
-	// ----- vertical bar of letter t -----
-	botTXPos = 12*width/16;
-	botTYPos = (height-150)/2;
-
-	transform = new Transform(device);
-	transform.translate(botTXPos, botTYPos);
-	gc.setTransform(transform);
-	transform.dispose();
-	
-	gc.setForeground(device.getSystemColor(SWT.COLOR_RED));
-	gc.drawString(GraphicsExample.getResourceString("Cubic"), 0, 175, true);
-	
-	path = new Path(device);
-	path.cubicTo(-33 + tBotDiffX1, 50 + tBotDiffY1, 33 + tBotDiffX2, 100 + tBotDiffY2, 0, 150);
-	gc.drawPath(path);
-	path.dispose();
-	
-	gc.setTransform(null);
-	gc.drawRectangle(tBottomRect1.x + (int)botTXPos, tBottomRect1.y + (int)botTYPos, tBottomRect1.width, tBottomRect1.height);
-	gc.drawRectangle(tBottomRect2.x + (int)botTXPos, tBottomRect2.y + (int)botTYPos, tBottomRect2.width, tBottomRect2.height);
-
-	font.dispose();
-}
-
-/**
- * Returns the name of a valid font for the resident platform.
- */
-static String getPlatformFont() {
-	if(SWT.getPlatform() == "win32") {
-		return "Arial";	
-	} else if (SWT.getPlatform() == "motif") {
-		return "Helvetica";		
-	} else if (SWT.getPlatform() == "gtk") {
-		return "Baekmuk Batang";		
-	} else if (SWT.getPlatform() == "carbon") {
-		return "Arial";
-	} else { // photon, etc ...
-		return "Verdana";
-	}
-}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/CurvesTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/CurvesTab.java
deleted file mode 100644
index 9784154..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/CurvesTab.java
+++ /dev/null

@@ -1,300 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This tab presents cubic and quadratic curves that can be drawn.
- * The user may reposition the cubic and quadratic handles. 
- */
-public class CurvesTab extends GraphicsTab {
-	/** These rectangles represent the handles on the curves. */
-	private Rectangle quadHndl, quadEndHndl, cubHndl1, cubHndl2, cubEndHndl;
-	
-	/** These values represent the positions of the curves. */
-	private float quadXPos, quadYPos, cubXPos, cubYPos;
-	
-	/** These values represent the x and y displacement of each handle. */
-	private float quadDiffX, quadDiffY, quadEndDiffX, quadEndDiffY;
-	private float cubDiffX1, cubDiffY1, cubDiffX2, cubDiffY2, cubEndDiffX, cubEndDiffY;
-	
-	/** These are flags that indicate whether or not a handle has been moved. */
-	private boolean quadPtMoved, quadEndPtMoved, cubPt1Moved, cubPt2Moved, cubEndPtMoved;
-
-	private MouseMoveListener mouseMoveListener;
-	private MouseListener mouseListener;
-	private Cursor cursor;
-
-	/** true if hovering over a handle, false otherwise */
-	private boolean hovering = false;
-	
-	/** true if left mouse button is held down, false otherwise */
-	private boolean mouseDown = false;
-
-	
-public CurvesTab(GraphicsExample example) {
-	super(example);
-	quadHndl = new Rectangle(200, 150, 5, 5);
-	quadEndHndl = new Rectangle(400, 0, 5, 5);
-	quadDiffX = quadDiffY = quadEndDiffX = quadEndDiffY = 0;
-	cubHndl1 = new Rectangle(133, -60, 5, 5);
-	cubHndl2 = new Rectangle(266, 60, 5, 5);
-	cubDiffX1 = cubDiffY1 = cubDiffX2 = cubDiffY2 = 0;
-	cubEndHndl = new Rectangle(400, 0, 5, 5);
-	cubEndDiffX = cubEndDiffY = 0;
-}
-
-public String getCategory() {
-	return GraphicsExample.getResourceString("Curves"); //$NON-NLS-1$
-}
-
-public String getText() {
-	return GraphicsExample.getResourceString("Curves"); //$NON-NLS-1$
-}
-
-public String getDescription() {
-	return GraphicsExample.getResourceString("CurvesDescription"); //$NON-NLS-1$
-}
-
-public boolean getDoubleBuffered() {
-	return true;
-}
-
-public void dispose() {
-	if (mouseListener != null)
-		example.canvas.removeMouseListener(mouseListener);
-	
-	if (mouseMoveListener != null)
-		example.canvas.removeMouseMoveListener(mouseMoveListener);
-	
-	if (cursor != null) {
-		cursor.dispose();
-		cursor = null;
-	}
-}
-
-/**
- * This helper method determines whether or not the cursor is positioned
- * over a handle.
- * 
- * @param e
- *            A MouseEvent
- * @return true if cursor is positioned over a handle; false otherwise
- */
-private boolean isHovering(MouseEvent e) {
-	Rectangle quad = new Rectangle(quadHndl.x + (int)quadXPos - 1, quadHndl.y + (int)quadYPos - 1, quadHndl.width+2, quadHndl.height+2);
-	Rectangle quadEnd = new Rectangle(quadEndHndl.x + (int)quadXPos - 1, quadEndHndl.y + (int)quadYPos - 1, quadEndHndl.width+2, quadEndHndl.height+2);
-	Rectangle cub1 = new Rectangle(cubHndl1.x + (int)cubXPos - 1, cubHndl1.y + (int)cubYPos - 1, cubHndl1.width+2, cubHndl1.height+2);
-	Rectangle cub2 = new Rectangle(cubHndl2.x + (int)cubXPos - 1, cubHndl2.y + (int)cubYPos - 1, cubHndl2.width+2, cubHndl2.height+2);
-	Rectangle cubEnd = new Rectangle(cubEndHndl.x + (int)cubXPos - 1, cubEndHndl.y + (int)cubYPos - 1, cubEndHndl.width+2, cubEndHndl.height+2);
-
-	return ( quad.contains(e.x, e.y) || quadEnd.contains(e.x, e.y) 
-		 || cub1.contains(e.x, e.y) || cub2.contains(e.x, e.y) 
-		 || cubEnd.contains(e.x, e.y));
-}
-/** 
- * Creates the widgets used to control the drawing.
- */
-public void createControlPanel(Composite parent) {
-	if (cursor == null) { 
-		cursor = new Cursor(parent.getDisplay(), SWT.CURSOR_HAND);
-	}
-
-	mouseMoveListener = new MouseMoveListener() {
-		
-		public void mouseMove(MouseEvent e) {
-			if (hovering && mouseDown) {
-				example.canvas.setCursor(cursor);
-			} else if (isHovering(e)) {
-				example.canvas.setCursor(cursor);
-				hovering = true;
-			} else {
-				example.canvas.setCursor(null);
-				hovering = false;
-			}
-
-			if (quadPtMoved) {
-				quadDiffX = quadDiffX + e.x - (int)quadXPos - quadHndl.x;
-				quadDiffY = quadDiffY + e.y - (int)quadYPos - quadHndl.y;
-				quadHndl.x = e.x - (int)quadXPos;
-				quadHndl.y = e.y - (int)quadYPos;				
-			} else if (quadEndPtMoved) {
-				quadEndDiffX = quadEndDiffX + e.x - (int)quadXPos - quadEndHndl.x;
-				quadEndDiffY = quadEndDiffY + e.y - (int)quadYPos - quadEndHndl.y;
-				quadEndHndl.x = e.x - (int)quadXPos;
-				quadEndHndl.y = e.y - (int)quadYPos;	
-			} else if (cubPt1Moved) {
-				cubDiffX1 = cubDiffX1 + e.x - (int)cubXPos - cubHndl1.x;
-				cubDiffY1 = cubDiffY1 + e.y - (int)cubYPos - cubHndl1.y;
-				cubHndl1.x = e.x - (int)cubXPos;
-				cubHndl1.y = e.y - (int)cubYPos;	
-			} else if (cubPt2Moved) {
-				cubDiffX2 = cubDiffX2 + e.x - (int)cubXPos - cubHndl2.x;
-				cubDiffY2 = cubDiffY2 + e.y - (int)cubYPos - cubHndl2.y;
-				cubHndl2.x = e.x - (int)cubXPos;
-				cubHndl2.y = e.y - (int)cubYPos;
-			} else if (cubEndPtMoved) {
-				cubEndDiffX = cubEndDiffX + e.x - (int)cubXPos - cubEndHndl.x;
-				cubEndDiffY = cubEndDiffY + e.y - (int)cubYPos - cubEndHndl.y;
-				cubEndHndl.x = e.x - (int)cubXPos;
-				cubEndHndl.y = e.y - (int)cubYPos;
-			}
-			example.redraw();			
-		}
-	};
-	
-	mouseListener = new MouseListener() {
-
-		public void mouseDoubleClick(MouseEvent e) {}
-
-		/**
-		 * Sent when a mouse button is pressed.
-		 *
-		 * @param e an event containing information about the mouse button press
-		 */
-		public void mouseDown(MouseEvent e) {  
-			Rectangle quad = new Rectangle(quadHndl.x + (int)quadXPos - 1, quadHndl.y + (int)quadYPos - 1, quadHndl.width+2, quadHndl.height+2);
-			Rectangle quadEnd = new Rectangle(quadEndHndl.x + (int)quadXPos - 1, quadEndHndl.y + (int)quadYPos - 1, quadEndHndl.width+2, quadEndHndl.height+2);
-			Rectangle cub1 = new Rectangle(cubHndl1.x + (int)cubXPos - 1, cubHndl1.y + (int)cubYPos - 1, cubHndl1.width+2, cubHndl1.height+2);
-			Rectangle cub2 = new Rectangle(cubHndl2.x + (int)cubXPos - 1, cubHndl2.y + (int)cubYPos - 1, cubHndl2.width+2, cubHndl2.height+2);
-			Rectangle cubEnd = new Rectangle(cubEndHndl.x + (int)cubXPos - 1, cubEndHndl.y + (int)cubYPos - 1, cubEndHndl.width+2, cubEndHndl.height+2);
-			
-			if (quad.contains(e.x, e.y)) {
-				quadPtMoved = true;
-				mouseDown = true;
-			} else if (quadEnd.contains(e.x, e.y)) {
-				quadEndPtMoved = true;
-				mouseDown = true;
-			} else if (cub1.contains(e.x, e.y)) {
-				cubPt1Moved = true;
-				mouseDown = true;
-			} else if (cub2.contains(e.x, e.y)) {
-				cubPt2Moved = true;
-				mouseDown = true;
-			} else if (cubEnd.contains(e.x, e.y)) {
-				cubEndPtMoved = true;
-				mouseDown = true;
-			}
-		}
-
-		/**
-		 * Sent when a mouse button is released.
-		 *
-		 * @param e an event containing information about the mouse button release
-		 */
-		public void mouseUp(MouseEvent e) {
-			mouseDown = false;
-			if (isHovering(e)) {
-				example.canvas.setCursor(cursor);
-			} else {
-				example.canvas.setCursor(null);
-			}
-
-			if (quadPtMoved)
-				quadPtMoved = false;
-			if (quadEndPtMoved)
-				quadEndPtMoved = false;
-			if (cubPt1Moved)
-				cubPt1Moved = false;	
-			if (cubPt2Moved)
-				cubPt2Moved = false;
-			if (cubEndPtMoved)
-				cubEndPtMoved = false;
-			
-			example.redraw();
-		}
-	};
-	example.canvas.addMouseMoveListener(mouseMoveListener);
-	example.canvas.addMouseListener(mouseListener);
-}
-
-public void paint(GC gc, int width, int height) {
-	if (!example.checkAdvancedGraphics()) return;
-	Device device = gc.getDevice();
-	
-	Font font = new Font(device, getPlatformFont(), 16, SWT.ITALIC);
-	gc.setFont(font);
-	gc.setLineWidth(5);
-	
-	Transform transform;
-
-	// ----- cubic curve -----
-	cubXPos = width/5;
-	cubYPos = height/3;
-	
-	transform = new Transform(device);
-	transform.translate(cubXPos, cubYPos);
-	gc.setTransform(transform);
-	transform.dispose();
-	
-	gc.setForeground(device.getSystemColor(SWT.COLOR_RED));
-	gc.drawString(GraphicsExample.getResourceString("Cubic"), 25, -70, true);
-	
-	Path path = new Path(device);
-	path.cubicTo(133 + cubDiffX1, -60 + cubDiffY1, 266 + cubDiffX2, 60 + cubDiffY2, 400 + cubEndDiffX, 0 + cubEndDiffY);
-	gc.drawPath(path);
-	path.dispose();
-
-	gc.setTransform(null);
-	gc.setForeground(device.getSystemColor(SWT.COLOR_DARK_BLUE));
-	gc.drawRectangle(cubHndl1.x + (int)cubXPos, cubHndl1.y + (int)cubYPos, cubHndl1.width, cubHndl1.height);
-	gc.drawRectangle(cubHndl2.x + (int)cubXPos, cubHndl2.y + (int)cubYPos, cubHndl2.width, cubHndl2.height);
-	gc.drawRectangle(cubEndHndl.x + (int)cubXPos, cubEndHndl.y + (int)cubYPos, cubEndHndl.width, cubEndHndl.height);
-	
-	// ----- quadratic curve -----
-	quadXPos = width/5;
-	quadYPos = 2*height/3;
-	
-	transform = new Transform(device);
-	transform.translate(quadXPos, quadYPos);
-	gc.setTransform(transform);
-	transform.dispose();
-	
-	gc.setForeground(device.getSystemColor(SWT.COLOR_GREEN));
-	gc.drawString(GraphicsExample.getResourceString("Quadratic"), 0, -50, true);
-	
-	path = new Path(device);
-	path.quadTo(200 + quadDiffX, 150 + quadDiffY, 400 + quadEndDiffX, 0 + quadEndDiffY);
-	gc.drawPath(path);
-	path.dispose();
-	
-	gc.setTransform(null);
-	gc.setForeground(device.getSystemColor(SWT.COLOR_GRAY));
-	gc.drawRectangle(quadHndl.x + (int)quadXPos, quadHndl.y + (int)quadYPos, quadHndl.width, quadHndl.height);
-	gc.drawRectangle(quadEndHndl.x + (int)quadXPos, quadEndHndl.y + (int)quadYPos, quadEndHndl.width, quadEndHndl.height);
-
-	font.dispose();
-}
-
-/**
- * Returns the name of a valid font for the resident platform.
- */
-static String getPlatformFont() {
-	if(SWT.getPlatform() == "win32") {
-		return "Arial";	
-	} else if (SWT.getPlatform() == "motif") {
-		return "Helvetica";		
-	} else if (SWT.getPlatform() == "gtk") {
-		return "Baekmuk Batang";		
-	} else if (SWT.getPlatform() == "carbon") {
-		return "Arial";
-	} else { // photon, etc ...
-		return "Verdana";
-	}
-}
-
-}
-

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/CustomAlphaTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/CustomAlphaTab.java
deleted file mode 100644
index 386fc5a..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/CustomAlphaTab.java
+++ /dev/null

@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This tab demonstrates the use of alpha blending. It allows a user to specify
- * a custom alpha value.
- */
-public class CustomAlphaTab extends AnimatedGraphicsTab {
-	
-	private Spinner alphaSpinner;
-	private Button colorButton;
-	private GraphicsBackground background;
-	private Menu menu;
-	private int angle;
-
-public CustomAlphaTab(GraphicsExample example) {
-	super(example);
-}
-
-public String getCategory() {
-	return GraphicsExample.getResourceString("Alpha"); //$NON-NLS-1$
-}
-
-public String getText() {
-	return GraphicsExample.getResourceString("CustomAlpha"); //$NON-NLS-1$
-}
-
-public String getDescription() {
-	return GraphicsExample.getResourceString("CustomAlphaDescription"); //$NON-NLS-1$
-}
-
-public void dispose() {
-	if (menu != null) {
-		menu.dispose();
-		menu = null;
-	}
-}
-
-/** 
- * Creates the widgets used to control the drawing.
- */
-public void createControlPanel(Composite parent) {
-	super.createControlPanel(parent);
-	
-	// create drop down combo for choosing clipping
-	Composite comp;
-	
-	// create spinner for line width
-	comp = new Composite(parent, SWT.NONE);
-	comp.setLayout(new GridLayout(2, false));
-	new Label(comp, SWT.CENTER).setText(GraphicsExample
-				.getResourceString("Alpha")); //$NON-NLS-1$
-	alphaSpinner = new Spinner(comp, SWT.BORDER | SWT.WRAP);
-	alphaSpinner.setMinimum(0);
-	alphaSpinner.setMaximum(255);
-	alphaSpinner.setSelection(127);
-	alphaSpinner.addListener(SWT.Selection, new Listener() {
-		public void handleEvent(Event event) {
-				example.redraw();
-		}
-	});
-	
-	// color menu
-	ColorMenu cm = new ColorMenu();
-	cm.setPatternItems(example.checkAdvancedGraphics());
-	menu = cm.createMenu(parent.getParent(), new ColorListener() {
-		public void setColor(GraphicsBackground gb) {
-			background = gb;		
-			colorButton.setImage(gb.getThumbNail());
-			example.redraw();
-		}
-	});
-
-	// initialize the background to the 5th item in the menu (blue)
-	background = (GraphicsBackground)menu.getItem(4).getData();
-	
-	// color button
-	comp = new Composite(parent, SWT.NONE);
-	comp.setLayout(new GridLayout(2, false));
-	
-	colorButton = new Button(comp, SWT.PUSH);
-	colorButton.setText(GraphicsExample
-			.getResourceString("Color")); //$NON-NLS-1$
-	colorButton.setImage(background.getThumbNail());
-	colorButton.addListener(SWT.Selection, new Listener() { 
-		public void handleEvent(Event event) {
-			final Button button = (Button) event.widget;
-			final Composite parent = button.getParent(); 
-			Rectangle bounds = button.getBounds();
-			Point point = parent.toDisplay(new Point(bounds.x, bounds.y));
-			menu.setLocation(point.x, point.y + bounds.height);
-			menu.setVisible(true);
-		}
-	});
-}
-
-public void next(int width, int height) {
-	
-	angle = (angle+1)%360;
-}
-
-public void paint(GC gc, int width, int height) {
-	if (!example.checkAdvancedGraphics()) return;
-	Device device = gc.getDevice();
-
-	Pattern pattern = null;
-	if (background.getBgColor1() != null) {
-		gc.setBackground(background.getBgColor1());
-	} else if (background.getBgImage() != null) {
-		pattern = new Pattern(device, background.getBgImage());
-		gc.setBackgroundPattern(pattern);
-	}
-	
-	gc.setAntialias(SWT.ON);
-	gc.setAlpha(alphaSpinner.getSelection());
-	
-	// rotate on center
-	Transform transform = new Transform(device);
-	transform.translate(width/2, height/2);
-	transform.rotate(-angle);
-	transform.translate(-width/2, -height/2);
-	gc.setTransform(transform);
-	transform.dispose();
-	
-	// choose the smallest between height and width
-	int diameter = (height < width) ? height : width;
-	
-	Path path = new Path(device);
-	path.addArc((width-diameter/5)/2, (height-diameter/5)/2, diameter/5, diameter/5, 0, 360);
-	path.addArc(5*(width-diameter/8)/12, 4*(height-diameter/8)/12, diameter/8, diameter/8, 0, 360);
-	path.addArc(7*(width-diameter/8)/12, 8*(height-diameter/8)/12, diameter/8, diameter/8, 0, 360);
-	path.addArc(6*(width-diameter/12)/12, 3*(height-diameter/12)/12, diameter/12, diameter/12, 0, 360);
-	path.addArc(6*(width-diameter/12)/12, 9*(height-diameter/12)/12, diameter/12, diameter/12, 0, 360);
-	path.addArc(11.5f*(width-diameter/18)/20, 5*(height-diameter/18)/18, diameter/18, diameter/18, 0, 360);	
-	path.addArc(8.5f*(width-diameter/18)/20, 13*(height-diameter/18)/18, diameter/18, diameter/18, 0, 360);
-	path.addArc(62f*(width-diameter/25)/100, 32*(height-diameter/25)/100, diameter/25, diameter/25, 0, 360);
-	path.addArc(39f*(width-diameter/25)/100, 67*(height-diameter/25)/100, diameter/25, diameter/25, 0, 360);
-		
-	gc.fillPath(path);
-	path.dispose();
-			
-    if (pattern != null) pattern.dispose();
-}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/CustomFontTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/CustomFontTab.java
deleted file mode 100644
index ff8d283..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/CustomFontTab.java
+++ /dev/null

@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import java.util.*;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This tab demonstrates various text fonts. It allows the user to specify font
- * parameters such as face, style and size.
- */
-public class CustomFontTab extends GraphicsTab {
-
-	String text = GraphicsExample.getResourceString("SWT");
-	GraphicsBackground fontForeground;
-	Combo fontFaceCb, fontStyleCb;
-	Spinner fontPointSpinner;
-	Button colorButton;
-	ArrayList fontNames;
-	int [] styleValues;
-	String [] fontStyles;
-	Menu menu;
-	
-public CustomFontTab(GraphicsExample example) {
-	super(example);
-	
-	// create list of fonts for this platform
-	FontData [] fontData = Display.getCurrent().getFontList(null, true);
-	fontNames = new ArrayList();
-	for (int i=0; i < fontData.length; i++) {
-		// remove duplicates and sort
-		String nextName = fontData[i].getName();
-		if (!fontNames.contains(nextName)) {
-			int j = 0;
-			while(j < fontNames.size() && nextName.compareTo((String)fontNames.get(j)) > 0) {
-				j++;
-			}
-			fontNames.add(j, nextName);
-		}
-	}
-	fontStyles = new String [] {
-			GraphicsExample.getResourceString("Regular"), //$NON-NLS-1$
-			GraphicsExample.getResourceString("Italic"), //$NON-NLS-1$
-			GraphicsExample.getResourceString("Bold"), //$NON-NLS-1$
-			GraphicsExample.getResourceString("BoldItalic") //$NON-NLS-1$
-	};
-	styleValues = new int [] {SWT.NORMAL, SWT.ITALIC, SWT.BOLD, SWT.BOLD | SWT.ITALIC};
-}
-
-public String getCategory() {
-	return GraphicsExample.getResourceString("Font"); //$NON-NLS-1$
-}
-
-public String getText() {
-	return GraphicsExample.getResourceString("CustomFont"); //$NON-NLS-1$
-}
-
-public String getDescription() {
-	return GraphicsExample.getResourceString("CustomFontDescription"); //$NON-NLS-1$
-}
-
-public void dispose() {
-	if (menu != null) {
-		menu.dispose();
-		menu = null;
-	}
-}
-
-public void createControlPanel(Composite parent) {
-
-	Composite mainComp = new Composite(parent, SWT.NONE);
-	mainComp.setLayout(new RowLayout());
-	
-	// create combo for font face
-	Composite comp = new Composite(mainComp, SWT.NONE);
-	comp.setLayout(new GridLayout(2, false));
-	
-	new Label(comp, SWT.LEFT).setText(GraphicsExample.getResourceString("FontFace")); //$NON-NLS-1$
-	fontFaceCb = new Combo(comp, SWT.DROP_DOWN);
-	for (int i=0; i < fontNames.size(); i++) {
-		String name = (String)fontNames.get(i);
-		fontFaceCb.add(name);
-	}
-	fontFaceCb.select(0);
-	fontFaceCb.addListener(SWT.Selection, new Listener() {
-		public void handleEvent (Event event) {
-			example.redraw();
-		}
-	});
-	
-	// create combo for font style
-	comp = new Composite(mainComp, SWT.NONE);
-	comp.setLayout(new GridLayout(2, false));
-	
-	new Label(comp, SWT.LEFT).setText(GraphicsExample.getResourceString("FontStyle")); //$NON-NLS-1$
-	fontStyleCb = new Combo(comp, SWT.DROP_DOWN);
-	for (int i=0; i < fontStyles.length; i++) {
-		fontStyleCb.add(fontStyles[i]);
-	}
-	fontStyleCb.select(0);
-	fontStyleCb.addListener(SWT.Selection, new Listener() {
-		public void handleEvent (Event event) {
-			example.redraw();
-		}
-	});
-	
-	// create spinner for font size (points)
-	comp = new Composite(mainComp, SWT.NONE);
-	comp.setLayout(new GridLayout(2, false));
-	
-	new Label(comp, SWT.LEFT).setText(GraphicsExample.getResourceString("FontSize")); //$NON-NLS-1$
-	fontPointSpinner = new Spinner(comp, SWT.BORDER | SWT.WRAP);
-	fontPointSpinner.setMinimum(1);
-	fontPointSpinner.setMaximum(1000);
-	fontPointSpinner.setSelection(200);
-	fontPointSpinner.addListener(SWT.Selection, new Listener() {
-		public void handleEvent(Event event) {
-				example.redraw();
-		}
-	});
-
-	ColorMenu cm = new ColorMenu();
-	cm.setColorItems(true);
-	cm.setPatternItems(example.checkAdvancedGraphics());
-	menu = cm.createMenu(parent.getParent(), new ColorListener() {
-		public void setColor(GraphicsBackground gb) {
-			fontForeground = gb;
-			colorButton.setImage(gb.getThumbNail());
-			example.redraw();
-		}
-	});
-	
-	// initialize the background to the 2nd item in the menu (black)
-	fontForeground = (GraphicsBackground)menu.getItem(1).getData();
-	
-	// create color button
-	comp = new Composite(parent, SWT.NONE);
-	comp.setLayout(new GridLayout());
-		
-	colorButton = new Button(comp, SWT.PUSH);
-	colorButton.setText(GraphicsExample.getResourceString("Color")); //$NON-NLS-1$
-	colorButton.setImage(fontForeground.getThumbNail());
-	colorButton.addListener(SWT.Selection, new Listener() { 
-		public void handleEvent(Event event) {
-			final Button button = (Button) event.widget;
-			final Composite parent = button.getParent(); 
-			Rectangle bounds = button.getBounds();
-			Point point = parent.toDisplay(new Point(bounds.x, bounds.y));
-			menu.setLocation(point.x, point.y + bounds.height);
-			menu.setVisible(true);
-		}
-	});
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.swt.examples.graphics.GraphicsTab#paint(org.eclipse.swt.graphics.GC, int, int)
- */
-public void paint(GC gc, int width, int height) {
-	if (!example.checkAdvancedGraphics()) return;
-	Device device = gc.getDevice();
-	
-	String fontFace = (String)fontNames.get(fontFaceCb.getSelectionIndex());
-	int points = fontPointSpinner.getSelection();
-	int style = styleValues[fontStyleCb.getSelectionIndex()];
-	
-	Font font = new Font(device, fontFace, points, style);
-	gc.setFont(font);
-	gc.setTextAntialias(SWT.ON);
-
-	Point size = gc.stringExtent(text);
-	int textWidth = size.x;
-	int textHeight = size.y;
-
-	Pattern pattern = null;
-	if (fontForeground.getBgColor1() != null) {
-		gc.setForeground(fontForeground.getBgColor1());
-	} else if (fontForeground.getBgImage() != null) {
-		pattern = new Pattern(device, fontForeground.getBgImage());
-		gc.setForegroundPattern(pattern);
-	}
-	
-	gc.drawString(text, (width-textWidth)/2, (height-textHeight)/2, true);
-
-	font.dispose();
-	if (pattern != null) pattern.dispose();	
-}
-
-}
-

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/FontBounceTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/FontBounceTab.java
deleted file mode 100644
index f7418cb..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/FontBounceTab.java
+++ /dev/null

@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-
-/**
- * This tab is an animated graphic. It presents the word SWT in different fonts
- * as it bounces around the screen.
- */
-public class FontBounceTab extends AnimatedGraphicsTab {
-	
-	float x, y;
-	float incX = 10.0f;				// units by which to move the word along X axis
-	float incY = 5.0f;				// units by which to move the word along Y axis 
-	int textWidth, textHeight;		// width and height of the word SWT
-	String text = GraphicsExample.getResourceString("SWT");
-	int fontSize = 100;
-	int fontFace = 0; 
-	int foreGrdColor, fillColor;	// font colors
-	int fontStyle;				// represents various style attributes applicable to a Font
-	
-public FontBounceTab(GraphicsExample example) {
-	super(example);
-}
-
-public String getCategory() {
-	return GraphicsExample.getResourceString("Font"); //$NON-NLS-1$
-}
-
-public String getText() {
-	return GraphicsExample.getResourceString("Bounce"); //$NON-NLS-1$
-}
-
-public String getDescription() {
-	return GraphicsExample.getResourceString("FontBounceDescription"); //$NON-NLS-1$
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.swt.examples.graphics.AnimatedGraphicsTab#next(int, int)
- */
-public void next(int width, int height) {
-	x += incX;
-    y += incY;
-	float random = (float)Math.random();
-	
-	// collision with right side of screen 
-    if (x + textWidth > width) {
-        x = width - textWidth;
-        incX = random * -width / 16 - 1;
-        fontFace = 0;
-        fontSize = 125;
-        fillColor = SWT.COLOR_DARK_BLUE;  
-        foreGrdColor = SWT.COLOR_YELLOW;
-        fontStyle = SWT.ITALIC;
-    }
-	// collision with left side of screen
-    if (x < 0) {
-        x = 0;
-        incX = random * width / 16 + 1;
-        fontFace = 1;
-        fontSize = 80;
-        fillColor = SWT.COLOR_DARK_MAGENTA;
-        foreGrdColor = SWT.COLOR_CYAN;
-        fontStyle = SWT.NONE;
-    }
-	// collision with bottom side of screen
-    if (y + textHeight > height) {
-        y = (height - textHeight)- 2;
-        incY = random * -height / 16 - 1;
-        fontFace = 2;
-        fontSize = 100;
-        fillColor = SWT.COLOR_YELLOW;
-        foreGrdColor = SWT.COLOR_BLACK;
-        fontStyle = SWT.BOLD;
-    }
-	// collision with top side of screen
-    if (y < 0) {
-        y = 0;
-        incY = random * height / 16 + 1;
-        fontFace = 3;
-        fontSize = 120;
-        fillColor = SWT.COLOR_GREEN;
-        foreGrdColor = SWT.COLOR_GRAY;
-        fontStyle = SWT.NONE;
-    }
-}
-
-
-/* (non-Javadoc)
- * @see org.eclipse.swt.examples.graphics.GraphicsTab#paint(org.eclipse.swt.graphics.GC, int, int)
- */
-public void paint(GC gc, int width, int height) {
-	if (!example.checkAdvancedGraphics()) return;
-	Device device = gc.getDevice();
-	
-	Font font = new Font(device, getPlatformFontFace(fontFace), fontSize, fontStyle);
-	gc.setFont(font);
-	
-	Point size = gc.stringExtent(text);
-	textWidth = size.x;
-	textHeight = size.y;
-	
-	Path path = new Path(device);
-	path.addString(text, x, y, font);
-
-	gc.setForeground(device.getSystemColor(foreGrdColor));
-	gc.setBackground(device.getSystemColor(fillColor));
-
-	gc.fillPath(path);
-	gc.drawPath(path);
-	font.dispose();
-	path.dispose();
-}
-
-/**
- * Returns the name of the font using the specified index.
- * This method takes into account the resident platform.
- * 
- * @param index
- * 			The index of the font to be used
- */
-static String getPlatformFontFace(int index) {	
-	if(SWT.getPlatform() == "win32") {
-		return new String [] {"Arial", "Impact", "Times", "Verdana"} [index];	
-	} else if (SWT.getPlatform() == "motif") {
-		return new String [] {"URW Chancery L", "URW Gothic L", "Times", "qub"} [index];		
-	} else if (SWT.getPlatform() == "gtk") {
-		return new String [] {"URW Chancery L", "Baekmuk Batang", "Baekmuk Headline", "KacsTitleL"} [index];
-	} else if (SWT.getPlatform() == "carbon") {
-		return new String [] {"Arial", "Impact", "Times", "Verdana"} [index];
-	} else { // photon, etc ...
-		return new String [] {"Arial", "Impact", "Times", "Verdana"} [index];
-	}
-}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/GradientDialog.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/GradientDialog.java
deleted file mode 100644
index af8a685..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/GradientDialog.java
+++ /dev/null

@@ -1,277 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import java.util.*;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This dialog is used for prompting the user to select two colors for the
- * creation of a gradient.
- */
-public class GradientDialog extends Dialog {
-
-	Canvas canvas;
-
-	Button colorButton1, colorButton2;		// color buttons
-
-	Button okButton, cancelButton;
-
-	Menu menu1, menu2;
-	
-	RGB rgb1, rgb2;			// first and second color used in gradient
-	int returnVal; 			// value to be returned by open(), set to SWT.OK 
-							// if the ok button has been pressed		
-	ArrayList resources;
-			
-	public GradientDialog(Shell parent) {		
-		this (parent, SWT.PRIMARY_MODAL);
-	}
-	
-	public GradientDialog(Shell parent, int style) {
-		super(parent, style);
-		rgb1 = rgb2 = null;
-		returnVal = SWT.CANCEL;
-		resources = new ArrayList();
-	}
-	
-	/**
-	 * Sets up the dialog and opens it.
-	 * */
-	public int open() {
-		final Shell dialog = new Shell(getParent(), SWT.DIALOG_TRIM | SWT.RESIZE | getStyle());
-		dialog.setText(GraphicsExample.getResourceString("Gradient")); //$NON-NLS-1$
-				
-		GridLayout gridLayout = new GridLayout();
-	    gridLayout.numColumns = 2;
-	    gridLayout.marginHeight = 10;
-	    gridLayout.marginWidth = 10;
-	    dialog.setLayout(gridLayout);
-	    
-	    // create the controls in the dialog
-	    createDialogControls(dialog);
-		
-		dialog.addListener(SWT.Close, new Listener() {
-			public void handleEvent(Event event) {
-				for (int i = 0; i < resources.size(); i++) {
-					Object obj = resources.get(i);
-					if (obj != null && obj instanceof Resource) {
-						((Resource) obj).dispose();
-					}
-				}
-				dialog.dispose();
-			}
-		});	
-
-		dialog.setDefaultButton (okButton);
-		dialog.pack ();
-		Rectangle rect = getParent().getMonitor().getBounds();
-		Rectangle bounds = dialog.getBounds();
-		dialog.setLocation(rect.x + (rect.width - bounds.width) / 2, rect.y + (rect.height - bounds.height) / 2);
-		dialog.setMinimumSize(bounds.width, bounds.height);
-		
-		dialog.open ();
-		
-		Display display = getParent().getDisplay();
-		while (!dialog.isDisposed()) {
-			if (!display.readAndDispatch()) display.sleep();
-		}
-		
-		if (menu1 != null) {
-			menu1.dispose();
-			menu1 = null;
-		}
-		
-		if (menu2 != null) {
-			menu2.dispose();
-			menu2 = null;
-		}
-
-		return returnVal;
-	}
-	
-	/**
-	 * Creates the controls of the dialog.
-	 * */
-	public void createDialogControls(final Shell parent) {
-		final Display display = parent.getDisplay();
-		
-		// message
-		Label message = new Label(parent, SWT.NONE); 
-		message.setText(GraphicsExample.getResourceString("GradientDlgMsg"));
-		GridData gridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gridData.horizontalSpan = 2;
-		message.setLayoutData(gridData);
-		
-		// default colors are white and black
-		if (rgb1 == null || rgb2 == null) {
-			rgb1 = display.getSystemColor(SWT.COLOR_WHITE).getRGB();
-			rgb2 = display.getSystemColor(SWT.COLOR_BLACK).getRGB();
-		}			
-
-		// canvas
-		canvas = new Canvas(parent, SWT.NONE);
-		gridData = new GridData(GridData.FILL_BOTH);
-		gridData.widthHint = 200;
-		gridData.heightHint = 100;
-		canvas.setLayoutData(gridData);
-		canvas.addListener (SWT.Paint, new Listener () {
-			public void handleEvent (Event e) {
-				Image preview = null;
-				Point size = canvas.getSize();
-				Color color1 = new Color(display, rgb1);
-				Color color2 = new Color(display, rgb2);
-				preview = GraphicsExample.createImage(display, color1, color2, size.x, size.y);
-				if (preview != null) {
-					e.gc.drawImage (preview, 0, 0);
-				}
-				preview.dispose();
-				color1.dispose();
-				color2.dispose();
-			}
-		});
-		
-		// composite used for both color buttons
-		Composite colorButtonComp = new Composite(parent, SWT.NONE);
-		
-		// layout buttons
-		RowLayout layout = new RowLayout();;
-		layout.type = SWT.VERTICAL;
-		layout.pack = false;
-		colorButtonComp.setLayout(layout);
-
-		// position composite
-		gridData = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
-	    colorButtonComp.setLayoutData(gridData);
-	    
-		ColorMenu colorMenu = new ColorMenu();
-		
-		// color controls: first color
-		colorButton1 = new Button(colorButtonComp, SWT.PUSH);
-		colorButton1.setText(GraphicsExample.getResourceString("GradientDlgButton1"));
-		Color color1 = new Color(display, rgb1);
-		Image img1 = GraphicsExample.createImage(display, color1);
-		color1.dispose();
-		colorButton1.setImage(img1);
-		resources.add(img1);
-		menu1 = colorMenu.createMenu(parent.getParent(), new ColorListener() {
-			public void setColor(GraphicsBackground gb) {
-				rgb1 = gb.getBgColor1().getRGB();
-				colorButton1.setImage(gb.getThumbNail());
-				if (canvas != null) canvas.redraw();
-			}
-		});
-		colorButton1.addListener(SWT.Selection, new Listener() { 
-			public void handleEvent(Event event) {
-				final Button button = (Button) event.widget;
-				final Composite parent = button.getParent(); 
-				Rectangle bounds = button.getBounds();
-				Point point = parent.toDisplay(new Point(bounds.x, bounds.y));
-				menu1.setLocation(point.x, point.y + bounds.height);
-				menu1.setVisible(true);
-			}
-		});
-		
-		// color controls: second color 
-		colorButton2 = new Button(colorButtonComp, SWT.PUSH);
-		colorButton2.setText(GraphicsExample.getResourceString("GradientDlgButton2"));
-		Color color2 = new Color(display, rgb2);
-		Image img2 = GraphicsExample.createImage(display, color2);
-		color2.dispose();
-		colorButton2.setImage(img2);
-		resources.add(img2);
-		menu2 = colorMenu.createMenu(parent.getParent(), new ColorListener() {
-			public void setColor(GraphicsBackground gb) {
-				rgb2 = gb.getBgColor1().getRGB();
-				colorButton2.setImage(gb.getThumbNail());
-				if (canvas != null) canvas.redraw();
-			}
-		});
-		colorButton2.addListener(SWT.Selection, new Listener() { 
-			public void handleEvent(Event event) {
-				final Button button = (Button) event.widget;
-				final Composite parent = button.getParent(); 
-				Rectangle bounds = button.getBounds();
-				Point point = parent.toDisplay(new Point(bounds.x, bounds.y));
-				menu2.setLocation(point.x, point.y + bounds.height);
-				menu2.setVisible(true);
-			}
-		});
-		
-		// composite used for ok and cancel buttons
-		Composite okCancelComp = new Composite(parent, SWT.NONE);
-
-		// layout buttons
-		RowLayout rowLayout = new RowLayout();
-		rowLayout.pack = false;
-		rowLayout.marginTop = 5;
-		okCancelComp.setLayout(rowLayout);
-
-		// position composite
-		gridData = new GridData(GridData.HORIZONTAL_ALIGN_END);
-	    gridData.horizontalSpan = 2;
-	    okCancelComp.setLayoutData(gridData);
-		
-	    // OK button
-		okButton = new Button (okCancelComp, SWT.PUSH);
-		okButton.setText("&OK");
-		okButton.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				returnVal = SWT.OK;
-				parent.close();
-			}
-		});
-		
-		// cancel button
-		cancelButton = new Button (okCancelComp, SWT.PUSH);
-		cancelButton.setText("&Cancel");
-		cancelButton.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				parent.close();
-			}
-		});
-	}
-	
-	/**
-	 * Returns the first RGB selected by the user.
-	 * */
-	public RGB getFirstRGB() {
-		return rgb1;		
-	}
-	
-	/**
-	 * Sets the first RGB.
-	 * @param rgb
-	 */
-	public void setFirstRGB(RGB rgb) {
-		this.rgb1 = rgb;
-	}
-	
-	/**
-	 * Returns the second RGB selected by the user.
-	 * */
-	public RGB getSecondRGB() {
-		return rgb2;
-	}
-
-	/**
-	 * Sets the second RGB.
-	 * @param rgb
-	 */
-	public void setSecondRGB(RGB rgb) {
-		this.rgb2 = rgb;
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/GradientTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/GradientTab.java
deleted file mode 100644
index 33034bb..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/GradientTab.java
+++ /dev/null

@@ -1,210 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import java.util.*;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This tab draws an image consisting of gradients of two colors.
- * */
-public class GradientTab extends GraphicsTab {
-	
-	ToolBar toolBar;
-	ToolItem colorItem1, colorItem2;
-	Menu menu1, menu2;
-	GraphicsBackground colorGB1, colorGB2;
-	ArrayList resources;		// resources to be disposed when the dipose() method is invoked
-	
-
-public GradientTab(GraphicsExample example) {
-	super(example);
-	resources = new ArrayList();
-}
-
-/**
- * Dispose resources created by this tab.
- * */
-public void dispose() {
-	for (int i = 0; i < resources.size(); i++) {
-		Object obj = resources.get(i);
-		if (obj != null && obj instanceof Resource) 
-			((Resource) obj).dispose();
-	}
-	resources = new ArrayList();
-	
-	if (menu1 != null) {
-		menu1.dispose();
-		menu1 = null;
-	}
-	if (menu2 != null) {
-		menu2.dispose();
-		menu2 = null;
-	}
-}
-
-public String getCategory() {
-	return GraphicsExample.getResourceString("Gradient"); //$NON-NLS-1$
-}
-
-public String getText() {
-	return GraphicsExample.getResourceString("GradImage"); //$NON-NLS-1$
-}
-
-public String getDescription() {
-	return GraphicsExample.getResourceString("GradientImageDescription"); //$NON-NLS-1$
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.swt.examples.graphics.GraphicsTab#createControlPanel(org.eclipse.swt.widgets.Composite)
- */
-public void createControlPanel(final Composite parent) {
-	final Display display = parent.getDisplay();
-	
-	toolBar = new ToolBar(parent, SWT.FLAT);
-	
-	ColorMenu colorMenu = new ColorMenu();
-
-	// menu for colorItem1
-	menu1 = colorMenu.createMenu(parent.getParent(), new ColorListener() {
-		public void setColor(GraphicsBackground gb) {
-			colorGB1 = gb;
-			colorItem1.setImage(gb.getThumbNail());
-			example.redraw();
-		}
-	});
-	
-	// initialize the background to the 5th item in the menu (blue)
-	colorGB1 = (GraphicsBackground)menu1.getItem(4).getData();
-	
-	// toolbar item for color1
-	colorItem1 = new ToolItem(toolBar, SWT.PUSH);
-	colorItem1.setText(GraphicsExample.getResourceString("GradientTabItem1"));
-	colorItem1.setImage(colorGB1.getThumbNail());
-	colorItem1.addListener(SWT.Selection, new Listener(){
-		public void handleEvent(Event event) {
-			final ToolItem toolItem = (ToolItem) event.widget;
-			final ToolBar  toolBar = toolItem.getParent();
-			Rectangle toolItemBounds = toolItem.getBounds();
-			Point point = toolBar.toDisplay(new Point(toolItemBounds.x, toolItemBounds.y));
-			menu1.setLocation(point.x, point.y + toolItemBounds.height);
-			menu1.setVisible(true);
-		}
-	});
-	
-	// menu for colorItem2
-	menu2 = colorMenu.createMenu(parent.getParent(), new ColorListener() {
-		public void setColor(GraphicsBackground gb) {
-			colorGB2 = gb;
-			colorItem2.setImage(gb.getThumbNail());
-			example.redraw();
-		}
-	});
-	
-	// initialize the background to the 3rd item in the menu (red)
-	colorGB2 = (GraphicsBackground)menu2.getItem(2).getData();
-	
-	// toolbar item for color2
-	colorItem2 = new ToolItem(toolBar, SWT.PUSH);
-	colorItem2.setText(GraphicsExample.getResourceString("GradientTabItem2"));
-	colorItem2.setImage(colorGB2.getThumbNail());
-	colorItem2.addListener(SWT.Selection, new Listener(){
-		public void handleEvent(Event event) {
-			final ToolItem toolItem = (ToolItem) event.widget;
-			final ToolBar  toolBar = toolItem.getParent();
-			Rectangle toolItemBounds = toolItem.getBounds();
-			Point point = toolBar.toDisplay(new Point(toolItemBounds.x, toolItemBounds.y));
-			menu2.setLocation(point.x, point.y + toolItemBounds.height);
-			menu2.setVisible(true);
-		}
-	});
-	
-	// toolbar item for swapping colors
-	ToolItem swapItem = new ToolItem(toolBar, SWT.PUSH);
-	swapItem.setText(GraphicsExample.getResourceString("SwapColors")); //$NON-NLS-1$
-	swapItem.setImage(example.loadImage(display, "swap.gif"));
-	swapItem.addListener(SWT.Selection, new Listener(){
-		public void handleEvent(Event event) {
-			GraphicsBackground tmp = colorGB1;
-			colorGB1 = colorGB2;
-			colorGB2 = tmp;
-			colorItem1.setImage(colorGB1.getThumbNail());
-			colorItem2.setImage(colorGB2.getThumbNail());
-			example.redraw();
-		}
-	});
-}
-
-/**
- * This method draws the gradient patterns that make up the image. The image
- * consists of 4 rows, each consisting of 4 gradient patterns (total of 16).
- */
-public void paint(GC gc, int width, int height) {
-	if (!example.checkAdvancedGraphics()) return;
-	Device device = gc.getDevice();
-	
-	Image image = createImage(device, colorGB1.getBgColor1(), colorGB2.getBgColor1(), width, height);
-	Pattern p = new Pattern(device, image);
-	gc.setBackgroundPattern(p);
-	gc.fillRectangle(0, 0, width, height);
-
-	p.dispose();
-	image.dispose();
-}
-
-
-/**
- * Creates and returns an image made up of gradient patterns. The image takes up
- * a quarter of the area of the total drawing surface.
- * 
- * @param device
- *            A Device
- * @param color1
- *            A Color
- * @param color2
- *            A Color
- * @param width
- *            Width of the drawing surface
- * @param height
- *            Height of the drawing surface
- */
-Image createImage(Device device, Color color1, Color color2, int width, int height) {
-	Image image = new Image(device, width/2, height/2);
-	GC gc = new GC(image);
-	Rectangle rect = image.getBounds();
-	
-	Pattern pattern1 = new Pattern(device, rect.x, rect.y, rect.width/2f, rect.height/2f, color1, color2);
-	gc.setBackgroundPattern(pattern1);	
-	Path path = new Path(device);
-	path.addRectangle(0, 0, width/4f, height/4f);
-	path.addRectangle(width/4f, height/4f, width/4f, height/4f);
-	gc.fillPath(path);
-	path.dispose();
-	
-	Pattern pattern2 = new Pattern(device, rect.width, 0, rect.width/2f, rect.height/2f, color1, color2);
-	gc.setBackgroundPattern(pattern2);
-	path = new Path(device);
-	path.addRectangle(width/4f, 0, width/4f, height/4f);
-	path.addRectangle(0, height/4f, width/4f, height/4f);
-	gc.fillPath(path);
-	path.dispose();	
-
-	gc.dispose();
-	pattern1.dispose();
-	pattern2.dispose();
-	return image;
-}
-
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/GraphicAntialiasTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/GraphicAntialiasTab.java
deleted file mode 100644
index 482f700..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/GraphicAntialiasTab.java
+++ /dev/null

@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This tab demonstrates antialiasing for graphics. Antialiasing is used for
- * smoothing jagged edges in graphics. This tab allows the user to see the
- * effects of different antialiasing values.
- */
-public class GraphicAntialiasTab extends GraphicsTab {
-
-	Combo aliasCombo;
-	int[] aliasValues = { SWT.OFF, SWT.DEFAULT, SWT.ON };
-	
-	Button colorButton;
-	Menu menu;
-	GraphicsBackground ovalColorGB;
-
-	
-public GraphicAntialiasTab(GraphicsExample example) {
-	super(example);
-}
-
-public String getCategory() {
-	return GraphicsExample.getResourceString("Antialiasing"); //$NON-NLS-1$
-}
-
-public String getText() {
-	return GraphicsExample.getResourceString("Graphics"); //$NON-NLS-1$
-}
-
-public String getDescription() {
-	return GraphicsExample.getResourceString("AntialiasingGraphicsDesc"); //$NON-NLS-1$
-}
-
-public void dispose() {
-	if (menu != null) {
-		menu.dispose();
-		menu = null;
-	}
-}
-
-public void createControlPanel(Composite parent) {
-
-	Composite comp;
-	
-	// create drop down combo for antialiasing
-	comp = new Composite(parent, SWT.NONE);
-	comp.setLayout(new GridLayout(2, false));
-	new Label(comp, SWT.CENTER).setText(GraphicsExample
-			.getResourceString("Antialiasing")); //$NON-NLS-1$
-	aliasCombo = new Combo(comp, SWT.DROP_DOWN);
-	aliasCombo.add("OFF");
-	aliasCombo.add("DEFAULT");
-	aliasCombo.add("ON");
-	aliasCombo.select(0);
-	aliasCombo.addListener(SWT.Selection, new Listener() {
-		public void handleEvent(Event event) {
-				example.redraw();
-		}
-	});
-
-	ColorMenu cm = new ColorMenu();
-	cm.setColorItems(true);
-	menu = cm.createMenu(parent.getParent(), new ColorListener() {
-		public void setColor(GraphicsBackground gb) {
-			ovalColorGB = gb;
-			colorButton.setImage(gb.getThumbNail());
-			example.redraw();
-		}
-	});
-	
-	// create color button
-	comp = new Composite(parent, SWT.NONE);
-	comp.setLayout(new GridLayout());
-	
-    // initialize the background to the 5th item in the menu (blue)
-	ovalColorGB = (GraphicsBackground)menu.getItem(4).getData();
-	
-	// color button
-	colorButton = new Button(comp, SWT.PUSH);
-	colorButton.setText(GraphicsExample.getResourceString("Color")); //$NON-NLS-1$
-	colorButton.setImage(ovalColorGB.getThumbNail());
-	colorButton.addListener(SWT.Selection, new Listener() { 
-		public void handleEvent(Event event) {
-			final Button button = (Button) event.widget;
-			final Composite parent = button.getParent(); 
-			Rectangle bounds = button.getBounds();
-			Point point = parent.toDisplay(new Point(bounds.x, bounds.y));
-			menu.setLocation(point.x, point.y + bounds.height);
-			menu.setVisible(true);
-		}
-	});
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.swt.examples.graphics.GraphicsTab#paint(org.eclipse.swt.graphics.GC, int, int)
- */
-public void paint(GC gc, int width, int height) {
-	if (!example.checkAdvancedGraphics()) return;
-	Device device = gc.getDevice();
-	
-	if (ovalColorGB != null && ovalColorGB.getBgColor1() != null)
-		gc.setBackground(ovalColorGB.getBgColor1());
-	
-	gc.setAntialias(aliasValues[aliasCombo.getSelectionIndex()]);
-
-	Path path = new Path(device);
-	float offsetX = 2*width/3f, offsetY = height/3f;
-	for(int i=0; i < 25; i++) {
-		path.addArc(offsetX-(50*i), offsetY-(25*i), 50+(100*i), 25+(50*i), 0, 360);
-	}
-	gc.fillPath(path);
-	path.dispose();
-}
-}
-

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/GraphicsBackground.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/GraphicsBackground.java
deleted file mode 100644
index f699fec..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/GraphicsBackground.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * This class is used for storing data relevant to a background.
- */
-public class GraphicsBackground {
-	
-	private Image bgImage;
-	private Image thumbNail;
-	private Color bgColor1;
-	private Color bgColor2;
-	
-	public GraphicsBackground() {
-		bgImage = null;
-		thumbNail = null;
-		bgColor1 = null;
-		bgColor2 = null;
-	}
-
-	public Image getBgImage() {
-		return bgImage;
-	}
-
-	public void setBgImage(Image bgImage) {
-		this.bgImage = bgImage;
-	}
-
-	public Color getBgColor1() {
-		return bgColor1;
-	}
-
-	public void setBgColor1(Color bgColor1) {
-		this.bgColor1 = bgColor1;
-	}
-
-	public Color getBgColor2() {
-		return bgColor2;
-	}
-
-	public void setBgColor2(Color bgColor2) {
-		this.bgColor2 = bgColor2;
-	}
-
-	public Image getThumbNail() {
-		return thumbNail;
-	}
-
-	public void setThumbNail(Image thumbNail) {
-		this.thumbNail = thumbNail;
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/GraphicsExample.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/GraphicsExample.java
deleted file mode 100644
index 5445531..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/GraphicsExample.java
+++ /dev/null

@@ -1,648 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.graphics;
-
-import java.io.*;
-import java.util.*;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This class is the main class of the graphics application. Various "tabs" are
- * created and made visible by this class.
- */
-public class GraphicsExample {
-		
-	Composite parent;
-	GraphicsTab[] tabs;				// tabs to be found in the application
-	GraphicsTab tab;				// the current tab
-	GraphicsBackground background;	// used to store information about the background
-	
-	ToolBar toolBar;				// toolbar that contains backItem and dbItem
-	Tree tabList;					// tree structure of tabs
-	Text tabDesc;					// multi-line text widget that displays a tab description
-	Sash hSash, vSash;
-	Canvas canvas;
-	Composite tabControlPanel;
-	ToolItem backItem, dbItem;		// background, double buffer items
-	Menu backMenu;					// background menu item
-	
-	ArrayList resources;			// stores resources that will be disposed
-	ArrayList tabs_in_order;		// stores GraphicsTabs in the order that they appear in the tree
-	boolean animate = true;			// whether animation should happen
-
-	static boolean advanceGraphics, advanceGraphicsInit;
-	
-	static final int MARGIN = 5;
-	static final int SASH_SPACING = 1;
-	static final int TIMER = 30;
-	static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle("examples_graphics"); //$NON-NLS-1$
-
-/*
- * Default constructor is needed so that example launcher can create an instance. 
- */
-public GraphicsExample() {
-	super();
-}
-
-public GraphicsExample(final Composite parent) {
-	this.parent = parent;
-	resources = new ArrayList();
-	createControls(parent);
-	setTab(tab);
-	startAnimationTimer();
-}
-
-boolean checkAdvancedGraphics() {
-	if (advanceGraphicsInit) return advanceGraphics;
-	advanceGraphicsInit = true;
-	Display display = parent.getDisplay();
-	try {
-		Path path = new Path(display);
-		path.dispose();
-	} catch (SWTException e) {
-		Shell shell = display.getActiveShell(), newShell = null;
-		if (shell == null) shell = newShell = new Shell(display);
-		MessageBox dialog = new MessageBox(shell, SWT.ICON_WARNING | SWT.OK);
-		dialog.setText(RESOURCE_BUNDLE.getString("Warning")); //$NON-NLS-1$
-		dialog.setMessage(RESOURCE_BUNDLE.getString("LibNotFound")); //$NON-NLS-1$
-		dialog.open();
-		if (newShell != null) newShell.dispose();
-		return false;
-	}
-	return advanceGraphics = true;
-}
-
-void createControls(final Composite parent) {
-	tabs = createTabs();
-	createToolBar(parent);
-	createTabList(parent);
-	hSash = new Sash(parent, SWT.HORIZONTAL);
-	createTabDesc(parent);	
-	vSash = new Sash(parent, SWT.VERTICAL);
-	createCanvas(parent);
-	createControlPanel(parent);
-	
-	FormData data;
-	FormLayout layout = new FormLayout();
-	parent.setLayout(layout);
-	
-	data = new FormData();
-	data.left = new FormAttachment(0, MARGIN);
-	data.top = new FormAttachment(0, MARGIN);
-	data.right = new FormAttachment(100, -MARGIN);
-	toolBar.setLayoutData(data);
-
-	data = new FormData();
-	data.left = new FormAttachment(0, MARGIN);
-	data.top = new FormAttachment(toolBar, MARGIN);
-	data.right = new FormAttachment(vSash, -SASH_SPACING);
-	data.bottom = new FormAttachment(hSash, -SASH_SPACING);
-	tabList.setLayoutData(data);
-
-	data = new FormData();
-	data.left = new FormAttachment(0, MARGIN);
-	int offset = parent.getBounds().height - tabDesc.computeSize(SWT.DEFAULT, tabDesc.getLineHeight() * 10).y;
-	data.top = new FormAttachment(null, offset);
-	data.right = new FormAttachment(vSash, -SASH_SPACING);
-	hSash.setLayoutData(data);
-
-	data = new FormData();
-	data.left = new FormAttachment(0, MARGIN);
-	data.top = new FormAttachment(hSash, SASH_SPACING);
-	data.right = new FormAttachment(vSash, -SASH_SPACING);
-	data.bottom = new FormAttachment(100, -MARGIN);
-	tabDesc.setLayoutData(data);
-	
-	data = new FormData();
-	data.left = new FormAttachment(null, tabList.computeSize(SWT.DEFAULT, SWT.DEFAULT).x + 50);
-	data.top = new FormAttachment(toolBar, MARGIN);
-	data.bottom = new FormAttachment(100, -MARGIN);
-	vSash.setLayoutData(data);
-
-	data = new FormData();
-	data.left = new FormAttachment(vSash, SASH_SPACING);
-	data.top = new FormAttachment(toolBar, MARGIN);
-	data.right = new FormAttachment(100, -MARGIN);
-	data.bottom = new FormAttachment(tabControlPanel);
-	canvas.setLayoutData(data);
-
-	data = new FormData();
-	data.left = new FormAttachment(vSash, SASH_SPACING);
-	data.right = new FormAttachment(100, -MARGIN);
-	data.bottom = new FormAttachment(100, -MARGIN);
-	tabControlPanel.setLayoutData(data);
-	
-	vSash.addListener(SWT.Selection, new Listener() {
-		public void handleEvent(Event event) {
-			Rectangle rect = hSash.getParent().getClientArea();
-			event.x = Math.min (Math.max (event.x, 60), rect.width - 60);
-			System.out.println(event.x);
-			if (event.detail != SWT.DRAG) {
-				FormData data = (FormData)vSash.getLayoutData();
-				data.left.offset = event.x;
-				parent.layout(true);
-				animate = true;
-			} else {
-				animate = false;
-			}
-		}
-	});
-	hSash.addListener (SWT.Selection, new Listener () {
-		public void handleEvent (Event event) {
-			Rectangle rect = vSash.getParent().getClientArea();
-			event.y = Math.min (Math.max (event.y, tabList.getLocation().y + 60), rect.height - 60);
-			if (event.detail != SWT.DRAG) {
-				FormData data = (FormData)hSash.getLayoutData();
-				data.top.offset = event.y;
-				parent.layout(true);
-			}
-		}
-	});
-}
-
-void createCanvas(Composite parent) {
-	int style = SWT.NO_BACKGROUND;
-	if (dbItem.getSelection()) style |= SWT.DOUBLE_BUFFERED;
-	canvas = new Canvas(parent, style);
-	canvas.addListener(SWT.Paint, new Listener() {
-		public void handleEvent(Event event) {
-			GC gc = event.gc;
-			Rectangle rect = canvas.getClientArea();			
-			Device device = gc.getDevice();
-			Pattern pattern = null;
-			if (background.getBgColor1() != null) {
-				if (background.getBgColor2() != null) { // gradient
-					pattern = new Pattern(device, 0, 0, rect.width, 
-							rect.height,
-							background.getBgColor1(),
-							background.getBgColor2());
-					gc.setBackgroundPattern(pattern);
-				} else {	// solid color
-					gc.setBackground(background.getBgColor1());
-				}
-			} else if (background.getBgImage() != null) {		// image
-				pattern = new Pattern(device, background.getBgImage());
-				gc.setBackgroundPattern(pattern);
-			}
-			gc.fillRectangle(rect);
-			GraphicsTab tab = getTab();
-			if (tab != null) tab.paint(gc, rect.width, rect.height);
-			if (pattern != null) pattern.dispose();
-		}
-	});
-}
-
-void recreateCanvas() {
-	if (dbItem.getSelection() == ((canvas.getStyle() & SWT.DOUBLE_BUFFERED) != 0)) return;
-	Object data = canvas.getLayoutData();
-	if (canvas != null) canvas.dispose();
-	createCanvas(parent);
-	canvas.setLayoutData(data);
-	parent.layout(true, true);
-}
-
-/**
- * Creates the control panel 
- * @param parent
- */
-void createControlPanel(Composite parent) {
-	Group group;
-	tabControlPanel = group = new Group(parent, SWT.NONE);
-	group.setText(getResourceString("Settings")); //$NON-NLS-1$
-	tabControlPanel.setLayout(new RowLayout());
-}
-
-void createToolBar(final Composite parent) {
-	final Display display = parent.getDisplay();
-	
-	toolBar = new ToolBar(parent, SWT.FLAT);
-	
-	ToolItem  back = new ToolItem(toolBar, SWT.PUSH);
-	back.setText(getResourceString("Back")); //$NON-NLS-1$
-	back.setImage(loadImage(display, "back.gif")); //$NON-NLS-1$
-	
-	back.addListener(SWT.Selection, new Listener() {
-		public void handleEvent(Event event) {
-			int index = tabs_in_order.indexOf(tab) - 1;
-			if (index < 0)
-				index = tabs_in_order.size() - 1;
-			setTab((GraphicsTab)tabs_in_order.get(index));
-		}
-	});
-	
-	ToolItem  next = new ToolItem(toolBar, SWT.PUSH);
-	next.setText(getResourceString("Next")); //$NON-NLS-1$
-	next.setImage(loadImage(display, "next.gif")); //$NON-NLS-1$
-	next.addListener(SWT.Selection, new Listener() {
-		public void handleEvent(Event event) {
-			int index = (tabs_in_order.indexOf(tab) + 1)%tabs_in_order.size();
-			setTab((GraphicsTab)tabs_in_order.get(index));
-		}
-	});
-	
-	ColorMenu colorMenu = new ColorMenu();
-	
-	// setup items to be contained in the background menu
-	colorMenu.setColorItems(true);
-	colorMenu.setPatternItems(checkAdvancedGraphics());
-	colorMenu.setGradientItems(checkAdvancedGraphics());
-	
-	// create the background menu
-	backMenu = colorMenu.createMenu(parent, new ColorListener() {
-		public void setColor(GraphicsBackground gb) {
-			background = gb;
-			backItem.setImage(gb.getThumbNail());
-			if (canvas != null) canvas.redraw();
-		}
-	});
-	
-	// initialize the background to the first item in the menu
-	background = (GraphicsBackground)backMenu.getItem(0).getData();
-	
-	// background tool item
-	backItem = new ToolItem(toolBar, SWT.PUSH);
-	backItem.setText(getResourceString("Background")); //$NON-NLS-1$
-	backItem.setImage(background.getThumbNail());
-	backItem.addListener(SWT.Selection, new Listener() {
-		public void handleEvent(Event event) {
-			if (event.widget == backItem) {
-				final ToolItem toolItem = (ToolItem) event.widget;
-				final ToolBar  toolBar = toolItem.getParent();
-				Rectangle toolItemBounds = toolItem.getBounds();
-				Point point = toolBar.toDisplay(new Point(toolItemBounds.x, toolItemBounds.y));
-				backMenu.setLocation(point.x, point.y + toolItemBounds.height);
-				backMenu.setVisible(true);
-			}
-		}
-	});
-	
-	// double buffer tool item
-	dbItem = new ToolItem(toolBar, SWT.CHECK);
-	dbItem.setText(getResourceString("DoubleBuffer")); //$NON-NLS-1$
-	dbItem.setImage(loadImage(display, "db.gif")); //$NON-NLS-1$
-	dbItem.addListener(SWT.Selection, new Listener() {
-		public void handleEvent(Event event) {
-			setDoubleBuffered(dbItem.getSelection());
-		}
-	});
-}
-
-/**
- * Creates and returns a thumbnail image.
- * 
- * @param device
- * 			a device
- * @param name
- * 			filename of the image
- */
-static Image createThumbnail(Device device, String name) {
-	Image image = new Image(device, name);
-	Rectangle src = image.getBounds();
-	Image result = null;
-	if (src.width != 16 || src.height != 16) {
-		result = new Image(device, 16, 16);
-		GC gc = new GC(result);
-		Rectangle dest = result.getBounds();
-		gc.drawImage(image, src.x, src.y, src.width, src.height, dest.x, dest.y, dest.width, dest.height);
-		gc.dispose();				
-	}
-	if (result != null) {
-		image.dispose();
-		return result;
-	}
-	return image;
-}
-
-/**
- * Creates an image based on a gradient pattern made up of two colors.
- * 
- * @param device - The Device
- * @param color1 - The first color used to create the image
- * @param color2 - The second color used to create the image
- * 
- * */
-static Image createImage(Device device, Color color1, Color color2, int width, int height) {
-	Image image = new Image(device, width, height);
-	GC gc = new GC(image);
-	Rectangle rect = image.getBounds();
-	Pattern pattern = new Pattern(device, rect.x, rect.y, rect.width - 1,
-				rect.height - 1, color1, color2);
-	gc.setBackgroundPattern(pattern);
-	gc.fillRectangle(rect);
-	gc.drawRectangle(rect.x, rect.y, rect.width - 1, rect.height - 1);
-	gc.dispose();
-	pattern.dispose();
-	return image;
-}
-
-/**
- * Creates an image based on the color provided and returns it.
- * 
- * @param device - The Device
- * @param color - The color used to create the image
- * 
- * */
-static Image createImage(Device device, Color color) {
-	Image image = new Image(device, 16, 16);
-	GC gc = new GC(image);
-	gc.setBackground(color);
-	Rectangle rect = image.getBounds();
-	gc.fillRectangle(rect);
-	if (color.equals(device.getSystemColor(SWT.COLOR_BLACK))) {
-		gc.setForeground(device.getSystemColor(SWT.COLOR_WHITE));
-	}
-	gc.drawRectangle(rect.x, rect.y, rect.width - 1, rect.height - 1);
-	gc.dispose();
-	return image;
-}
-
-void createTabList(Composite parent) {
-	tabList = new Tree(parent, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
-	Arrays.sort(tabs, new Comparator() {
-		public int compare(Object tab0, Object tab1) {
-			return ((GraphicsTab)tab0).getText().compareTo(((GraphicsTab)tab1).getText());
-		}
-	});
-	HashSet set = new HashSet();
-	for (int i = 0; i < tabs.length; i++) {
-		GraphicsTab tab = tabs[i];
-		set.add(tab.getCategory());
-	}
-	String[] categories = new String[set.size()];
-	set.toArray(categories);
-	Arrays.sort(categories);
-	for (int i = 0; i < categories.length; i++) {
-		String text = categories[i];
-		TreeItem item = new TreeItem(tabList, SWT.NONE);
-		item.setText(text);
-	}
-	tabs_in_order = new ArrayList();
-	TreeItem[] items = tabList.getItems();
-	for (int i = 0; i < items.length; i++) {
-		TreeItem item = items[i];
-		for (int j = 0; j < tabs.length; j++) {
-			GraphicsTab tab = tabs[j];
-			if (item.getText().equals(tab.getCategory())) {
-				TreeItem item1 = new TreeItem(item, SWT.NONE);
-				item1.setText(tab.getText());
-				item1.setData(tab);
-				tabs_in_order.add(tab);
-			}
-		}
-	}
-	tabList.addListener(SWT.Selection, new Listener() {
-		public void handleEvent(Event event) {
-			TreeItem item = (TreeItem)event.item;
-			if (item != null) {
-				GraphicsTab gt = (GraphicsTab)item.getData();
-				if (gt == tab) return;
-				setTab((GraphicsTab)item.getData());
-			}
-		}
-	});
-}
-
-/**
- * Creates the multi-line text widget that will contain the tab description. 
- * */
-void createTabDesc(Composite parent) {
-	tabDesc = new Text(parent, SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL | SWT.WRAP | SWT.BORDER);
-	tabDesc.setEditable(false);
-	tabDesc.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
-}
-
-/**
- * Initializes the GraphicsTab instances that will be contained in GraphicsExample.
- * */
-GraphicsTab[] createTabs() {
-	return new GraphicsTab[] {
-		new LineTab(this),
-		new StarPolyTab(this),
-		tab = new IntroTab(this),
-		new BlackHoleTab(this),
-		new AlphaTab(this),
-		new BallTab(this),
-		new CountDownTab(this),
-		new CurvesSWTTab(this),
-		new CurvesTab(this),
-		new CustomFontTab(this),
-		new FontBounceTab(this),
-		new GradientTab(this),
-		new ImageTransformTab(this),
-		new ShapesTab(this),
-		new MazeTab(this),
-		new RGBTab(this),
-		new SpiralTab(this),
-		new CardsTab(this),
-		new LineCapTab(this),
-		new InterpolationTab(this),
-		new PathClippingTab(this),
-		new PathClippingAnimTab(this),
-		new LineStyleTab(this),
-		new LineJoinTab(this),
-		new RegionClippingTab(this),
-		new CustomAlphaTab(this),
-		new TextAntialiasTab(this),
-		new GraphicAntialiasTab(this),
-		new ImageFlipTab(this),
-		new PathTab(this),
-	};
-}
-
-/**
- * Disposes all resources created by the receiver.
- */
-public void dispose() {
-	if (tabs != null) {
-		for (int i = 0; i < tabs.length; i++) {
-			GraphicsTab tab = tabs[i];
-			tab.dispose();
-		}
-	}
-	tabs = null;
-	if (resources != null) {
-		for (int i = 0; i < resources.size(); i++) {
-			if (resources.get(i) instanceof Resource) {
-				((Resource)resources.get(i)).dispose();
-			}
-		}
-	}
-	resources = null;
-	
-	if (backMenu != null) {
-		backMenu.dispose();
-		backMenu = null;
-	}
-}
-
-TreeItem findItemByData(TreeItem[] items, Object data) {
-	for (int i = 0; i < items.length; i++) {
-		TreeItem item = items[i];
-		if (item.getData() == data) return item;
-		item = findItemByData(item.getItems(), data);
-		if (item != null) return item;
-	}
-	return null;
-}
-
-/**
- * Gets the current tab.
- */
-public GraphicsTab getTab() {
-	return tab;
-}
-
-/**
- * Gets a string from the resource bundle.
- * We don't want to crash because of a missing String.
- * Returns the key if not found.
- */
-static String getResourceString(String key) {
-	try {
-		return RESOURCE_BUNDLE.getString(key);
-	} catch (MissingResourceException e) {
-		return key;
-	} catch (NullPointerException e) {
-		return "!" + key + "!"; //$NON-NLS-1$ //$NON-NLS-2$
-	}			
-}
-
-static Image loadImage (Device device, Class clazz, String string) {
-	InputStream stream = clazz.getResourceAsStream (string);
-	if (stream == null) return null;
-	Image image = null;
-	try {
-		image = new Image (device, stream);
-	} catch (SWTException ex) {
-	} finally {
-		try {
-			stream.close ();
-		} catch (IOException ex) {}
-	}
-	return image;
-}
-
-Image loadImage(Device device, String name) {
-	Image image = loadImage(device, GraphicsExample.class, name);
-	if (image != null) resources.add(image);
-	return image;
-}
-
-public Shell open(final Display display) {
-	Shell shell = new Shell(display);
-	shell.setText(getResourceString("AdvancedGraphics")); //$NON-NLS-1$
-	final GraphicsExample example = new GraphicsExample(shell);
-	shell.addListener(SWT.Close, new Listener() {
-		public void handleEvent(Event event) {
-			example.dispose();
-		}
-	});	
-	shell.open();
-	return shell;
-}
-
-/**
- * Redraws the current tab.
- */
-public void redraw() {
-	canvas.redraw();
-}
-
-/**
- * Sets wheter the canvas is double buffered or not.
- */
-public void setDoubleBuffered(boolean doubleBuffered) {
-	dbItem.setSelection(doubleBuffered);
-	recreateCanvas();
-}
-
-/**
- * Grabs input focus.
- */
-public void setFocus() {
-	tabList.setFocus();
-}
-
-/**
- * Sets the current tab.
- */
-public void setTab(GraphicsTab tab) {
-	Control[] children = tabControlPanel.getChildren();
-	for (int i = 0; i < children.length; i++) {
-		Control control = children[i];
-		control.dispose();
-	}
-	if (this.tab != null) this.tab.dispose();
-	this.tab = tab;
-	if (tab != null) {
-		setDoubleBuffered(tab.getDoubleBuffered());
-		tab.createControlPanel(tabControlPanel);
-		tabDesc.setText(tab.getDescription());
-	} else {
-		tabDesc.setText("");
-	}
-	FormData data = (FormData)tabControlPanel.getLayoutData();
-	children = tabControlPanel.getChildren();
-	if (children.length != 0) {
-		data.top = null;
-	} else {
-		data.top = new FormAttachment(100, -MARGIN);
-	}
-	parent.layout(true, true);
-	if (tab != null) {
-		TreeItem[] selection = tabList.getSelection();
-		if (selection.length == 0 || selection[0].getData() != tab) {
-			TreeItem item = findItemByData(tabList.getItems(), tab);
-			if (item != null) tabList.setSelection(new TreeItem[]{item});
-		}
-	}
-	canvas.redraw();
-}
-
-/**
- * Starts the animation if the animate flag is set.
- */
-void startAnimationTimer() {
-	final Display display = parent.getDisplay();
-	display.timerExec(TIMER, new Runnable() {
-		public void run() {
-			if (canvas.isDisposed()) return;
-			int timeout = TIMER;
-			GraphicsTab tab = getTab();
-			if (tab instanceof AnimatedGraphicsTab) {
-				AnimatedGraphicsTab animTab = (AnimatedGraphicsTab) tab;	
-				if (animate && animTab.getAnimation()) {
-					Rectangle rect = canvas.getClientArea();
-					animTab.next(rect.width, rect.height);
-					canvas.redraw();
-					canvas.update();
-				}
-				timeout =  animTab.getAnimationTime();
-			}
-			display.timerExec(timeout, this);
-		}
-	});
-}
-
-public static void main(String[] args) {
-	Display display = new Display();
-	Shell shell = new GraphicsExample().open(display);
-	while (shell != null && !shell.isDisposed()) {
-		if (!display.readAndDispatch())
-			display.sleep();
-	}
-	display.dispose();
-}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/GraphicsTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/GraphicsTab.java
deleted file mode 100644
index 55590b5..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/GraphicsTab.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This class is the one used for creating a graphic. Override the paint()
- * method to create the drawing. To create an animated graphic, use the
- * AnimatedGraphicsTab class.
- */
-public abstract class GraphicsTab {
-	
-GraphicsExample example;
-
-public GraphicsTab(GraphicsExample example) {
-	this.example = example;
-}
-
-/** 
- * Creates the widgets used to control the drawing.
- */
-public void createControlPanel(Composite parent) {
-}
-
-/** 
- * Disposes resources created by the receiver.
- */
-public void dispose() {
-}
-
-/** 
- * Answer the receiver's name.
- */
-public abstract String getText();
-
-/** 
- * Answer the receiver's category.
- */
-public String getCategory() {
-	return GraphicsExample.getResourceString("Misc"); //$NON-NLS-1$
-}
-
-/**
- *  Answer the receiver's description.
- * */
-public String getDescription() {
-	return "";
-}
-
-/**
- *  Answer whether the receiver's drawing should be double bufferer.
- */
-public boolean getDoubleBuffered() {
-	return false;
-}
-
-/** 
- * Paint the receiver into the specified GC. 
- */
-public void paint(GC gc, int width, int height) {
-}
-
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ImageFlipTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ImageFlipTab.java
deleted file mode 100644
index ff9579b..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ImageFlipTab.java
+++ /dev/null

@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-
-/**
- * This tab demonstrates how an image can be flipped in various fashions. 
- */
-public class ImageFlipTab extends GraphicsTab {
-
-public ImageFlipTab(GraphicsExample example) {
-	super(example);
-}
-
-public String getCategory() {
-	return GraphicsExample.getResourceString("Image"); //$NON-NLS-1$
-}
-
-public String getText() {
-	return GraphicsExample.getResourceString("Flip"); //$NON-NLS-1$
-}
-
-public String getDescription() {
-	return GraphicsExample.getResourceString("FlipDescription"); //$NON-NLS-1$
-}
-
-public void paint(GC gc, int width, int height) {
-	if (!example.checkAdvancedGraphics()) return;
-	Device device = gc.getDevice();
-	
-	Image image = GraphicsExample.loadImage(device, GraphicsExample.class, "houses.png");
-	Rectangle bounds = image.getBounds();
-	
-	// top
-	Transform transform = new Transform(device);
-	transform.translate((width-bounds.width)/2, (height-bounds.height)/2);
-	transform.scale(1, -1);
-	gc.setTransform(transform);
-		
-	// draw the original image
-	gc.drawImage(image, 0, 0);
-	
-	transform.dispose();
-	
-	// bottom
-	transform = new Transform(device);
-	transform.translate((width-bounds.width)/2, 2*bounds.height + (height-bounds.height)/2);
-	transform.scale(1, -1);
-	gc.setTransform(transform);
-	
-	// draw the original image
-	gc.drawImage(image, 0, 0);
-	
-	transform.dispose();
-	
-	// left
-	transform = new Transform(device);
-	transform.translate((width-bounds.width)/2, (height-bounds.height)/2);
-	transform.scale(-1, 1);
-	gc.setTransform(transform);
-	
-	// draw the original image
-	gc.drawImage(image, 0, 0);
-	
-	transform.dispose();
-	
-	// right
-	transform = new Transform(device);
-	transform.translate(2*bounds.width + (width-bounds.width)/2, (height-bounds.height)/2);
-	transform.scale(-1, 1);
-	gc.setTransform(transform);
-	
-	// draw the original image
-	gc.drawImage(image, 0, 0);
-	
-	transform.dispose();
-	
-	gc.setTransform(null);
-	gc.drawImage(image, (width-bounds.width)/2, (height-bounds.height)/2);
-	image.dispose();
-}
-
-/**
- * Returns the name of a valid font for the host platform.
- */
-static String getPlatformFont() {
-	if(SWT.getPlatform() == "win32") {
-		return "Arial";	
-	} else if (SWT.getPlatform() == "motif") {
-		return "Helvetica";		
-	} else if (SWT.getPlatform() == "gtk") {
-		return "Baekmuk Batang";		
-	} else if (SWT.getPlatform() == "carbon") {
-		return "Arial";
-	} else { // photon, etc ...
-		return "Verdana";
-	}
-}
-}
-

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ImageTransformTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ImageTransformTab.java
deleted file mode 100644
index f19774e..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ImageTransformTab.java
+++ /dev/null

@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This tab demonstrates transformations, such as scaling, rotation, and
- * invert.  It allows the user to specify values for scaling and rotation.
- */
-public class ImageTransformTab extends GraphicsTab {
-
-	private Spinner rotateSpinner, scaleSpinnerX, scaleSpinnerY;
-	private Button invertButton;
-
-/**
- * Constructor
- * @param example A GraphicsExample
- */
-public ImageTransformTab(GraphicsExample example) {
-	super(example);
-}
-
-public String getCategory() {
-	return GraphicsExample.getResourceString("Transform"); //$NON-NLS-1$
-}
-
-public String getText() {
-	return GraphicsExample.getResourceString("Image"); //$NON-NLS-1$
-}
-
-public String getDescription() {
-	return GraphicsExample.getResourceString("TransformImgDescription"); //$NON-NLS-1$
-}
-
-/**
- * This method creates the controls specific to the tab. The call to the
- * createControlPanel method in the super class create the controls that are
- * defined in the super class.
- * 
- * @param parent The parent composite 
- */
-public void createControlPanel(Composite parent) {
-	
-	Composite comp;
-	GridLayout gridLayout = new GridLayout(2, false);
-	
-	// create spinner for the rotation angle
-	comp = new Composite(parent, SWT.NONE);
-	comp.setLayout(gridLayout);
- 
-	new Label(comp, SWT.CENTER).setText(GraphicsExample.getResourceString("Rotate")); //$NON-NLS-1$
-	rotateSpinner = new Spinner(comp, SWT.BORDER | SWT.WRAP);
-	rotateSpinner.setSelection(0);
-	rotateSpinner.setMinimum(0);
-	rotateSpinner.setMaximum(360);
-	rotateSpinner.setIncrement(10);
-	rotateSpinner.addListener(SWT.Selection, new Listener() {
-		public void handleEvent(Event event) {	
-				example.redraw();
-		}
-	});
-	
-	// create a slider for scaling along the x axis
-	comp = new Composite(parent, SWT.NONE);
-	comp.setLayout(gridLayout);
-	
-	new Label(comp, SWT.CENTER).setText(GraphicsExample.getResourceString("xscale")); //$NON-NLS-1$
-	scaleSpinnerX = new Spinner(comp, SWT.BORDER | SWT.WRAP);
-	scaleSpinnerX.setDigits(2);
-	scaleSpinnerX.setMinimum(1);
-	scaleSpinnerX.setMaximum(500);
-	scaleSpinnerX.setSelection(75);
-	scaleSpinnerX.addListener(SWT.Selection, new Listener() {
-		public void handleEvent(Event event) {	
-				example.redraw();
-		}
-	});
-	
-	// create a slider for scaling along the y axis
-	comp = new Composite(parent, SWT.NONE);
-	comp.setLayout(gridLayout);
-
-	new Label(comp, SWT.CENTER).setText(GraphicsExample.getResourceString("yscale")); //$NON-NLS-1$
-	scaleSpinnerY = new Spinner(comp, SWT.BORDER | SWT.WRAP);
-	scaleSpinnerY.setDigits(2);
-	scaleSpinnerY.setMinimum(1);
-	scaleSpinnerY.setMaximum(500);
-	scaleSpinnerY.setSelection(75);
-	scaleSpinnerY.addListener(SWT.Selection, new Listener() {
-		public void handleEvent(Event event) {	
-				example.redraw();
-		}
-	});
-	
-	// create a button for "invert"
-	comp = new Composite(parent, SWT.NONE);
-	comp.setLayout(new GridLayout());
-	invertButton = new Button(comp, SWT.TOGGLE);
-	invertButton.setText(GraphicsExample.getResourceString("Invert")); //$NON-NLS-1$
-	invertButton.addListener(SWT.Selection, new Listener() {
-		public void handleEvent(Event event) {	
-				example.redraw();
-		}
-	});
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.swt.examples.graphics.GraphicsTab#paint(org.eclipse.swt.graphics.GC, int, int)
- */
-public void paint(GC gc, int width, int height) {
-	if (!example.checkAdvancedGraphics()) return;
-	Device device = gc.getDevice();
-
-	Image image = GraphicsExample.loadImage(device, GraphicsExample.class, "ace_club.jpg"); 
-
-	Transform transform = new Transform(device);
-	
-	// scale image
-	transform.scale(scaleSpinnerX.getSelection()/100f, scaleSpinnerY.getSelection()/100f);
-	
-	// rotate on center of image
-	Rectangle rect = image.getBounds();
-	transform.translate(rect.width/2, rect.height/2);
-	transform.rotate(rotateSpinner.getSelection());
-	transform.translate(-rect.width/2, -rect.height/2);
-	
-	if(invertButton.getSelection()){
-		transform.invert();
-	}
-	
-	gc.setTransform(transform);
-	
-	gc.drawImage(image, 0, 0);
-	gc.drawRoundRectangle(0, 0, image.getBounds().width, 
-								image.getBounds().height, 22, 22);
-	transform.dispose();
-	image.dispose();
-}
-
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/InterpolationTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/InterpolationTab.java
deleted file mode 100644
index d9eef86..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/InterpolationTab.java
+++ /dev/null

@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This tab shows the effects of applying various interpolation algorithms to
- * images that have been stretched or shrunk.
- */
-public class InterpolationTab extends GraphicsTab {
-	
-	Combo imageCb;	// combo for selecting images
-
-public InterpolationTab(GraphicsExample example) {
-	super(example);
-}
-
-public String getCategory() {
-	return GraphicsExample.getResourceString("Image"); //$NON-NLS-1$
-}
-
-public String getText() {
-	return GraphicsExample.getResourceString("Interpolation"); //$NON-NLS-1$
-}
-
-public String getDescription() {
-	return GraphicsExample.getResourceString("ImageInterpolationDesc"); //$NON-NLS-1$
-}
-
-public void createControlPanel(Composite parent) {
-	
-	Composite comp;
-	GridLayout gridLayout = new GridLayout(2, false);
-	
-	// create drop down combo 
-	comp = new Composite(parent, SWT.NONE);
-	comp.setLayout(gridLayout);
-	new Label(comp, SWT.CENTER).setText(GraphicsExample
-				.getResourceString("Image")); //$NON-NLS-1$
-	imageCb = new Combo(comp, SWT.DROP_DOWN);
-	imageCb.add(GraphicsExample.getResourceString("House")); //$NON-NLS-1$
-	imageCb.add(GraphicsExample.getResourceString("Question")); //$NON-NLS-1$
-	imageCb.add(GraphicsExample.getResourceString("Task")); //$NON-NLS-1$
-	imageCb.add(GraphicsExample.getResourceString("Font")); //$NON-NLS-1$
-	imageCb.add(GraphicsExample.getResourceString("Cube")); //$NON-NLS-1$
-	imageCb.add(GraphicsExample.getResourceString("SWT")); //$NON-NLS-1$
-	imageCb.add(GraphicsExample.getResourceString("Ovals")); //$NON-NLS-1$
-	imageCb.select(0);
-	imageCb.addListener(SWT.Selection, new Listener() {
-		public void handleEvent(Event event) {
-				example.redraw();
-		}
-	});
-}
-
-public void paint(GC gc, int width, int height) {
-	if (!example.checkAdvancedGraphics()) return;
-	Device device = gc.getDevice();
-
-	float scaleX = 10f;
-	float scaleY = 10f;
-	Image image = null;
-	switch (imageCb.getSelectionIndex()) {
-	
-	case 0:
-		image = GraphicsExample.loadImage(device, GraphicsExample.class, "home_nav.gif");
-		break;
-	case 1:
-		image = GraphicsExample.loadImage(device, GraphicsExample.class, "help.gif");
-		break;
-	case 2:
-		image = GraphicsExample.loadImage(device, GraphicsExample.class, "task.gif");
-		break;
-	case 3:
-		image = GraphicsExample.loadImage(device, GraphicsExample.class, "font.gif");
-		break;
-	case 4:
-		image = GraphicsExample.loadImage(device, GraphicsExample.class, "cube.png");
-		scaleX = 0.75f;
-		scaleY = 0.5f;
-		break;
-	case 5:
-		image = GraphicsExample.loadImage(device, GraphicsExample.class, "swt.png");
-		scaleX = 0.4f;
-		scaleY = 0.8f;
-		break;
-	case 6:
-		image = GraphicsExample.loadImage(device, GraphicsExample.class, "ovals.png");
-		scaleX = 1.1f;
-		scaleY = 0.5f;
-		break;
-	}
-	
-	Rectangle bounds = image.getBounds();
-	
-	// draw the original image
-	gc.drawImage(image, (width-bounds.width)/2, 20);	
-	
-	Font font = new Font(device, getPlatformFont(), 20, SWT.NORMAL);
-	gc.setFont(font);
-	
-	// write some text below the original image
-	String text = GraphicsExample.getResourceString("OriginalImg"); //$NON-NLS-1$
-	Point size = gc.stringExtent(text);	
-	gc.drawString(text, (width-size.x)/2, 25 + bounds.height, true);
-	
-	Transform transform = new Transform(device);
-	transform.translate((width - (bounds.width * scaleX + 10) * 4) / 2, 25 + bounds.height + size.y +
-				(height - (25 + bounds.height + size.y + bounds.height*scaleY)) / 2);
-	transform.scale(scaleX, scaleY);
-
-	// --- draw strings ---
-	float[] point = new float[2];
-	text = GraphicsExample.getResourceString("None"); //$NON-NLS-1$
-	size = gc.stringExtent(text);	
-	point[0] = (scaleX*bounds.width + 5 - size.x)/(2*scaleX);
-	point[1] = bounds.height;
-	transform.transform(point);
-	gc.drawString(text, (int)point[0], (int)point[1], true);
-	
-	text = GraphicsExample.getResourceString("Low"); //$NON-NLS-1$
-	size = gc.stringExtent(text);
-	point[0] = (scaleX*bounds.width + 5 - size.x)/(2*scaleX) + bounds.width;
-	point[1] = bounds.height;
-	transform.transform(point);
-	gc.drawString(text, (int)point[0], (int)point[1], true);
-	
-	text = GraphicsExample.getResourceString("Default"); //$NON-NLS-1$
-	size = gc.stringExtent(text);
-	point[0] = (scaleX*bounds.width + 5 - size.x)/(2*scaleX) + 2*bounds.width;
-	point[1] = bounds.height;
-	transform.transform(point);
-	gc.drawString(text, (int)point[0], (int)point[1], true);
-	
-	text = GraphicsExample.getResourceString("High"); //$NON-NLS-1$
-	size = gc.stringExtent(text);
-	point[0] = (scaleX*bounds.width + 5 - size.x)/(2*scaleX) + 3*bounds.width;
-	point[1] = bounds.height;
-	transform.transform(point);
-	gc.drawString(text, (int)point[0], (int)point[1], true);
-
-	gc.setTransform(transform);
-	transform.dispose();
-
-	// --- draw images ---
-	
-	// no interpolation
-	gc.setInterpolation(SWT.NONE);
-	gc.drawImage(image, 0, 0);
-	
-	// low interpolation
-	gc.setInterpolation(SWT.LOW);
-	gc.drawImage(image, bounds.width, 0);
-
-	// default interpolation
-	gc.setInterpolation(SWT.DEFAULT);
-	gc.drawImage(image, 2*bounds.width, 0);
-	
-	// high interpolation
-	gc.setInterpolation(SWT.HIGH);
-	gc.drawImage(image, 3*bounds.width, 0);
-
-	font.dispose();
-	if (image != null) image.dispose();
-}
-
-/**
- * Returns the name of a valid font for the host platform.
- */
-static String getPlatformFont() {
-	if(SWT.getPlatform() == "win32") {
-		return "Arial";	
-	} else if (SWT.getPlatform() == "motif") {
-		return "Helvetica";		
-	} else if (SWT.getPlatform() == "gtk") {
-		return "Baekmuk Batang";		
-	} else if (SWT.getPlatform() == "carbon") {
-		return "Arial";
-	} else { // photon, etc ...
-		return "Verdana";
-	}
-}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/IntroTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/IntroTab.java
deleted file mode 100644
index 504ed00..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/IntroTab.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.graphics;
-
-import java.util.*;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-
-public class IntroTab extends AnimatedGraphicsTab {
-	
-	Font font;
-	Image image;
-	Random random = new Random();
-	float x, y;
-    float incX = 10.0f;
-	float incY = 5.0f;
-	int textWidth, textHeight;
-	String text = GraphicsExample.getResourceString("SWT");
-	
-public IntroTab(GraphicsExample example) {
-	super(example);
-}
-
-public void dispose() {
-	if (image != null) image.dispose();
-	image = null;
-	if (font != null) font.dispose();
-	font = null;
-}
-
-public String getCategory() {
-	return GraphicsExample.getResourceString("Introduction"); //$NON-NLS-1$
-}
-
-public String getText() {
-	return GraphicsExample.getResourceString("SWT"); //$NON-NLS-1$
-}
-
-public String getDescription() {
-	return GraphicsExample.getResourceString("IntroductionDescription"); //$NON-NLS-1$
-}
-
-public void next(int width, int height) {
-    x += incX;
-    y += incY;
-	float random = (float)Math.random(); 
-    if (x + textWidth > width) {
-        x = width - textWidth;
-        incX = random * -width / 16 - 1;
-    }
-    if (x < 0) {
-        x = 0;
-        incX = random * width / 16 + 1;
-    }
-    if (y + textHeight > height) {
-        y = (height - textHeight)- 2;
-        incY = random * -height / 16 - 1;
-    }
-    if (y < 0) {
-        y = 0;
-        incY = random * height / 16 + 1;
-    }
-}
-
-public void paint(GC gc, int width, int height) {
-	if (!example.checkAdvancedGraphics()) return;
-	Device device = gc.getDevice();
-	if (image == null) {
-		image = example.loadImage(device, "irmaos.jpg");
-		Rectangle rect = image.getBounds();
-		FontData fd = device.getSystemFont().getFontData()[0];
-		font = new Font(device, fd.getName(), rect.height / 4, SWT.BOLD);
-		gc.setFont(font);
-		Point size = gc.stringExtent(text);
-		textWidth = size.x;
-		textHeight = size.y;
-	}
-	Path path = new Path(device);
-	path.addString(text, x, y, font);
-	gc.setClipping(path);
-	Rectangle rect = image.getBounds();
-	gc.drawImage(image, 0, 0, rect.width, rect.height, 0, 0, width, height);
-	gc.setClipping((Rectangle)null);
-	gc.setForeground(device.getSystemColor(SWT.COLOR_BLUE));
-	gc.drawPath(path);
-	path.dispose();
-}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/LineCapTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/LineCapTab.java
deleted file mode 100644
index e28ffa3..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/LineCapTab.java
+++ /dev/null

@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This tab demonstrates various line caps applicable to a line.
- */
-public class LineCapTab extends GraphicsTab {
-
-	Button colorButton;
-	GraphicsBackground foreground;
-	Menu menu;
-
-public LineCapTab(GraphicsExample example) {
-	super(example);
-}
-
-public String getCategory() {
-	return GraphicsExample.getResourceString("Lines"); //$NON-NLS-1$
-}
-
-public String getText() {
-	return GraphicsExample.getResourceString("LineCap"); //$NON-NLS-1$
-}
-
-public String getDescription() {
-	return GraphicsExample.getResourceString("LineCapDescription"); //$NON-NLS-1$
-}
-
-public void dispose() {
-	if (menu != null) {
-		menu.dispose();
-		menu = null;
-	}
-}
-
-public void createControlPanel(Composite parent) {
-	
-	Composite comp;
-		
-	// create color button
-	comp = new Composite(parent, SWT.NONE);
-	comp.setLayout(new GridLayout());
-	
-	ColorMenu cm = new ColorMenu();
-	cm.setPatternItems(example.checkAdvancedGraphics());
-	menu = cm.createMenu(parent.getParent(), new ColorListener() {
-		public void setColor(GraphicsBackground gb) {
-			foreground = gb;		
-			colorButton.setImage(gb.getThumbNail());
-			example.redraw();
-		}
-	});
-
-	// initialize the foreground to the 3rd item in the menu (red)
-	foreground = (GraphicsBackground)menu.getItem(2).getData();
-	
-	// color button
-	colorButton = new Button(comp, SWT.PUSH);
-	colorButton.setText(GraphicsExample
-			.getResourceString("Color")); //$NON-NLS-1$
-	colorButton.setImage(foreground.getThumbNail());
-	colorButton.addListener(SWT.Selection, new Listener() { 
-		public void handleEvent(Event event) {
-			final Button button = (Button) event.widget;
-			final Composite parent = button.getParent(); 
-			Rectangle bounds = button.getBounds();
-			Point point = parent.toDisplay(new Point(bounds.x, bounds.y));
-			menu.setLocation(point.x, point.y + bounds.height);
-			menu.setVisible(true);
-		}
-	});
-}
-
-public void paint(GC gc, int width, int height) {
-	Device device = gc.getDevice();
-	
-	// draw side lines
-	gc.setLineWidth(1);
-	gc.setLineStyle(SWT.LINE_DOT);
-	gc.setForeground(device.getSystemColor(SWT.COLOR_BLACK));
-	gc.drawLine(3*width/16, height/6, 3*width/16, 5*height/6);
-	gc.drawLine(13*width/16, height/6, 13*width/16, 5*height/6);
-	gc.setLineStyle(SWT.LINE_SOLID);
-	
-	// draw labels
-	Font font = new Font(device, getPlatformFont(), 20, SWT.NORMAL);
-	gc.setFont(font);
-
-	String text = GraphicsExample.getResourceString("Flat"); //$NON-NLS-1$
-	Point size = gc.stringExtent(text);
-	gc.drawString(text, (width-size.x)/2, 3*height/12, true);
-	text = GraphicsExample.getResourceString("Square"); //$NON-NLS-1$
-	size = gc.stringExtent(text);	
-	gc.drawString(text, (width-size.x)/2, 5*height/12, true);
-	text = GraphicsExample.getResourceString("Round"); //$NON-NLS-1$
-	size = gc.stringExtent(text);
-	gc.drawString(text, (width-size.x)/2, 7*height/12, true);
-	font.dispose();
-
-	Pattern pattern = null;
-	if (foreground.getBgColor1() != null) {
-		gc.setForeground(foreground.getBgColor1());
-	} else if (foreground.getBgImage() != null) {
-		pattern = new Pattern(device, foreground.getBgImage());
-		gc.setForegroundPattern(pattern);
-	}
-	
-	// draw lines with caps
-	gc.setLineWidth(20);
-	gc.setLineCap(SWT.CAP_FLAT);
-	gc.drawLine(3*width/16, 2*height/6, 13*width/16, 2*height/6);
-	gc.setLineCap(SWT.CAP_SQUARE);
-	gc.drawLine(3*width/16, 3*height/6, 13*width/16, 3*height/6);
-	gc.setLineCap(SWT.CAP_ROUND);
-	gc.drawLine(3*width/16, 4*height/6, 13*width/16, 4*height/6);
-	
-	if (pattern != null) pattern.dispose();	
-}
-
-/**
- * Returns the name of a valid font for the resident platform.
- */
-static String getPlatformFont() {
-	if(SWT.getPlatform() == "win32") {
-		return "Arial";	
-	} else if (SWT.getPlatform() == "motif") {
-		return "Helvetica";		
-	} else if (SWT.getPlatform() == "gtk") {
-		return "Baekmuk Batang";		
-	} else if (SWT.getPlatform() == "carbon") {
-		return "Arial";
-	} else { // photon, etc ...
-		return "Verdana";
-	}
-}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/LineJoinTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/LineJoinTab.java
deleted file mode 100644
index 06dc8cf..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/LineJoinTab.java
+++ /dev/null

@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This tab demonstrates various line joins. It allows a user to choose from
- * bevel, miter and round.
- */
-public class LineJoinTab extends GraphicsTab {
-	
-	private Combo joinCb;
-	private Button colorButton;
-	private GraphicsBackground shapeColor;
-	private Menu menu;
-	private int [] joinValues = new int [] {SWT.JOIN_BEVEL, SWT.JOIN_MITER, SWT.JOIN_ROUND};
-
-public LineJoinTab(GraphicsExample example) {
-	super(example);
-}
-
-public String getCategory() {
-	return GraphicsExample.getResourceString("Lines"); //$NON-NLS-1$
-}
-
-public String getText() {
-	return GraphicsExample.getResourceString("LineJoin"); //$NON-NLS-1$
-}
-
-public String getDescription() {
-	return GraphicsExample.getResourceString("LineJoinDescription"); //$NON-NLS-1$
-}
-
-public void dispose() {
-	if (menu != null) {
-		menu.dispose();
-		menu = null;
-	}
-}
-
-public void createControlPanel(Composite parent) {
-	
-	// create drop down combo for choosing clipping
-	Composite comp = new Composite(parent, SWT.NONE);
-	comp.setLayout(new GridLayout(2, false));
-	
-	new Label(comp, SWT.CENTER).setText(GraphicsExample
-				.getResourceString("LineJoin")); //$NON-NLS-1$
-	joinCb = new Combo(comp, SWT.DROP_DOWN);
-	joinCb.add(GraphicsExample
-			.getResourceString("bevel")); //$NON-NLS-1$
-	joinCb.add(GraphicsExample
-			.getResourceString("miter")); //$NON-NLS-1$
-	joinCb.add(GraphicsExample
-			.getResourceString("round")); //$NON-NLS-1$
-	joinCb.select(1);
-	joinCb.addListener(SWT.Selection, new Listener() {
-		public void handleEvent(Event event) {
-				example.redraw();
-		}
-	});
-	
-	// color menu
-	ColorMenu cm = new ColorMenu();
-	cm.setPatternItems(example.checkAdvancedGraphics());
-	menu = cm.createMenu(parent.getParent(), new ColorListener() {
-		public void setColor(GraphicsBackground gb) {
-			shapeColor = gb;		
-			colorButton.setImage(gb.getThumbNail());
-			example.redraw();
-		}
-	});
-
-	// initialize the shape color to the 4th item in the menu (green)
-	shapeColor =(GraphicsBackground)menu.getItem(3).getData();
-	
-	// color button
-	comp = new Composite(parent, SWT.NONE);
-	comp.setLayout(new GridLayout(2, false));
-	
-	colorButton = new Button(comp, SWT.PUSH);
-	colorButton.setText(GraphicsExample
-			.getResourceString("Color")); //$NON-NLS-1$
-	colorButton.setImage(shapeColor.getThumbNail());
-	colorButton.addListener(SWT.Selection, new Listener() { 
-		public void handleEvent(Event event) {
-			final Button button = (Button) event.widget;
-			final Composite parent = button.getParent(); 
-			Rectangle bounds = button.getBounds();
-			Point point = parent.toDisplay(new Point(bounds.x, bounds.y));
-			menu.setLocation(point.x, point.y + bounds.height);
-			menu.setVisible(true);
-		}
-	});
-
-}
-
-public void paint(GC gc, int width, int height) {
-	if (!example.checkAdvancedGraphics()) return;
-	Device device = gc.getDevice();
-
-	gc.setLineWidth(20);
-	gc.setLineJoin(joinValues[joinCb.getSelectionIndex()]);
-	
-	// set the foreground color or pattern
-	Pattern pattern = null;
-	if (shapeColor.getBgColor1() != null) {
-		gc.setForeground(shapeColor.getBgColor1());
-	} else if (shapeColor.getBgImage() != null) {
-		pattern = new Pattern(device, shapeColor.getBgImage());
-		gc.setForegroundPattern(pattern);
-	}
-	
-	// draw the shape
-	Path path = new Path(device);
-	path.moveTo(width/2, 25);
-	path.lineTo(2*width/3, height/3);
-	path.lineTo(width-25, height/2);
-	path.lineTo(2*width/3, 2*height/3);
-	path.lineTo(width/2, height-25);
-	path.lineTo(width/3, 2*height/3);
-	path.lineTo(25, height/2);
-	path.lineTo(width/3, height/3);
-	path.lineTo(width/2, 25);
-	path.close();
-	gc.drawPath(path);
-	path.dispose();
-	
-	if (pattern != null) pattern.dispose();
-}
-
-}
-
-

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/LineStyleTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/LineStyleTab.java
deleted file mode 100644
index 698c7a2..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/LineStyleTab.java
+++ /dev/null

@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This tab demonstrates line styles applicable to a line.  It shows the use of the
- * <code>GC.setLineStyle()</code> method.
- */
-public class LineStyleTab extends GraphicsTab {
-
-	Button colorButton;
-	GraphicsBackground lineColor;
-	Menu menu;
-	Spinner lineWidthSpinner;
-
-public LineStyleTab(GraphicsExample example) {
-	super(example);
-}
-
-public String getCategory() {
-	return GraphicsExample.getResourceString("Lines"); //$NON-NLS-1$
-}
-
-public String getText() {
-	return GraphicsExample.getResourceString("LineStyles"); //$NON-NLS-1$
-}
-
-public String getDescription() {
-	return GraphicsExample.getResourceString("LineStylesDescription"); //$NON-NLS-1$
-}
-
-public void dispose() {
-	if (menu != null) {
-		menu.dispose();
-		menu = null;
-	}
-}
-
-public void createControlPanel(Composite parent) {
-	
-	Composite comp;
-	
-	comp = new Composite(parent, SWT.NONE);
-	comp.setLayout(new GridLayout(2, false));
-	
-	new Label(comp, SWT.CENTER).setText(GraphicsExample
-			.getResourceString("LineWidth")); //$NON-NLS-1$
-	lineWidthSpinner = new Spinner(comp, SWT.BORDER | SWT.WRAP);
-	lineWidthSpinner.setSelection(10);
-	lineWidthSpinner.setMinimum(1);
-	lineWidthSpinner.setMaximum(30);
-	lineWidthSpinner.addListener(SWT.Selection, new Listener() {
-		public void handleEvent(Event event) {
-				example.redraw();
-		}
-	});
-		
-	ColorMenu cm = new ColorMenu();
-	cm.setPatternItems(example.checkAdvancedGraphics());
-	menu = cm.createMenu(parent.getParent(), new ColorListener() {
-		public void setColor(GraphicsBackground gb) {
-			lineColor = gb;		
-			colorButton.setImage(gb.getThumbNail());
-			example.redraw();
-		}
-	});
-
-	// create color button
-	comp = new Composite(parent, SWT.NONE);
-	comp.setLayout(new GridLayout());
-	
-	// initialize the foreground to the 5th item in the menu (blue)
-	lineColor = (GraphicsBackground)menu.getItem(4).getData();
-	
-	// color button
-	colorButton = new Button(comp, SWT.PUSH);
-	colorButton.setText(GraphicsExample
-			.getResourceString("Color")); //$NON-NLS-1$
-	colorButton.setImage(lineColor.getThumbNail());
-	colorButton.addListener(SWT.Selection, new Listener() { 
-		public void handleEvent(Event event) {
-			final Button button = (Button) event.widget;
-			final Composite parent = button.getParent(); 
-			Rectangle bounds = button.getBounds();
-			Point point = parent.toDisplay(new Point(bounds.x, bounds.y));
-			menu.setLocation(point.x, point.y + bounds.height);
-			menu.setVisible(true);
-		}
-	});
-}
-
-public void paint(GC gc, int width, int height) {
-	Device device = gc.getDevice();
-
-	Pattern pattern = null;
-	if (lineColor.getBgColor1() != null) {
-		gc.setForeground(lineColor.getBgColor1());
-	} else if (lineColor.getBgImage() != null) {
-		pattern = new Pattern(device, lineColor.getBgImage());
-		gc.setForegroundPattern(pattern);
-	}
-	
-	// set line width
-	gc.setLineWidth(lineWidthSpinner.getSelection());
-	
-	// draw lines with caps
-	gc.drawLine(3*width/16, 1*height/6, 13*width/16, 1*height/6);
-	gc.setLineStyle(SWT.LINE_DASH);
-	gc.drawLine(3*width/16, 2*height/6, 13*width/16, 2*height/6);
-	gc.setLineStyle(SWT.LINE_DOT);
-	gc.drawLine(3*width/16, 3*height/6, 13*width/16, 3*height/6);
-	gc.setLineStyle(SWT.LINE_DASHDOT);
-	gc.drawLine(3*width/16, 4*height/6, 13*width/16, 4*height/6);
-	gc.setLineStyle(SWT.LINE_DASHDOTDOT);
-	gc.drawLine(3*width/16, 5*height/6, 13*width/16, 5*height/6);
-	
-	// draw labels
-	Font font = new Font(device, getPlatformFont(), 20, SWT.NORMAL);
-	gc.setFont(font);
-
-	gc.setForeground(device.getSystemColor(SWT.COLOR_BLACK));
-	
-	String text = GraphicsExample.getResourceString("Solid"); //$NON-NLS-1$
-	Point size = gc.stringExtent(text);
-	gc.drawString(text, (width-size.x)/2, 1*height/12, true);
-	text = GraphicsExample.getResourceString("Dash"); //$NON-NLS-1$
-	size = gc.stringExtent(text);	
-	gc.drawString(text, (width-size.x)/2, 3*height/12, true);
-	text = GraphicsExample.getResourceString("Dot"); //$NON-NLS-1$
-	size = gc.stringExtent(text);
-	gc.drawString(text, (width-size.x)/2, 5*height/12, true);
-	text = GraphicsExample.getResourceString("DashDot"); //$NON-NLS-1$
-	size = gc.stringExtent(text);
-	gc.drawString(text, (width-size.x)/2, 7*height/12, true);
-	text = GraphicsExample.getResourceString("DashDotDot"); //$NON-NLS-1$
-	size = gc.stringExtent(text);
-	gc.drawString(text, (width-size.x)/2, 9*height/12, true);
-	font.dispose();
-}
-
-/**
- * Returns the name of a valid font for the resident platform.
- */
-static String getPlatformFont() {
-	if(SWT.getPlatform() == "win32") {
-		return "Arial";	
-	} else if (SWT.getPlatform() == "motif") {
-		return "Helvetica";		
-	} else if (SWT.getPlatform() == "gtk") {
-		return "Baekmuk Batang";		
-	} else if (SWT.getPlatform() == "carbon") {
-		return "Arial";
-	} else { // photon, etc ...
-		return "Verdana";
-	}
-}
-}
-

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/LineTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/LineTab.java
deleted file mode 100644
index 7458757..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/LineTab.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.swt.graphics.*;
-
-public class LineTab extends GraphicsTab {
-
-public LineTab(GraphicsExample example) {
-	super(example);
-}
-
-public String getCategory() {
-	return GraphicsExample.getResourceString("Lines"); //$NON-NLS-1$
-}
-
-public String getText() {
-	return GraphicsExample.getResourceString("Line"); //$NON-NLS-1$
-}
-
-public String getDescription() {
-	return GraphicsExample.getResourceString("LineDescription"); //$NON-NLS-1$
-}
-
-public void paint(GC gc, int width, int height) {
-	gc.drawLine(0, 0, width, height);
-	gc.drawLine(width, 0, 0, height);
-}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/MazeTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/MazeTab.java
deleted file mode 100644
index 674e145..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/MazeTab.java
+++ /dev/null

@@ -1,328 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import java.util.*;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This tab shows three circles, each following a different path in a maze.
- * Only one of the three circles follows the correct path.
- */
-public class MazeTab extends AnimatedGraphicsTab {
-
-	int nextIndex, nextIndex2, nextIndex3;
-	int xcoord, ycoord, xcoord2, ycoord2, xcoord3, ycoord3;
-	ArrayList nextCoord, nextCoord2, nextCoord3;
-	boolean isDone, isDone2, isDone3;
-	Image image;
-
-/**
- * Constructor
- * @param example A GraphicsExample
- */
-public MazeTab(GraphicsExample example) {
-	super(example);
-
-	// correct path
-	nextCoord = new ArrayList();
-	nextCoord.addAll(moveDown(20, -50, 20, 110, 10));
-	nextCoord.addAll(moveRight(30, 110, 130, 110, 10));
-	nextCoord.addAll(moveUp(135, 100, 135, 15, 10));
-	nextCoord.addAll(moveRight(140, 15, 210, 15, 10));
-	nextCoord.addAll(moveDown(210, 25, 210, 75, 10));
-	nextCoord.addAll(moveRight(220, 75, 320, 75, 10));
-	nextCoord.addAll(moveUp(320, 65, 320, 55, 10));
-	nextCoord.addAll(moveRight(330, 50, 475, 50, 10));
-	nextCoord.addAll(moveDown(475, 60, 475, 225, 10));
-	nextCoord.addAll(moveLeft(465, 225, 200, 225, 10));
-	nextCoord.addAll(moveUp(200, 215, 200, 180, 10));
-	nextCoord.addAll(moveLeft(190, 180, 120, 180, 10));
-	nextCoord.addAll(moveDown(120, 190, 120, 320, 10));
-	nextCoord.addAll(moveRight(130, 320, 475, 320, 10));
-	nextCoord.addAll(moveDown(475, 330, 475, 435, 10));
-	nextCoord.addAll(moveLeft(465, 435, 20, 435, 10));
-	nextCoord.addAll(moveDown(20, 445, 20, 495, 10));
-	
-	nextIndex = 0;
-	xcoord = ((Integer)nextCoord.get(nextIndex)).intValue();
-	ycoord = ((Integer)nextCoord.get(nextIndex+1)).intValue();
-	
-	// wrong path 1
-	nextCoord2 = new ArrayList();
-	nextCoord2.addAll(moveDown(20, -25, 20, 110, 10));
-	nextCoord2.addAll(moveRight(30, 110, 130, 110, 10));
-	nextCoord2.addAll(moveUp(135, 100, 135, 15, 10));
-	nextCoord2.addAll(moveRight(140, 15, 520, 15, 10));
-	nextCoord2.addAll(moveDown(525, 15, 525, 480, 10));
-	nextCoord2.addAll(moveLeft(515, 480, 70, 480, 10));
-	
-	nextIndex2 = 0;
-	xcoord2 = ((Integer)nextCoord2.get(nextIndex2)).intValue();
-	ycoord2 = ((Integer)nextCoord2.get(nextIndex2+1)).intValue();
-	
-	// wrong path 2
-	nextCoord3 = new ArrayList();
-	nextCoord3.addAll(moveDown(20, 0, 20, 110, 10));
-	nextCoord3.addAll(moveRight(30, 110, 130, 110, 10));
-	nextCoord3.addAll(moveUp(135, 100, 135, 15, 10));
-	nextCoord3.addAll(moveRight(140, 15, 210, 15, 10));
-	nextCoord3.addAll(moveDown(210, 25, 210, 75, 10));
-	nextCoord3.addAll(moveRight(220, 75, 320, 75, 10));
-	nextCoord3.addAll(moveUp(320, 65, 320, 55, 10));
-	nextCoord3.addAll(moveRight(330, 50, 475, 50, 10));
-	nextCoord3.addAll(moveDown(475, 60, 475, 225, 10));
-	nextCoord3.addAll(moveLeft(465, 225, 425, 225, 10));
-	nextCoord3.addAll(moveUp(420, 225, 420, 150, 10));
-	nextCoord3.addAll(moveLeft(420, 145, 70, 145, 10));
-	nextCoord3.addAll(moveDown(70, 150, 70, 320, 10));
-	
-	nextIndex3 = 0;
-	xcoord3 = ((Integer)nextCoord3.get(nextIndex3)).intValue();
-	ycoord3 = ((Integer)nextCoord3.get(nextIndex3+1)).intValue();
-	
-	isDone = isDone2 = isDone3 = false;
-}
-
-public String getCategory() {
-	return GraphicsExample.getResourceString("Misc"); //$NON-NLS-1$
-}
-
-public String getText() {
-	return GraphicsExample.getResourceString("Maze"); //$NON-NLS-1$
-}
-
-public String getDescription() {
-	return GraphicsExample.getResourceString("MazeDescription"); //$NON-NLS-1$
-}
-
-public int getInitialAnimationTime() {
-	return 50;
-}
-
-public void dispose() {
-	if (image != null) {
-		image.dispose();
-		image = null;
-	}
-}
-
-public void createControlPanel(Composite parent) {
-	super.createControlPanel(parent);
-	
-	// add selection listener to reset nextNumber after 
-	// the sequence has completed
-	playItem.addListener(SWT.Selection, new Listener() {
-		public void handleEvent(Event event) {
-			if (isDone){
-				nextIndex = nextIndex2 = nextIndex3 = 0;
-				isDone = isDone2 = isDone3 = false; 
-			}
-		}
-	});
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.swt.examples.graphics.AnimatedGraphicsTab#next(int, int)
- */
-public void next(int width, int height) {
-
-	if (nextIndex+2 < nextCoord.size()) {
-		nextIndex = (nextIndex+2)%nextCoord.size();
-		xcoord = ((Integer)nextCoord.get(nextIndex)).intValue();
-		ycoord = ((Integer)nextCoord.get(nextIndex+1)).intValue();
-	} else {
-		// stop animation
-		setAnimation(false);
-		isDone = true;
-	}
-	
-	if (nextIndex2+2 < nextCoord2.size()) {
-		nextIndex2 = (nextIndex2+2)%nextCoord2.size();
-		xcoord2 = ((Integer)nextCoord2.get(nextIndex2)).intValue();
-		ycoord2 = ((Integer)nextCoord2.get(nextIndex2+1)).intValue();
-	} else {
-		isDone2 = true;
-	}
-	
-	if (nextIndex3+2 < nextCoord3.size()) {
-		nextIndex3 = (nextIndex3+2)%nextCoord3.size();
-		xcoord3 = ((Integer)nextCoord3.get(nextIndex3)).intValue();
-		ycoord3 = ((Integer)nextCoord3.get(nextIndex3+1)).intValue();
-	} else {
-		isDone3 = true;
-	}
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.swt.examples.graphics.GraphicsTab#paint(org.eclipse.swt.graphics.GC, int, int)
- */
-public void paint(GC gc, int width, int height) {
-	Device device = gc.getDevice();
-	
-	if (image == null) {
-		image = example.loadImage(device, "maze.bmp");
-	}
-	// draw maze
-	Rectangle bounds = image.getBounds();
-	int x = (width - bounds.width) / 2;
-	int y = (height - bounds.height) / 2;
-	gc.drawImage(image, x, y);
-	
-	// draw correct oval
-	gc.setBackground(device.getSystemColor(SWT.COLOR_RED));
-	gc.fillOval(x + xcoord, y + ycoord, 16, 16);
-	gc.drawOval(x + xcoord, y + ycoord, 15, 15);
-	
-	// draw wrong oval 1
-	gc.setBackground(device.getSystemColor(SWT.COLOR_BLUE));
-	gc.fillOval(x + xcoord2, y + ycoord2, 16, 16);
-	gc.drawOval(x + xcoord2, y + ycoord2, 15, 15);
-	
-	// draw wrong oval 2
-	gc.setBackground(device.getSystemColor(SWT.COLOR_GREEN));
-	gc.fillOval(x + xcoord3, y + ycoord3, 16, 16);
-	gc.drawOval(x + xcoord3, y + ycoord3, 15, 15);
-
-	if (isDone2) {
-		Image helpImg = example.loadImage(device, "help.gif");
-		gc.drawImage(helpImg, x + xcoord2 + 16, y + ycoord2 - 16);
-		helpImg.dispose();
-	}
-
-	if (isDone3) {
-		Image helpImg = example.loadImage(device, "help.gif");
-		gc.drawImage(helpImg, x + xcoord3 + 16, y + ycoord3 - 16);
-		helpImg.dispose();
-	}
-}
-
-/**
- * Returns a list of coordinates moving in a "left-moving" fashion from the start
- * point to the end point inclusively.
- * 
- * @param x1
- *            X component of the start point
- * @param y1
- *            Y component of the start point
- * @param x2
- *            X component of the end point
- * @param y2
- *            Y component of the end point
- * @param stepsize
- *            The number of pixels that separate each coordinate
- */
-private ArrayList moveLeft(int x1, int y1, int x2, int y2, int stepsize) {
-	ArrayList coords = new ArrayList();
-	coords.add(new Integer(x1));
-	coords.add(new Integer(y1));
-	while(x1 - stepsize > x2) {
-		x1 = x1 - stepsize;
-		coords.add(new Integer(x1));
-		coords.add(new Integer(y1));
-	}
-	coords.add(new Integer(x2));
-	coords.add(new Integer(y2));
-	return coords;
-}
-
-/**
- * Returns a list of coordinates moving in a "right-moving" fashion from the start
- * point to the end point inclusively.
- * 
- * @param x1
- *            X component of the start point
- * @param y1
- *            Y component of the start point
- * @param x2
- *            X component of the end point
- * @param y2
- *            Y component of the end point
- * @param stepsize
- *            The number of pixels that separate each coordinate
- */
-private ArrayList moveRight(int x1, int y1, int x2, int y2, int stepsize) {
-	ArrayList coords = new ArrayList();
-	coords.add(new Integer(x1));
-	coords.add(new Integer(y1));
-	while(x1 + stepsize < x2) {
-		x1 = x1 + stepsize;
-		coords.add(new Integer(x1));
-		coords.add(new Integer(y1));
-	}
-	coords.add(new Integer(x2));
-	coords.add(new Integer(y2));
-	return coords;
-}
-
-/**
- * Returns a list of coordinates moving in an upward fashion from the start
- * point to the end point inclusively.
- * 
- * @param x1
- *            X component of the start point
- * @param y1
- *            Y component of the start point
- * @param x2
- *            X component of the end point
- * @param y2
- *            Y component of the end point
- * @param stepsize
- *            The number of pixels that separate each coordinate
- */
-private ArrayList moveUp(int x1, int y1, int x2, int y2, int stepsize) {
-	ArrayList coords = new ArrayList();
-	coords.add(new Integer(x1));
-	coords.add(new Integer(y1));
-	while(y1 - stepsize > y2) {
-		y1 = y1 - stepsize;
-		coords.add(new Integer(x1));
-		coords.add(new Integer(y1));
-	}
-	coords.add(new Integer(x2));
-	coords.add(new Integer(y2));
-	return coords;
-}
-
-/**
- * Returns a list of coordinates moving in a downward fashion from the start
- * point to the end point inclusively.
- * 
- * @param x1
- *            X component of the start point
- * @param y1
- *            Y component of the start point
- * @param x2
- *            X component of the end point
- * @param y2
- *            Y component of the end point
- * @param stepsize
- *            The number of pixels that separate each coordinate
- */
-private ArrayList moveDown(int x1, int y1, int x2, int y2, int stepsize) {
-	ArrayList coords = new ArrayList();
-	coords.add(new Integer(x1));
-	coords.add(new Integer(y1));
-	while(y1 + stepsize < y2) {
-		y1 = y1 + stepsize;
-		coords.add(new Integer(x1));
-		coords.add(new Integer(y1));
-	}
-	coords.add(new Integer(x2));
-	coords.add(new Integer(y2));
-	return coords;
-}
-
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/PathClippingAnimTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/PathClippingAnimTab.java
deleted file mode 100644
index 343c4ef..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/PathClippingAnimTab.java
+++ /dev/null

@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This is another tab that demonstrates the use of a path clipping.
- */
-public class PathClippingAnimTab extends AnimatedGraphicsTab {
-
-	private Button colorButton;
-	private GraphicsBackground background;
-	private Menu menu;
-	private int rectWidth = 300;
-	private int rectHeight = 300;
-	private int incWidth = 5;
-	private int incHeight = 5;
-	private boolean vertical = false;
-	private int angle;
-
-	public PathClippingAnimTab(GraphicsExample example) {
-		super(example);
-	}
-
-	public String getCategory() {
-		return GraphicsExample.getResourceString("Clipping"); //$NON-NLS-1$
-	}
-
-	public String getText() {
-		return GraphicsExample.getResourceString("AnimPathClipping"); //$NON-NLS-1$
-	}
-	
-	public String getDescription() {
-		return GraphicsExample.getResourceString("AnimPathClippingDesc"); //$NON-NLS-1$
-	}
-
-	public void dispose() {
-		if (menu != null) {
-			menu.dispose();
-			menu = null;
-		}
-	}
-
-	/**
-	 * Creates the widgets used to control the drawing.
-	 */
-	public void createControlPanel(Composite parent) {
-		super.createControlPanel(parent);
-
-		// color menu
-		ColorMenu cm = new ColorMenu();
-		cm.setPatternItems(example.checkAdvancedGraphics());
-		menu = cm.createMenu(parent.getParent(), new ColorListener() {
-			public void setColor(GraphicsBackground gb) {
-				background = gb;
-				colorButton.setImage(gb.getThumbNail());
-				example.redraw();
-			}
-		});
-
-		// initialize the background to the 5th item in the menu (blue)
-		background = (GraphicsBackground) menu.getItem(4).getData();
-
-		// color button
-		Composite comp = new Composite(parent, SWT.NONE);
-		comp.setLayout(new GridLayout(2, false));
-
-		colorButton = new Button(comp, SWT.PUSH);
-		colorButton.setText(GraphicsExample.getResourceString("Color")); //$NON-NLS-1$
-		colorButton.setImage(background.getThumbNail());
-		colorButton.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				final Button button = (Button) event.widget;
-				final Composite parent = button.getParent();
-				Rectangle bounds = button.getBounds();
-				Point point = parent.toDisplay(new Point(bounds.x, bounds.y));
-				menu.setLocation(point.x, point.y + bounds.height);
-				menu.setVisible(true);
-			}
-		});
-	}
-
-	public void next(int width, int height) {
-		angle = (angle + 5)%360;
-		if (vertical) {
-			if (rectHeight <= 0) {
-				incHeight = -incHeight;
-			}
-			if (rectHeight >= height) {
-				incHeight = -incHeight;
-				vertical = false;
-			}
-			rectHeight = rectHeight + incHeight;
-		} else {
-			if (rectWidth <= 0) {
-				incWidth = -incWidth;
-			}
-			if (rectWidth >= width) {
-				incWidth = -incWidth;
-				vertical = true;
-			}
-			rectWidth = rectWidth + incWidth;
-		}
-	}
-
-	public void paint(GC gc, int width, int height) {
-		if (!example.checkAdvancedGraphics()) return;
-		Device device = gc.getDevice();
-		
-		// top triangle
-		Path path = new Path(device);
-		path.moveTo(width/2, 0);
-		path.lineTo(width/2+100, 173);
-		path.lineTo(width/2-100, 173);
-		path.lineTo(width/2, 0);
-		
-		// bottom triangle
-		Path path2 = new Path(device);
-		path2.moveTo(width/2, height);
-		path2.lineTo(width/2+100, height-173);
-		path2.lineTo(width/2-100, height-173);
-		path2.lineTo(width/2, height);
-		
-		// left triangle
-		Path path3 = new Path(device);
-		path3.moveTo(0, height/2);
-		path3.lineTo(173, height/2-100);
-		path3.lineTo(173, height/2+100);
-		path3.lineTo(0, height/2);
-		
-		// right triangle
-		Path path4 = new Path(device);
-		path4.moveTo(width, height/2);
-		path4.lineTo(width-173, height/2-100);
-		path4.lineTo(width-173, height/2+100);
-		path4.lineTo(width, height/2);
-		
-		// circle
-		Path path5 = new Path(device);
-		path5.moveTo((width-200)/2, (height-200)/2);
-		path5.addArc((width-200)/2, (height-200)/2, 200, 200, 0, 360);
-		
-		// top rectangle
-		Path path6 = new Path(device);
-		path6.addRectangle((width-40)/2, 175, 40, ((height-200)/2)-177);
-		
-		// bottom rectangle
-		Path path7 = new Path(device);
-		path7.addRectangle((width-40)/2, ((height-200)/2)+202, 40, (height-175)-(((height-200)/2)+202));
-		
-		// left rectangle
-		Path path8 = new Path(device);
-		path8.addRectangle(175, (height-40)/2, ((width-200)/2)-177, 40);
-		
-		// right rectangle
-		Path path9 = new Path(device);
-		path9.addRectangle((width-200)/2+202, (height-40)/2, (width-175)-((width-200)/2+202), 40);
-		
-		path.addPath(path2);
-		path.addPath(path3);
-		path.addPath(path4);
-		path.addPath(path5);
-		path.addPath(path6);
-		path.addPath(path7);
-		path.addPath(path8);
-		path.addPath(path9);
-		gc.setClipping(path);
-
-		Pattern pattern = null;
-		if (background.getBgColor1() != null) {
-			gc.setBackground(background.getBgColor1());
-		} else if (background.getBgImage() != null) {
-			pattern = new Pattern(device, background.getBgImage());
-			gc.setBackgroundPattern(pattern);
-		}
-
-		gc.setLineWidth(2);
-		gc.fillRectangle((width-rectWidth)/2, (height-rectHeight)/2, rectWidth, rectHeight);
-		gc.drawPath(path);
-		
-		if (pattern != null)
-			pattern.dispose();
-		
-		path9.dispose();
-		path8.dispose();
-		path7.dispose();
-		path6.dispose();
-		path5.dispose();
-		path4.dispose();
-		path3.dispose();
-		path2.dispose();
-		path.dispose();
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/PathClippingTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/PathClippingTab.java
deleted file mode 100644
index 3087029..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/PathClippingTab.java
+++ /dev/null

@@ -1,244 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This tab demonstrates how to apply a path clipping and the effects of
- * applying one.
- */
-public class PathClippingTab extends GraphicsTab {
-	
-	private Combo clippingCb;
-	private Button colorButton;
-	private GraphicsBackground background;
-	private Menu menu;
-
-public PathClippingTab(GraphicsExample example) {
-	super(example);
-}
-
-public String getCategory() {
-	return GraphicsExample.getResourceString("Clipping"); //$NON-NLS-1$
-}
-
-public String getText() {
-	return GraphicsExample.getResourceString("PathClipping"); //$NON-NLS-1$
-}
-
-public String getDescription() {
-	return GraphicsExample.getResourceString("PathClippingDesc"); //$NON-NLS-1$
-}
-
-public void dispose() {
-	if (menu != null) {
-		menu.dispose();
-		menu = null;
-	}
-}
-
-/** 
- * Creates the widgets used to control the drawing.
- */
-public void createControlPanel(Composite parent) {	
-	
-	// create drop down combo for choosing clipping
-	Composite comp = new Composite(parent, SWT.NONE);
-	comp.setLayout(new GridLayout(2, false));
-	
-	new Label(comp, SWT.CENTER).setText(GraphicsExample
-				.getResourceString("Clipping")); //$NON-NLS-1$
-	clippingCb = new Combo(comp, SWT.DROP_DOWN);
-	clippingCb.add(GraphicsExample.getResourceString("Circles")); //$NON-NLS-1$
-	clippingCb.add(GraphicsExample.getResourceString("Rectangle")); //$NON-NLS-1$
-	clippingCb.add(GraphicsExample.getResourceString("Oval")); //$NON-NLS-1$
-	clippingCb.add(GraphicsExample.getResourceString("Word")); //$NON-NLS-1$
-	clippingCb.add(GraphicsExample.getResourceString("Star")); //$NON-NLS-1$
-	clippingCb.add(GraphicsExample.getResourceString("Triangles")); //$NON-NLS-1$
-	clippingCb.add(GraphicsExample.getResourceString("Default")); //$NON-NLS-1$
-	clippingCb.select(0);
-	clippingCb.addListener(SWT.Selection, new Listener() {
-		public void handleEvent(Event event) {
-				example.redraw();
-		}
-	});
-	
-	// color menu
-	ColorMenu cm = new ColorMenu();
-	cm.setPatternItems(example.checkAdvancedGraphics());
-	menu = cm.createMenu(parent.getParent(), new ColorListener() {
-		public void setColor(GraphicsBackground gb) {
-			background = gb;		
-			colorButton.setImage(gb.getThumbNail());
-			example.redraw();
-		}
-	});
-
-	// initialize the background to the 5th item in the menu (blue)
-	background =(GraphicsBackground)menu.getItem(4).getData();
-	
-	// color button
-	comp = new Composite(parent, SWT.NONE);
-	comp.setLayout(new GridLayout(2, false));
-	
-	colorButton = new Button(comp, SWT.PUSH);
-	colorButton.setText(GraphicsExample
-			.getResourceString("Color")); //$NON-NLS-1$
-	colorButton.setImage(background.getThumbNail());
-	colorButton.addListener(SWT.Selection, new Listener() { 
-		public void handleEvent(Event event) {
-			final Button button = (Button) event.widget;
-			final Composite parent = button.getParent(); 
-			Rectangle bounds = button.getBounds();
-			Point point = parent.toDisplay(new Point(bounds.x, bounds.y));
-			menu.setLocation(point.x, point.y + bounds.height);
-			menu.setVisible(true);
-		}
-	});
-}
-public void paint(GC gc, int width, int height) {
-	if (!example.checkAdvancedGraphics()) return;
-	Device device = gc.getDevice();
-
-	int clipping = clippingCb.getSelectionIndex();
-	switch (clipping) {
-	
-	case 0:		// circles
-		Path path = new Path(device);
-		path.addArc((width-width/5)/2, (height-height/5)/2, width/5, height/5, 0, 360);
-		path.addArc(5*(width-width/8)/12, 4*(height-height/8)/12, width/8, height/8, 0, 360);
-		path.addArc(7*(width-width/8)/12, 8*(height-height/8)/12, width/8, height/8, 0, 360);
-		path.addArc(6*(width-width/12)/12, 3*(height-height/12)/12, width/12, height/12, 0, 360);
-		path.addArc(6*(width-width/12)/12, 9*(height-height/12)/12, width/12, height/12, 0, 360);
-		path.addArc(11.5f*(width-width/18)/20, 5*(height-height/18)/18, width/18, height/18, 0, 360);
-		path.addArc(8.5f*(width-width/18)/20, 13*(height-height/18)/18, width/18, height/18, 0, 360);
-		gc.setClipping(path);
-		path.dispose();
-		break;
-	case 1:		// rectangle
-		path = new Path(device);
-		path.addRectangle(100, 100, width-200, height-200);
-		path.addRectangle(120, 120, width-240, height-240);
-		path.addRectangle(140, 140, width-280, height-280);
-		gc.setClipping(path);
-		path.dispose();
-		break;
-	case 2:		// circle
-		path = new Path(device);
-		path.addArc(100, 100, width-200, height-200, 0, 360);
-		path.addArc((width-width/5)/2, (height-height/5)/2, width/5, height/5, 0, 360);
-		path.addArc(5*(width-width/8)/12, 4*(height-height/8)/12, width/8, height/8, 0, 360);
-		path.addArc(7*(width-width/8)/12, 8*(height-height/8)/12, width/8, height/8, 0, 360);
-		path.addArc(6*(width-width/12)/12, 3*(height-height/12)/12, width/12, height/12, 0, 360);
-		path.addArc(6*(width-width/12)/12, 9*(height-height/12)/12, width/12, height/12, 0, 360);
-		path.addArc(11.5f*(width-width/18)/20, 5*(height-height/18)/18, width/18, height/18, 0, 360);
-		path.addArc(8.5f*(width-width/18)/20, 13*(height-height/18)/18, width/18, height/18, 0, 360);
-		gc.setClipping(path);
-		path.dispose();
-		break;
-	case 3:		// word
-		path = new Path(device);
-		String text = GraphicsExample.getResourceString("SWT"); //$NON-NLS-1$
-		Font font = new Font(device, "Times", 200, SWT.NORMAL);
-		gc.setFont(font);
-		Point size = gc.stringExtent(text);
-		path.addString(text, (width-size.x)/2, (height-size.y)/2, font);
-		font.dispose();
-		gc.setClipping(path);
-		path.dispose();
-		break;
-	case 4:		// star
-		path = new Path(device);
-		path.lineTo(width/2, 0);
-		path.lineTo(5*width/8, height/3);
-		path.lineTo(width, height/3);
-		path.lineTo(3*width/4, 10*height/16);
-		path.lineTo(7*width/8, height);
-		path.lineTo(width/2, 3*height/4);
-		path.lineTo(width/8, height);
-		path.lineTo(width/4, 10*height/16);
-		path.lineTo(0, height/3);
-		path.lineTo(3*width/8, height/3);
-		path.lineTo(width/2, 0);
-		
-		Path ovalPath = new Path(device);
-		ovalPath.addArc(90, 90, width-180, height-180, 0, 360);
-		
-		path.addPath(ovalPath);
-		gc.setClipping(path);
-		ovalPath.dispose();
-		path.dispose();
-		break;
-	case 5:		// triangles
-		path = new Path(device);
-		path.addRectangle(0, 0, width, height);
-		path.lineTo(width/4, 0);
-		path.lineTo(width/4, height/2);
-		path.lineTo(0, height/2);
-		path.lineTo(width/4, 0);
-		
-		Path path2 = new Path(device);
-		path2.lineTo(width/2, 0);
-		path2.lineTo(width/4, height/2);
-		path2.lineTo(3*width/4, height/2);
-		path2.lineTo(width/2, 0);
-		
-		Path path3 = new Path(device);
-		path3.lineTo(3*width/4, 0);
-		path3.lineTo(3*width/4, height/2);
-		path3.lineTo(width, height/2);
-		path3.lineTo(3*width/4, 0);
-		
-		Path path4 = new Path(device);
-		path4.lineTo(0, height);
-		path4.lineTo(width/4, height/2);
-		path4.lineTo(width/2, height);
-		path4.lineTo(0, height);
-		
-		Path path5 = new Path(device);
-		path5.lineTo(width/2, height);
-		path5.lineTo(3*width/4, height/2);
-		path5.lineTo(width, height);
-		path5.lineTo(width/2, height);
-		
-		path.addPath(path2);
-		path.addPath(path3);
-		path.addPath(path4);
-		path.addPath(path5);
-		gc.setClipping(path);
-		
-		path5.dispose();
-		path4.dispose();
-		path3.dispose();
-		path2.dispose();
-		path.dispose();
-		break;
-	case 6:		// default
-		gc.setClipping(0, 0, width, height);
-		break;
-	}
-	
-	Pattern pattern = null;
-	if (background.getBgColor1() != null) {
-		gc.setBackground(background.getBgColor1());
-	} else if (background.getBgImage() != null) {
-		pattern = new Pattern(device, background.getBgImage());
-		gc.setBackgroundPattern(pattern);
-	}
-    gc.fillRectangle(0, 0, width, height);
-    if (pattern != null) pattern.dispose();
-}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/PathTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/PathTab.java
deleted file mode 100644
index deaaaed..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/PathTab.java
+++ /dev/null

@@ -1,178 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This tab demonstrates the use of paths. It allows the user to see the
- * differences between filling, drawing and closing paths.
- */
-public class PathTab extends GraphicsTab {
-
-	Button colorButton, fillButton, drawButton, closeButton;
-	GraphicsBackground fillColor;
-	Menu menu;
-
-public PathTab(GraphicsExample example) {
-	super(example);
-}
-
-public String getCategory() {
-	return GraphicsExample.getResourceString("Path"); //$NON-NLS-1$
-}
-
-public String getText() {
-	return GraphicsExample.getResourceString("PathOper"); //$NON-NLS-1$
-}
-
-public String getDescription() {
-	return GraphicsExample.getResourceString("PathOperDescription"); //$NON-NLS-1$
-}
-
-public void dispose() {
-	if (menu != null) {
-		menu.dispose();
-		menu = null;
-	}
-}
-
-public void createControlPanel(Composite parent) {
-	
-	Composite comp;
-
-	// create draw button
-	comp = new Composite(parent, SWT.NONE);
-	comp.setLayout(new GridLayout());
-	
-	drawButton = new Button(comp, SWT.TOGGLE);
-	drawButton.setText(GraphicsExample.getResourceString("DrawPath")); //$NON-NLS-1$
-	drawButton.addListener(SWT.Selection, new Listener() { 
-		public void handleEvent(Event event) {
-			example.redraw();
-		}
-	});
-	drawButton.setSelection(true);
-	
-	// create fill button
-	comp = new Composite(parent, SWT.NONE);
-	comp.setLayout(new GridLayout());
-	
-	fillButton = new Button(comp, SWT.TOGGLE);
-	fillButton.setText(GraphicsExample.getResourceString("FillPath")); //$NON-NLS-1$
-	fillButton.addListener(SWT.Selection, new Listener() { 
-		public void handleEvent(Event event) {
-			example.redraw();
-		}
-	});
-	
-	// create close button
-	comp = new Composite(parent, SWT.NONE);
-	comp.setLayout(new GridLayout());
-	
-	closeButton = new Button(comp, SWT.TOGGLE);
-	closeButton.setText(GraphicsExample.getResourceString("ClosePath")); //$NON-NLS-1$
-	closeButton.addListener(SWT.Selection, new Listener() { 
-		public void handleEvent(Event event) {
-			example.redraw();
-		}
-	});
-		
-	// create color button
-	comp = new Composite(parent, SWT.NONE);
-	comp.setLayout(new GridLayout());
-	
-	ColorMenu cm = new ColorMenu();
-	cm.setPatternItems(example.checkAdvancedGraphics());
-	menu = cm.createMenu(parent.getParent(), new ColorListener() {
-		public void setColor(GraphicsBackground gb) {
-			fillColor = gb;		
-			colorButton.setImage(gb.getThumbNail());
-			example.redraw();
-		}
-	});
-
-	// initialize the foreground to the 5th item in the menu (green)
-	fillColor = (GraphicsBackground)menu.getItem(3).getData();
-	
-	// color button
-	colorButton = new Button(comp, SWT.PUSH);
-	colorButton.setText(GraphicsExample.getResourceString("FillColor")); //$NON-NLS-1$
-	colorButton.setImage(fillColor.getThumbNail());
-	colorButton.addListener(SWT.Selection, new Listener() { 
-		public void handleEvent(Event event) {
-			final Button button = (Button) event.widget;
-			final Composite parent = button.getParent(); 
-			Rectangle bounds = button.getBounds();
-			Point point = parent.toDisplay(new Point(bounds.x, bounds.y));
-			menu.setLocation(point.x, point.y + bounds.height);
-			menu.setVisible(true);
-		}
-	});
-}
-
-public void paint(GC gc, int width, int height) {
-	if (!example.checkAdvancedGraphics()) return;
-	Device device = gc.getDevice();
-
-	Pattern pattern = null;
-	if (fillColor.getBgColor1() != null) {
-		gc.setBackground(fillColor.getBgColor1());
-	} else if (fillColor.getBgImage() != null) {
-		pattern = new Pattern(device, fillColor.getBgImage());
-		gc.setBackgroundPattern(pattern);
-	}
-
-	gc.setLineWidth(5);
-	gc.setForeground(device.getSystemColor(SWT.COLOR_BLACK));
-	
-	// arc
-	Path path = new Path(device);
-	path.addArc((width-250)/2, (height-400)/2, 500, 400, 90, 180);
-	if (closeButton.getSelection()) path.close();
-	if (fillButton.getSelection()) gc.fillPath(path);
-	if (drawButton.getSelection()) gc.drawPath(path);
-	path.dispose();
-	
-	// shape on left
-	Transform transform = new Transform(device);
-	transform.translate((width-250)/4, height/2-150);
-	gc.setTransform(transform);
-	transform.dispose();
-	path = new Path(device);
-	path.cubicTo(-150, 100, 150, 200, 0, 300);
-	if (closeButton.getSelection()) path.close();
-	if (fillButton.getSelection()) gc.fillPath(path);
-	if (drawButton.getSelection()) gc.drawPath(path);
-	path.dispose();
-	gc.setTransform(null);
-	
-	// shape on right
-	path = new Path(device);
-	path.moveTo(3*(width-250)/4 - 25 + 250, height/2);
-	path.lineTo(3*(width-250)/4 + 50 + 250, height/2 - 200);
-	path.lineTo(3*(width-250)/4 + 50 + 250, height/2 + 50);
-	path.lineTo(3*(width-250)/4 - 25 + 250, height/2 + 150);
-	path.lineTo(3*(width-250)/4 + 25 + 250, height/2 + 50);
-	if (closeButton.getSelection()) path.close();
-	if (fillButton.getSelection()) gc.fillPath(path);
-	if (drawButton.getSelection()) gc.drawPath(path);
-	path.dispose();
-
-	if (pattern != null) pattern.dispose();
-}
-}
-
-

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/RGBTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/RGBTab.java
deleted file mode 100644
index 830b3e0..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/RGBTab.java
+++ /dev/null

@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-
-/**
- * Miscellaneous tab that demonstrates emerging colors from layering other
- * colors.
- */
-public class RGBTab extends AnimatedGraphicsTab {
-	
-	int translateX, translateY;
-	float diagTranslateX1, diagTranslateX2, diagTranslateY1, diagTranslateY2;
-
-/**
- * Constructor
- * @param example A GraphicsExample
- */
-public RGBTab(GraphicsExample example) {
-	super(example);
-	translateX = translateY = 0;
-	diagTranslateX1 = diagTranslateX2 = diagTranslateY1 = diagTranslateY2 = 0;
-}
-
-public String getCategory() {
-	return GraphicsExample.getResourceString("Misc"); //$NON-NLS-1$
-}
-
-public String getText() {
-	return GraphicsExample.getResourceString("rgb"); //$NON-NLS-1$
-}
-
-public String getDescription() {
-	return GraphicsExample.getResourceString("rgbDescription"); //$NON-NLS-1$
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.swt.examples.graphics.AnimatedGraphicsTab#next(int, int)
- */
-public void next(int width, int height) {
-	
-	float h = height;
-	float w = width;
-	
-	translateX = (translateX+3)%width;
-	translateY = (translateY+5)%height;
-
-	diagTranslateX1 = (diagTranslateX1+6)%width;
-	diagTranslateY1 = diagTranslateX1*(h/w);
-	
-	diagTranslateX2 = (diagTranslateX2+8)%width;
-	diagTranslateY2 = -diagTranslateX2*(h/w) + h;
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.swt.examples.graphics.GraphicsTab#paint(org.eclipse.swt.graphics.GC, int, int)
- */
-public void paint(GC gc, int width, int height) {
-	if (!example.checkAdvancedGraphics()) return;
-	Device device = gc.getDevice();
-	
-	// horizontal rectangle
-	Transform transform = new Transform(device);
-	transform.translate(0, translateY);
-	gc.setTransform(transform);
-	transform.dispose();
-	
-	Path path = new Path(device);
-	path.addRectangle(0, 0, width, 50);
-	Pattern pattern = new Pattern(device, 0, 0, width, 50, 
-				device.getSystemColor(SWT.COLOR_BLUE), 0x7f,
-				device.getSystemColor(SWT.COLOR_RED), 0x7f);
-	gc.setBackgroundPattern(pattern);
-	gc.fillPath(path);
-	gc.drawPath(path);
-	path.dispose();
-
-	// vertical rectangle
-	transform = new Transform(device);
-	transform.translate(translateX, 0);
-	gc.setTransform(transform);
-	transform.dispose();
-	
-	path = new Path(device);
-	path.addRectangle(0, 0, 50, height);
-	pattern.dispose();
-	pattern = new Pattern(device, 0, 0, 50, height, 
-				device.getSystemColor(SWT.COLOR_DARK_CYAN), 0x7f,
-				device.getSystemColor(SWT.COLOR_WHITE), 0x7f);
-	gc.setBackgroundPattern(pattern);
-	gc.fillPath(path);
-	gc.drawPath(path);
-	path.dispose();
-
-	// diagonal rectangle from bottom right corner
-	Rectangle rect = new Rectangle(0, 0, 50, height);
-	transform = new Transform(device);
-	transform.translate(width-diagTranslateX1, (height/2)-diagTranslateY1);
-	
-	// rotate on center of rectangle
-	transform.translate(rect.width/2, rect.height/2);
-	transform.rotate(45);
-	transform.translate(-rect.width/2, -rect.height/2);
-	gc.setTransform(transform);
-	transform.dispose();
-	
-	path = new Path(device);
-	path.addRectangle(rect.x, rect.y, rect.width, rect.height);
-	pattern.dispose();
-	pattern = new Pattern(device, rect.x, rect.y, rect.width, rect.height, 
-			device.getSystemColor(SWT.COLOR_DARK_GREEN), 0x7f,
-			device.getSystemColor(SWT.COLOR_DARK_MAGENTA), 0x7f);
-	gc.setBackgroundPattern(pattern);
-	gc.fillPath(path);
-	gc.drawPath(path);
-	path.dispose();
-	
-	// diagonal rectangle from top right corner
-	transform = new Transform(device);
-	transform.translate(width-diagTranslateX2, (height/2)-diagTranslateY2);
-	
-	// rotate on center of rectangle
-	transform.translate(rect.width/2, rect.height/2);
-	transform.rotate(-45);
-	transform.translate(-rect.width/2, -rect.height/2);
-	gc.setTransform(transform);
-	transform.dispose();
-	
-	path = new Path(device);
-	path.addRectangle(rect.x, rect.y, rect.width, rect.height);
-	pattern.dispose();
-	pattern = new Pattern(device, rect.x, rect.y, rect.width, rect.height, 
-			device.getSystemColor(SWT.COLOR_DARK_RED), 0x7f,
-			device.getSystemColor(SWT.COLOR_YELLOW), 0x7f);
-	gc.setBackgroundPattern(pattern);
-	gc.fillPath(path);
-	gc.drawPath(path);
-	pattern.dispose();
-	path.dispose();
-}
-
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/RegionClippingTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/RegionClippingTab.java
deleted file mode 100644
index 6b536f0..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/RegionClippingTab.java
+++ /dev/null

@@ -1,210 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This tab demonstrates how to apply a region clipping and the effects of
- * applying one.
- */
-public class RegionClippingTab extends GraphicsTab {
-	
-	private Combo clippingCb;
-	private Button colorButton1, colorButton2;
-	private Menu menu1, menu2;
-	private GraphicsBackground colorGB1, colorGB2;
-
-public RegionClippingTab(GraphicsExample example) {
-	super(example);
-}
-
-public String getCategory() {
-	return GraphicsExample.getResourceString("Clipping"); //$NON-NLS-1$
-}
-
-public String getText() {
-	return GraphicsExample.getResourceString("RegionClipping"); //$NON-NLS-1$
-}
-
-public String getDescription() {
-	return GraphicsExample.getResourceString("RegionClippingDescription"); //$NON-NLS-1$
-}
-
-public void dispose() {
-	if (menu1 != null) {
-		menu1.dispose();
-		menu1 = null;
-	}
-	if (menu2 != null) {
-		menu2.dispose();
-		menu2 = null;
-	}
-}
-
-/** 
- * Creates the widgets used to control the drawing.
- */
-public void createControlPanel(Composite parent) {
-	// create drop down combo for choosing clipping
-	Composite comp = new Composite(parent, SWT.NONE);
-	comp.setLayout(new GridLayout(2, false));
-	
-	new Label(comp, SWT.CENTER).setText(GraphicsExample
-			.getResourceString("Clipping")); //$NON-NLS-1$
-	clippingCb = new Combo(comp, SWT.DROP_DOWN);
-	clippingCb.add(GraphicsExample.getResourceString("Region1")); //$NON-NLS-1$
-	clippingCb.add(GraphicsExample.getResourceString("Region2")); //$NON-NLS-1$
-	clippingCb.add(GraphicsExample.getResourceString("Add")); //$NON-NLS-1$
-	clippingCb.add(GraphicsExample.getResourceString("Sub")); //$NON-NLS-1$
-	clippingCb.add(GraphicsExample.getResourceString("Inter")); //$NON-NLS-1$
-	clippingCb.select(0);
-	clippingCb.addListener(SWT.Selection, new Listener() {
-		public void handleEvent(Event event) {
-				example.redraw();
-		}
-	});
-
-	// color menu
-	ColorMenu cm = new ColorMenu();
-	menu1 = cm.createMenu(parent.getParent(), new ColorListener() {
-		public void setColor(GraphicsBackground gb) {
-			colorGB1 = gb;		
-			colorButton1.setImage(gb.getThumbNail());
-			example.redraw();
-		}
-	});
-	menu2 = cm.createMenu(parent.getParent(), new ColorListener() {
-		public void setColor(GraphicsBackground gb) {
-			colorGB2 = gb;		
-			colorButton2.setImage(gb.getThumbNail());
-			example.redraw();
-		}
-	});
-	
-	// initialize the color to blue
-	colorGB1 = (GraphicsBackground)menu1.getItem(4).getData();
-	// initialize the color to red
-	colorGB2 = (GraphicsBackground)menu2.getItem(2).getData();
-	
-	// color button 1
-	comp = new Composite(parent, SWT.NONE);
-	comp.setLayout(new GridLayout(2, false));
-	
-	colorButton1 = new Button(comp, SWT.PUSH);
-	colorButton1.setText(GraphicsExample
-			.getResourceString("Color1")); //$NON-NLS-1$
-	colorButton1.setImage(colorGB1.getThumbNail());
-	colorButton1.addListener(SWT.Selection, new Listener() { 
-		public void handleEvent(Event event) {
-			final Button button = (Button) event.widget;
-			final Composite parent = button.getParent(); 
-			Rectangle bounds = button.getBounds();
-			Point point = parent.toDisplay(new Point(bounds.x, bounds.y));
-			menu1.setLocation(point.x, point.y + bounds.height);
-			menu1.setVisible(true);
-		}
-	});
-
-	// color button 2
-	comp = new Composite(parent, SWT.NONE);
-	comp.setLayout(new GridLayout(2, false));
-	
-	colorButton2 = new Button(comp, SWT.PUSH);
-	colorButton2.setText(GraphicsExample
-			.getResourceString("Color2")); //$NON-NLS-1$
-	colorButton2.setImage(colorGB2.getThumbNail());
-	colorButton2.addListener(SWT.Selection, new Listener() { 
-		public void handleEvent(Event event) {
-			final Button button = (Button) event.widget;
-			final Composite parent = button.getParent(); 
-			Rectangle bounds = button.getBounds();
-			Point point = parent.toDisplay(new Point(bounds.x, bounds.y));
-			menu2.setLocation(point.x, point.y + bounds.height);
-			menu2.setVisible(true);
-		}
-	});
-}
-
-public void paint(GC gc, int width, int height) {
-	if (!example.checkAdvancedGraphics()) return;
-	Device device = gc.getDevice();
-	
-	// array of coordinate points of polygon 1 (region 1)
-	int [] polygon1 = new int [] {10, height/2, 9*width/16, 10, 9*width/16, height-10};
-	Region region1 = new Region(device);
-	region1.add(polygon1);
-
-	// array of coordinate points of polygon 2 (region 2)
-	int [] polygon2 = new int [] {
-			9*width/16, 10,
-			9*width/16, height/8,
-			7*width/16, 2*height/8,
-			9*width/16, 3*height/8,
-			7*width/16, 4*height/8,
-			9*width/16, 5*height/8,
-			7*width/16, 6*height/8,
-			9*width/16, 7*height/8,
-			9*width/16, height-10,
-			width-10, height/2
-	};
-	Region region2 = new Region(device);
-	region2.add(polygon2);
-	
-	gc.setAlpha(127);
-	
-	int clippingIndex = clippingCb.getSelectionIndex();
-	
-	switch (clippingIndex) {
-	case 0:
-		// region 1
-		gc.setClipping(region1);
-		gc.setBackground(colorGB1.getBgColor1());
-		gc.fillPolygon(polygon1);
-		break;
-	case 1:
-		// region 2
-		gc.setClipping(region2);
-		gc.setBackground(colorGB2.getBgColor1());
-		gc.fillPolygon(polygon2);
-		break;
-	case 2:
-		// add		
-		region1.add(region2);
-		break;
-	case 3:
-		// sub
-		region1.subtract(region2);
-		break;
-	case 4:
-		// intersect
-		region1.intersect(region2);
-		break;		
-	}
-	
-	if (clippingIndex > 1) {
-		gc.setClipping(region1);
-		
-		gc.setBackground(colorGB1.getBgColor1());
-		gc.fillPolygon(polygon1);
-		
-		gc.setBackground(colorGB2.getBgColor1());
-	    gc.fillPolygon(polygon2);
-	}
-	
-	region1.dispose();
-	region2.dispose();
-    }
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ShapesTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ShapesTab.java
deleted file mode 100644
index 8cebcdb..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ShapesTab.java
+++ /dev/null

@@ -1,199 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-
-/**
- * This tab draws 3D shapes (in 2D) using various line styles.
- */
-public class ShapesTab extends AnimatedGraphicsTab {
-	
-	int upDownValue;
-	int inc = 1;
-	
-public ShapesTab(GraphicsExample example) {
-	super(example);
-	upDownValue = 0;
-}
-
-public String getCategory() {
-	return GraphicsExample.getResourceString("Lines"); //$NON-NLS-1$
-}
-
-public String getText() {
-	return GraphicsExample.getResourceString("Shapes"); //$NON-NLS-1$
-}
-
-public String getDescription() {
-	return GraphicsExample.getResourceString("ShapesDescription"); //$NON-NLS-1$
-}
-
-public void next(int width, int height) {
-	upDownValue += inc;
-
-	if (upDownValue > 5) inc = -1;
-	if (upDownValue < -5) inc = 1;
-}
-
-public void paint(GC gc, int width, int height) {
-	if (!example.checkAdvancedGraphics()) return;
-	Device device = gc.getDevice();
-
-	int size = 100;
-	
-	gc.setLineWidth(2);
-	
-	// ----- cube -----
-	
-	Transform transform = new Transform(device);
-	transform.translate(width/4 - size, height/4 + -upDownValue);
-	gc.setTransform(transform);
-	
-	gc.setLineStyle(SWT.LINE_DOT);
-
-	// fill in left face
-	gc.setBackground(device.getSystemColor(SWT.COLOR_RED));
-	gc.fillPolygon(new int [] {0, 0, size/3, -size/2, size/3, size/2, 0, size});
-	
-	gc.setLineStyle(SWT.LINE_SOLID);
-	
-	// square
-	gc.drawRectangle(0, 0, size, size);
-	
-	// next 3 solid lines
-	gc.drawLine(0, 0, size/3, -size/2);			// left
-	gc.drawLine(size, 0, 4*size/3, -size/2);	// middle
-	gc.drawLine(size, size, 4*size/3, size/2);	// right
-	
-	// 2 furthest solid lines
-	gc.drawLine(size/3, -size/2, 4*size/3, -size/2);  	// horizontal
-	gc.drawLine(4*size/3, size/2, 4*size/3, -size/2);	// vertical
-	
-	// 3 dotted lines
-	gc.setLineStyle(SWT.LINE_DOT);
-	gc.drawLine(0, size, size/3, size/2);
-	gc.drawLine(size/3, -size/2, size/3, size/2);
-	gc.drawLine(4*size/3, size/2, size/3, size/2);
-	
-	// fill right side of cube
-	gc.setBackground(device.getSystemColor(SWT.COLOR_GRAY));
-	gc.fillPolygon(new int [] {size, 0, 4*size/3, -size/2, 4*size/3, size/2, size, size});
-	
-	transform.dispose();
-	
-	// ----- pyramid -----
-	
-	transform = new Transform(device);
-	transform.translate(width/2 + size/2, height/4 + size + upDownValue);
-	gc.setTransform(transform);
-	
-	// fill back of pyramid
-	gc.fillPolygon(new int [] {size/3, -size/2, 6*size/10, -5*size/4, 4*size/3, -size/2});
-	
-	// fill left side of pyramid
-	gc.setBackground(device.getSystemColor(SWT.COLOR_GREEN));
-	gc.fillPolygon(new int [] {0, 0, 6*size/10, -5*size/4, size/3, -size/2});
-	
-	// select solid line style
-	gc.setLineStyle(SWT.LINE_SOLID);
-	
-	// 2 solid lines of base
-	gc.drawLine(0, 0, size, 0);
-	gc.drawLine(size, 0, 4*size/3, -size/2);
-	
-	// 3 solid lines of pyramid
-	gc.drawLine(0, 0, 6*size/10, -5*size/4);
-	gc.drawLine(size, 0, 6*size/10, -5*size/4);
-	gc.drawLine(4*size/3, -size/2, 6*size/10, -5*size/4);
-	
-	// select dot line style
-	gc.setLineStyle(SWT.LINE_DOT);
-	
-	// 3 dotted lines
-	gc.drawLine(0, 0, size/3, -size/2);					// left 
-	gc.drawLine(size/3, -size/2, 6*size/10, -5*size/4); // to top of pyramid
-	gc.drawLine(4*size/3, -size/2, size/3, -size/2);	// right
-
-	transform.dispose();
-	
-	// ----- rectangular prism -----
-	
-	transform = new Transform(device);
-	transform.translate(width/2 + upDownValue, height/2 + size);
-	gc.setTransform(transform);
-	
-	// fill bottom
-	gc.setBackground(device.getSystemColor(SWT.COLOR_BLUE));
-	gc.fillPolygon(new int [] {0, size, size/3, size/2, 7*size/3, size/2, 2*size, size});
-	
-	// select solid line style
-	gc.setLineStyle(SWT.LINE_SOLID);
-	
-	gc.drawRectangle(0, 0, 2*size, size);
-	
-	// next 3 solid lines
-	gc.drawLine(0, 0, size/3, -size/2);			// left
-	gc.drawLine(2*size, 0, 7*size/3, -size/2);	// middle
-	gc.drawLine(2*size, size, 7*size/3, size/2);	// right
-	
-	// 2 furthest solid lines
-	gc.drawLine(size/3, -size/2, 7*size/3, -size/2);  	// horizontal
-	gc.drawLine(7*size/3, size/2, 7*size/3, -size/2);	// vertical
-	
-	// 3 dotted lines
-	gc.setLineStyle(SWT.LINE_DASHDOTDOT);
-	gc.drawLine(0, size, size/3, size/2);
-	gc.drawLine(size/3, -size/2, size/3, size/2);
-	gc.drawLine(7*size/3, size/2, size/3, size/2);
-	
-	// fill top
-	gc.setBackground(device.getSystemColor(SWT.COLOR_GRAY));
-	gc.fillPolygon(new int [] {0, 0, size/3, -size/2, 7*size/3, -size/2, 2*size, 0});
-
-	transform.dispose();
-	
-	// ----- triangular shape -----
-	transform = new Transform(device);
-	transform.translate(width/4 - size - upDownValue, height/2 + size + upDownValue);
-	gc.setTransform(transform);
-	
-	// fill back of shape (top left)
-	gc.setBackground(device.getSystemColor(SWT.COLOR_YELLOW));
-	gc.fillPolygon(new int [] {0, 0, size/2, -size, size/2, -size/3});
-
-	// fill back of shape (bottom right)
-	gc.fillPolygon(new int [] {size, 0, size/2, size, size/2, -size/3});
-	
-	// select solid line style
-	gc.setLineStyle(SWT.LINE_SOLID);
-	
-	// solid lines of bottom triangle
-	gc.drawLine(0, 0, size/2, size);
-	gc.drawLine(size, 0, size/2, size);
-	
-	// solid lines of top triangle
-	gc.drawLine(0, 0, size/2, -size);
-	gc.drawLine(size, 0, size/2, -size);
-	
-	// solid lines on top
-	gc.drawLine(0, 0, size/2, -size/3);
-	gc.drawLine(size, 0, size/2, -size/3);
-	gc.drawLine(size/2, -size/3, size/2, size);
-	gc.drawLine(size/2, -size/3, size/2, -size);
-	
-	transform.dispose();
-}
-
-}
-

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/SpiralTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/SpiralTab.java
deleted file mode 100644
index 59122ef..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/SpiralTab.java
+++ /dev/null

@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This tab presents a spiral consisting of the number of petals specified.
- * */
-public class SpiralTab extends AnimatedGraphicsTab {
-	
-	int angle;					// angle by which to rotate the petals
-	Spinner petalSpinner;		// spinner to control number of petals
-	Button colorButton;
-	GraphicsBackground foreground;
-	Menu menu;
-	
-public SpiralTab(GraphicsExample example) {
-	super(example);
-	angle = -90;
-}
-
-public void dispose() {
-	if (menu != null) {
-		menu.dispose();
-		menu = null;
-	}
-}
-/**
- * This method creates a spinner for specifying the number of petals. The call to the
- * createControlPanel method in the super class create the controls that are
- * defined in the super class.
- * 
- * @param parent The parent composite 
- */
-public void createControlPanel(Composite parent) {
-	super.createControlPanel(parent);
-		
-	// create spinner number of petals
-	Composite comp = new Composite(parent, SWT.NONE);
-	comp.setLayout(new GridLayout(2, false));
-	
-	new Label(comp, SWT.CENTER).setText(GraphicsExample
-			.getResourceString("Petals")); //$NON-NLS-1$
-	petalSpinner = new Spinner(comp, SWT.BORDER | SWT.WRAP);
-	petalSpinner.setSelection(8);
-	petalSpinner.setMinimum(3);
-	petalSpinner.setMaximum(20);
-	petalSpinner.addListener(SWT.Selection, new Listener() {
-		public void handleEvent (Event event) {
-			example.redraw();
-		}
-	});
-	
-	// create color button
-	comp = new Composite(parent, SWT.NONE);
-	comp.setLayout(new GridLayout());
-	
-	ColorMenu cm = new ColorMenu();
-	cm.setPatternItems(example.checkAdvancedGraphics());
-	menu = cm.createMenu(parent.getParent(), new ColorListener() {
-		public void setColor(GraphicsBackground gb) {
-			foreground = gb;		
-			colorButton.setImage(gb.getThumbNail());
-			example.redraw();
-		}
-	});
-
-	// initialize the foreground to the 2nd item in the menu
-	foreground = (GraphicsBackground)menu.getItem(1).getData();
-	
-	// color button
-	colorButton = new Button(comp, SWT.PUSH);
-	colorButton.setText(GraphicsExample
-			.getResourceString("Color")); //$NON-NLS-1$
-	colorButton.setImage(foreground.getThumbNail());
-	colorButton.addListener(SWT.Selection, new Listener() { 
-		public void handleEvent(Event event) {
-			final Button button = (Button) event.widget;
-			final Composite parent = button.getParent(); 
-			Rectangle bounds = button.getBounds();
-			Point point = parent.toDisplay(new Point(bounds.x, bounds.y));
-			menu.setLocation(point.x, point.y + bounds.height);
-			menu.setVisible(true);
-		}
-	});
-}
-
-public String getCategory() {
-	return GraphicsExample.getResourceString("Misc"); //$NON-NLS-1$
-}
-
-public String getText() {
-	return GraphicsExample.getResourceString("Spiral"); //$NON-NLS-1$
-}
-
-public String getDescription() {
-	return GraphicsExample.getResourceString("SpiralDescription"); //$NON-NLS-1$
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.swt.examples.graphics.AnimatedGraphicsTab#getAnimationTime()
- */
-public int getInitialAnimationTime() {
-	return 150;	
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.swt.examples.graphics.AnimatedGraphicsTab#next(int, int)
- */
-public void next(int width, int height) {
-	if (angle == 270) {
-		angle = -90;
-	}
-	angle += 10;
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.swt.examples.graphics.GraphicsTab#paint(org.eclipse.swt.graphics.GC, int, int)
- */
-public void paint(GC gc, int width, int height) {
-	if (!example.checkAdvancedGraphics()) return;
-	Device device = gc.getDevice();
-	
-	// set line attributes
-	gc.setLineWidth(20);
-	gc.setLineCap(SWT.CAP_ROUND);	// round line ends
-	gc.setAntialias(SWT.ON);	// smooth jagged edges
-	
-	Pattern pattern = null;
-	if (foreground.getBgColor1() != null) {
-		gc.setForeground(foreground.getBgColor1());
-	} else if (foreground.getBgImage() != null) {
-		pattern = new Pattern(device, foreground.getBgImage());
-		gc.setForegroundPattern(pattern);
-	}
-
-	// draw petals for the spiral
-	Transform transform;
-	int n = petalSpinner.getSelection();
-	for (int i=0; i < n; i++) {
-		transform = new Transform(device);
-		transform.translate(width/2, height/2);
-		transform.rotate(-(angle + 360/n * i));
-		gc.setTransform(transform);
-		gc.drawArc(0, 0, width/3, height/6, 0, 180);
-		transform.dispose();
-	}
-	
-	if (pattern != null) pattern.dispose();
-}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/StarPolyTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/StarPolyTab.java
deleted file mode 100644
index 383e420..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/StarPolyTab.java
+++ /dev/null

@@ -1,68 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.*;
-
-public class StarPolyTab extends GraphicsTab {
-	int[] radial;
-	static final int POINTS  = 11;
-	
-	Combo fillRuleCb;
-
-public StarPolyTab(GraphicsExample example) {
-	super(example);
-	radial = new int[POINTS * 2];
-}
-
-public void createControlPanel(Composite parent) {
-	new Label(parent, SWT.NONE).setText(GraphicsExample.getResourceString("FillRule")); //$NON-NLS-1$
-	fillRuleCb = new Combo(parent, SWT.DROP_DOWN);
-	fillRuleCb.add("FILL_EVEN_ODD");
-	fillRuleCb.add("FILL_WINDING");
-	fillRuleCb.select(0);
-	fillRuleCb.addListener(SWT.Selection, new Listener() {
-		public void handleEvent (Event event) {
-			example.redraw();
-		}
-	});
-}
-
-public String getCategory() {
-	return GraphicsExample.getResourceString("Polygons"); //$NON-NLS-1$
-}
-
-public String getText() {
-	return GraphicsExample.getResourceString("StarPolygon"); //$NON-NLS-1$
-}
-
-public String getDescription() {
-	return GraphicsExample.getResourceString("StarPolygonDescription"); //$NON-NLS-1$
-}
-
-public void paint(GC gc, int width, int height) {
-    int centerX = width / 2;
-    int centerY = height / 2;
-    int pos = 0;
-    for (int i = 0; i < POINTS; ++i) {
-        double r = Math.PI*2 * pos/POINTS;
-        radial[i*2] = (int)((1+Math.cos(r))*centerX);
-        radial[i*2+1] = (int)((1+Math.sin(r))*centerY);
-        pos = (pos + POINTS/2) % POINTS;
-    }
-	gc.setFillRule(fillRuleCb.getSelectionIndex() != 0 ? SWT.FILL_WINDING : SWT.FILL_EVEN_ODD);
-	gc.setBackground(gc.getDevice().getSystemColor(SWT.COLOR_WHITE));
-    gc.fillPolygon(radial);
-    gc.drawPolygon(radial);
-}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/TextAntialiasTab.java b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/TextAntialiasTab.java
deleted file mode 100644
index 2a3755c..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/TextAntialiasTab.java
+++ /dev/null

@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.swt.examples.graphics;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This tab demonstrates antialiasing for text. Antialiasing is used for
- * smoothing jagged edges in graphics. This tab allows the user to see the
- * effects of different antialiasing values.
- */
-public class TextAntialiasTab extends GraphicsTab {
-
-	Combo aliasCombo;
-	static int[] aliasValues = { SWT.OFF, SWT.DEFAULT, SWT.ON };
-	
-	Button colorButton;
-	Menu menu;
-	GraphicsBackground textColor;
-	String text = GraphicsExample.getResourceString("SWT");
-
-	
-public TextAntialiasTab(GraphicsExample example) {
-	super(example);
-}
-
-public String getCategory() {
-	return GraphicsExample.getResourceString("Antialiasing"); //$NON-NLS-1$
-}
-
-public String getText() {
-	return GraphicsExample.getResourceString("Text"); //$NON-NLS-1$ 
-}
-
-public String getDescription() {
-	return GraphicsExample.getResourceString("AntialiasingTextDesc"); //$NON-NLS-1$
-}
-
-public void dispose() {
-	if (menu != null) {
-		menu.dispose();
-		menu = null;
-	}
-}
-
-public void createControlPanel(Composite parent) {
-
-	Composite comp;
-	
-	// create drop down combo for antialiasing
-	comp = new Composite(parent, SWT.NONE);
-	comp.setLayout(new GridLayout(2, false));
-	new Label(comp, SWT.CENTER).setText(GraphicsExample
-			.getResourceString("Antialiasing")); //$NON-NLS-1$
-	aliasCombo = new Combo(comp, SWT.DROP_DOWN);
-	aliasCombo.add("OFF");
-	aliasCombo.add("DEFAULT");
-	aliasCombo.add("ON");
-	aliasCombo.select(0);
-	aliasCombo.addListener(SWT.Selection, new Listener() {
-		public void handleEvent(Event event) {
-				example.redraw();
-		}
-	});
-		
-	ColorMenu cm = new ColorMenu();
-	cm.setColorItems(true);
-	menu = cm.createMenu(parent.getParent(), new ColorListener() {
-		public void setColor(GraphicsBackground gb) {
-			textColor = gb;
-			colorButton.setImage(gb.getThumbNail());
-			example.redraw();
-		}
-	});
-	
-	// create color button
-	comp = new Composite(parent, SWT.NONE);
-	comp.setLayout(new GridLayout());
-	
-	// initialize the color to black
-	textColor = (GraphicsBackground)menu.getItem(1).getData();
-	
-	colorButton = new Button(comp, SWT.PUSH);
-	colorButton.setText(GraphicsExample.getResourceString("Color")); //$NON-NLS-1$
-	colorButton.setImage(textColor.getThumbNail());
-	
-	colorButton.addListener(SWT.Selection, new Listener() { 
-		public void handleEvent(Event event) {
-			final Button button = (Button) event.widget;
-			final Composite parent = button.getParent(); 
-			Rectangle bounds = button.getBounds();
-			Point point = parent.toDisplay(new Point(bounds.x, bounds.y));
-			menu.setLocation(point.x, point.y + bounds.height);
-			menu.setVisible(true);
-		}
-	});
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.swt.examples.graphics.GraphicsTab#paint(org.eclipse.swt.graphics.GC, int, int)
- */
-public void paint(GC gc, int width, int height) {
-	if (!example.checkAdvancedGraphics()) return;
-	Device device = gc.getDevice();
-	
-	if (textColor != null && textColor.getBgColor1() != null)
-		gc.setForeground(textColor.getBgColor1());
-
-	gc.setTextAntialias(aliasValues[aliasCombo.getSelectionIndex()]);
-
-	// column 1, row 1
-	Font font = new Font(device, getPlatformFontFace(0), 100, SWT.NORMAL);
-	gc.setFont(font);
-	Point size = gc.stringExtent(text);
-	gc.drawString(text, width/4 - size.x/2, height/4 - size.y/2, true);
-	font.dispose();
-	
-	// column 1, row 2
-	font = new Font(device, getPlatformFontFace(1), 100, SWT.NORMAL);
-	gc.setFont(font);
-	size = gc.stringExtent(text);
-	gc.drawString(text, width/4 - size.x/2, 3*height/4 - size.y/2, true);
-	font.dispose();
-	
-	// column 2, row 1
-	font = new Font(device, getPlatformFontFace(2), 50, SWT.NORMAL);
-	gc.setFont(font);
-	size = gc.stringExtent(text);
-	gc.drawString(text, (width-size.x)/2, 0, true);
-	font.dispose();
-	
-	// column 2, row 2
-	font = new Font(device, getPlatformFontFace(3), 100, SWT.ITALIC);
-	gc.setFont(font);
-	size = gc.stringExtent(text);
-	gc.drawString(text, (width-size.x)/2, (height-size.y)/2, true);
-	font.dispose();
-	
-	// column 2, row 3
-	font = new Font(device, getPlatformFontFace(4), 50, SWT.NORMAL);
-	gc.setFont(font);
-	size = gc.stringExtent(text);
-	gc.drawString(text, (width-size.x)/2, height-size.y, true);
-	font.dispose();
-	
-	// column 3, row 1
-	font = new Font(device, getPlatformFontFace(5), 100, SWT.NORMAL);
-	gc.setFont(font);
-	size = gc.stringExtent(text);
-	gc.drawString(text, 3*width/4 - size.x/2, height/4 - size.y/2, true);
-	font.dispose();
-	
-	// column 3, row 2
-	font = new Font(device, getPlatformFontFace(6), 100, SWT.NORMAL);
-	gc.setFont(font);
-	size = gc.stringExtent(text);
-	gc.drawString(text, 3*width/4 - size.x/2, 3*height/4 - size.y/2, true);
-	font.dispose();
-}
-
-/**
- * Returns the name of a valid font for the host platform.
- * 
- * @param index
- *            index is used to determine the appropriate font face
- */
-static String getPlatformFontFace(int index) {
-	if(SWT.getPlatform() == "win32") {
-		return new String [] {"Bookman Old Style", "Century Gothic", "Comic Sans MS", "Impact", "Garamond", "Lucida Console", "Monotype Corsiva"} [index];	
-	} else if (SWT.getPlatform() == "motif") {
-		return new String [] {"urw palladio l", "Courier", "qub", "URW Gothic L", "Times", "Lucida", "URW ChanceryL"} [index];
-	} else if (SWT.getPlatform() == "gtk") {
-		return new String [] {"Luxi Mono", "KacstTitleL", "Baekmuk Batang", "Baekmuk Headline", "KacstFarsi", "Baekmuk Gulim", "URW Chancery L"} [index];
-	} else if (SWT.getPlatform() == "carbon") {
-		return new String [] {"Apple Chancery", "Brush Script MT", "Comic Sans MS", "Impact", "Herculanum", "Lucida Grande", "Papyrus"} [index];
-	} else { // photon, etc ...
-		return new String [] {"Courier", "Verdana"} [index];
-	}
-}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ace_club.jpg b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ace_club.jpg
deleted file mode 100644
index ed5ea31..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ace_club.jpg
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ace_diamond.jpg b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ace_diamond.jpg
deleted file mode 100644
index 3cf13f2..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ace_diamond.jpg
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ace_hearts.jpg b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ace_hearts.jpg
deleted file mode 100644
index e7431b1..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ace_hearts.jpg
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ace_spade.jpg b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ace_spade.jpg
deleted file mode 100644
index f409111..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ace_spade.jpg
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/alpha_img1.png b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/alpha_img1.png
deleted file mode 100644
index 6b410e2..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/alpha_img1.png
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/alpha_img2.png b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/alpha_img2.png
deleted file mode 100644
index b720214..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/alpha_img2.png
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/back.gif b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/back.gif
deleted file mode 100644
index 4fb4150..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/back.gif
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/cube.png b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/cube.png
deleted file mode 100644
index 636a4a3..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/cube.png
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/db.gif b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/db.gif
deleted file mode 100644
index 0a13d8c..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/db.gif
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/font.gif b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/font.gif
deleted file mode 100644
index 6538949..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/font.gif
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/help.gif b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/help.gif
deleted file mode 100644
index 9d70301..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/help.gif
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/home_nav.gif b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/home_nav.gif
deleted file mode 100644
index 4472e8c..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/home_nav.gif
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/houses.png b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/houses.png
deleted file mode 100644
index ef5814c..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/houses.png
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/irmaos.jpg b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/irmaos.jpg
deleted file mode 100644
index 3352cde..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/irmaos.jpg
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/maze.bmp b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/maze.bmp
deleted file mode 100644
index 5b87e76..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/maze.bmp
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/next.gif b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/next.gif
deleted file mode 100644
index e2f8c3e..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/next.gif
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ovals.png b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ovals.png
deleted file mode 100644
index df7fe5e..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/ovals.png
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/pattern1.jpg b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/pattern1.jpg
deleted file mode 100644
index d66a7d0..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/pattern1.jpg
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/pattern2.jpg b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/pattern2.jpg
deleted file mode 100644
index d689eca..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/pattern2.jpg
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/pattern3.jpg b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/pattern3.jpg
deleted file mode 100644
index 81e06ac..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/pattern3.jpg
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/pause.gif b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/pause.gif
deleted file mode 100644
index 161e3f5..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/pause.gif
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/play.gif b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/play.gif
deleted file mode 100644
index 16f4e25..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/play.gif
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/swap.gif b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/swap.gif
deleted file mode 100644
index 870934b..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/swap.gif
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/swt.png b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/swt.png
deleted file mode 100644
index 4049b55..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/swt.png
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/task.gif b/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/task.gif
deleted file mode 100644
index d3d10f5..0000000
--- a/demos/app-model/org.eclipse.swt.examples.graphics/src/org/eclipse/swt/examples/graphics/task.gif
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/.classpath b/demos/app-model/org.eclipse.swt.examples.paint/.classpath
deleted file mode 100644
index ce73933..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<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 kind="output" path="bin"/>
-</classpath>

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/.cvsignore b/demos/app-model/org.eclipse.swt.examples.paint/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/.project b/demos/app-model/org.eclipse.swt.examples.paint/.project
deleted file mode 100644
index 5b3b621..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.swt.examples.paint</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/demos/app-model/org.eclipse.swt.examples.paint/.settings/org.eclipse.jdt.core.prefs b/demos/app-model/org.eclipse.swt.examples.paint/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b356946..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Tue Mar 20 12:28:57 CDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/.settings/org.eclipse.pde.core.prefs b/demos/app-model/org.eclipse.swt.examples.paint/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 3fbf4e3..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/.settings/org.eclipse.pde.core.prefs
+++ /dev/null

@@ -1,4 +0,0 @@
-#Mon Feb 26 13:00:47 CST 2007
-eclipse.preferences.version=1
-pluginProject.extensions=true
-resolve.requirebundle=false

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/META-INF/MANIFEST.MF b/demos/app-model/org.eclipse.swt.examples.paint/META-INF/MANIFEST.MF
deleted file mode 100644
index 5e6ba71..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Paint Plug-in
-Bundle-SymbolicName: org.eclipse.swt.examples.paint;singleton:=true
-Bundle-Version: 1.0.0
-Import-Package: org.eclipse.equinox.app;version="1.0.0",
- org.eclipse.swt,
- org.eclipse.swt.accessibility,
- org.eclipse.swt.events,
- org.eclipse.swt.graphics,
- org.eclipse.swt.layout,
- org.eclipse.swt.widgets
-Require-Bundle: org.eclipse.equinox.app
-Bundle-RequiredExecutionEnvironment: J2SE-1.4

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/build.properties b/demos/app-model/org.eclipse.swt.examples.paint/build.properties
deleted file mode 100644
index e9863e2..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/plugin.xml b/demos/app-model/org.eclipse.swt.examples.paint/plugin.xml
deleted file mode 100644
index 0fbc322..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/plugin.xml
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         id="app"
-         name="Paint"
-         point="org.eclipse.core.runtime.applications">
-      <application
-            cardinality="1"
-            thread="any">
-         <run
-               class="org.eclipse.swt.examples.paint.Application">
-         </run>
-      </application>
-   </extension>
-
-</plugin>

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/examples_paint.properties b/demos/app-model/org.eclipse.swt.examples.paint/src/examples_paint.properties
deleted file mode 100644
index b2ecec5..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/examples_paint.properties
+++ /dev/null

@@ -1,115 +0,0 @@
-###############################################################################
-# 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
-###############################################################################
-error.CouldNotLoadResources = Unable to load resources
-window.title = Paint
-
-menu.Tools.label = Tools
-menu.Options.label = Options
-
-tool.Pencil.label = Pencil
-tool.Pencil.tooltip = Pencil tool
-tool.Pencil.image = tool_pencil.gif
-tool.Pencil.description = Selects the Pencil tool.
-
-tool.Airbrush.label = Airbrush
-tool.Airbrush.tooltip = Airbrush tool
-tool.Airbrush.image = tool_airbrush.gif
-tool.Airbrush.description = Selects the Airbrush tool.
-
-tool.Line.label = Line
-tool.Line.tooltip = Line tool
-tool.Line.image = tool_line.gif
-tool.Line.description = Selects the Line tool.
-
-tool.PolyLine.label = Polygon
-tool.PolyLine.tooltip = Polygon tool
-tool.PolyLine.image = tool_polyline.gif
-tool.PolyLine.description = Selects the PolyLine tool.
-
-tool.Rectangle.label = Rectangle
-tool.Rectangle.tooltip = Rectangle tool
-tool.Rectangle.image = tool_rectangle.gif
-tool.Rectangle.description = Selects the Rectangle tool.
-
-tool.Ellipse.label = Ellipse
-tool.Ellipse.tooltip = Ellipse tool
-tool.Ellipse.image = tool_ellipse.gif
-tool.Ellipse.description = Selects the Ellipse tool.
-
-tool.RoundedRectangle.label = Rounded Rectangle
-tool.RoundedRectangle.tooltip = Rounded Rectangle tool
-tool.RoundedRectangle.image = tool_roundedrectangle.gif
-tool.RoundedRectangle.description = Selects the Rounded Rectangle tool.
-
-tool.Text.label = Text
-tool.Text.tooltip = Text tool
-tool.Text.image = tool_text.gif
-tool.Text.description = Selects the Text tool.
-tool.Text.settings.defaulttext = Hello!
-tool.Text.dialog.title = Text Tool Settings
-tool.Text.dialog.message = Please enter the new text string to be painted.
-
-tool.Null.label = <none>
-
-fill.None.label = No Fill
-fill.None.tooltip = No fill mode
-fill.None.image = fill_none.gif
-fill.None.description = Selects No Fill mode.
-
-fill.Outline.label = Outline Fill
-fill.Outline.tooltip = Outline fill mode
-fill.Outline.image = fill_outline.gif
-fill.Outline.description = Selects Outline Fill mode.
-
-fill.Solid.label = Solid Fill
-fill.Solid.tooltip = Solid fill mode
-fill.Solid.image = fill_solid.gif
-fill.Solid.description = Selects Solid Fill mode.
-
-linestyle.Solid.label = Solid Line
-linestyle.Solid.tooltip = Solid line style
-linestyle.Solid.image = linestyle_solid.gif
-linestyle.Solid.description = Select Solid Line style.
-
-linestyle.Dot.label = Dotted Line
-linestyle.Dot.tooltip = Dotted line style
-linestyle.Dot.image = linestyle_dot.gif
-linestyle.Dot.description = Select Dotted Line style.
-
-linestyle.Dash.label = Dashed Line
-linestyle.Dash.tooltip = Dashed line style
-linestyle.Dash.image = linestyle_dash.gif
-linestyle.Dash.description = Select Dashed Line style.
-
-linestyle.DashDot.label = Dash-Dot Line
-linestyle.DashDot.tooltip = Dash-Dot line style
-linestyle.DashDot.image = linestyle_dashdot.gif
-linestyle.DashDot.description = Select Dash-Dot Line style.
-
-options.Font.label = Text Tool Font
-options.Font.tooltip = Select Text Tool font
-options.Font.image = options_font.gif
-options.Font.description = Selects Text Tool font.
-options.Font.dialog.title = Text Tool Font
-
-settings.AirbrushRadius.text = Airbrush Radius
-settings.AirbrushIntensity.text = Airbrush Intensity
-
-session.Null.message = Select a tool...
-session.ContinuousPaint.message = Click and drag to draw...
-session.DragInteractivePaint.message = Click and drag to preview, release to draw, right-click to cancel...
-session.SegmentedInteractivePaint.message.anchorMode = Click to set anchor...
-session.SegmentedInteractivePaint.message.interactiveMode = Click to draw, double-click to close figure, right-click to cancel...
-session.Text.message = Click to draw text, right-click to edit text...
-
-status.Coord.format = ({0}, {1})
-status.CoordRange.format = ({0}, {1}) - ({2}, {3})
-status.Bar.format = {0} : {1}   {2}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/AirbrushTool.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/AirbrushTool.java
deleted file mode 100644
index e42c6f5..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/AirbrushTool.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-
-import java.util.Random;
-import org.eclipse.swt.graphics.*;
-
-/**
- * An airbrush tool.
- */
-public class AirbrushTool extends ContinuousPaintSession implements PaintTool {
-	private ToolSettings settings;
-	private Random random;
-	private int cachedRadiusSquared;
-	private int cachedNumPoints;
-	
-	/**
-	 * Constructs a Tool.
-	 * 
-	 * @param toolSettings the new tool settings
-	 * @param paintSurface the PaintSurface we will render on.
-	 */
-	public AirbrushTool(ToolSettings toolSettings, PaintSurface paintSurface) {
-		super(paintSurface);
-		random = new Random();
-		setRetriggerTimer(10);
-		set(toolSettings);
-	}
-	
-	/**
-	 * Sets the tool's settings.
-	 * 
-	 * @param toolSettings the new tool settings
-	 */
-	public void set(ToolSettings toolSettings) {
-		// compute things we need to know for drawing
-		settings = toolSettings;
-		cachedRadiusSquared = settings.airbrushRadius * settings.airbrushRadius;
-		cachedNumPoints = 314 * settings.airbrushIntensity * cachedRadiusSquared / 250000;
-		if (cachedNumPoints == 0 && settings.airbrushIntensity != 0)
-			cachedNumPoints = 1;
-	}
-
-	/**
-	 * Returns the name associated with this tool.
-	 * 
-	 * @return the localized name of this tool
-	 */
-	public String getDisplayName() {
-		return PaintExample.getResourceString("tool.Airbrush.label");
-	}
-
-	/*
-	 * Template method for drawing
-	 */
-	protected void render(Point point) {
-		// Draws a bunch (cachedNumPoints) of random pixels within a specified circle (cachedRadiusSquared).
-		ContainerFigure cfig = new ContainerFigure();
-
-		for (int i = 0; i < cachedNumPoints; ++i) {
-			int randX, randY;
-			do {
-				randX = (int) ((random.nextDouble() - 0.5) * settings.airbrushRadius * 2.0);
-				randY = (int) ((random.nextDouble() - 0.5) * settings.airbrushRadius * 2.0);
-			} while (randX * randX + randY * randY > cachedRadiusSquared);
-			cfig.add(new PointFigure(settings.commonForegroundColor, point.x + randX, point.y + randY));
-		}
-		getPaintSurface().drawFigure(cfig);
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/Application.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/Application.java
deleted file mode 100644
index 5eb7b59..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/Application.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-import org.eclipse.equinox.app.IApplication;
-import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.swt.widgets.Display;
-
-public class Application implements IApplication {
-	PaintExample app;
-
-	public Object start(IApplicationContext context) throws Exception {
-		final Display display = Display.getDefault();
-		display.syncExec(new Runnable() {
-			public void run() {
-				app = PaintExample.runApplication(display);
-			}
-		});
-		context.applicationRunning();
-		while (!app.isDisposed())
-			Thread.sleep(200);
-		return null;
-	}
-
-	public void stop() {
-		Display.getDefault().syncExec(new Runnable() {
-			public void run() {
-				if (app != null && !app.isDisposed())
-					app.dispose();
-			}
-		});
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/BasicPaintSession.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/BasicPaintSession.java
deleted file mode 100644
index fc2fdf4..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/BasicPaintSession.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-
-public abstract class BasicPaintSession implements PaintSession {
-	/**
-	 * The paint surface
-	 */
-	private PaintSurface paintSurface;
-
-	/**
-	 * Constructs a PaintSession.
-	 * 
-	 * @param paintSurface the drawing surface to use
-	 */
-	protected BasicPaintSession(PaintSurface paintSurface) {
-		this.paintSurface = paintSurface;
-	}
-
-	/**
-	 * Returns the paint surface associated with this paint session.
-	 * 
-	 * @return the associated PaintSurface
-	 */
-	public PaintSurface getPaintSurface() {
-		return paintSurface;
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/ContainerFigure.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/ContainerFigure.java
deleted file mode 100644
index df7753a..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/ContainerFigure.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-
-import org.eclipse.swt.graphics.*;
-
-/**
- * Container for Figure objects with stacking preview mechanism.
- */
-public class ContainerFigure extends Figure {
-	private static final int INITIAL_ARRAY_SIZE = 16;
-	
-	Figure[]   objectStack = null;
-	int      nextIndex = 0;
-
-	/**
-	 * Constructs an empty Container
-	 */
-	public ContainerFigure() {
-	}
-	/**
-	 * Adds an object to the container for later drawing.
-	 * 
-	 * @param object the object to add to the drawing list
-	 */
-	public void add(Figure object) {
-		if (objectStack == null) {
-			objectStack = new Figure[INITIAL_ARRAY_SIZE];
-		} else if (objectStack.length <= nextIndex) {
-			Figure[] newObjectStack = new Figure[objectStack.length * 2];
-			System.arraycopy(objectStack, 0, newObjectStack, 0, objectStack.length);
-			objectStack = newObjectStack;
-		}
-		objectStack[nextIndex] = object;
-		++nextIndex;
-	}
-	/**
-	 * Determines if the container is empty.
-	 * @return true if the container is empty
-	 */
-	public boolean isEmpty() {
-		return nextIndex == 0;
-	}
-	/**
-	 * Adds an object to the container and draws its preview then updates the supplied preview state.
-	 * 
-	 * @param object the object to add to the drawing list
-	 * @param gc the GC to draw on
-	 * @param offset the offset to add to virtual coordinates to get display coordinates
-	 * @param rememberedState the state returned by a previous drawPreview() or addAndPreview()
-	 *        using this Container, may be null if there was no such previous call
-	 * @return object state that must be passed to erasePreview() later to erase this object
-	 */
-//	public Object addAndPreview(Figure object, GC gc, Point offset, Object rememberedState) {
-//		Object[] stateStack = (Object[]) rememberedState;
-//		if (stateStack == null) {
-//			stateStack = new Object[INITIAL_ARRAY_SIZE];
-//		} else if (stateStack.length <= nextIndex) {
-//			Object[] newStateStack = new Object[stateStack.length * 2];
-//			System.arraycopy(stateStack, 0, newStateStack, 0, stateStack.length);
-//			stateStack = newStateStack;
-//		}
-//		add(object);
-//		stateStack[nextIndex - 1] = object.drawPreview(gc, offset);
-//		return stateStack;
-//	}
-	/**
-	 * Clears the container.
-	 * <p>
-	 * Note that erasePreview() cannot be called after this point to erase any previous
-	 * drawPreview()'s.
-	 * </p>
-	 */
-	public void clear() {
-		while (--nextIndex > 0) objectStack[nextIndex] = null;
-		nextIndex = 0;
-	}
-	public void draw(FigureDrawContext fdc) {
-		for (int i = 0; i < nextIndex; ++i) objectStack[i].draw(fdc);
-	}
-	public void addDamagedRegion(FigureDrawContext fdc, Region region) {
-		for (int i = 0; i < nextIndex; ++i) objectStack[i].addDamagedRegion(fdc, region);
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/ContinuousPaintSession.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/ContinuousPaintSession.java
deleted file mode 100644
index b415351..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/ContinuousPaintSession.java
+++ /dev/null

@@ -1,234 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * The superclass for paint tools that draw continuously along the path
- * traced by the mouse's movement while the button is depressed
- */
-public abstract class ContinuousPaintSession extends BasicPaintSession {
-	/**
-	 * True if a click-drag is in progress.
-	 */
-	private boolean dragInProgress = false;
-	
-	/**
-	 * A cached Point array for drawing.
-	 */
-	private Point[] points = new Point[] { new Point(-1, -1), new Point(-1, -1) };
-
-	/**
-	 * The time to wait between retriggers in milliseconds.
-	 */
-	private int retriggerInterval = 0;
-	
-	/**
-	 * The currently valid RetriggerHandler
-	 */
-	protected Runnable retriggerHandler = null;
-
-	/**
-	 * Constructs a ContinuousPaintSession.
-	 * 
-	 * @param paintSurface the drawing surface to use
-	 */
-	protected ContinuousPaintSession(PaintSurface paintSurface) {
-		super(paintSurface);
-	}
-
-	/**
-	 * Sets the retrigger timer.
-	 * <p>
-	 * After the timer elapses, if the mouse is still hovering over the same point with the
-	 * drag button pressed, a new render order is issued and the timer is restarted.
-	 * </p>
-	 * @param interval the time in milliseconds to wait between retriggers, 0 to disable
-	 */
-	public void setRetriggerTimer(int interval) {
-		retriggerInterval = interval;
-	}
-
-	/**
-	 * Activates the tool.
-	 */
-	public void beginSession() {
-		getPaintSurface().
-			setStatusMessage(PaintExample.getResourceString("session.ContinuousPaint.message"));
-		dragInProgress = false;
-	}
-	
-	/**
-	 * Deactivates the tool.
-     */
-	public void endSession() {
-		abortRetrigger();
-	}
-	
-	/**
-	 * Aborts the current operation.
-	 */
-	public void resetSession() {
-		abortRetrigger();
-	}
-
-	/**
-	 * Handles a mouseDown event.
-	 * 
-	 * @param event the mouse event detail information
-	 */
-	public final void mouseDown(MouseEvent event) {
-		if (event.button != 1) return;
-		if (dragInProgress) return; // spurious event
-		dragInProgress = true;
-
-		points[0].x = event.x;
-		points[0].y = event.y;
-		render(points[0]);
-		prepareRetrigger();
-	}
-
-	/**
-	 * Handles a mouseDoubleClick event.
-	 * 
-	 * @param event the mouse event detail information
-	 */
-	public final void mouseDoubleClick(MouseEvent event) {
-	}
-
-	/**
-	 * Handles a mouseUp event.
-	 * 
-	 * @param event the mouse event detail information
-	 */
-	public final void mouseUp(MouseEvent event) {
-		if (event.button != 1) return;
-		if (! dragInProgress) return; // spurious event
-		abortRetrigger();
-		mouseSegmentFinished(event);
-		dragInProgress = false;
-	}
-	
-	/**
-	 * Handles a mouseMove event.
-	 * 
-	 * @param event the mouse event detail information
-	 */
-	public final void mouseMove(MouseEvent event) {
-		final PaintSurface ps = getPaintSurface();
-		ps.setStatusCoord(ps.getCurrentPosition());
-		if (! dragInProgress) return;
-		mouseSegmentFinished(event);
-		prepareRetrigger();
-	}
-	
-	/**
-	 * Handle a rendering segment
-	 * 
-	 * @param event the mouse event detail information
-	 */
-	private final void mouseSegmentFinished(MouseEvent event) {
-		if (points[0].x == -1) return; // spurious event
-		if (points[0].x != event.x || points[0].y != event.y) {
-			// draw new segment
-			points[1].x = event.x;
-			points[1].y = event.y;
-			renderContinuousSegment();
-		}
-	}
-
-	/**
-	 * Draws a continuous segment from points[0] to points[1].
-	 * Assumes points[0] has been drawn already.
-	 * 
-	 * @post points[0] will refer to the same point as points[1]
-	 */
-	protected void renderContinuousSegment() {
-		/* A lazy but effective line drawing algorithm */
-		final int dX = points[1].x - points[0].x;
-		final int dY = points[1].y - points[0].y;
-		int absdX = Math.abs(dX);
-		int absdY = Math.abs(dY);
-
-		if ((dX == 0) && (dY == 0)) return;
-		
-		if (absdY > absdX) {
-			final int incfpX = (dX << 16) / absdY;
-			final int incY = (dY > 0) ? 1 : -1;
-			int fpX = points[0].x << 16; // X in fixedpoint format
-
-			while (--absdY >= 0) {
-				points[0].y += incY;
-				points[0].x = (fpX += incfpX) >> 16;
-				render(points[0]);
-			}
-			if (points[0].x == points[1].x) return;
-			points[0].x = points[1].x;
-		} else {
-			final int incfpY = (dY << 16) / absdX;
-			final int incX = (dX > 0) ? 1 : -1;
-			int fpY = points[0].y << 16; // Y in fixedpoint format
-
-			while (--absdX >= 0) {
-				points[0].x += incX;
-				points[0].y = (fpY += incfpY) >> 16;
-				render(points[0]);
-			}
-			if (points[0].y == points[1].y) return;
-			points[0].y = points[1].y;
-		}
-		render(points[0]);
-	}		
-
-	/**
-	 * Prepare the retrigger timer
-	 */
-	private final void prepareRetrigger() {
-		if (retriggerInterval > 0) {
-			/*
-			 * timerExec() provides a lightweight mechanism for running code at intervals from within
-			 * the event loop when timing accuracy is not important.
-			 *
-			 * Since it is not possible to cancel a timerExec(), we remember the Runnable that is
-			 * active in order to distinguish the valid one from the stale ones.  In practice,
-			 * if the interval is 1/100th of a second, then creating a few hundred new RetriggerHandlers
-			 * each second will not cause a significant performance hit.
-			 */
-			Display display = getPaintSurface().getDisplay();
-			retriggerHandler = new Runnable() {
-				public void run() {
-					if (retriggerHandler == this) {
-						render(points[0]);
-						prepareRetrigger();
-					}
-				}
-			};			
-			display.timerExec(retriggerInterval, retriggerHandler);
-		}
-	}
-
-	/**
-	 * Aborts the retrigger timer
-	 */
-	private final void abortRetrigger() {
-		retriggerHandler = null;
-	}
-	
-	/**
-	 * Template method: Renders a point.
-	 * @param point, the point to render
-	 */
-	protected abstract void render(Point point);
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/DragPaintSession.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/DragPaintSession.java
deleted file mode 100644
index 0401ca2..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/DragPaintSession.java
+++ /dev/null

@@ -1,136 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.graphics.*;
-
-/**
- * The superclass for paint tools that use click-drag-release motions to
- * draw objects.
- */
-public abstract class DragPaintSession extends BasicPaintSession {
-	/**
-	 * True if a click-drag is in progress
-	 */
-	private boolean dragInProgress = false;
-	
-	/**
-	 * The position of the first click in a click-drag
-	 */
-	private Point anchorPosition = new Point(-1, -1);
-
-	/**
-	 * A temporary point
-	 */
-	private Point tempPosition = new Point(-1, -1);
-	
-	/**
-	 * Constructs a PaintSession.
-	 * 
-	 * @param getPaintSurface() the drawing surface to use
-	 */
-	protected DragPaintSession(PaintSurface paintSurface) {
-		super(paintSurface);
-	}
-
-	/**
-	 * Activates the tool.
-	 */
-	public void beginSession() {
-		getPaintSurface().
-			setStatusMessage(PaintExample.getResourceString("session.DragInteractivePaint.message"));
-		anchorPosition.x = -1;
-		dragInProgress = false;
-	}
-	
-	/**
-	 * Deactivates the tool.
-     */
-	public void endSession() {
-	}
-	
-	/**
-	 * Resets the tool.
-	 * Aborts any operation in progress.
-	 */
-	public void resetSession() {
-		getPaintSurface().clearRubberbandSelection();
-		anchorPosition.x = -1;
-		dragInProgress = false;
-	}
-
-	/**
-	 * Handles a mouseDown event.
-	 * 
-	 * @param event the mouse event detail information
-	 */
-	public void mouseDown(MouseEvent event) {
-		if (event.button != 1) return;
-		if (dragInProgress) return; // spurious event
-		dragInProgress = true;
-		
-		anchorPosition.x = event.x;
-		anchorPosition.y = event.y;
-	}
-
-	/**
-	 * Handles a mouseDoubleClick event.
-	 * 
-	 * @param event the mouse event detail information
-	 */
-	public void mouseDoubleClick(MouseEvent event) {
-	}
-
-	/**
-	 * Handles a mouseUp event.
-	 * 
-	 * @param event the mouse event detail information
-	 */
-	public void mouseUp(MouseEvent event) {
-		if (event.button != 1) {
-			resetSession(); // abort if right or middle mouse button pressed
-			return;
-		}
-		if (! dragInProgress) return; // spurious event
-		dragInProgress = false;
-		if (anchorPosition.x == -1) return; // spurious event
-		
-		getPaintSurface().commitRubberbandSelection();
-	}
-	
-	/**
-	 * Handles a mouseMove event.
-	 * 
-	 * @param event the mouse event detail information
-	 */
-	public void mouseMove(MouseEvent event) {
-		final PaintSurface ps = getPaintSurface();
-		if (! dragInProgress) {
-			ps.setStatusCoord(ps.getCurrentPosition());
-			return;
-		}
-		ps.setStatusCoordRange(anchorPosition, ps.getCurrentPosition());
-		ps.clearRubberbandSelection();
-		tempPosition.x = event.x;
-		tempPosition.y = event.y;
-		ps.addRubberbandSelection(createFigure(anchorPosition, tempPosition));
-	}
-	
-	/**
-	 * Template Method: Creates a Figure for drawing rubberband entities and the final product
-	 * 
-	 * @param anchor the anchor point
-	 * @param cursor the point marking the current pointer location
-	 */
-	protected abstract Figure createFigure(Point anchor, Point cursor);
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/EllipseFigure.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/EllipseFigure.java
deleted file mode 100644
index ed07ef2..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/EllipseFigure.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-
-/**
- * 2D Ellipse object
- */
-public class EllipseFigure extends Figure {
-	private Color foregroundColor, backgroundColor;
-	private int lineStyle, x1, y1, x2, y2;
-	/**
-	 * Constructs an Ellipse
-	 * These objects are defined by any two diametrically opposing corners of a box
-	 * bounding the ellipse.
-	 * 
-	 * @param color the color for this object
-	 * @param lineStyle the line style for this object
-	 * @param x1 the virtual X coordinate of the first corner
-	 * @param y1 the virtual Y coordinate of the first corner
-	 * @param x2 the virtual X coordinate of the second corner
-	 * @param y2 the virtual Y coordinate of the second corner
-	 */
-	public EllipseFigure(Color foregroundColor, Color backgroundColor, int lineStyle, int x1, int y1, int x2, int y2) {
-		this.foregroundColor = foregroundColor;
-		this.backgroundColor = backgroundColor;
-		this.lineStyle = lineStyle;
-		this.x1 = x1; this.y1 = y1; this.x2 = x2; this.y2 = y2;
-	}
-	public void draw(FigureDrawContext fdc) {
-		Rectangle r = fdc.toClientRectangle(x1, y1, x2, y2);
-		fdc.gc.setForeground(foregroundColor);
-		fdc.gc.setBackground(backgroundColor);
-		fdc.gc.setLineStyle(lineStyle);
-		fdc.gc.drawOval(r.x, r.y, r.width - 1, r.height - 1);
-		fdc.gc.setLineStyle(SWT.LINE_SOLID);
-	}
-	public void addDamagedRegion(FigureDrawContext fdc, Region region) {
-		region.add(fdc.toClientRectangle(x1, y1, x2, y2));
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/EllipseTool.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/EllipseTool.java
deleted file mode 100644
index 6611c76..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/EllipseTool.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-
-import org.eclipse.swt.graphics.*;
-
-/**
- * A drawing tool.
- */
-public class EllipseTool extends DragPaintSession implements PaintTool {
-	private ToolSettings settings;
-
-	/**
-	 * Constructs a EllipseTool.
-	 * 
-	 * @param toolSettings the new tool settings
-	 * @param paintSurface the PaintSurface we will render on.
-	 */
-	public EllipseTool(ToolSettings toolSettings, PaintSurface paintSurface) {
-		super(paintSurface);
-		set(toolSettings);
-	}
-
-	/**
-	 * Sets the tool's settings.
-	 * 
-	 * @param toolSettings the new tool settings
-	 */
-	public void set(ToolSettings toolSettings) {
-		settings = toolSettings;
-	}
-
-	/**
-	 * Returns name associated with this tool.
-	 * 
-	 * @return the localized name of this tool
-	 */
-	public String getDisplayName() {
-		return PaintExample.getResourceString("tool.Ellipse.label");
-	}
-
-	/*
-	 * Template methods for drawing
-	 */
-	protected Figure createFigure(Point a, Point b) {
-		ContainerFigure container = new ContainerFigure();
-		if (settings.commonFillType != ToolSettings.ftNone)
-			container.add(new SolidEllipseFigure(settings.commonBackgroundColor, a.x, a.y, b.x, b.y));
-		if (settings.commonFillType != ToolSettings.ftSolid)
-			container.add(new EllipseFigure(settings.commonForegroundColor, settings.commonBackgroundColor, settings.commonLineStyle,
-				a.x, a.y, b.x, b.y));
-		return container;
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/Figure.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/Figure.java
deleted file mode 100644
index 7fce7e6..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/Figure.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-
-import org.eclipse.swt.graphics.*;
-
-/**
- * Superinterface for all drawing objects.
- * All drawing objects know how to render themselved to the screen and can draw a
- * temporary version of themselves for previewing the general appearance of the
- * object onscreen before it gets committed.
- */
-public abstract class Figure {
-	/**
-	 * Draws this object.
-	 * 
-	 * @param fdc a parameter block specifying drawing-related information
-	 */
-	public abstract void draw(FigureDrawContext fdc);
-
-	/**
-	 * Computes the damaged screen region caused by drawing this object (imprecise), then
-	 * appends it to the supplied region.
-	 * 
-	 * @param fdc a parameter block specifying drawing-related information
-	 * @param region a region to which additional damage areas will be added
-	 */
-	public abstract void addDamagedRegion(FigureDrawContext fdc, Region region);
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/FigureDrawContext.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/FigureDrawContext.java
deleted file mode 100644
index c4ab18d..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/FigureDrawContext.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-
-import org.eclipse.swt.graphics.*;
-
-public class FigureDrawContext {
-	/*
-	 * <p>
-	 * The GC must be set up as follows
-	 * (it will be returned to this state upon completion of drawing operations)
-	 * <ul>
-	 *   <li>setXORMode(false)
-	 * </ul>
-	 * </p>
-	 */
-	public GC gc = null;
-	public int xOffset = 0, yOffset = 0; // substract to get GC coords
-	public int xScale = 1, yScale = 1;
-	
-	public Rectangle toClientRectangle(int x1, int y1, int x2, int y2) {
-		return new Rectangle(
-			Math.min(x1, x2) * xScale - xOffset,
-			Math.min(y1, y2) * yScale - yOffset,
-			(Math.abs(x2 - x1) + 1) * xScale,
-			(Math.abs(y2 - y1) + 1) * yScale);
-	}
-	public Point toClientPoint(int x, int y) {
-		return new Point(x * xScale - xOffset, y * yScale - yOffset);
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/LineFigure.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/LineFigure.java
deleted file mode 100644
index 023fd19..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/LineFigure.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-
-/**
- * 2D Line object
- */
-public class LineFigure extends Figure {
-	private Color foregroundColor, backgroundColor;
-	private int lineStyle, x1, y1, x2, y2;
-	/**
-	 * Constructs a Line
-	 * These objects are defined by their two end-points.
-	 * 
-	 * @param color the color for this object
-	 * @param lineStyle the line style for this object
-	 * @param x1 the virtual X coordinate of the first end-point
-	 * @param y1 the virtual Y coordinate of the first end-point
-	 * @param x2 the virtual X coordinate of the second end-point
-	 * @param y2 the virtual Y coordinate of the second end-point
-	 */
-	public LineFigure(Color foregroundColor, Color backgroundColor, int lineStyle, int x1, int y1, int x2, int y2) {
-		this.foregroundColor = foregroundColor;
-		this.backgroundColor = backgroundColor;
-		this.lineStyle = lineStyle;
-		this.x1 = x1; this.y1 = y1; this.x2 = x2; this.y2 = y2;
-	}
-	public void draw(FigureDrawContext fdc) {
-		Point p1 = fdc.toClientPoint(x1, y1);
-		Point p2 = fdc.toClientPoint(x2, y2);
-		fdc.gc.setForeground(foregroundColor);
-		fdc.gc.setBackground(backgroundColor);
-		fdc.gc.setLineStyle(lineStyle);
-		fdc.gc.drawLine(p1.x, p1.y, p2.x, p2.y);
-		fdc.gc.setLineStyle(SWT.LINE_SOLID);
-	}
-	public void addDamagedRegion(FigureDrawContext fdc, Region region) {
-		region.add(fdc.toClientRectangle(x1, y1, x2, y2));
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/LineTool.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/LineTool.java
deleted file mode 100644
index e8a64a2..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/LineTool.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-
-import org.eclipse.swt.graphics.*;
-
-/**
- * A line drawing tool
- */
-public class LineTool extends DragPaintSession implements PaintTool {
-	private ToolSettings settings;
-
-	/**
-	 * Constructs a LineTool.
-	 * 
-	 * @param toolSettings the new tool settings
-	 * @param paintSurface the PaintSurface we will render on.
-	 */
-	public LineTool(ToolSettings toolSettings, PaintSurface paintSurface) {
-		super(paintSurface);
-		set(toolSettings);
-	}
-	
-	/**
-	 * Sets the tool's settings.
-	 * 
-	 * @param toolSettings the new tool settings
-	 */
-	public void set(ToolSettings toolSettings) {
-		settings = toolSettings;
-	}
-	
-	/**
-	 * Returns name associated with this tool.
-	 * 
-	 * @return the localized name of this tool
-	 */
-	public String getDisplayName() {
-		return PaintExample.getResourceString("tool.Line.label");
-	}
-
-	/*
-	 * Template methods for drawing
-	 */
-	protected Figure createFigure(Point a, Point b) {
-		return new LineFigure(settings.commonForegroundColor, settings.commonBackgroundColor, settings.commonLineStyle,
-			a.x, a.y, b.x, b.y);
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintExample.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintExample.java
deleted file mode 100644
index 90e4382..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintExample.java
+++ /dev/null

@@ -1,605 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.accessibility.*;
-
-import java.io.*;
-import java.text.*;
-import java.util.*;
-
-public class PaintExample {
-	private static ResourceBundle resourceBundle =
-		ResourceBundle.getBundle("examples_paint");
-	private Composite mainComposite;
-	private Canvas activeForegroundColorCanvas;
-	private Canvas activeBackgroundColorCanvas;
-	private Color paintColorBlack, paintColorWhite; // alias for paintColors[0] and [1]
-	private Color[] paintColors;
-	private Font paintDefaultFont; // do not free
-	private static final int numPaletteRows = 3;
-	private static final int numPaletteCols = 50;
-	private ToolSettings toolSettings; // current active settings
-	private PaintSurface paintSurface; // paint surface for drawing
-
-	static final int Pencil_tool = 0;
-	static final int Airbrush_tool = 1;
-	static final int Line_tool = 2;
-	static final int PolyLine_tool = 3;
-	static final int Rectangle_tool = 4;
-	static final int RoundedRectangle_tool = 5;
-	static final int Ellipse_tool = 6;
-	static final int Text_tool = 7;
-	static final int None_fill = 8;
-	static final int Outline_fill = 9;
-	static final int Solid_fill = 10;
-	static final int Solid_linestyle = 11;
-	static final int Dash_linestyle = 12;
-	static final int Dot_linestyle = 13;
-	static final int DashDot_linestyle = 14;
-	static final int Font_options = 15;
-	
-	static final int Default_tool = Pencil_tool;
-	static final int Default_fill = None_fill;
-	static final int Default_linestyle = Solid_linestyle;
-	
-	public static final Tool[] tools = {
-		new Tool(Pencil_tool, "Pencil", "tool", SWT.RADIO),
-		new Tool(Airbrush_tool, "Airbrush", "tool", SWT.RADIO),
-		new Tool(Line_tool, "Line", "tool", SWT.RADIO),
-		new Tool(PolyLine_tool, "PolyLine", "tool", SWT.RADIO),
-		new Tool(Rectangle_tool, "Rectangle", "tool", SWT.RADIO),
-		new Tool(RoundedRectangle_tool, "RoundedRectangle", "tool", SWT.RADIO),
-		new Tool(Ellipse_tool, "Ellipse", "tool", SWT.RADIO),
-		new Tool(Text_tool, "Text", "tool", SWT.RADIO),
-		new Tool(None_fill, "None", "fill", SWT.RADIO, new Integer(ToolSettings.ftNone)),
-		new Tool(Outline_fill, "Outline", "fill", SWT.RADIO, new Integer(ToolSettings.ftOutline)),
-		new Tool(Solid_fill, "Solid", "fill", SWT.RADIO, new Integer(ToolSettings.ftSolid)),
-		new Tool(Solid_linestyle, "Solid", "linestyle", SWT.RADIO, new Integer(SWT.LINE_SOLID)),
-		new Tool(Dash_linestyle, "Dash", "linestyle", SWT.RADIO, new Integer(SWT.LINE_DASH)),
-		new Tool(Dot_linestyle, "Dot", "linestyle", SWT.RADIO, new Integer(SWT.LINE_DOT)),
-		new Tool(DashDot_linestyle, "DashDot", "linestyle", SWT.RADIO, new Integer(SWT.LINE_DASHDOT)),
-		new Tool(Font_options, "Font", "options", SWT.PUSH)
-	};
-
-	/**
-	 * Creates an instance of a PaintExample embedded inside
-	 * the supplied parent Composite.
-	 * 
-	 * @param parent the container of the example
-	 */
-	public PaintExample(Composite parent) {
-		mainComposite = parent;
-		initResources();
-		initActions();
-		init();
-	}
-
-	/**
-	 * Invokes as a standalone program.
-	 */
-	public static void main(String[] args) {
-		Display display = new Display();
-		Shell shell = new Shell(display);
-		shell.setText(getResourceString("window.title"));
-		shell.setLayout(new GridLayout());
-		PaintExample instance = new PaintExample(shell);
-		instance.createToolBar(shell);
-		Composite composite = new Composite(shell, SWT.NONE);
-		composite.setLayout(new FillLayout());
-		composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		instance.createGUI(composite);
-		instance.setDefaults();
-		setShellSize(display, shell);
-		shell.open();
-		while (! shell.isDisposed()) {
-			if (! display.readAndDispatch()) display.sleep();
-		}
-		instance.dispose();
-	}
-
-	public static PaintExample runApplication(Display display) {
-		Shell shell = new Shell(display);
-		shell.setText(getResourceString("window.title"));
-		shell.setLayout(new GridLayout());
-		PaintExample instance = new PaintExample(shell);
-		instance.createToolBar(shell);
-		Composite composite = new Composite(shell, SWT.NONE);
-		composite.setLayout(new FillLayout());
-		composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		instance.createGUI(composite);
-		instance.setDefaults();
-		setShellSize(display, shell);
-		shell.open();
-		return instance;
-	}
-
-	public boolean isDisposed() {
-		return mainComposite.isDisposed();
-	}
-
-	/**
-	 * Creates the toolbar.
-	 * Note: Only called by standalone.
-	 */
-	private void createToolBar(Composite parent) {
-		ToolBar toolbar = new ToolBar (parent, SWT.NONE);
-		String group = null;
-		for (int i = 0; i < tools.length; i++) {
-			Tool tool = tools[i];
-			if (group != null && !tool.group.equals(group)) {
-				new ToolItem (toolbar, SWT.SEPARATOR);
-			}
-			group = tool.group;
-			ToolItem item = addToolItem(toolbar, tool);
-			if (i == Default_tool || i == Default_fill || i == Default_linestyle) item.setSelection(true);
-		}
-	}
-
-	/**
-	 * Adds a tool item to the toolbar.
-	 * Note: Only called by standalone.
-	 */
-	private ToolItem addToolItem(final ToolBar toolbar, final Tool tool) {
-		final String id = tool.group + '.' + tool.name;
-		ToolItem item = new ToolItem (toolbar, tool.type);
-		item.setText (getResourceString(id + ".label"));
-		item.setToolTipText(getResourceString(id + ".tooltip"));
-		item.setImage(tool.image);
-		item.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				tool.action.run();
-			}
-		});
-		final int childID = toolbar.indexOf(item);
-		toolbar.getAccessible().addAccessibleListener(new AccessibleAdapter() {
-			public void getName(org.eclipse.swt.accessibility.AccessibleEvent e) {
-				if (e.childID == childID) {
-					e.result = getResourceString(id + ".description");
-				}
-			}
-		});
-		return item;
-	}
-
-	/**
-	 * Sets the default tool item states.
-	 */
-	public void setDefaults() {
-		setPaintTool(Default_tool);
-		setFillType(Default_fill);
-		setLineStyle(Default_linestyle);
-		setForegroundColor(paintColorBlack);
-		setBackgroundColor(paintColorWhite);
-	}
-
-	/**
-	 * Creates the GUI.
-	 */
-	public void createGUI(Composite parent) {
-		GridLayout gridLayout;
-		GridData gridData;
-
-		/*** Create principal GUI layout elements ***/		
-		Composite displayArea = new Composite(parent, SWT.NONE);
-		gridLayout = new GridLayout();
-		gridLayout.numColumns = 1;
-		displayArea.setLayout(gridLayout);
-
-		// Creating these elements here avoids the need to instantiate the GUI elements
-		// in strict layout order.  The natural layout ordering is an artifact of using
-		// SWT layouts, but unfortunately it is not the same order as that required to
-		// instantiate all of the non-GUI application elements to satisfy referential
-		// dependencies.  It is possible to reorder the initialization to some extent, but
-		// this can be very tedious.
-		
-		// paint canvas
-		final Canvas paintCanvas = new Canvas(displayArea, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL |
-			SWT.NO_REDRAW_RESIZE | SWT.NO_BACKGROUND);
-		gridData = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
-		paintCanvas.setLayoutData(gridData);
-		paintCanvas.setBackground(paintColorWhite);
-		
-		// color selector frame
-		final Composite colorFrame = new Composite(displayArea, SWT.NONE);
-		gridData = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL);
-		colorFrame.setLayoutData(gridData);
-
-		// tool settings frame
-		final Composite toolSettingsFrame = new Composite(displayArea, SWT.NONE);
-		gridData = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL);
-		toolSettingsFrame.setLayoutData(gridData);
-
-		// status text
-		final Text statusText = new Text(displayArea, SWT.BORDER | SWT.SINGLE | SWT.READ_ONLY);
-		gridData = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL);
-		statusText.setLayoutData(gridData);
-
-		/*** Create the remaining application elements inside the principal GUI layout elements ***/	
-		// paintSurface
-		paintSurface = new PaintSurface(paintCanvas, statusText, paintColorWhite);
-
-		// finish initializing the tool data
-		tools[Pencil_tool].data = new PencilTool(toolSettings, paintSurface);
-		tools[Airbrush_tool].data = new AirbrushTool(toolSettings, paintSurface);
-		tools[Line_tool].data = new LineTool(toolSettings, paintSurface);
-		tools[PolyLine_tool].data = new PolyLineTool(toolSettings, paintSurface);
-		tools[Rectangle_tool].data = new RectangleTool(toolSettings, paintSurface);
-		tools[RoundedRectangle_tool].data = new RoundedRectangleTool(toolSettings, paintSurface);
-		tools[Ellipse_tool].data = new EllipseTool(toolSettings, paintSurface);
-		tools[Text_tool].data = new TextTool(toolSettings, paintSurface);
-
-		// colorFrame		
-		gridLayout = new GridLayout();
-		gridLayout.numColumns = 3;
-		gridLayout.marginHeight = 0;
-		gridLayout.marginWidth = 0;
-		colorFrame.setLayout(gridLayout);
-
-		// activeForegroundColorCanvas, activeBackgroundColorCanvas
-		activeForegroundColorCanvas = new Canvas(colorFrame, SWT.BORDER);
-		gridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gridData.heightHint = 24;
-		gridData.widthHint = 24;
-		activeForegroundColorCanvas.setLayoutData(gridData);
-
-		activeBackgroundColorCanvas = new Canvas(colorFrame, SWT.BORDER);
-		gridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gridData.heightHint = 24;
-		gridData.widthHint = 24;
-		activeBackgroundColorCanvas.setLayoutData(gridData);
-
-		// paletteCanvas
-		final Canvas paletteCanvas = new Canvas(colorFrame, SWT.BORDER | SWT.NO_BACKGROUND);
-		gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.heightHint = 24;
-		paletteCanvas.setLayoutData(gridData);
-		paletteCanvas.addListener(SWT.MouseDown, new Listener() {
-			public void handleEvent(Event e) {
-				Rectangle bounds = paletteCanvas.getClientArea();
-				Color color = getColorAt(bounds, e.x, e.y);				
-					
-				if (e.button == 1) setForegroundColor(color);
-				else setBackgroundColor(color);
-			}
-			private Color getColorAt(Rectangle bounds, int x, int y) {
-				if (bounds.height <= 1 && bounds.width <= 1) return paintColorWhite;
-				final int row = (y - bounds.y) * numPaletteRows / bounds.height;
-				final int col = (x - bounds.x) * numPaletteCols / bounds.width;
-				return paintColors[Math.min(Math.max(row * numPaletteCols + col, 0), paintColors.length - 1)];
-			}
-		});
-		Listener refreshListener = new Listener() {
-			public void handleEvent(Event e) {
-				if (e.gc == null) return;
-				Rectangle bounds = paletteCanvas.getClientArea();
-				for (int row = 0; row < numPaletteRows; ++row) {
-					for (int col = 0; col < numPaletteCols; ++col) {
-						final int x = bounds.width * col / numPaletteCols;
-						final int y = bounds.height * row / numPaletteRows;
-						final int width = Math.max(bounds.width * (col + 1) / numPaletteCols - x, 1);
-						final int height = Math.max(bounds.height * (row + 1) / numPaletteRows - y, 1);
-						e.gc.setBackground(paintColors[row * numPaletteCols + col]);
-						e.gc.fillRectangle(bounds.x + x, bounds.y + y, width, height);
-					}
-				}
-			}
-		};
-		paletteCanvas.addListener(SWT.Resize, refreshListener);
-		paletteCanvas.addListener(SWT.Paint, refreshListener);
-		//paletteCanvas.redraw();
-		
-		// toolSettingsFrame
-		gridLayout = new GridLayout();
-		gridLayout.numColumns = 4;
-		gridLayout.marginHeight = 0;
-		gridLayout.marginWidth = 0;
-		toolSettingsFrame.setLayout(gridLayout);
-
-		Label label = new Label(toolSettingsFrame, SWT.NONE);
-		label.setText(getResourceString("settings.AirbrushRadius.text"));
-
-		final Scale airbrushRadiusScale = new Scale(toolSettingsFrame, SWT.HORIZONTAL);
-		airbrushRadiusScale.setMinimum(5);
-		airbrushRadiusScale.setMaximum(50);
-		airbrushRadiusScale.setSelection(toolSettings.airbrushRadius);
-		airbrushRadiusScale.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL));
-		airbrushRadiusScale.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				toolSettings.airbrushRadius = airbrushRadiusScale.getSelection();
-				updateToolSettings();
-			}
-		});
-
-		label = new Label(toolSettingsFrame, SWT.NONE);
-		label.setText(getResourceString("settings.AirbrushIntensity.text"));
-
-		final Scale airbrushIntensityScale = new Scale(toolSettingsFrame, SWT.HORIZONTAL);
-		airbrushIntensityScale.setMinimum(1);
-		airbrushIntensityScale.setMaximum(100);
-		airbrushIntensityScale.setSelection(toolSettings.airbrushIntensity);
-		airbrushIntensityScale.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL));
-		airbrushIntensityScale.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				toolSettings.airbrushIntensity = airbrushIntensityScale.getSelection();
-				updateToolSettings();
-			}
-		});
-	}
-		
-	/**
-	 * Disposes of all resources associated with a particular
-	 * instance of the PaintExample.
-	 */	
-	public void dispose() {
-		if (mainComposite != null) mainComposite.dispose();
-		if (paintSurface != null) paintSurface.dispose();		
-		if (paintColors != null) {
-			for (int i = 0; i < paintColors.length; ++i) {
-				final Color color = paintColors[i];
-				if (color != null) color.dispose();
-			}
-		}
-		paintDefaultFont = null;
-		paintColors = null;
-		paintSurface = null;
-		freeResources();
-	}
-
-	/**
-	 * Frees the resource bundle resources.
-	 */
-	public void freeResources() {
-		for (int i = 0; i < tools.length; ++i) {
-			Tool tool = tools[i];
-			final Image image = tool.image;
-			if (image != null) image.dispose();
-			tool.image = null;
-		}
-	}
-	
-	/**
-	 * Returns the Display.
-	 * 
-	 * @return the display we're using
-	 */
-	public Display getDisplay() {
-		return mainComposite.getDisplay();
-	}
-	
-	/**
-	 * Gets a string from the resource bundle.
-	 * We don't want to crash because of a missing String.
-	 * Returns the key if not found.
-	 */
-	public static String getResourceString(String key) {
-		try {
-			return resourceBundle.getString(key);
-		} catch (MissingResourceException e) {
-			return key;
-		} catch (NullPointerException e) {
-			return "!" + key + "!";
-		}			
-	}
-
-	/**
-	 * Gets a string from the resource bundle and binds it
-	 * with the given arguments. If the key is not found,
-	 * return the key.
-	 */
-	public static String getResourceString(String key, Object[] args) {
-		try {
-			return MessageFormat.format(getResourceString(key), args);
-		} catch (MissingResourceException e) {
-			return key;
-		} catch (NullPointerException e) {
-			return "!" + key + "!";
-		}
-	}
-
-	/**
-	 * Initialize colors, fonts, and tool settings.
-	 */
-	private void init() {
-		Display display = mainComposite.getDisplay();
-		
-		paintColorWhite = new Color(display, 255, 255, 255);
-		paintColorBlack = new Color(display, 0, 0, 0);
-		
-		paintDefaultFont = display.getSystemFont();
-
-		paintColors = new Color[numPaletteCols * numPaletteRows];
-		paintColors[0] = paintColorBlack;
-		paintColors[1] = paintColorWhite;
-		for (int i = 2; i < paintColors.length; i++) {
-			paintColors[i] = new Color(display,
-				((i*7)%255),((i*23)%255), ((i*51)%255));
-		}
-
-		toolSettings = new ToolSettings();
-		toolSettings.commonForegroundColor = paintColorBlack;
-		toolSettings.commonBackgroundColor = paintColorWhite;
-		toolSettings.commonFont = paintDefaultFont;
-	}
-
-	/**
-	 * Sets the action field of the tools
-	 */
-	private void initActions() {
-		for (int i = 0; i < tools.length; ++i) {
-			final Tool tool = tools[i];
-			String group = tool.group;
-			if (group.equals("tool")) {
-				tool.action = new Runnable() {
-					public void run() {
-						setPaintTool(tool.id);
-					}
-				};
-			} else if (group.equals("fill")) {
-				tool.action = new Runnable() {
-					public void run() {
-						setFillType(tool.id);
-					}
-				};
-			} else if (group.equals("linestyle")) {
-				tool.action = new Runnable() {
-					public void run() {
-						setLineStyle(tool.id);
-					}
-				};
-			} else if (group.equals("options")) {
-				tool.action = new Runnable() {
-					public void run() {
-						FontDialog fontDialog = new FontDialog(paintSurface.getShell(), SWT.PRIMARY_MODAL);
-						FontData[] fontDatum = toolSettings.commonFont.getFontData();
-						if (fontDatum != null && fontDatum.length > 0) {
-							fontDialog.setFontList(fontDatum);
-						}
-						fontDialog.setText(getResourceString("options.Font.dialog.title"));
-
-						paintSurface.hideRubberband();
-						FontData fontData = fontDialog.open();
-						paintSurface.showRubberband();
-						if (fontData != null) {
-							try {
-								Font font = new Font(mainComposite.getDisplay(), fontData);
-								toolSettings.commonFont = font;
-								updateToolSettings();
-							} catch (SWTException ex) {
-							}
-						}
-					}
-				};
-			}
-		}
-	}
-
-	/**
-	 * Loads the image resources.
-	 */
-	public void initResources() {
-		final Class clazz = PaintExample.class;
-		if (resourceBundle != null) {
-			try {
-				for (int i = 0; i < tools.length; ++i) {
-					Tool tool = tools[i];
-					String id = tool.group + '.' + tool.name;
-					InputStream sourceStream = clazz.getResourceAsStream(getResourceString(id + ".image"));
-					ImageData source = new ImageData(sourceStream);
-					ImageData mask = source.getTransparencyMask();
-					tool.image = new Image(null, source, mask);
-					try {
-						sourceStream.close();
-					} catch (IOException e) {
-						e.printStackTrace();
-					}
-				}
-				return;
-			} catch (Throwable t) {
-			}
-		}
-		String error = (resourceBundle != null) ?
-			getResourceString("error.CouldNotLoadResources") :
-			"Unable to load resources";
-		freeResources();
-		throw new RuntimeException(error);
-	}
-
-	/**
-	 * Grabs input focus.
-	 */
-	public void setFocus() {
-		mainComposite.setFocus();
-	}
-	
-	/**
-	 * Sets the tool foreground color.
-	 * 
-	 * @param color the new color to use
-	 */
-	public void setForegroundColor(Color color) {
-		if (activeForegroundColorCanvas != null)
-			activeForegroundColorCanvas.setBackground(color);
-		toolSettings.commonForegroundColor = color;
-		updateToolSettings();
-	}
-
-	/**
-	 * Set the tool background color.
-	 * 
-	 * @param color the new color to use
-	 */
-	public void setBackgroundColor(Color color) {
-		if (activeBackgroundColorCanvas != null)
-			activeBackgroundColorCanvas.setBackground(color);
-		toolSettings.commonBackgroundColor = color;
-		updateToolSettings();
-	}
-
-	/**
-	 * Selects a tool given its ID.
-	 */
-	public void setPaintTool(int id) {
-		PaintTool paintTool = (PaintTool) tools[id].data;
-		paintSurface.setPaintSession(paintTool);
-		updateToolSettings();
-	}
-	
-	/**
-	 * Selects a filltype given its ID.
-	 */
-	public void setFillType(int id) {
-		Integer fillType = (Integer) tools[id].data;
-		toolSettings.commonFillType = fillType.intValue();
-		updateToolSettings();		
-	}
-
-	/**
-	 * Selects line type given its ID.
-	 */
-	public void setLineStyle(int id) {
-		Integer lineType = (Integer) tools[id].data;
-		toolSettings.commonLineStyle = lineType.intValue();
-		updateToolSettings();		
-	}
-
-	/**
-	 * Sets the size of the shell to it's "packed" size,
-	 * unless that makes it bigger than the display,
-	 * in which case set it to 9/10 of display size.
-	 */
-	private static void setShellSize (Display display, Shell shell) {
-		Rectangle bounds = display.getBounds();
-		Point size = shell.computeSize (SWT.DEFAULT, SWT.DEFAULT);
-		if (size.x > bounds.width) size.x = bounds.width * 9 / 10;
-		if (size.y > bounds.height) size.y = bounds.height * 9 / 10;
-		shell.setSize (size);
-	}
-
-	/**
-	 * Notifies the tool that its settings have changed.
-	 */
-	private void updateToolSettings() {
-		final PaintTool activePaintTool = paintSurface.getPaintTool();
-		if (activePaintTool == null) return;
-		
-		activePaintTool.endSession();
-		activePaintTool.set(toolSettings);
-		activePaintTool.beginSession();
-	}
-}
-

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintSession.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintSession.java
deleted file mode 100644
index 2fa86f5..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintSession.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-
-import org.eclipse.swt.events.*;
-
-/**
- * Manages an interactive paint session.
- * Note that the coordinates received via the listener interfaces are virtualized to zero-origin
- * relative to the painting surface.
- */ 
-public interface PaintSession extends MouseListener, MouseMoveListener {
-	/**
-	 * Returns the paint surface associated with this paint session
-	 * 
-	 * @return the associated PaintSurface
-	 */
-	public PaintSurface getPaintSurface();
-
-	/**
-	 * Activates the session.
-	 * 
-	 * Note: When overriding this method, call super.beginSession() at method start.
-	 */
-	public abstract void beginSession();
-	
-	/**
-	 * Deactivates the session.
-     *
-	 * Note: When overriding this method, call super.endSession() at method exit.
-     */
-	public abstract void endSession();
-	
-	/**
-	 * Resets the session.
-	 * Aborts any operation in progress.
-	 * 
-	 * Note: When overriding this method, call super.resetSession() at method exit.
-	 */
-	public abstract void resetSession();
-	
-	
-	/**
-	 * Returns the name associated with this tool.
-	 * 
-	 * @return the localized name of this tool
-	 */
-	public String getDisplayName();
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintSurface.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintSurface.java
deleted file mode 100644
index 6866409..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintSurface.java
+++ /dev/null

@@ -1,521 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * Manages a simple drawing surface.
- */
-public class PaintSurface {
-	private Point currentPosition = new Point(0, 0);
-	private Canvas paintCanvas;
-
-	private PaintSession paintSession;
-	private Image image;
-	private Image paintImage; // buffer for refresh blits
-	private int   imageWidth, imageHeight;
-	private int   visibleWidth, visibleHeight;
-
-	private FigureDrawContext displayFDC = new FigureDrawContext();
-	private FigureDrawContext imageFDC = new FigureDrawContext();
-	private FigureDrawContext paintFDC = new FigureDrawContext();
-
-	/* Rubberband */
-	private ContainerFigure rubberband = new ContainerFigure();
-		// the active rubberband selection
-	private int rubberbandHiddenNestingCount = 0;
-		// always >= 0, if > 0 rubberband has been hidden
-
-	/* Status */
-	private Text statusText;
-	private String statusActionInfo, statusMessageInfo, statusCoordInfo;
-
-	/**
-	 * Constructs a PaintSurface.
-	 * <p>
-	 * paintCanvas must have SWT.NO_REDRAW_RESIZE and SWT.NO_BACKGROUND styles,
-	 *     and may have SWT.V_SCROLL and/or SWT.H_SCROLL.
-	 * </p>
-	 * @param paintCanvas the Canvas object in which to render
-	 * @param paintStatus the PaintStatus object to use for providing user feedback
-	 * @param fillColor the color to fill the canvas with initially
-	 */
-	public PaintSurface(Canvas paintCanvas, Text statusText, Color fillColor) {
-		this.paintCanvas = paintCanvas;
-		this.statusText = statusText;
-		clearStatus();
-
-		/* Set up the drawing surface */
-		Rectangle displayRect = paintCanvas.getDisplay().getClientArea();
-		imageWidth = displayRect.width;
-		imageHeight = displayRect.height;
-		image = new Image(paintCanvas.getDisplay(), imageWidth, imageHeight);
-
-		imageFDC.gc = new GC(image);
-		imageFDC.gc.setBackground(fillColor);
-		imageFDC.gc.fillRectangle(0, 0, imageWidth, imageHeight);
-		displayFDC.gc = new GC(paintCanvas);
-
-		/* Initialize the session */
-		setPaintSession(null);
-
-		/* Add our listeners */
-		paintCanvas.addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
-				displayFDC.gc.dispose();
-			}			
-		});
-		paintCanvas.addMouseListener(new MouseAdapter() {
-			public void mouseDown(MouseEvent event) {
-				processMouseEventCoordinates(event);
-				if (paintSession != null) paintSession.mouseDown(event);
-			}
-			public void mouseUp(MouseEvent event) {
-				processMouseEventCoordinates(event);
-				if (paintSession != null) paintSession.mouseUp(event);
-			}
-			public void mouseDoubleClick(MouseEvent event) {
-				processMouseEventCoordinates(event);
-				if (paintSession != null) paintSession.mouseDoubleClick(event);
-			}			
-		});
-		paintCanvas.addMouseMoveListener(new MouseMoveListener() {
-			public void mouseMove(MouseEvent event) {
-				processMouseEventCoordinates(event);
-				if (paintSession != null) paintSession.mouseMove(event);
-			}
-		});
-		paintCanvas.addPaintListener(new PaintListener() {
-			public void paintControl(PaintEvent event) {
-				if (rubberband.isEmpty()) {
-					// Nothing to merge, so we just refresh
-					event.gc.drawImage(image,
-						displayFDC.xOffset + event.x, displayFDC.yOffset + event.y, event.width, event.height,
-						event.x, event.y, event.width, event.height);
-				} else {
-					/*
-					 * Avoid flicker when merging overlayed objects by constructing the image on
-					 * a backbuffer first, then blitting it to the screen.
-					 */
-					// Check that the backbuffer is large enough
-					if (paintImage != null) {
-						Rectangle rect = paintImage.getBounds();
-						if ((event.width + event.x > rect.width) ||
-							(event.height + event.y > rect.height)) {
-							paintFDC.gc.dispose();
-							paintImage.dispose();
-							paintImage = null;
-						}
-					}
-					if (paintImage == null) {
-						Display display = getDisplay();
-						Rectangle rect = display.getClientArea();
-						paintImage = new Image(display,
-							Math.max(rect.width, event.width + event.x),
-							Math.max(rect.height, event.height + event.y));
-						paintFDC.gc = new GC(paintImage);
-					}
-					// Setup clipping and the FDC
-					Region clipRegion = new Region();
-					event.gc.getClipping(clipRegion);					
-					paintFDC.gc.setClipping(clipRegion);
-					clipRegion.dispose();
-
-					paintFDC.xOffset = displayFDC.xOffset;
-					paintFDC.yOffset = displayFDC.yOffset;
-					paintFDC.xScale = displayFDC.xScale;
-					paintFDC.yScale = displayFDC.yScale;
-					
-					// Merge the overlayed objects into the image, then blit
-					paintFDC.gc.drawImage(image,
-						displayFDC.xOffset + event.x, displayFDC.yOffset + event.y, event.width, event.height,
-						event.x, event.y, event.width, event.height);
-					rubberband.draw(paintFDC);
-					event.gc.drawImage(paintImage,
-						event.x, event.y, event.width, event.height,
-						event.x, event.y, event.width, event.height);
-				}
-			}
-		});
-		paintCanvas.addControlListener(new ControlAdapter() {
-			public void controlResized(ControlEvent event) {
-				handleResize();
-			}			
-		});
-
-		/* Set up the paint canvas scroll bars */
-		ScrollBar horizontal = paintCanvas.getHorizontalBar();
-		horizontal.setVisible(true);
-		horizontal.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				scrollHorizontally((ScrollBar)event.widget);
-			}
-		});
-		ScrollBar vertical = paintCanvas.getVerticalBar();
-		vertical.setVisible(true);
-		vertical.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				scrollVertically((ScrollBar)event.widget);
-			}
-		});
-		handleResize();
-	}
-	
-	/**
-	 * Disposes of the PaintSurface's resources.
-	 */
-	public void dispose() {
-		imageFDC.gc.dispose();
-		image.dispose();
-		if (paintImage != null) {
-			paintImage.dispose();
-			paintFDC.gc.dispose();
-		}
-
-		currentPosition = null;
-		paintCanvas = null;
-		paintSession = null;
-		image = null;
-		paintImage = null;
-		displayFDC = null;
-		imageFDC = null;
-		paintFDC = null;
-		rubberband = null;
-		statusText = null;
-		statusActionInfo = null;
-		statusMessageInfo = null;
-		statusCoordInfo = null;
-	}
-
-	/**
-	 * Called when we must grab focus.
-	 */
-	public void setFocus()  {
-		paintCanvas.setFocus();
-	}
-
-	/**
-	 * Returns the Display on which the PaintSurface resides.
-	 * @return the Display
-	 */
-	public Display getDisplay() {
-		return paintCanvas.getDisplay();
-	}
-
-	/**
-	 * Returns the Shell in which the PaintSurface resides.
-	 * @return the Shell
-	 */
-	public Shell getShell() {
-		return paintCanvas.getShell();
-	}
-
-	/**
-	 * Sets the current paint session.
-	 * <p>
-	 * If oldPaintSession != paintSession calls oldPaintSession.end()
-	 * and paintSession.begin()
-	 * </p>
-	 * 
-	 * @param paintSession the paint session to activate; null to disable all sessions
-	 */
-	public void setPaintSession(PaintSession paintSession) {
-		if (this.paintSession != null) {
-			if (this.paintSession == paintSession) return;
-			this.paintSession.endSession();
-		}
-		this.paintSession = paintSession;
-		clearStatus();
-		if (paintSession != null) {
-			setStatusAction(paintSession.getDisplayName());
-			paintSession.beginSession();
-		} else {
-			setStatusAction(PaintExample.getResourceString("tool.Null.label"));
-			setStatusMessage(PaintExample.getResourceString("session.Null.message"));
-		}
-	}
-
-	/**
-	 * Returns the current paint session.
-	 * 
-	 * @return the current paint session, null if none is active
-	 */
-	public PaintSession getPaintSession() {
-		return paintSession;
-	}
-
-	/**
-	 * Returns the current paint tool.
-	 * 
-	 * @return the current paint tool, null if none is active (though some other session
-	 *         might be)
-	 */
-	public PaintTool getPaintTool() {
-		return (paintSession != null && paintSession instanceof PaintTool) ?
-			(PaintTool)paintSession : null;
-	}
-
-	/**
-	 * Returns the current position in an interactive operation.
-	 *
-	 * @return the last known position of the pointer
-	 */
-	public Point getCurrentPosition() {
-		return currentPosition;
-	}
-
-	/**
-	 * Draws a Figure object to the screen and to the backing store permanently.
-	 * 
-	 * @param object the object to draw onscreen
-	 */
-	public void drawFigure(Figure object) {
-		object.draw(imageFDC);
-		object.draw(displayFDC);
-	}
-
-	/**
-	 * Adds a Figure object to the active rubberband selection.
-	 * <p>
-	 * This object will be drawn to the screen as a preview and refreshed appropriately
-	 * until the selection is either cleared or committed.
-	 * </p>
-	 * 
-	 * @param object the object to add to the selection
-	 */
-	public void addRubberbandSelection(Figure object) {
-		rubberband.add(object);
-		if (! isRubberbandHidden()) object.draw(displayFDC);
-	}
-
-	/**
-	 * Clears the active rubberband selection.
-	 * <p>
-	 * Erases any rubberband objects on the screen then clears the selection.
-	 * </p>
-	 */
-	public void clearRubberbandSelection() {
-		if (! isRubberbandHidden()) {
-			Region region = new Region();
-			rubberband.addDamagedRegion(displayFDC, region);
-			Rectangle r = region.getBounds();
-			paintCanvas.redraw(r.x, r.y, r.width, r.height, true);
-			region.dispose();
-		}
-		rubberband.clear();
-
-	}
-
-	/**
-	 * Commits the active rubberband selection.
-	 * <p>
-	 * Redraws any rubberband objects on the screen as permanent objects then clears the selection.
-	 * </p>
-	 */
-	public void commitRubberbandSelection() {
-		rubberband.draw(imageFDC);
-		if (isRubberbandHidden()) rubberband.draw(displayFDC);
-		rubberband.clear();
-	}
-	
-	/**
-	 * Hides the rubberband (but does not eliminate it).
-	 * <p>
-	 * Increments by one the rubberband "hide" nesting count.  The rubberband
-	 * is hidden from view (but remains active) if it wasn't already hidden.
-	 * </p>
-	 */
-	public void hideRubberband() {
-		if (rubberbandHiddenNestingCount++ <= 0) {
-			Region region = new Region();
-			rubberband.addDamagedRegion(displayFDC, region);
-			Rectangle r = region.getBounds();
-			paintCanvas.redraw(r.x, r.y, r.width, r.height, true);
-			region.dispose();
-		}
-	}		
-
-	/**
-	 * Shows (un-hides) the rubberband.
-	 * <p>
-	 * Decrements by one the rubberband "hide" nesting count.  The rubberband
-	 * is only made visible when showRubberband() has been called once for each
-	 * previous hideRubberband().  It is not permitted to call showRubberband() if
-	 * the rubber band is not presently hidden.
-	 * </p>
-	 */
-	public void showRubberband() {
-		if (rubberbandHiddenNestingCount <= 0)
-			throw new IllegalStateException("rubberbandHiddenNestingCount > 0");
-		if (--rubberbandHiddenNestingCount == 0) {
-			rubberband.draw(displayFDC);
-		}
-	}
-	
-	/**
-	 * Determines if the rubberband is hidden.
-	 * 
-	 * @return true iff the rubber is hidden
-	 */
-	public boolean isRubberbandHidden() {
-		return rubberbandHiddenNestingCount > 0;
-	}
-
-	/**
-	 * Handles a horizontal scroll event
-	 * 
-	 * @param scrollbar the horizontal scroll bar that posted this event
-	 */
-	public void scrollHorizontally(ScrollBar scrollBar) {
-		if (image == null) return;
-		if (imageWidth > visibleWidth) {
-			final int oldOffset = displayFDC.xOffset;
-			final int newOffset = Math.min(scrollBar.getSelection(), imageWidth - visibleWidth);
-			if (oldOffset != newOffset) {
-				paintCanvas.update();
-				displayFDC.xOffset = newOffset;
-				paintCanvas.scroll(Math.max(oldOffset - newOffset, 0), 0, Math.max(newOffset - oldOffset, 0), 0,
-					visibleWidth, visibleHeight, false);
-			}
-		}
-	}
-
-	/**
-	 * Handles a vertical scroll event
-	 * 
-	 * @param scrollbar the vertical scroll bar that posted this event
-	 */
-	public void scrollVertically(ScrollBar scrollBar) {
-		if (image == null) return;
-		if (imageHeight > visibleHeight) {
-			final int oldOffset = displayFDC.yOffset;
-			final int newOffset = Math.min(scrollBar.getSelection(), imageHeight - visibleHeight);
-			if (oldOffset != newOffset) {
-				paintCanvas.update();
-				displayFDC.yOffset = newOffset;
-				paintCanvas.scroll(0, Math.max(oldOffset - newOffset, 0), 0, Math.max(newOffset - oldOffset, 0),
-					visibleWidth, visibleHeight, false);
-			}
-		}
-	}
-	
-	/**
-	 * Handles resize events
-	 */
-	private void handleResize() {
-		paintCanvas.update();
-
-		Rectangle visibleRect = paintCanvas.getClientArea();
-		visibleWidth = visibleRect.width;
-		visibleHeight = visibleRect.height;
-
-		ScrollBar horizontal = paintCanvas.getHorizontalBar();
-		if (horizontal != null) {
-			displayFDC.xOffset = Math.min(horizontal.getSelection(), imageWidth - visibleWidth);
-			if (imageWidth <= visibleWidth) {
-				horizontal.setEnabled(false);
-				horizontal.setSelection(0);
-			} else {
-				horizontal.setEnabled(true);
-				horizontal.setValues(displayFDC.xOffset, 0, imageWidth, visibleWidth,
-					8, visibleWidth);
-			}
-		}
-
-		ScrollBar vertical = paintCanvas.getVerticalBar();
-		if (vertical != null) {
-			displayFDC.yOffset = Math.min(vertical.getSelection(), imageHeight - visibleHeight);
-			if (imageHeight <= visibleHeight) {
-				vertical.setEnabled(false);
-				vertical.setSelection(0);
-			} else {
-				vertical.setEnabled(true);
-				vertical.setValues(displayFDC.yOffset, 0, imageHeight, visibleHeight,
-					8, visibleHeight);
-			}
-		}
-	}
-
-	/**
-	 * Virtualizes MouseEvent coordinates and stores the current position.
-	 */
-	private void processMouseEventCoordinates(MouseEvent event) {
-		currentPosition.x = event.x =
-			Math.min(Math.max(event.x, 0), visibleWidth - 1) + displayFDC.xOffset;
-		currentPosition.y = event.y =
-			Math.min(Math.max(event.y, 0), visibleHeight - 1) + displayFDC.yOffset;
-	}
-	
-	/**
-	 * Clears the status bar.
-	 */
-	public void clearStatus() {
-		statusActionInfo = "";
-		statusMessageInfo = "";
-		statusCoordInfo = "";
-		updateStatus();
-	}
-
-	/**
-	 * Sets the status bar action text.
-	 *
-	 * @param action the action in progress, null to clear
-	 */
-	public void setStatusAction(String action) {
-		statusActionInfo = (action != null) ? action : "";
-		updateStatus();
-	}
-	
-	/**
-	 * Sets the status bar message text.
-	 * 
-	 * @param message the message to display, null to clear
-	 */
-	public void setStatusMessage(String message) {
-		statusMessageInfo = (message != null) ? message : "";
-		updateStatus();
-	}
-
-	/**
-	 * Sets the coordinates in the status bar.
-	 * 
-	 * @param coord the coordinates to display, null to clear
-	 */
-	public void setStatusCoord(Point coord) {
-		statusCoordInfo = (coord != null) ? PaintExample.getResourceString("status.Coord.format", new Object[]
-			{ new Integer(coord.x), new Integer(coord.y)}) : "";
-		updateStatus();
-	}
-
-	/**
-	 * Sets the coordinate range in the status bar.
-	 * 
-	 * @param a the "from" coordinate, must not be null
-	 * @param b the "to" coordinate, must not be null
-	 */
-	public void setStatusCoordRange(Point a, Point b) {
-		statusCoordInfo = PaintExample.getResourceString("status.CoordRange.format", new Object[]
-			{ new Integer(a.x), new Integer(a.y), new Integer(b.x), new Integer(b.y)});
-		updateStatus();
-	}
-
-	/**
-	 * Updates the display.
-	 */
-	private void updateStatus() {
-		statusText.setText(
-			PaintExample.getResourceString("status.Bar.format", new Object[]
-			{ statusActionInfo, statusMessageInfo, statusCoordInfo }));
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintTool.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintTool.java
deleted file mode 100644
index ad5614e..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintTool.java
+++ /dev/null

@@ -1,20 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-public interface PaintTool extends PaintSession {
-	/**
-	 * Sets the tool's settings.
-	 * 
-	 * @param toolSettings the new tool settings
-	 */
-	public void set(ToolSettings toolSettings);
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PencilTool.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PencilTool.java
deleted file mode 100644
index 167e503..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PencilTool.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-
-import org.eclipse.swt.graphics.*;
-
-/**
- * A pencil tool.
- */
-public class PencilTool extends ContinuousPaintSession implements PaintTool {
-	private ToolSettings settings;
-	
-	/**
-	 * Constructs a pencil tool.
-	 * 
-	 * @param toolSettings the new tool settings
-	 * @param getPaintSurface() the PaintSurface we will render on.
-	 */
-	public PencilTool(ToolSettings toolSettings, PaintSurface paintSurface) {
-		super(paintSurface);
-		set(toolSettings);
-	}
-	
-	/**
-	 * Sets the tool's settings.
-	 * 
-	 * @param toolSettings the new tool settings
-	 */
-	public void set(ToolSettings toolSettings) {
-		settings = toolSettings;
-	}
-
-	/**
-	 * Returns the name associated with this tool.
-	 * 
-	 * @return the localized name of this tool
-	 */
-	public String getDisplayName() {
-		return PaintExample.getResourceString("tool.Pencil.label");
-	}
-
-	/*
-	 * Template method for drawing
-	 */
-	public void render(final Point point) {
-		final PaintSurface ps = getPaintSurface();
-		ps.drawFigure(new PointFigure(settings.commonForegroundColor, point.x, point.y));
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PointFigure.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PointFigure.java
deleted file mode 100644
index d528317..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PointFigure.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-
-import org.eclipse.swt.graphics.*;
-
-/**
- * 2D Point object
- */
-public class PointFigure extends Figure {
-	private Color color;
-	private int x, y;
-	/**
-	 * Constructs a Point
-	 * 
-	 * @param color the color for this object
-	 * @param x the virtual X coordinate of the first end-point
-	 * @param y the virtual Y coordinate of the first end-point
-	 */
-	public PointFigure(Color color, int x, int y) {
-		this.color = color; this.x = x; this.y = y;
-	}
-	public void draw(FigureDrawContext fdc) {
-		Point p = fdc.toClientPoint(x, y);
-		fdc.gc.setBackground(color);
-		fdc.gc.fillRectangle(p.x, p.y, 1, 1);
-	}
-	public void addDamagedRegion(FigureDrawContext fdc, Region region) {
-		region.add(fdc.toClientRectangle(x, y, x, y));
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PolyLineTool.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PolyLineTool.java
deleted file mode 100644
index 2498155..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PolyLineTool.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-
-import org.eclipse.swt.graphics.*;
-
-/**
- * A polyline drawing tool.
- */
-public class PolyLineTool extends SegmentedPaintSession implements PaintTool {
-	private ToolSettings settings;
-
-	/**
-	 * Constructs a PolyLineTool.
-	 * 
-	 * @param toolSettings the new tool settings
-	 * @param paintSurface the PaintSurface we will render on.
-	 */
-	public PolyLineTool(ToolSettings toolSettings, PaintSurface paintSurface) {
-		super(paintSurface);
-		set(toolSettings);
-	}
-	
-	/**
-	 * Sets the tool's settings.
-	 * 
-	 * @param toolSettings the new tool settings
-	 */
-	public void set(ToolSettings toolSettings) {
-		settings = toolSettings;
-	}
-
-	/**
-	 * Returns the name associated with this tool.
-	 * 
-	 * @return the localized name of this tool
-	 */
-	public String getDisplayName() {
-		return PaintExample.getResourceString("tool.PolyLine.label");
-	}
-
-	/*
-	 * Template methods for drawing
-	 */
-	protected Figure createFigure(Point[] points, int numPoints, boolean closed) {
-		ContainerFigure container = new ContainerFigure();
-		if (closed && settings.commonFillType != ToolSettings.ftNone && numPoints >= 3) {
-			container.add(new SolidPolygonFigure(settings.commonBackgroundColor, points, numPoints));
-		}
-		if (! closed || settings.commonFillType != ToolSettings.ftSolid || numPoints < 3) {
-			for (int i = 0; i < numPoints - 1; ++i) {
-				final Point a = points[i];
-				final Point b = points[i + 1];
-				container.add(new LineFigure(settings.commonForegroundColor, settings.commonBackgroundColor, settings.commonLineStyle,
-					a.x, a.y, b.x, b.y));
-			}
-			if (closed) {
-				final Point a = points[points.length - 1];
-				final Point b = points[0];
-				container.add(new LineFigure(settings.commonForegroundColor, settings.commonBackgroundColor, settings.commonLineStyle,
-					a.x, a.y, b.x, b.y));
-			}
-		}
-		return container;
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/RectangleFigure.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/RectangleFigure.java
deleted file mode 100644
index 1d80e60..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/RectangleFigure.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-
-/**
- * 2D Rectangle object
- */
-public class RectangleFigure extends Figure {
-	private Color foregroundColor, backgroundColor;
-	private int lineStyle, x1, y1, x2, y2;
-	/**
-	 * Constructs a Rectangle
-	 * These objects are defined by any two diametrically opposing corners.
-	 * 
-	 * @param color the color for this object
-	 * @param lineStyle the line style for this object
-	 * @param x1 the virtual X coordinate of the first corner
-	 * @param y1 the virtual Y coordinate of the first corner
-	 * @param x2 the virtual X coordinate of the second corner
-	 * @param y2 the virtual Y coordinate of the second corner
-	 */
-	public RectangleFigure(Color foregroundColor, Color backgroundColor, int lineStyle, int x1, int y1, int x2, int y2) {
-		this.foregroundColor = foregroundColor;
-		this.backgroundColor = backgroundColor;
-		this.lineStyle = lineStyle;
-		this.x1 = x1; this.y1 = y1; this.x2 = x2; this.y2 = y2;
-	}
-	public void draw(FigureDrawContext fdc) {
-		Rectangle r = fdc.toClientRectangle(x1, y1, x2, y2);
-		fdc.gc.setForeground(foregroundColor);
-		fdc.gc.setBackground(backgroundColor);
-		fdc.gc.setLineStyle(lineStyle);
-		fdc.gc.drawRectangle(r.x, r.y, r.width - 1, r.height - 1);
-		fdc.gc.setLineStyle(SWT.LINE_SOLID);
-	}
-	public void addDamagedRegion(FigureDrawContext fdc, Region region) {
-		region.add(fdc.toClientRectangle(x1, y1, x2, y2));
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/RectangleTool.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/RectangleTool.java
deleted file mode 100644
index 0473bbd..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/RectangleTool.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-
-import org.eclipse.swt.graphics.*;
-
-/**
- * A drawing tool.
- */
-public class RectangleTool extends DragPaintSession implements PaintTool {
-	private ToolSettings settings;
-
-	/**
-	 * Constructs a RectangleTool.
-	 * 
-	 * @param toolSettings the new tool settings
-	 * @param paintSurface the PaintSurface we will render on.
-	 */
-	public RectangleTool(ToolSettings toolSettings, PaintSurface paintSurface) {
-		super(paintSurface);
-		set(toolSettings);
-	}
-	
-	/**
-	 * Sets the tool's settings.
-	 * 
-	 * @param toolSettings the new tool settings
-	 */
-	public void set(ToolSettings toolSettings) {
-		settings = toolSettings;
-	}
-	
-	/**
-	 * Returns name associated with this tool.
-	 * 
-	 * @return the localized name of this tool
-	 */
-	public String getDisplayName() {
-		return PaintExample.getResourceString("tool.Rectangle.label");
-	}
-
-	/*
-	 * Template method for drawing
-	 */
-	protected Figure createFigure(Point a, Point b) {
-		switch (settings.commonFillType) {
-			default:
-			case ToolSettings.ftNone:
-				return new RectangleFigure(settings.commonForegroundColor, settings.commonBackgroundColor, settings.commonLineStyle,
-					a.x, a.y, b.x, b.y);
-			case ToolSettings.ftSolid:
-				return new SolidRectangleFigure(settings.commonBackgroundColor, a.x, a.y, b.x, b.y);
-			case ToolSettings.ftOutline: {
-				ContainerFigure container = new ContainerFigure();
-				container.add(new SolidRectangleFigure(settings.commonBackgroundColor, a.x, a.y, b.x, b.y));
-				container.add(new RectangleFigure(settings.commonForegroundColor, settings.commonBackgroundColor, settings.commonLineStyle,
-					a.x, a.y, b.x, b.y));
-				return container;
-			}
-		}
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/RoundedRectangleFigure.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/RoundedRectangleFigure.java
deleted file mode 100644
index 4c71d67..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/RoundedRectangleFigure.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-
-/**
- * 2D Rectangle object
- */
-public class RoundedRectangleFigure extends Figure {
-	private Color foregroundColor, backgroundColor;
-	private int lineStyle, x1, y1, x2, y2, diameter;
-	/**
-	 * Constructs a Rectangle
-	 * These objects are defined by any two diametrically opposing corners.
-	 * 
-	 * @param color the color for this object
-	 * @param lineStyle the line style for this object
-	 * @param x1 the virtual X coordinate of the first corner
-	 * @param y1 the virtual Y coordinate of the first corner
-	 * @param x2 the virtual X coordinate of the second corner
-	 * @param y2 the virtual Y coordinate of the second corner
-	 * @param diameter the diameter of curvature of all four corners
-	 */
-	public RoundedRectangleFigure(Color foregroundColor, Color backgroundColor, int lineStyle, int x1, int y1, int x2, int y2, int diameter) {
-		this.foregroundColor = foregroundColor;
-		this.backgroundColor = backgroundColor;
-		this.lineStyle = lineStyle;
-		this.x1 = x1; this.y1 = y1; this.x2 = x2; this.y2 = y2;
-		this.diameter = diameter;
-	}
-	public void draw(FigureDrawContext fdc) {
-		Rectangle r = fdc.toClientRectangle(x1, y1, x2, y2);
-		fdc.gc.setForeground(foregroundColor);
-		fdc.gc.setBackground(backgroundColor);
-		fdc.gc.setLineStyle(lineStyle);
-		fdc.gc.drawRoundRectangle(r.x, r.y, r.width - 1, r.height - 1, diameter, diameter);
-		fdc.gc.setLineStyle(SWT.LINE_SOLID);
-	}
-	public void addDamagedRegion(FigureDrawContext fdc, Region region) {
-		region.add(fdc.toClientRectangle(x1, y1, x2, y2));
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/RoundedRectangleTool.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/RoundedRectangleTool.java
deleted file mode 100644
index 3b5c064..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/RoundedRectangleTool.java
+++ /dev/null

@@ -1,64 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-
-import org.eclipse.swt.graphics.*;
-
-/**
- * A drawing tool.
- */
-public class RoundedRectangleTool extends DragPaintSession implements PaintTool {
-	private ToolSettings settings;
-
-	/**
-	 * Constructs a RoundedRectangleTool.
-	 * 
-	 * @param toolSettings the new tool settings
-	 * @param paintSurface the PaintSurface we will render on.
-	 */
-	public RoundedRectangleTool(ToolSettings toolSettings, PaintSurface paintSurface) {
-		super(paintSurface);
-		set(toolSettings);
-	}
-	
-	/**
-	 * Sets the tool's settings.
-	 * 
-	 * @param toolSettings the new tool settings
-	 */
-	public void set(ToolSettings toolSettings) {
-		settings = toolSettings;
-	}
-	
-	/**
-	 * Returns name associated with this tool.
-	 * 
-	 * @return the localized name of this tool
-	 */
-	public String getDisplayName() {
-		return PaintExample.getResourceString("tool.RoundedRectangle.label");
-	}
-
-	/*
-	 * Template methods for drawing
-	 */
-	protected Figure createFigure(Point a, Point b) {
-		ContainerFigure container = new ContainerFigure();
-		if (settings.commonFillType != ToolSettings.ftNone)
-			container.add(new SolidRoundedRectangleFigure(settings.commonBackgroundColor,
-				a.x, a.y, b.x, b.y, settings.roundedRectangleCornerDiameter));
-		if (settings.commonFillType != ToolSettings.ftSolid)
-			container.add(new RoundedRectangleFigure(settings.commonForegroundColor, settings.commonBackgroundColor,
-				settings.commonLineStyle, a.x, a.y, b.x, b.y, settings.roundedRectangleCornerDiameter));
-		return container;
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/SegmentedPaintSession.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/SegmentedPaintSession.java
deleted file mode 100644
index c0abc8d..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/SegmentedPaintSession.java
+++ /dev/null

@@ -1,157 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.*;
-
-import java.util.*;
-
-/**
- * The superclass for paint tools that contruct objects from individually
- * picked segments.
- */
-public abstract class SegmentedPaintSession extends BasicPaintSession {
-	/**
-	 * The set of control points making up the segmented selection
-	 */
-	private Vector /* of Point */ controlPoints = new Vector();
-
-	/**
-	 * The previous figure (so that we can abort with right-button)
-	 */
-	private Figure previousFigure = null;
-
-	/**
-	 * The current figure (so that we can abort with right-button)
-	 */
-	private Figure currentFigure = null;
-
-	/**
-	 * Constructs a PaintSession.
-	 * 
-	 * @param paintSurface the drawing surface to use
-	 */
-	protected SegmentedPaintSession(PaintSurface paintSurface) {
-		super(paintSurface);
-	}
-
-	/**
-	 * Activates the tool.
-	 */
-	public void beginSession() {
-		getPaintSurface().setStatusMessage(PaintExample.getResourceString(
-			"session.SegmentedInteractivePaint.message.anchorMode"));
-		previousFigure = null;
-		currentFigure = null;
-		controlPoints.clear();
-	}
-	
-	/**
-	 * Deactivates the tool.
-     */
-	public void endSession() {
-		getPaintSurface().clearRubberbandSelection();
-		if (previousFigure != null) getPaintSurface().drawFigure(previousFigure);
-	}
-	
-	/**
-	 * Resets the tool.
-	 * Aborts any operation in progress.
-	 */
-	public void resetSession() {
-		getPaintSurface().clearRubberbandSelection();
-		if (previousFigure != null) getPaintSurface().drawFigure(previousFigure);
-		
-		getPaintSurface().setStatusMessage(PaintExample.getResourceString(
-			"session.SegmentedInteractivePaint.message.anchorMode"));
-		previousFigure = null;
-		currentFigure = null;
-		controlPoints.clear();
-	}
-
-	/**
-	 * Handles a mouseDown event.
-	 * 
-	 * @param event the mouse event detail information
-	 */
-	public void mouseDown(MouseEvent event) {
-		if (event.button != 1) return;
-
-		getPaintSurface().setStatusMessage(PaintExample.getResourceString(
-			"session.SegmentedInteractivePaint.message.interactiveMode"));
-		previousFigure = currentFigure;
-
-		if (controlPoints.size() > 0) {
-			final Point lastPoint = (Point) controlPoints.elementAt(controlPoints.size() - 1);
-			if (lastPoint.x == event.x || lastPoint.y == event.y) return; // spurious event
-		}
-		controlPoints.add(new Point(event.x, event.y));
-	}
-
-	/**
-	 * Handles a mouseDoubleClick event.
-	 * 
-	 * @param event the mouse event detail information
-	 */
-	public void mouseDoubleClick(MouseEvent event) {
-		if (event.button != 1) return;
-		if (controlPoints.size() >= 2) {
-			getPaintSurface().clearRubberbandSelection();
-			previousFigure = createFigure(
-				(Point[]) controlPoints.toArray(new Point[controlPoints.size()]),
-				controlPoints.size(), true);
-		}
-		resetSession();
-	}
-
-	/**
-	 * Handles a mouseUp event.
-	 * 
-	 * @param event the mouse event detail information
-	 */
-	public void mouseUp(MouseEvent event) {
-		if (event.button != 1) {
-			resetSession(); // abort if right or middle mouse button pressed
-			return;
-		}
-	}
-	
-	/**
-	 * Handles a mouseMove event.
-	 * 
-	 * @param event the mouse event detail information
-	 */
-	public void mouseMove(MouseEvent event) {
-		final PaintSurface ps = getPaintSurface();
-		if (controlPoints.size() == 0) {
-			ps.setStatusCoord(ps.getCurrentPosition());
-			return; // spurious event
-		}
-		ps.setStatusCoordRange((Point) controlPoints.elementAt(controlPoints.size() - 1),
-			ps.getCurrentPosition());
-		ps.clearRubberbandSelection();
-		Point[] points = (Point[]) controlPoints.toArray(new Point[controlPoints.size() + 1]);
-		points[controlPoints.size()] = ps.getCurrentPosition();
-		currentFigure = createFigure(points, points.length, false);
-		ps.addRubberbandSelection(currentFigure);
-	}	
-
-	/**
-	 * Template Method: Creates a Figure for drawing rubberband entities and the final product
-	 * 
-	 * @param points the array of control points
-	 * @param numPoints the number of valid points in the array (n >= 2)
-	 * @param closed true if the user double-clicked on the final control point
-	 */
-	protected abstract Figure createFigure(Point[] points, int numPoints, boolean closed);
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/SolidEllipseFigure.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/SolidEllipseFigure.java
deleted file mode 100644
index a7e9ada..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/SolidEllipseFigure.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-
-import org.eclipse.swt.graphics.*;
-
-/**
- * 2D Solid Ellipse object
- */
-public class SolidEllipseFigure extends Figure {
-	private Color color;
-	private int x1, y1, x2, y2;
-	/**
-	 * Constructs a SolidEllipse
-	 * These objects are defined by any two diametrically opposing corners of a box
-	 * bounding the ellipse.
-	 * 
-	 * @param color the color for this object
-	 * @param x1 the virtual X coordinate of the first corner
-	 * @param y1 the virtual Y coordinate of the first corner
-	 * @param x2 the virtual X coordinate of the second corner
-	 * @param y2 the virtual Y coordinate of the second corner
-	 */
-	public SolidEllipseFigure(Color color, int x1, int y1, int x2, int y2) {
-		this.color = color; this.x1 = x1; this.y1 = y1; this.x2 = x2; this.y2 = y2;
-	}
-	public void draw(FigureDrawContext fdc) {
-		Rectangle r = fdc.toClientRectangle(x1, y1, x2, y2);
-		fdc.gc.setBackground(color);
-		fdc.gc.fillOval(r.x, r.y, r.width, r.height);
-	}
-	public void addDamagedRegion(FigureDrawContext fdc, Region region) {
-		region.add(fdc.toClientRectangle(x1, y1, x2, y2));
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/SolidPolygonFigure.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/SolidPolygonFigure.java
deleted file mode 100644
index 0051400..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/SolidPolygonFigure.java
+++ /dev/null

@@ -1,59 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-
-import org.eclipse.swt.graphics.*;
-
-/**
- * 2D Line object
- */
-public class SolidPolygonFigure extends Figure {
-	private Color color;
-	private int[] points;
-	/**
-	 * Constructs a SolidPolygon
-	 * These objects are defined by a sequence of vertices.
-	 * 
-	 * @param color the color for this object
-	 * @param vertices the array of vertices making up the polygon
-	 * @param numPoint the number of valid points in the array (n >= 3)
-	 */
-	public SolidPolygonFigure(Color color, Point[] vertices, int numPoints) {
-		this.color = color;
-		this.points = new int[numPoints * 2];
-		for (int i = 0; i < numPoints; ++i) {
-			points[i * 2] = vertices[i].x;
-			points[i * 2 + 1] = vertices[i].y;
-		}
-	}
-	public void draw(FigureDrawContext fdc) {
-		int[] drawPoints = new int[points.length];
-		for (int i = 0; i < points.length; i += 2) {
-			drawPoints[i] = points[i] * fdc.xScale - fdc.xOffset;
-			drawPoints[i + 1] = points[i + 1] * fdc.yScale - fdc.yOffset;
-		}
-		fdc.gc.setBackground(color);
-		fdc.gc.fillPolygon(drawPoints);
-	}
-	public void addDamagedRegion(FigureDrawContext fdc, Region region) {
-		int xmin = Integer.MAX_VALUE, ymin = Integer.MAX_VALUE;
-		int xmax = Integer.MIN_VALUE, ymax = Integer.MIN_VALUE;
-
-		for (int i = 0; i < points.length; i += 2) {
-			if (points[i] < xmin) xmin = points[i];
-			if (points[i] > xmax) xmax = points[i];
-			if (points[i+1] < ymin) ymin = points[i+1];
-			if (points[i+1] > ymax) ymax = points[i+1];
-		}		
-		region.add(fdc.toClientRectangle(xmin, ymin, xmax, ymax));
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/SolidRectangleFigure.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/SolidRectangleFigure.java
deleted file mode 100644
index f3f2fb9..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/SolidRectangleFigure.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-
-import org.eclipse.swt.graphics.*;
-
-/**
- * 2D SolidRectangle object
- */
-public class SolidRectangleFigure extends Figure {
-	private Color color;
-	private int x1, y1, x2, y2;
-	/**
-	 * Constructs a SolidRectangle
-	 * These objects are defined by any two diametrically opposing corners.
-	 * 
-	 * @param color the color for this object
-	 * @param x1 the virtual X coordinate of the first corner
-	 * @param y1 the virtual Y coordinate of the first corner
-	 * @param x2 the virtual X coordinate of the second corner
-	 * @param y2 the virtual Y coordinate of the second corner
-	 */
-	public SolidRectangleFigure(Color color, int x1, int y1, int x2, int y2) {
-		this.color = color; this.x1 = x1; this.y1 = y1; this.x2 = x2; this.y2 = y2;
-	}
-	public void draw(FigureDrawContext fdc) {
-		Rectangle r = fdc.toClientRectangle(x1, y1, x2, y2);
-		fdc.gc.setBackground(color);
-		fdc.gc.fillRectangle(r.x, r.y, r.width, r.height);
-	}
-	public void addDamagedRegion(FigureDrawContext fdc, Region region) {
-		region.add(fdc.toClientRectangle(x1, y1, x2, y2));
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/SolidRoundedRectangleFigure.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/SolidRoundedRectangleFigure.java
deleted file mode 100644
index 9c0d2ec..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/SolidRoundedRectangleFigure.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-
-import org.eclipse.swt.graphics.*;
-
-/**
- * 2D SolidRectangle object
- */
-public class SolidRoundedRectangleFigure extends Figure {
-	private Color color;
-	private int x1, y1, x2, y2, diameter;
-	/**
-	 * Constructs a SolidRectangle
-	 * These objects are defined by any two diametrically opposing corners.
-	 * 
-	 * @param color the color for this object
-	 * @param x1 the virtual X coordinate of the first corner
-	 * @param y1 the virtual Y coordinate of the first corner
-	 * @param x2 the virtual X coordinate of the second corner
-	 * @param y2 the virtual Y coordinate of the second corner
-	 * @param diameter the diameter of curvature of all four corners
-	 */
-	public SolidRoundedRectangleFigure(Color color, int x1, int y1, int x2, int y2, int diameter) {
-		this.color = color; this.x1 = x1; this.y1 = y1; this.x2 = x2; this.y2 = y2;
-		this.diameter = diameter;
-	}
-	public void draw(FigureDrawContext fdc) {
-		Rectangle r = fdc.toClientRectangle(x1, y1, x2, y2);
-		fdc.gc.setBackground(color);
-		fdc.gc.fillRoundRectangle(r.x, r.y, r.width, r.height, diameter, diameter);
-	}
-	public void addDamagedRegion(FigureDrawContext fdc, Region region) {
-		region.add(fdc.toClientRectangle(x1, y1, x2, y2));
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/TextFigure.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/TextFigure.java
deleted file mode 100644
index cabd0c3..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/TextFigure.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-
-import org.eclipse.swt.graphics.*;
-
-/**
- * 2D Rectangle object
- */
-public class TextFigure extends Figure {
-	private Color  color;
-	private Font   font;
-	private String text;
-	private int x, y;
-	/**
-	 * Constructs a TextFigure
-	 * 
-	 * @param color the color for this object
-	 * @param font  the font for this object
-	 * @param text  the text to draw, tab and new-line expansion is performed
-	 * @param x     the virtual X coordinate of the top-left corner of the text bounding box
-	 * @param y     the virtual Y coordinate of the top-left corner of the text bounding box
-	 */
-	public TextFigure(Color color, Font font, String text, int x, int y) {
-		this.color = color; this.font = font; this.text = text; this.x = x; this.y = y;
-	}
-	public void draw(FigureDrawContext fdc) {
-		Point p = fdc.toClientPoint(x, y);
-		fdc.gc.setFont(font);
-		fdc.gc.setForeground(color);
-		fdc.gc.drawText(text, p.x, p.y, true);
-	}
-	public void addDamagedRegion(FigureDrawContext fdc, Region region) {
-		Font oldFont = fdc.gc.getFont();
-		fdc.gc.setFont(font);
-		Point textExtent = fdc.gc.textExtent(text);
-		fdc.gc.setFont(oldFont);
-		region.add(fdc.toClientRectangle(x, y, x + textExtent.x, y + textExtent.y));
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/TextTool.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/TextTool.java
deleted file mode 100644
index 766787e..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/TextTool.java
+++ /dev/null

@@ -1,160 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-
-/**
- * A text drawing tool.
- */
-public class TextTool extends BasicPaintSession implements PaintTool {
-	private ToolSettings settings;
-	private String drawText = PaintExample.getResourceString("tool.Text.settings.defaulttext");
-
-	/**
-	 * Constructs a PaintTool.
-	 * 
-	 * @param toolSettings the new tool settings
-	 * @param paintSurface the PaintSurface we will render on.
-	 */
-	public TextTool(ToolSettings toolSettings, PaintSurface paintSurface) {
-		super(paintSurface);
-		set(toolSettings);
-	}
-	
-	/**
-	 * Sets the tool's settings.
-	 * 
-	 * @param toolSettings the new tool settings
-	 */
-	public void set(ToolSettings toolSettings) {
-		settings = toolSettings;
-	}
-	
-	/**
-	 * Returns name associated with this tool.
-	 * 
-	 * @return the localized name of this tool
-	 */
-	public String getDisplayName() {
-		return PaintExample.getResourceString("tool.Text.label");
-	}
-	
-	/**
-	 * Activates the tool.
-	 */
-	public void beginSession() {
-		getPaintSurface().setStatusMessage(PaintExample.getResourceString(
-			"session.Text.message"));
-	}
-	
-	/**
-	 * Deactivates the tool.
-     */
-	public void endSession() {
-		getPaintSurface().clearRubberbandSelection();
-	}
-	
-	/**
-	 * Aborts the current operation.
-	 */
-	public void resetSession() {
-		getPaintSurface().clearRubberbandSelection();
-	}
-	
-	/**
-	 * Handles a mouseDown event.
-	 * 
-	 * @param event the mouse event detail information
-	 */
-	public void mouseDown(MouseEvent event) {
-		if (event.button == 1) {
-			// draw with left mouse button
-			getPaintSurface().commitRubberbandSelection();
-		} else {
-			// set text with right mouse button
-			getPaintSurface().clearRubberbandSelection();
-			Shell shell = getPaintSurface().getShell();
-			final Shell dialog = new Shell(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-			dialog.setText(PaintExample.getResourceString("tool.Text.dialog.title"));
-			dialog.setLayout(new GridLayout());
-			Label label = new Label(dialog, SWT.NONE);
-			label.setText(PaintExample.getResourceString("tool.Text.dialog.message"));
-			label.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
-			final Text field = new Text(dialog, SWT.SINGLE | SWT.BORDER);
-			field.setText(drawText);
-			field.selectAll();
-			field.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-			Composite buttons = new Composite(dialog, SWT.NONE);
-			GridLayout layout = new GridLayout(2, true);
-			layout.marginWidth = 0;
-			buttons.setLayout(layout);
-			buttons.setLayoutData(new GridData(SWT.END, SWT.CENTER, false, false));
-			Button ok = new Button(buttons, SWT.PUSH);
-			ok.setText(PaintExample.getResourceString("OK"));
-			ok.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
-			ok.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					drawText = field.getText();
-					dialog.dispose();
-				}
-			});
-			Button cancel = new Button(buttons, SWT.PUSH);
-			cancel.setText(PaintExample.getResourceString("Cancel"));
-			cancel.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					dialog.dispose();
-				}
-			});
-			dialog.setDefaultButton(ok);
-			dialog.pack();
-			dialog.open();
-			Display display = dialog.getDisplay();
-			while (! shell.isDisposed() && ! dialog.isDisposed()) {
-				if (! display.readAndDispatch()) display.sleep();
-			}
-		}	
-	}
-
-	/**
-	 * Handles a mouseDoubleClick event.
-	 * 
-	 * @param event the mouse event detail information
-	 */
-	public void mouseDoubleClick(MouseEvent event) {
-	}
-
-	/**
-	 * Handles a mouseUp event.
-	 * 
-	 * @param event the mouse event detail information
-	 */
-	public void mouseUp(MouseEvent event) {
-	}
-	
-	/**
-	 * Handles a mouseMove event.
-	 * 
-	 * @param event the mouse event detail information
-	 */
-	public void mouseMove(MouseEvent event) {
-		final PaintSurface ps = getPaintSurface();
-		ps.setStatusCoord(ps.getCurrentPosition());
-		ps.clearRubberbandSelection();
-		ps.addRubberbandSelection(
-			new TextFigure(settings.commonForegroundColor, settings.commonFont,
-				drawText, event.x, event.y));
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/Tool.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/Tool.java
deleted file mode 100644
index 5b51ce2..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/Tool.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-import org.eclipse.swt.graphics.*;
-
-public class Tool {
-	public int id;
-	public String name;
-	public String group;
-	public int type;
-	public Runnable action;
-	public Image image = null;
-	public Object data;
-	
-	public Tool(int id, String name, String group, int type) {
-		super();
-		this.id = id;
-		this.name = name;
-		this.group = group;
-		this.type = type;
-	}
-
-	public Tool(int id, String name, String group, int type, Object data) {
-		this(id, name, group, type);
-		this.data = data;
-	}
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/ToolSettings.java b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/ToolSettings.java
deleted file mode 100644
index b69bedc..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/ToolSettings.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.swt.examples.paint;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-
-/**
- * Tool Settings objects group tool-related configuration information.
- */
-public class ToolSettings {
-	public static final int ftNone = 0, ftOutline = 1, ftSolid = 2;
-
-	/**
-	 * commonForegroundColor: current tool foreground colour
-	 */
-	public Color commonForegroundColor;
-
-	/**
-	 * commonBackgroundColor: current tool background colour
-	 */
-	public Color commonBackgroundColor;
-
-	/**
-	 * commonFont: current font
-	 */
-	public Font commonFont;
-
-	/**
-	 * commonFillType: current fill type
-	 * <p>One of ftNone, ftOutline, ftSolid.</p>
-	 */
-	public int commonFillType = ftNone;
-
-	/**
-	 * commonLineStyle: current line type
-	 */
-	public int commonLineStyle = SWT.LINE_SOLID;
-	
-	/**
-	 * airbrushRadius: coverage radius in pixels
-	 */
-	public int airbrushRadius = 10;
-	
-	/**
-	 * airbrushIntensity: average surface area coverage in region defined by radius per "jot"
-	 */
-	public int airbrushIntensity = 30;
-	
-	/**
-	 * roundedRectangleCornerDiameter: the diameter of curvature of corners in a rounded rectangle
-	 */
-	public int roundedRectangleCornerDiameter = 16;
-}

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/fill_none.gif b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/fill_none.gif
deleted file mode 100644
index d26dd58..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/fill_none.gif
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/fill_outline.gif b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/fill_outline.gif
deleted file mode 100644
index c6ccfee..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/fill_outline.gif
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/fill_solid.gif b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/fill_solid.gif
deleted file mode 100644
index cb34e64..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/fill_solid.gif
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/linestyle_dash.gif b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/linestyle_dash.gif
deleted file mode 100644
index fb57bb3..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/linestyle_dash.gif
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/linestyle_dashdot.gif b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/linestyle_dashdot.gif
deleted file mode 100644
index 322968c..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/linestyle_dashdot.gif
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/linestyle_dot.gif b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/linestyle_dot.gif
deleted file mode 100644
index 4937ccb..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/linestyle_dot.gif
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/linestyle_solid.gif b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/linestyle_solid.gif
deleted file mode 100644
index 70a57ce..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/linestyle_solid.gif
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/options_font.gif b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/options_font.gif
deleted file mode 100644
index 965fe08..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/options_font.gif
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_airbrush.gif b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_airbrush.gif
deleted file mode 100644
index a310edd..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_airbrush.gif
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_ellipse.gif b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_ellipse.gif
deleted file mode 100644
index dc2142f..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_ellipse.gif
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_line.gif b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_line.gif
deleted file mode 100644
index 2ff819f..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_line.gif
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_pencil.gif b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_pencil.gif
deleted file mode 100644
index f16a234..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_pencil.gif
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_polyline.gif b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_polyline.gif
deleted file mode 100644
index aa384e9..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_polyline.gif
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_rectangle.gif b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_rectangle.gif
deleted file mode 100644
index d26dd58..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_rectangle.gif
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_roundedrectangle.gif b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_roundedrectangle.gif
deleted file mode 100644
index bf845d7..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_roundedrectangle.gif
+++ /dev/null
Binary files differ

diff --git a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_text.gif b/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_text.gif
deleted file mode 100644
index 0d7457f..0000000
--- a/demos/app-model/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/tool_text.gif
+++ /dev/null
Binary files differ

diff --git a/demos/splash/org.eclipse.equinox.examples.splash.ui/.classpath b/demos/splash/org.eclipse.equinox.examples.splash.ui/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/demos/splash/org.eclipse.equinox.examples.splash.ui/.project b/demos/splash/org.eclipse.equinox.examples.splash.ui/.project
deleted file mode 100644
index a290cfa..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash.ui/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.examples.splash.ui</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/demos/splash/org.eclipse.equinox.examples.splash.ui/META-INF/MANIFEST.MF b/demos/splash/org.eclipse.equinox.examples.splash.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index e605002..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Demo Plug-in
-Bundle-SymbolicName: org.eclipse.equinox.examples.splash.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.equinox.examples.splash.ui.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.equinox.examples.splash
-Eclipse-LazyStart: true
-Bundle-ClassPath: demo.jar

diff --git a/demos/splash/org.eclipse.equinox.examples.splash.ui/build.properties b/demos/splash/org.eclipse.equinox.examples.splash.ui/build.properties
deleted file mode 100644
index 5a3d57e..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash.ui/build.properties
+++ /dev/null

@@ -1,10 +0,0 @@
-bin.includes = plugin.xml,\
-               META-INF/,\
-               icons/,\
-               splash.bmp,\
-               content/,\
-               demo.jar
-source.demo.jar = src/
-output.demo.jar = bin/
-jars.compile.order = demo.jar
-source.demo.jar = src/

diff --git a/demos/splash/org.eclipse.equinox.examples.splash.ui/configuration/config.ini b/demos/splash/org.eclipse.equinox.examples.splash.ui/configuration/config.ini
deleted file mode 100644
index 719e718..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash.ui/configuration/config.ini
+++ /dev/null

@@ -1,6 +0,0 @@
-#Product Runtime Configuration File
-
-osgi.splashPath=platform:/base/plugins/org.eclipse.equinox.examples.splash
-eclipse.product=org.eclipse.equinox.examples.splash.ui.product
-osgi.bundles=org.eclipse.equinox.examples.splash@1:start,org.eclipse.equinox.common@2:start,org.eclipse.core.runtime@start,com.ibm.icu,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.databinding,org.eclipse.core.expressions,org.eclipse.core.jobs,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.equinox.app,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.equinox.examples.splash.ui,org.eclipse.help,org.eclipse.jface,org.eclipse.jface.databinding,org.eclipse.osgi.services,org.eclipse.swt,org.eclipse.swt.win32.win32.x86,org.eclipse.ui,org.eclipse.ui.workbench,org.eclipse.equinox.launcher,org.eclipse.equinox.launcher.win32.win32.x86
-osgi.bundles.defaultStartLevel=4

diff --git a/demos/splash/org.eclipse.equinox.examples.splash.ui/content/debugging.html b/demos/splash/org.eclipse.equinox.examples.splash.ui/content/debugging.html
deleted file mode 100644
index cb5c6b0..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash.ui/content/debugging.html
+++ /dev/null

@@ -1,24 +0,0 @@
-<!-- saved from url=(0014)about:internet -->
-<html>
-<body>
-<!--
-<OBJECT classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"
-WIDTH="952" HEIGHT="806" id="debugging">
-<PARAM NAME=movie VALUE="debugging.swf">
-<PARAM NAME=quality VALUE=high>
-<PARAM NAME=bgcolor VALUE=#FFFFFF>
-
-<EMBED src="debugging.swf" quality=high bgcolor=#FFFFFF WIDTH="952" HEIGHT="806"
-NAME="debug" ALIGN="" TYPE="application/x-shockwave-flash"
-PLUGINSPAGE="http://www.macromedia.com/go/getflashplayer"></EMBED>
-</OBJECT>
--->
-<object width="425" height="350">
-	<param name="movie" value="http://www.youtube.com/v/bcu8ZdJ2dQo"></param>
-	<param name="wmode" value="transparent"></param>
-	<embed src="http://www.youtube.com/v/bcu8ZdJ2dQo" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350"></embed>
-</object>
-</p>
-</body>
-</html>

diff --git a/demos/splash/org.eclipse.equinox.examples.splash.ui/content/debugging.swf b/demos/splash/org.eclipse.equinox.examples.splash.ui/content/debugging.swf
deleted file mode 100644
index 1f4a040..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash.ui/content/debugging.swf
+++ /dev/null
Binary files differ

diff --git a/demos/splash/org.eclipse.equinox.examples.splash.ui/icons/alt_about.gif b/demos/splash/org.eclipse.equinox.examples.splash.ui/icons/alt_about.gif
deleted file mode 100644
index 20d9ad2..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash.ui/icons/alt_about.gif
+++ /dev/null
Binary files differ

diff --git a/demos/splash/org.eclipse.equinox.examples.splash.ui/icons/alt_launcher.icns b/demos/splash/org.eclipse.equinox.examples.splash.ui/icons/alt_launcher.icns
deleted file mode 100644
index b77a6a6..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash.ui/icons/alt_launcher.icns
+++ /dev/null
Binary files differ

diff --git a/demos/splash/org.eclipse.equinox.examples.splash.ui/icons/alt_launcher.ico b/demos/splash/org.eclipse.equinox.examples.splash.ui/icons/alt_launcher.ico
deleted file mode 100644
index d548f71..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash.ui/icons/alt_launcher.ico
+++ /dev/null
Binary files differ

diff --git a/demos/splash/org.eclipse.equinox.examples.splash.ui/icons/alt_launcher.xpm b/demos/splash/org.eclipse.equinox.examples.splash.ui/icons/alt_launcher.xpm
deleted file mode 100644
index b0c139e..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash.ui/icons/alt_launcher.xpm
+++ /dev/null

@@ -1,307 +0,0 @@
-/* XPM */

-static char * icon48_xpm[] = {

-"48 48 256 2",

-"  	c #4B4B3B3B9090",

-". 	c #0D0D0E0E5454",

-"X 	c #11110E0E5B5B",

-"o 	c #17170F0F6363",

-"O 	c #1D1D13136969",

-"+ 	c #212114146C6C",

-"@ 	c #252514147171",

-"# 	c #282811116C6C",

-"$ 	c #26260D0D6363",

-"% 	c #22220B0B5E5E",

-"& 	c #1C1C0B0B5A5A",

-"* 	c #1C1C0B0B5252",

-"= 	c #1B1B05055353",

-"- 	c #161606064D4D",

-"; 	c #161605054949",

-": 	c #111104044848",

-"> 	c #131304044545",

-", 	c #131305054242",

-"< 	c #141410105E5E",

-"1 	c #2C2C15157373",

-"2 	c #2B2B1B1B7575",

-"3 	c #343416167272",

-"4 	c #313113136E6E",

-"5 	c #222209095757",

-"6 	c #1B1B06064D4D",

-"7 	c #15150B0B4242",

-"8 	c #13130C0C5555",

-"9 	c #2E2E1B1B7878",

-"0 	c #33331F1F7C7C",

-"q 	c #343418187878",

-"w 	c #3B3B1C1C7575",

-"e 	c #2E2E10106767",

-"r 	c #1B1B07074747",

-"t 	c #18180B0B4646",

-"y 	c #151513136262",

-"u 	c #1A1A15156464",

-"i 	c #34341F1F7777",

-"p 	c #40401E1E8080",

-"a 	c #42421B1B7A7A",

-"s 	c #3B3B15157474",

-"d 	c #2B2B0B0B5B5B",

-"f 	c #222207075252",

-"g 	c #373727277A7A",

-"h 	c #474724248484",

-"j 	c #393915156E6E",

-"k 	c #373711116A6A",

-"l 	c #343413136363",

-"z 	c #232319196E6E",

-"x 	c #292919197070",

-"c 	c #3C3C2C2C8282",

-"v 	c #444431318585",

-"b 	c #494934348A8A",

-"n 	c #505026268A8A",

-"m 	c #3D3D1B1B6E6E",

-"M 	c #31310E0E5C5C",

-"N 	c #2B2B0D0D5353",

-"B 	c #222207074A4A",

-"V 	c #52523C3C9292",

-"C 	c #58583C3C9494",

-"Z 	c #5D5D44449797",

-"A 	c #5C5C2E2E9292",

-"S 	c #676733339595",

-"D 	c #424228287575",

-"F 	c #29290A0A4F4F",

-"G 	c #6C6C4A4A9E9E",

-"H 	c #72725454A7A7",

-"J 	c #8C8C6D6DB2B2",

-"K 	c #343424246E6E",

-"L 	c #3A3A23236A6A",

-"P 	c #3A3A1C1C6767",

-"I 	c #24240A0A4B4B",

-"U 	c #151518186161",

-"Y 	c #76766F6FA5A5",

-"T 	c #ADAD9191CCCC",

-"R 	c #98988989D3D3",

-"E 	c #45453B3B8686",

-"W 	c #3C3C35357979",

-"Q 	c #363631317575",

-"! 	c #32322D2D6B6B",

-"~ 	c #323229296363",

-"^ 	c #30301F1F6262",

-"/ 	c #323218185E5E",

-"( 	c #272707074B4B",

-") 	c #202028286C6C",

-"_ 	c #1E1E1D1D6868",

-"` 	c #9A9A8282BBBB",

-"' 	c #C8C8B3B3D3D3",

-"] 	c #B3B3AFAFE7E7",

-"[ 	c #84847272C6C6",

-"{ 	c #58585757A3A3",

-"} 	c #3F3F3C3C8A8A",

-"| 	c #3B3B3A3A8484",

-" .	c #414139397D7D",

-"..	c #3D3D39397A7A",

-"X.	c #37372E2E6E6E",

-"o.	c #2C2C21215A5A",

-"O.	c #2E2E1B1B5B5B",

-"+.	c #F5F5EFEFF5F5",

-"@.	c #656566669A9A",

-"#.	c #47474B4B8E8E",

-"$.	c #3C3C44447B7B",

-"%.	c #444442428080",

-"&.	c #45453E3E8181",

-"*.	c #40403C3C8181",

-"=.	c #3D3D33337474",

-"-.	c #3B3B30306E6E",

-";.	c #38382D2D6969",

-":.	c #303026265D5D",

-">.	c #2C2C15155A5A",

-",.	c #1F1F1C1C7070",

-"<.	c #25251E1E7171",

-"1.	c #59595C5C9191",

-"2.	c #4D4D53538989",

-"3.	c #4C4C49498484",

-"4.	c #484845458585",

-"5.	c #494941418585",

-"6.	c #494940408181",

-"7.	c #2F2F1C1C5353",

-"8.	c #2B2B28287676",

-"9.	c #323231317F7F",

-"0.	c #545452528B8B",

-"q.	c #51514E4E8989",

-"w.	c #4E4E4B4B8C8C",

-"e.	c #4C4C47478686",

-"r.	c #46463D3D7E7E",

-"t.	c #434336367A7A",

-"y.	c #2B2B13135555",

-"u.	c #47473D3D8D8D",

-"i.	c #575757578E8E",

-"p.	c #48483E3E7F7F",

-"a.	c #46463A3A7D7D",

-"s.	c #424235357575",

-"d.	c #404034347171",

-"f.	c #BFBFCBCBFAFA",

-"g.	c #B8B8A8A8DDDD",

-"h.	c #5E5E60609292",

-"j.	c #565655558C8C",

-"k.	c #4B4B44448282",

-"l.	c #454539397B7B",

-"z.	c #434338387878",

-"x.	c #3F3F32326D6D",

-"c.	c #3D3D30306969",

-"v.	c #3A3A2E2E6363",

-"b.	c #36362A2A5C5C",

-"n.	c #343424245555",

-"m.	c #30301E1E4D4D",

-"M.	c #49493C3C8282",

-"N.	c #5E5E4F4F8C8C",

-"B.	c #56563B3B8B8B",

-"V.	c #545407078585",

-"C.	c #424234347272",

-"Z.	c #9797A4A4F7F7",

-"A.	c #444436367676",

-"S.	c #7D7D7979D5D5",

-"D.	c #464640408A8A",

-"F.	c #44444B4B8282",

-"G.	c #414107077777",

-"H.	c #71716161C1C1",

-"J.	c #303039397979",

-"K.	c #8E8E8E8EE6E6",

-"L.	c #404033338B8B",

-"P.	c #4A4A45458C8C",

-"I.	c #46463A3A8080",

-"U.	c #363629295454",

-"Y.	c #303022224848",

-"T.	c #424237377575",

-"R.	c #2E2E1D1D6363",

-"E.	c #79798383EAEA",

-"W.	c #74747B7BE4E4",

-"Q.	c #6D6D7676D6D6",

-"!.	c #6A6A7171CECE",

-"~.	c #66666969C6C6",

-"^.	c #62626565BCBC",

-"/.	c #5F5F6060B5B5",

-"(.	c #5B5B5B5BACAC",

-").	c #535353539898",

-"_.	c #4F4F4F4FA4A4",

-"`.	c #54544D4DA4A4",

-"'.	c #323204046B6B",

-"].	c #303035357979",

-"[.	c #313122224343",

-"{.	c #5A5A5B5BB7B7",

-"}.	c #484846468080",

-"|.	c #454541417575",

-" X	c #4B4B31318282",

-".X	c #47473C3C8484",

-"XX	c #3E3E35356E6E",

-"oX	c #2F2F26264040",

-"OX	c #2B2B23233A3A",

-"+X	c #262619195C5C",

-"@X	c #252515155A5A",

-"#X	c #55555151B3B3",

-"$X	c #3C3C2D2D5D5D",

-"%X	c #39392F2F5656",

-"&X	c #37372D2D5050",

-"*X	c #25251F1F3030",

-"=X	c #24241D1D4343",

-"-X	c #202013135656",

-";X	c #41413B3B6C6C",

-":X	c #444442429696",

-">X	c #212100005E5E",

-",X	c #444436367272",

-"<X	c #444436366F6F",

-"1X	c #424236366868",

-"2X	c #3F3F34346161",

-"3X	c #3C3C32325A5A",

-"4X	c #34342A2A4A4A",

-"5X	c #21211B1B2121",

-"6X	c #22221C1C6363",

-"7X	c #2D2D01015E5E",

-"8X	c #20201B1B2525",

-"9X	c #49492F2F7B7B",

-"0X	c #434334346C6C",

-"qX	c #323229294545",

-"wX	c #1C1C10104F4F",

-"eX	c #222217176363",

-"rX	c #37371E1E6B6B",

-"tX	c #424232326E6E",

-"yX	c #444433336969",

-"uX	c #424233336565",

-"iX	c #1E1E1A1A1E1E",

-"pX	c #161601014C4C",

-"aX	c #1C1C11115454",

-"sX	c #252503035B5B",

-"dX	c #414131316A6A",

-"fX	c #22221F1F7878",

-"gX	c #272724246767",

-"hX	c #1D1D16165E5E",

-"jX	c #131305055151",

-"kX	c #40402F2F6464",

-"lX	c #111107074E4E",

-"zX	c #0C0C05054B4B",

-"xX	c #22221E1E5757",

-"cX	c #1A1A0D0D4D4D",

-"vX	c #16160B0B4D4D",

-"bX	c #060604044747",

-"nX	c #040403034343",

-"mX	c #3B3B27276565",

-"MX	c #0E0E03034141",

-"NX	c #111106064A4A",

-"BX	c #0E0E04044646",

-"VX	c #111105053B3B",

-"CX	c #0D0D01013A3A",

-"ZX	c #030305053F3F",

-"AX	c #0F0F0F0F4C4C",

-"SX	c #020207073B3B",

-"DX	c #0D0D03034646",

-"FX	c #0B0B02023F3F",

-"GX	c #0D0D02023434",

-"HX	c #0A0A0E0E4444",

-"JX	c #161614145252",

-"KX	c #0B0B04044646",

-"LX	c #0A0A03034444",

-"PX	c #1D1D21215757",

-"IX	c #090910104040",

-"UX	c #18181E1E5353",

-"                                                                                                ",

-"  . . . . X X o o o o O + + @ @ @ @ @ @ @ # # # # # # $ $ % % & & & & * = - - - ; : > > , , ,   ",

-"  . . X X < < o o O O + @ 1 2 2 1 1 1 1 1 1 1 1 3 4 # # $ $ $ % % % 5 = = 6 6 - ; ; > > , , 7   ",

-"  . 8 < < < o O O + @ @ 2 9 9 0 0 q q q q q q q w 3 4 4 e e $ $ $ $ % 5 = = 6 6 6 ; ; > > r t   ",

-"  . X < y u O O + @ 1 2 i 0 0 p p p p p p p a a p a s 3 4 4 e e e e d 5 5 f f 6 6 6 ; ; r r t   ",

-"  X < y u O + + @ 2 9 0 g p p h h h h h h h p h h a a s s j k k j l d d 5 5 f f 6 6 r r r r r   ",

-"  X < y O z x x 9 0 g c v b n n n n n n n n n n n h a a s s j j m l M d d N f f B B B B r r r   ",

-"  < y u + z 2 0 c c b V C Z C C A A A A A S S S n h D w w m m m m k l M d d N f F F F B r r r   ",

-"  < y O z z 9 c b V Z G H H H G S G G J J H V v c g g K K K K L P l l l M M N N N N I B B r r   ",

-"  U u + z x i v C H Y J J J J H J T R H V E W W Q Q Q Q ! ! ! ~ ^ ^ / / M M M M M N ( B B r r   ",

-"  ) _ z x 9 g b Z Y ` ' ' ' T T ] [ { } |  .........W W Q Q X.! ~ ~ o.O./ / / / N F ( B B B r   ",

-"  ) ) z x i c V G J ' +.+.+.+.] [ @.#.$.%.%.%.&.*. . .....W =.-.X.;.~ :.o.O.^ >.N F ( B B B B   ",

-"  ) ,.<.2 g v C H J ' +.+.+.+.T Y 1.2.3.4.4.4.5.6.&.&. . ...W =.=.-.;.~ :.o.7.>.N F F ( B I I   ",

-"  ) ,.<.8.9.b C H J T +.+.+.' J @.1.0.q.q.w.e.4.5.6.&.r. . .t.W =.=.-.;.~ :.o.7.y.N F ( ( I I   ",

-"  8.8.8.9.| u.C G J T +.+.' ` Y @.1.i.0.q.q.e.e.5.6.p.r.a. .t.t.s.d.d.-.;.~ :.7.7.y.F F ( I I   ",

-"  9.c c c v b A S H ' f.g.` Y @.h.1.i.j.0.q.q.e.k.6.p.r.a.l.t.z.s.s.d.x.c.v.b.n.m.7.N F F F I   ",

-"  <.g M.N.B.B.n V.J f.R J @.h.h.1.i.i.j.j.0.q.3.k.6.p.r.a.l.l.z.s.C.d.x.x.c.v.b.n.m.y.N F F F   ",

-"  + x i v B.Z Z G g.Z.[ @.2.i.i.j.j.j.j.j.0.q.3.k.6.p.p.a.l.l.A.s.C.C.d.x.c.v.b.n.m.7.y.N N y.  ",

-"  O # 3 w p n Z ` f.S.H D.F.q.0.0.0.0.j.0.q.q.3.k.6.p.r.a.a.l.A.s.s.C.d.x.x.c.v.b.n.m.y.y.y.y.  ",

-"  O # 4 s a G.V.T Z.H.V J.%.e.w.q.0.0.0.0.q.q.e.k.6.p.r.a.a.l.z.A.s.C.d.d.x.c.v.b.n.m.7.>.y.y.  ",

-"  O # 4 s w G.A f.K.H L...4.P.w.w.w.q.q.q.q.e.e.5.6.M.I.I.a.a.l.z.A.s.d.d.x.c.v.v.U.Y.7.O.>.y.  ",

-"  $ # 4 3 s G.G f.S.Z 9.*.D.P.P.w.w.w.w.w.e.e.5.5.M.M.I.I.a.a.l.z.T.s.d.d.x.x.c.v.U.Y.m.R.>.>.  ",

-"  E.E.W.W.W.W.E.Z.E.W.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.!.!.!.!.!.~.~.~.~.~.~.^.^.^.^.^./././.(.{ { )._.`._.  ",

-"  + # 3 w s '.` f.H.V ].*.D.P.P.P.P.P.P.P.5.5.5.M.M.M.I.I.a.l.z.z.T.T.s.d.d.x.c.v.U.Y.[.^ O.>.  ",

-"  ~.~.~.~.~.~.K.Z.S.~.{.^.^.^.^.^.^.^.^././././././.(.(.(.(.(.(.{ { { { { ).).).w.w.}.|.P.u.}   ",

-"   .I.6. X X XT f.H.b ].*.E D.D.D.D.5.5..X.XM.M.I.I.a.a.l.l.z.z.T.T.T.d.XXx.c.v.b.U.oXOXR.+X@X  ",

-"  E.E.E.W.W.W.K.Z.E.W.Q.Q.Q.Q.Q.Q.Q.Q.!.!.!.!.!.!.~.~.~.~.~.~.^.^.^.^.^./././.(.{ { ).).#X_._.  ",

-"  & % $ e '.= H f.H.b 8.W *.E E E .X.X.XI.I.I.I.a.a.l.l.z.z.T.T.T.C.XXXXc.v.$X%X&XY.*X=X2 @X-X  ",

-"  {.{.{.{.{.#X~.Z.W.~.{.{./././././././././.(.(.(.(.(.(.(.{ { { { { { ).).).w.w.3.}.;X%.:X} }   ",

-"  & & % $ e >XV.f.S.C K X.W t. . .l.l.t.t.t.t.A.A.A.,X,X,X,X,X<X;X1X1X2X3X%X&X4XoX*X5Xo.6X-X-X  ",

-"  & & % $ $ >X7X` Z.Z D ! =.=.s.t.t.t.A.A.s.A.,X,X,X,X<X<X<X<X;X1X2X2X3X%X&X4XoXOX8X5X<.@X-X-X  ",

-"  8 & & $ e K 9XJ f.^. XK X.=.=.s.s.s.s.s.C.C.C.C.<X0X0X0X1X1X1X2X2X3X%X&X4XqXOX*X8X=X<.-X-XwX  ",

-"  8 & eXK k.@.M. Xg.E.B.rX~ -.d.d.C.C.C.C.C.tX0X0X0XyXyX1X1XuX2X2X3X%X&X4XqXoXOX8XiX6XeX-X-XwX  ",

-"  6XQ h.Y N.K e pXB.f./.9Xo.;.-.x.d.tXtXtXtXtX0X0XyXyXyXuXuX2X2X3X%X&X4XqXoXOX*XiX=X_ aX-XaXwX  ",

-"  Y Y  .R.@X% sX= 7XT Z.V P :.;.c.x.x.x.tXdXdXdXyXyXuXuX2X2X3X3X%X&X4XqXoXOX*X8X*XfXaXaXaXwXwX  ",

-"  gXhX& * & 5 5 sXjXa ] S.9X/ ~ v.c.dXdXdXdXdXuXuXuXkX2X2X3X%X%X&X4XqXoXOX*X8XiX<.hXwXwXaXwXwX  ",

-"  8 lXlXjX= * 5 5 = zX9X] H.D 7.b.v.v.kXc.kXkXkXkXkX2X$X3X%X&X&X4XqXoXOX*X8XiXxXhXwXcXcXwXwXwX  ",

-"  zXzXlXlXjX= = f f sXD Y ] ~.D 7.n.b.v.v.kXkXkXkX$X$X%X%X&X4XqXoXoXOX*X8X5XgXu cXvXvXcXcXwXwX  ",

-"  bXbXzXlXlX- = * @XX.h.e D T S.D n.m.b.$X$X$X$X$X%X%X&X&X4XqXoXOX*X8X8X*X<.hXvX; ; vXvXvXcXwX  ",

-"  nXbXzXzXlXlX- -XX.Y R.pXpXP J K.Z mXm.n.U.U.U.U.U.4X4XY.oXOX*X8X8X8X=X,.aXvX; > > > t t t cX  ",

-"  nXbXbXzXzXlXaXXXY +Xf = f = 7XtXR R   mXn.Y.[.[.[.[.OX*X*X8X5X*X=X,.u vXvX; > > MXMX, 7 t t   ",

-"  nXnXnXbXzXvX-.Y +XcX6 6 = = = d L B.G H `.X.:.7.m.=X=X=X=X=X6X,.u cXvXNX: BX> MXVXCXVX7 7 7   ",

-"  ZXZXnXbXAXgX@.+XvX; - - - - * @XR.>.sX>.R.i 0 x eXeXeXeXO hXaXcXvXNX: BXMXMXMXVXCXCXCXVX7 7   ",

-"  SXZXZXAXgXN.aXNX: : NXNXNX- * +X+X* 6 6 6 * * * * * * * vXvX- NX: DXBXMXMXFXCXCXCXCXGXVXVX7   ",

-"  SXSXHXgX0.JXKXLXKXKXDX: : NX* @X-X- - - - - - - - - - - NX: DXDXDXMXMXFXFXCXCXCXCXGXGXGXVXVX  ",

-"  SXHXPX3.JXnXnXnXnXbXLXKXKXNXaX-XvX: : NX: : : : : : : BXDXDXLXMXMXFXFXCXCXCXCXGXGXGXGXGXGXGX  ",

-"  IXUX$.AXZXZXZXZXnXnXnXLXLXNXJXvXBXDXBXBXBXBXDXDXDXDXLXDXLXLXFXFXFXFXCXCXCXCXGXGXGXGXGXGXGXGX  ",

-"                                                                                                "};


diff --git a/demos/splash/org.eclipse.equinox.examples.splash.ui/icons/alt_window_16.gif b/demos/splash/org.eclipse.equinox.examples.splash.ui/icons/alt_window_16.gif
deleted file mode 100644
index 05626b1..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash.ui/icons/alt_window_16.gif
+++ /dev/null
Binary files differ

diff --git a/demos/splash/org.eclipse.equinox.examples.splash.ui/icons/alt_window_32.gif b/demos/splash/org.eclipse.equinox.examples.splash.ui/icons/alt_window_32.gif
deleted file mode 100644
index b432f88..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash.ui/icons/alt_window_32.gif
+++ /dev/null
Binary files differ

diff --git a/demos/splash/org.eclipse.equinox.examples.splash.ui/plugin.xml b/demos/splash/org.eclipse.equinox.examples.splash.ui/plugin.xml
deleted file mode 100644
index c3e7e03..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash.ui/plugin.xml
+++ /dev/null

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
-   <extension
-         id="application"
-         point="org.eclipse.core.runtime.applications">
-      <application>
-         <run
-               class="org.eclipse.equinox.examples.splash.ui.Application">
-         </run>
-      </application>
-   </extension>
-   <extension
-         point="org.eclipse.ui.perspectives">
-      <perspective
-            name="RCP Perspective"
-            class="org.eclipse.equinox.examples.splash.ui.Perspective"
-            id="org.eclipse.equinox.examples.splash.ui.perspective">
-      </perspective>
-   </extension>
-   <extension
-         id="product"
-         point="org.eclipse.core.runtime.products">
-      <product
-            application="org.eclipse.equinox.examples.splash.ui.application"
-            name="Hello RCP">
-         <property
-               name="windowImages"
-               value="icons/alt_window_16.gif,icons/alt_window_32.gif">
-         </property>
-         <property
-               name="appName"
-               value="Hello RCP">
-         </property>
-      </product>
-   </extension>
-   <extension
-         point="org.eclipse.ui.splashHandlers">
-      <splashHandler
-            class="org.eclipse.equinox.examples.splash.ui.SplashHandler"
-            id="org.eclipse.equinox.examples.splash.ui">
-      </splashHandler>
-      <!--<splashHandlerProductBinding
-            productId="org.eclipse.equinox.examples.splash.ui.product"
-            splashId="org.eclipse.equinox.examples.splash.ui">
-      </splashHandlerProductBinding> -->
-      <splashHandlerProductBinding
-            productId="org.eclipse.sdk.ide"
-            splashId="org.eclipse.equinox.examples.splash.ui">
-      </splashHandlerProductBinding>
-   </extension>
-</plugin>

diff --git a/demos/splash/org.eclipse.equinox.examples.splash.ui/splash.bmp b/demos/splash/org.eclipse.equinox.examples.splash.ui/splash.bmp
deleted file mode 100644
index 86f224a..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash.ui/splash.bmp
+++ /dev/null
Binary files differ

diff --git a/demos/splash/org.eclipse.equinox.examples.splash.ui/splash.product b/demos/splash/org.eclipse.equinox.examples.splash.ui/splash.product
deleted file mode 100644
index 0b10099..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash.ui/splash.product
+++ /dev/null

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.1"?>
-
-<product name="Hello RCP" id="org.eclipse.equinox.examples.splash.ui.product" application="org.eclipse.equinox.examples.splash.ui.application" useFeatures="false">
-
-
-   <configIni use="custom" path="/org.eclipse.equinox.examples.splash.ui/configuration/config.ini"/>
-
-   <launcherArgs>
-      <programArgs>-showsplash org.eclipse.equinox.examples.splash.ui</programArgs>
-   </launcherArgs>
-
-   <windowImages i16="icons/alt_window_16.gif" i32="icons/alt_window_32.gif"/>
-
-   <splash
-      location="org.eclipse.equinox.examples.splash.ui" />
-   <launcher>
-      <solaris/>
-      <win useIco="false">
-         <bmp/>
-      </win>
-   </launcher>
-
-
-   <vm>
-   </vm>
-
-   <plugins>
-      <plugin id="com.ibm.icu"/>
-      <plugin id="org.eclipse.core.commands"/>
-      <plugin id="org.eclipse.core.contenttype"/>
-      <plugin id="org.eclipse.core.databinding"/>
-      <plugin id="org.eclipse.core.expressions"/>
-      <plugin id="org.eclipse.core.jobs"/>
-      <plugin id="org.eclipse.core.runtime"/>
-      <plugin id="org.eclipse.core.runtime.compatibility.auth"/>
-      <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
-      <plugin id="org.eclipse.equinox.app"/>
-      <plugin id="org.eclipse.equinox.common"/>
-      <plugin id="org.eclipse.equinox.examples.splash"/>
-      <plugin id="org.eclipse.equinox.examples.splash.ui"/>
-      <plugin id="org.eclipse.equinox.preferences"/>
-      <plugin id="org.eclipse.equinox.registry"/>
-      <plugin id="org.eclipse.help"/>
-      <plugin id="org.eclipse.jface"/>
-      <plugin id="org.eclipse.jface.databinding"/>
-      <plugin id="org.eclipse.osgi"/>
-      <plugin id="org.eclipse.osgi.services"/>
-      <plugin id="org.eclipse.swt"/>
-      <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
-      <plugin id="org.eclipse.ui"/>
-      <plugin id="org.eclipse.ui.workbench"/>
-   </plugins>
-
-</product>

diff --git a/demos/splash/org.eclipse.equinox.examples.splash.ui/src/org/eclipse/equinox/examples/splash/ui/Activator.java b/demos/splash/org.eclipse.equinox.examples.splash.ui/src/org/eclipse/equinox/examples/splash/ui/Activator.java
deleted file mode 100644
index e18bde9..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash.ui/src/org/eclipse/equinox/examples/splash/ui/Activator.java
+++ /dev/null

@@ -1,61 +0,0 @@
-package org.eclipse.equinox.examples.splash.ui;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.equinox.examples.splash.ui";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-}

diff --git a/demos/splash/org.eclipse.equinox.examples.splash.ui/src/org/eclipse/equinox/examples/splash/ui/Application.java b/demos/splash/org.eclipse.equinox.examples.splash.ui/src/org/eclipse/equinox/examples/splash/ui/Application.java
deleted file mode 100644
index 55549a0..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash.ui/src/org/eclipse/equinox/examples/splash/ui/Application.java
+++ /dev/null

@@ -1,46 +0,0 @@
-package org.eclipse.equinox.examples.splash.ui;
-
-import org.eclipse.equinox.app.IApplication;
-import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This class controls all aspects of the application's execution
- */
-public class Application implements IApplication {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
-	 */
-	public Object start(IApplicationContext context) throws Exception {
-		Display display = PlatformUI.createDisplay();
-		try {
-			int returnCode = PlatformUI.createAndRunWorkbench(display, new ApplicationWorkbenchAdvisor());
-			if (returnCode == PlatformUI.RETURN_RESTART)
-				return IApplication.EXIT_RESTART;
-			else
-				return IApplication.EXIT_OK;
-		} finally {
-			display.dispose();
-		}
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.app.IApplication#stop()
-	 */
-	public void stop() {
-		final IWorkbench workbench = PlatformUI.getWorkbench();
-		if (workbench == null)
-			return;
-		final Display display = workbench.getDisplay();
-		display.syncExec(new Runnable() {
-			public void run() {
-				if (!display.isDisposed())
-					workbench.close();
-			}
-		});
-	}
-}

diff --git a/demos/splash/org.eclipse.equinox.examples.splash.ui/src/org/eclipse/equinox/examples/splash/ui/ApplicationActionBarAdvisor.java b/demos/splash/org.eclipse.equinox.examples.splash.ui/src/org/eclipse/equinox/examples/splash/ui/ApplicationActionBarAdvisor.java
deleted file mode 100644
index cf27e68..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash.ui/src/org/eclipse/equinox/examples/splash/ui/ApplicationActionBarAdvisor.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package org.eclipse.equinox.examples.splash.ui;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.application.ActionBarAdvisor;
-import org.eclipse.ui.application.IActionBarConfigurer;
-
-public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
-
-    public ApplicationActionBarAdvisor(IActionBarConfigurer configurer) {
-        super(configurer);
-    }
-
-    protected void makeActions(IWorkbenchWindow window) {
-    }
-
-    protected void fillMenuBar(IMenuManager menuBar) {
-    }
-    
-}

diff --git a/demos/splash/org.eclipse.equinox.examples.splash.ui/src/org/eclipse/equinox/examples/splash/ui/ApplicationWorkbenchAdvisor.java b/demos/splash/org.eclipse.equinox.examples.splash.ui/src/org/eclipse/equinox/examples/splash/ui/ApplicationWorkbenchAdvisor.java
deleted file mode 100644
index 00799ae..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash.ui/src/org/eclipse/equinox/examples/splash/ui/ApplicationWorkbenchAdvisor.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package org.eclipse.equinox.examples.splash.ui;
-
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.ui.application.WorkbenchAdvisor;
-import org.eclipse.ui.application.WorkbenchWindowAdvisor;
-
-public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
-
-	private static final String PERSPECTIVE_ID = "org.eclipse.equinox.examples.splash.ui.perspective";
-
-    public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
-        return new ApplicationWorkbenchWindowAdvisor(configurer);
-    }
-
-	public String getInitialWindowPerspectiveId() {
-		return PERSPECTIVE_ID;
-	}
-}

diff --git a/demos/splash/org.eclipse.equinox.examples.splash.ui/src/org/eclipse/equinox/examples/splash/ui/ApplicationWorkbenchWindowAdvisor.java b/demos/splash/org.eclipse.equinox.examples.splash.ui/src/org/eclipse/equinox/examples/splash/ui/ApplicationWorkbenchWindowAdvisor.java
deleted file mode 100644
index 7dad1b9..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash.ui/src/org/eclipse/equinox/examples/splash/ui/ApplicationWorkbenchWindowAdvisor.java
+++ /dev/null

@@ -1,25 +0,0 @@
-package org.eclipse.equinox.examples.splash.ui;
-
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.ui.application.ActionBarAdvisor;
-import org.eclipse.ui.application.IActionBarConfigurer;
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.ui.application.WorkbenchWindowAdvisor;
-
-public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
-
-    public ApplicationWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
-        super(configurer);
-    }
-
-    public ActionBarAdvisor createActionBarAdvisor(IActionBarConfigurer configurer) {
-        return new ApplicationActionBarAdvisor(configurer);
-    }
-    
-    public void preWindowOpen() {
-        IWorkbenchWindowConfigurer configurer = getWindowConfigurer();
-        configurer.setInitialSize(new Point(400, 300));
-        configurer.setShowCoolBar(false);
-        configurer.setShowStatusLine(false);
-    }
-}

diff --git a/demos/splash/org.eclipse.equinox.examples.splash.ui/src/org/eclipse/equinox/examples/splash/ui/Perspective.java b/demos/splash/org.eclipse.equinox.examples.splash.ui/src/org/eclipse/equinox/examples/splash/ui/Perspective.java
deleted file mode 100644
index b85faeb..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash.ui/src/org/eclipse/equinox/examples/splash/ui/Perspective.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package org.eclipse.equinox.examples.splash.ui;
-
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-
-public class Perspective implements IPerspectiveFactory {
-
-	public void createInitialLayout(IPageLayout layout) {
-	}
-}

diff --git a/demos/splash/org.eclipse.equinox.examples.splash.ui/src/org/eclipse/equinox/examples/splash/ui/SplashHandler.java b/demos/splash/org.eclipse.equinox.examples.splash.ui/src/org/eclipse/equinox/examples/splash/ui/SplashHandler.java
deleted file mode 100644
index 310203e..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash.ui/src/org/eclipse/equinox/examples/splash/ui/SplashHandler.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/**
- * 
- */
-package org.eclipse.equinox.examples.splash.ui;
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.equinox.examples.splash.Splash;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.browser.ProgressEvent;
-import org.eclipse.swt.browser.ProgressListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.splash.AbstractSplashHandler;
-
-/**
- * @author aniefer
- * 
- */
-public class SplashHandler extends AbstractSplashHandler {
-	private boolean initialized = false;
-
-	public Shell getSplash() {
-		if (!initialized) {
-			init();
-		}
-		return super.getSplash();
-	}
-
-	public void init() {
-		Shell shell = Splash.getSplash().getShell();
-		super.init(shell);
-	}
-
-	private boolean movieLoaded = false, done = false;
-
-	public void init(final Shell splash) {
-		splash.setSize( 440, 430);
-		splash.setLayout(new GridLayout(1, true));
-		final Browser browser = new Browser(splash, SWT.NONE);
-		browser.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		final Button button = new Button(splash, SWT.PUSH);
-
-		button.setText("Press to close"); //$NON-NLS-1$
-		button.setBounds( 570 / 2 - button.computeSize(SWT.DEFAULT, SWT.DEFAULT).x / 2,
-						  splash.getSize().y - 20, splash.getSize().x, 20);
-
-		button.setVisible(false);
-		button.setLayoutData(new GridData(SWT.CENTER, SWT.FILL, false, false));
-		browser.addProgressListener(new ProgressListener() {
-			public void changed(ProgressEvent event) {
-			}
-			public void completed(ProgressEvent event) {
-				movieLoaded = true;
-				button.setVisible(true);
-				button.addSelectionListener(new SelectionListener() {
-					public void widgetDefaultSelected(SelectionEvent e) {
-					}
-
-					public void widgetSelected(SelectionEvent e) {
-						done = true;
-					}
-				});
-			}
-		});
-
-		URL url = Activator.getDefault().getBundle().getEntry("/content/debugging.html");
-		
-		try {
-			browser.setUrl(FileLocator.toFileURL(url).toExternalForm());
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} //$NON-NLS-1$
-		
-		// make the shell bigger to see the flash better
-		splash.layout(true);
-		while (!movieLoaded) {
-			while (splash.getDisplay().readAndDispatch());
-		}
-	}
-
-	public void dispose() {
-		getSplash().setActive();
-
-		if (movieLoaded) {
-			while (!done)
-				getSplash().getDisplay().readAndDispatch();
-		}
-	}
-}

diff --git a/demos/splash/org.eclipse.equinox.examples.splash.ui/ui.workbench.patch b/demos/splash/org.eclipse.equinox.examples.splash.ui/ui.workbench.patch
deleted file mode 100644
index 5b8ff67..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash.ui/ui.workbench.patch
+++ /dev/null

@@ -1,86 +0,0 @@
-### Eclipse Workspace Patch 1.0
-#P org.eclipse.ui.workbench
-Index: Eclipse UI/org/eclipse/ui/internal/Workbench.java
-===================================================================
-RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java,v
-retrieving revision 1.427
-diff -u -r1.427 Workbench.java
---- Eclipse UI/org/eclipse/ui/internal/Workbench.java	1 Mar 2007 13:20:46 -0000	1.427
-+++ Eclipse UI/org/eclipse/ui/internal/Workbench.java	1 Mar 2007 21:51:08 -0000
-@@ -280,11 +280,11 @@
- 
- 	/**
- 	 * Signals that the workbench should create a splash implementation when
--	 * instantiated. Intial value is <code>false</code>.
-+	 * instantiated. Intial value is <code>true</code>.
- 	 * 
- 	 * @since 3.3
- 	 */
--	private static boolean createSplash = false;
-+	private static boolean createSplash = true;
- 
- 	/**
- 	 * The splash handler.
-@@ -491,8 +491,6 @@
- 			} else {
- 				newDisplay = new Display();
- 			}
--			// we created the display, we create the splash
--			createSplash = true;
- 		}
- 
- 		// workaround for 1GEZ9UR and 1GF07HN
-@@ -534,30 +532,32 @@
- 					return;
- 				}
- 				
--				Shell splashShell = null;
--				// look for the 32 bit internal_new shell method
--				Method method = Shell.class
--						.getMethod(
--								"internal_new", new Class[] { Display.class, int.class }); //$NON-NLS-1$
--				if (method != null) {
--					// we're on a 32 bit platform so invoke it with splash handle as an int
--					splashShell = (Shell) method.invoke(null, new Object[] {
--							display, new Integer(splashHandle) });
--				} else {
--					// look for the 64 bit internal_new shell method
--					method = Shell.class
-+				Shell splashShell = splash.getSplash();
-+				if (splashShell == null) {
-+					// look for the 32 bit internal_new shell method
-+					Method method = Shell.class
- 							.getMethod(
--									"internal_new", new Class[] { Display.class, long.class }); //$NON-NLS-1$
--					if (method != null)
--						// we're on a 64 bit platform so invoke it with a long
-+									"internal_new", new Class[] { Display.class, int.class }); //$NON-NLS-1$
-+					if (method != null) {
-+						// we're on a 32 bit platform so invoke it with splash handle as an int
- 						splashShell = (Shell) method.invoke(null, new Object[] {
--								display, new Long(splashHandle) });
-+								display, new Integer(splashHandle) });
-+					} else {
-+						// look for the 64 bit internal_new shell method
-+						method = Shell.class
-+								.getMethod(
-+										"internal_new", new Class[] { Display.class, long.class }); //$NON-NLS-1$
-+						if (method != null)
-+							// we're on a 64 bit platform so invoke it with a long
-+							splashShell = (Shell) method.invoke(null, new Object[] {
-+									display, new Long(splashHandle) });
-+					}
-+					if (splashShell == null)
-+						return;
-+					if (background != null)
-+						splashShell.setBackgroundImage(background);
- 				}
--				if (splashShell == null)
--					return;
--				
--				if (background != null)
--					splashShell.setBackgroundImage(background);
-+
- 				Dictionary properties = new Hashtable();
- 				properties.put(Constants.SERVICE_RANKING, new Integer(Integer.MAX_VALUE));
- 				BundleContext context = WorkbenchPlugin.getDefault().getBundleContext();

diff --git a/demos/splash/org.eclipse.equinox.examples.splash/.classpath b/demos/splash/org.eclipse.equinox.examples.splash/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/demos/splash/org.eclipse.equinox.examples.splash/.project b/demos/splash/org.eclipse.equinox.examples.splash/.project
deleted file mode 100644
index 52bb3e1..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.examples.splash</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/demos/splash/org.eclipse.equinox.examples.splash/META-INF/MANIFEST.MF b/demos/splash/org.eclipse.equinox.examples.splash/META-INF/MANIFEST.MF
deleted file mode 100644
index bd31c2f..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Splash Plug-in
-Bundle-SymbolicName: org.eclipse.equinox.examples.splash;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.equinox.examples.splash.Activator
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.swt
-Export-Package: org.eclipse.equinox.examples.splash
-

diff --git a/demos/splash/org.eclipse.equinox.examples.splash/build.properties b/demos/splash/org.eclipse.equinox.examples.splash/build.properties
deleted file mode 100644
index 56c19df..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash/build.properties
+++ /dev/null

@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               splash.bmp,\
-               splash_early.bmp
-

diff --git a/demos/splash/org.eclipse.equinox.examples.splash/splash.bmp b/demos/splash/org.eclipse.equinox.examples.splash/splash.bmp
deleted file mode 100644
index 748eaa9..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash/splash.bmp
+++ /dev/null
Binary files differ

diff --git a/demos/splash/org.eclipse.equinox.examples.splash/splash_early.bmp b/demos/splash/org.eclipse.equinox.examples.splash/splash_early.bmp
deleted file mode 100644
index 5a40e01..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash/splash_early.bmp
+++ /dev/null
Binary files differ

diff --git a/demos/splash/org.eclipse.equinox.examples.splash/src/org/eclipse/equinox/examples/splash/Activator.java b/demos/splash/org.eclipse.equinox.examples.splash/src/org/eclipse/equinox/examples/splash/Activator.java
deleted file mode 100644
index e5881e7..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash/src/org/eclipse/equinox/examples/splash/Activator.java
+++ /dev/null

@@ -1,69 +0,0 @@
-package org.eclipse.equinox.examples.splash;
-
-import java.util.Dictionary;
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.osgi.service.runnable.StartupMonitor;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-import org.osgi.framework.ServiceRegistration;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.equinox.splash";
-
-	// The shared instance
-	private static Activator plugin;
-	private BundleContext context = null;
-	private static Splash splash;
-	private static ServiceRegistration registration;
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-		this.context = context;
-		
-		splash = new Splash();
-		Dictionary properties = new Hashtable();
-		properties.put(Constants.SERVICE_RANKING, new Integer(-42));
-		registration = context.registerService(StartupMonitor.class.getName(), splash, properties);
-		context.addBundleListener( splash );
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		registration.unregister();
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-	
-	public BundleContext getContext() {
-		return context;
-	}
-}

diff --git a/demos/splash/org.eclipse.equinox.examples.splash/src/org/eclipse/equinox/examples/splash/Splash.java b/demos/splash/org.eclipse.equinox.examples.splash/src/org/eclipse/equinox/examples/splash/Splash.java
deleted file mode 100644
index f18e6c7..0000000
--- a/demos/splash/org.eclipse.equinox.examples.splash/src/org/eclipse/equinox/examples/splash/Splash.java
+++ /dev/null

@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Andrew Niefer - IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.examples.splash;
-
-import java.io.BufferedInputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.osgi.service.runnable.StartupMonitor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.osgi.framework.BundleEvent;
-import org.osgi.framework.SynchronousBundleListener;
-
-public class Splash implements StartupMonitor, SynchronousBundleListener {
-	static private Splash splash = null;
-	private Display display = null;
-	private Shell shell = null;
-	private Image background = null;
-	private boolean initialized = false;
-	private Text text = null;
-	private Color color = null;
-	
-	public Splash() {
-		splash = this;
-	}
-	
-	public static Splash getSplash() {
-		return splash;
-	}
-	
-	public Shell getShell() {
-		return shell;
-	}
-	private void initialize() {
-		initialized = true;
-		
-		Integer handle = Integer.getInteger("org.eclipse.equinox.launcher.splash.handle");
-		if (handle == null)
-			return;
-		
-		display = new Display();
-		shell = Shell.internal_new(display, handle.intValue());
-
-		URL url = Activator.getDefault().getBundle().getEntry("/splash_early.bmp");
-		try {
-			background = loadImage(FileLocator.toFileURL(url).getPath());
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		
-		shell.setLayout(new FillLayout());
-		shell.setBackgroundMode(SWT.INHERIT_DEFAULT);
-		shell.setBackgroundImage(background);
-		
-		Composite panel = new Composite(shell, SWT.BORDER);
-		panel.setLayout(new GridLayout(2, false));
-		{
-			Label label = new Label(panel, SWT.NONE);
-			label.setText("Bundle:"); //$NON-NLS-1$
-			text = new Text(panel, SWT.BORDER);
-			text.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-		}
-		shell.layout(true);
-		while(display.readAndDispatch());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.osgi.service.runnable.StartupMonitor#applicationRunning()
-	 */
-	public void applicationRunning() {
-		shell.dispose();
-		if(color != null)
-			color.dispose();
-		if(background != null)
-			background.dispose();
-		Activator.getDefault().getContext().removeBundleListener(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.osgi.service.runnable.StartupMonitor#update()
-	 */
-	public void update() {
-		if( !initialized)
-			initialize();
-		if (display != null) {
-			while (display.readAndDispatch());
-
-		}
-	}
-
-	public void bundleChanged(BundleEvent event) {
-		if (display == null || text == null || text.isDisposed())
-			return;
-			
-		String str = event.getBundle().getSymbolicName() + " ";
-		switch(event.getType()) {
-			case BundleEvent.INSTALLED : str += " installed.";	break;
-			case BundleEvent.STARTED   : str += " started.";	break;
-			case BundleEvent.STARTING  : str += " starting.";	break;
-			case BundleEvent.LAZY_ACTIVATION : str += " being lazy."; break;
-		}
-		final String label = str;
-		display.asyncExec( new Runnable() {
-			public void run() {
-				text.setText(label);
-			}
-		});
-	}
-	private Image loadImage(String splashLoc) {
-		Image background = null;
-		if (splashLoc != null) {
-			try {
-				InputStream input = new BufferedInputStream(
-						new FileInputStream(splashLoc));
-				background = new Image(display, input);
-			} catch (IOException e) {
-			}
-		} 
-		return background;
-	}
-
-}
-
-
-

diff --git a/demos/splash/splash.zip b/demos/splash/splash.zip
deleted file mode 100644
index 94037f7..0000000
--- a/demos/splash/splash.zip
+++ /dev/null
Binary files differ

diff --git a/framework/bundles/org.eclipse.equinox.initializer/.classpath b/framework/bundles/org.eclipse.equinox.initializer/.classpath
deleted file mode 100644
index 7398f97..0000000
--- a/framework/bundles/org.eclipse.equinox.initializer/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry path="src" kind="src"/>
-	<classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER" kind="con"/>
-	<classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con"/>
-	<classpathentry path="bin" kind="output"/>
-</classpath>

diff --git a/framework/bundles/org.eclipse.equinox.initializer/.cvsignore b/framework/bundles/org.eclipse.equinox.initializer/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/framework/bundles/org.eclipse.equinox.initializer/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/framework/bundles/org.eclipse.equinox.initializer/.project b/framework/bundles/org.eclipse.equinox.initializer/.project
deleted file mode 100644
index f211500..0000000
--- a/framework/bundles/org.eclipse.equinox.initializer/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.initializer</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/framework/bundles/org.eclipse.equinox.initializer/.settings/org.eclipse.pde.core.prefs b/framework/bundles/org.eclipse.equinox.initializer/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 02391fa..0000000
--- a/framework/bundles/org.eclipse.equinox.initializer/.settings/org.eclipse.pde.core.prefs
+++ /dev/null

@@ -1,3 +0,0 @@
-#Thu May 04 13:04:43 CDT 2006
-eclipse.preferences.version=1
-pluginProject.extensions=true

diff --git a/framework/bundles/org.eclipse.equinox.initializer/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.equinox.initializer/META-INF/MANIFEST.MF
deleted file mode 100644
index b5a9220..0000000
--- a/framework/bundles/org.eclipse.equinox.initializer/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %bundlename
-Bundle-SymbolicName: org.eclipse.equinox.initializer;singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.equinox.internal.initializer.Activator
-Bundle-Localization: plugin
-Import-Package: org.eclipse.core.runtime,
- org.eclipse.osgi.util,
- org.osgi.framework;version="1.3.0"
-Eclipse-LazyStart: true

diff --git a/framework/bundles/org.eclipse.equinox.initializer/about.html b/framework/bundles/org.eclipse.equinox.initializer/about.html
deleted file mode 100644
index 3989f53..0000000
--- a/framework/bundles/org.eclipse.equinox.initializer/about.html
+++ /dev/null

@@ -1,28 +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 11, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/framework/bundles/org.eclipse.equinox.initializer/build.properties b/framework/bundles/org.eclipse.equinox.initializer/build.properties
deleted file mode 100644
index 8bfb369..0000000
--- a/framework/bundles/org.eclipse.equinox.initializer/build.properties
+++ /dev/null

@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Red Hat, Inc. and IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               plugin.properties
-src.includes = schema/,\
-               about.html

diff --git a/framework/bundles/org.eclipse.equinox.initializer/plugin.properties b/framework/bundles/org.eclipse.equinox.initializer/plugin.properties
deleted file mode 100644
index 12281fd..0000000
--- a/framework/bundles/org.eclipse.equinox.initializer/plugin.properties
+++ /dev/null

@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 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
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.equinox.initializer
-bundlename = Initializer Plug-in (Incubation)
-initializersName = Initializers
-initializerApp = Configuration Initializer Application
\ No newline at end of file

diff --git a/framework/bundles/org.eclipse.equinox.initializer/plugin.xml b/framework/bundles/org.eclipse.equinox.initializer/plugin.xml
deleted file mode 100644
index 50ccd5d..0000000
--- a/framework/bundles/org.eclipse.equinox.initializer/plugin.xml
+++ /dev/null

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-	<extension-point id="initializers" name="%initializersName" schema="schema/initializers.exsd"/>
-	<extension
-		id="configInitializer"
-		name="%initializerApp"
-		point="org.eclipse.core.runtime.applications">
-		<application>
-			<run class="org.eclipse.equinox.internal.initializer.Initializer"/>
-		</application>
-	</extension>
-	<extension id="fileInitializer"
-		point="org.eclipse.equinox.initializer.initializers">
-		<initializer>
-			<initialize class="org.eclipse.equinox.internal.initializer.FileInitializer"/>
-		</initializer>
-	</extension>
-</plugin>

diff --git a/framework/bundles/org.eclipse.equinox.initializer/schema/initializers.exsd b/framework/bundles/org.eclipse.equinox.initializer/schema/initializers.exsd
deleted file mode 100644
index e214603..0000000
--- a/framework/bundles/org.eclipse.equinox.initializer/schema/initializers.exsd
+++ /dev/null

@@ -1,137 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.equinox.initializer">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.equinox.initializer" id="initializers" name="Plug-in Initializers"/>
-      </appInfo>
-      <documentation>
-         Platform runtime supports plug-ins which would like to 
-be initialized. That is, plug-ins that needs to be initialized when
-the initialization application is being run should provide an extension
-to this extension-point.
-The initializers are run when the org.eclipse.equinox.initializer.configInitializer application is being run. The initializers are run in any order.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="initializer"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="initializer">
-      <complexType>
-         <sequence>
-            <element ref="initialize"/>
-         </sequence>
-      </complexType>
-   </element>
-
-   <element name="initialize">
-      <complexType>
-         <sequence>
-            <element ref="initialize"/>
-         </sequence>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.core.runtime.IPlatformRunnable"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         3.1
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         Following is an example of initializer declaration:
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension id=&quot;myInitializer&quot; point=&quot;org.eclipse.equinox.initializer.initializers&quot;&gt;
-      &lt;initializer&gt;
-         &lt;initialize class=&quot;myInitializer.Doit&quot;/&gt;
-      &lt;/initializer&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The value of the class attribute must represent an 
-implementor of 
-&lt;samp&gt;org.eclipse.core.runtime.IPlatformRunnable&lt;/samp&gt;.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
-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 
-&lt;a 
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/framework/bundles/org.eclipse.equinox.initializer/src/org/eclipse/equinox/internal/initializer/Activator.java b/framework/bundles/org.eclipse.equinox.initializer/src/org/eclipse/equinox/internal/initializer/Activator.java
deleted file mode 100644
index 23eb188..0000000
--- a/framework/bundles/org.eclipse.equinox.initializer/src/org/eclipse/equinox/internal/initializer/Activator.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Red Hat, Inc. and IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.internal.initializer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.osgi.framework.*;
-
-public class Activator implements BundleActivator {
-	private static BundleContext context;
-
-	public void start(BundleContext context) throws Exception {
-		Activator.context = context;
-	}
-
-	public void stop(BundleContext context) throws Exception {
-		Activator.context = null;
-	}
-
-	static BundleContext getContext() {
-		return context;
-	}
-
-	public static void log(IStatus status) {
-		BundleContext current = context;
-		if (current == null)
-			return;
-		Platform.getLog(current.getBundle()).log(status);
-	}
-}

diff --git a/framework/bundles/org.eclipse.equinox.initializer/src/org/eclipse/equinox/internal/initializer/FileInitializer.java b/framework/bundles/org.eclipse.equinox.initializer/src/org/eclipse/equinox/internal/initializer/FileInitializer.java
deleted file mode 100644
index 79c3050..0000000
--- a/framework/bundles/org.eclipse.equinox.initializer/src/org/eclipse/equinox/internal/initializer/FileInitializer.java
+++ /dev/null

@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Red Hat, Inc. and IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.internal.initializer;
-
-import java.io.*;
-import java.net.URL;
-import java.util.*;
-import java.util.regex.Pattern;
-import org.eclipse.core.runtime.*;
-import org.eclipse.osgi.util.NLS;
-import org.osgi.framework.Bundle;
-
-/**
- * <p>
- * This application extracts files to their "localURL". The file patterns that you
- * want to extract should be specified in a file in a properties format like this:
- * 
- * <pre>
- * .* = *.so,about.html
- * org.eclipse.team.core.cvs = *.html
- * </pre>
- * 
- * This application should be run through the generic initializer mechanism and 
- * not run directly.
- * </p>
- * 
- * <p>
- * To run this application, do something like:
- * </p>
- * 
- * <p>
- * <code>
- * java -cp startup.jar org.eclipse.core.launcher.Main -application org.eclipse.equinox.initializer.configInitializer [-justThisArchOSWS] -fileInitializer &lt;fileWithFilePatternsToExtract&gt;
- * </code>
- * </p>
- * 
- * <p>
- * <ul>
- * <li> 
- * Note: Only the files that are extracted will be printed to the console. If you
- * want to debug things, use the -consolelog option in
- * org.eclipse.core.launcher.Main
- * </li>
- * </ul>
- * </p>
- * 
- * @see Initializer
- * @see Platform#asLocalURL(URL)
- * @since 3.1
- */
-public class FileInitializer implements IPlatformRunnable {
-
-	private LinkedList extractedFiles;
-	private boolean justThisArchOSWS;
-
-	public Object run(Object args) throws Exception {
-		Properties bundleAndFilePatterns = getBundleAndFileNamePatterns((String[]) args);
-		// don't do anything if bundleAndFilePatterns is empty
-		if (bundleAndFilePatterns == null || bundleAndFilePatterns.size() == 0) {
-			return IPlatformRunnable.EXIT_OK;
-		}
-		justThisArchOSWS = getJustThisArchOSWS((String[]) args);
-		extractedFiles = new LinkedList();
-		Bundle[] installedBundles = Activator.getContext().getBundles();
-		Set bundlePatterns = bundleAndFilePatterns.keySet();
-		// foreach(bundle pattern)
-		for (Iterator bundlePatternIter = bundlePatterns.iterator(); bundlePatternIter.hasNext();) {
-			Object bundlePattern = bundlePatternIter.next();
-			Object fileNamePattern = bundleAndFilePatterns.get(bundlePattern);
-			// foreach(filename pattern)
-			String[] fileNamePatterns = ((String) fileNamePattern).split(","); //$NON-NLS-1$
-			for (int i = 0; i < fileNamePatterns.length; i++) {
-				fileNamePatterns[i] = fileNamePatterns[i].trim();
-			}
-			// foreach(bundle)
-			for (int i = 0; i < installedBundles.length; i++) {
-				String bundleName = installedBundles[i].getSymbolicName();
-				// if(bundle matches pattern) check fileNamePattern(s)
-				if (Pattern.matches((String) bundlePattern, bundleName)) {
-					for (int j = 0; j < fileNamePatterns.length; j++) {
-						extractMatchingFilesFromBundle(fileNamePatterns[j], installedBundles[i]);
-					}
-				}
-			}
-		} // end for
-		return IPlatformRunnable.EXIT_OK;
-	}
-
-	private void extractMatchingFilesFromBundle(String fileNamePattern, Bundle bundle) throws IOException {
-		Enumeration e = bundle.findEntries("/", fileNamePattern, true); //$NON-NLS-1$
-
-		while (e != null && e.hasMoreElements()) {
-			URL fileURL = (URL) e.nextElement();
-			if (justThisArchOSWS) {
-				Path filePath = new Path(fileURL.getPath());
-
-				String[] path = filePath.segments();
-				// check to see if the file should be extracted to the current os/arch
-				if (path.length == 4 && path[0].equals("os") && !(path[1].equals(Platform.getOS()) && path[2].equals(Platform.getOSArch()))) { //$NON-NLS-1$
-					continue;
-				}
-				// check to see if the file is should be extracted to the current ws
-				if (path.length == 3 && path[0].equals("ws") && !path[1].equals(Platform.getWS())) { //$NON-NLS-1$
-					continue;
-				}
-			}
-
-			// the call to Platform.asLocalURL(URL) does the actual extraction
-			URL localURL = FileLocator.toFileURL(fileURL);
-			if (localURL != null) {
-				String localURLPath = localURL.getPath();
-
-				// only print the path if it hasn't been printed yet
-				int index = Collections.binarySearch(extractedFiles, localURLPath);
-				if (index < 0) {
-					extractedFiles.add(-(index + 1), localURLPath);
-					System.out.println("FileInitializer: " + localURLPath); //$NON-NLS-1$
-				}
-			}
-		}
-	}
-
-	private final String ARG_FILE = "-fileInitializer"; //$NON-NLS-1$
-
-	private Properties getBundleAndFileNamePatterns(String[] argsArray) {
-
-		for (int i = 0; i < argsArray.length; i++) {
-			if (argsArray[i].equalsIgnoreCase(ARG_FILE)) {
-
-				// the "file patterns" file was not specified
-				if (argsArray.length < i + 2) {
-					String msg = NLS.bind(Messages.fileInitializer_missingFileName, this.getClass().getName());
-					IStatus status = new Status(IStatus.ERROR, Platform.PI_RUNTIME, Platform.PLUGIN_ERROR, msg, null);
-					Activator.log(status);
-					return null;
-				}
-
-				try {
-					FileInputStream fin = new FileInputStream(argsArray[i + 1]);
-					Properties bundleAndFileNameProperties = new Properties();
-					bundleAndFileNameProperties.load(fin);
-					fin.close();
-					return bundleAndFileNameProperties;
-				} catch (FileNotFoundException e1) {
-					String msg = NLS.bind(Messages.fileInitializer_fileNotFound, this.getClass().getName(), argsArray[i + 1]);
-					IStatus status = new Status(IStatus.ERROR, Platform.PI_RUNTIME, Platform.PLUGIN_ERROR, msg, null);
-					Activator.log(status);
-					return null;
-				} catch (IOException e) {
-					String msg = NLS.bind(Messages.fileInitializer_IOError, this.getClass().getName(), argsArray[i + 1]);
-					IStatus status = new Status(IStatus.ERROR, Platform.PI_RUNTIME, Platform.PLUGIN_ERROR, msg, e);
-					Activator.log(status);
-					return null;
-				}
-			}
-		}
-
-		// ARG_FILE wasn't found
-		return null;
-	}
-
-	private final String ARG_JUSTTHISARCHOSWS = "-justThisArchOSWS"; //$NON-NLS-1$
-
-	private boolean getJustThisArchOSWS(String[] argsArray) {
-		for (int i = 0; i < argsArray.length; i++) {
-			if (argsArray[i].equalsIgnoreCase(ARG_JUSTTHISARCHOSWS)) {
-				return true;
-			}
-		}
-		return false;
-	}
-}

diff --git a/framework/bundles/org.eclipse.equinox.initializer/src/org/eclipse/equinox/internal/initializer/Initializer.java b/framework/bundles/org.eclipse.equinox.initializer/src/org/eclipse/equinox/internal/initializer/Initializer.java
deleted file mode 100644
index faa79bf..0000000
--- a/framework/bundles/org.eclipse.equinox.initializer/src/org/eclipse/equinox/internal/initializer/Initializer.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.internal.initializer;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-
-public class Initializer implements IPlatformRunnable {
-
-	public static final String PT_INITIALIZERS = "initializers"; //$NON-NLS-1$
-	public static final String PI_INITIALIZER = "org.eclipse.equinox.initializer";
-
-	public Object run(Object args) throws Exception {
-		IExtensionPoint xpt = Platform.getExtensionRegistry().getExtensionPoint(PI_INITIALIZER, PT_INITIALIZERS);
-		if (xpt == null)
-			return IPlatformRunnable.EXIT_OK;
-		
-		IExtension[] exts = xpt.getExtensions();
-		for (int i = 0; i < exts.length; i++) {
-			IConfigurationElement[] configs = exts[i].getConfigurationElements();
-			IPlatformRunnable initializer = null;
-			if (configs.length != 0) {
-				try {
-					initializer = (IPlatformRunnable) configs[0].createExecutableExtension("initialize"); //$NON-NLS-1$
-					initializer.run(args);
-				} catch(CoreException e) {
-					String msg = NLS.bind(Messages.initializer_error, exts[i].getExtensionPointUniqueIdentifier());
-					IStatus status = new Status(IStatus.ERROR, PI_INITIALIZER, Platform.PLUGIN_ERROR, msg, e);
-					Activator.log(status);
-					return null;
-				}
-			}
-		}
-		return IPlatformRunnable.EXIT_OK;
-	}
-
-}

diff --git a/framework/bundles/org.eclipse.equinox.initializer/src/org/eclipse/equinox/internal/initializer/Messages.java b/framework/bundles/org.eclipse.equinox.initializer/src/org/eclipse/equinox/internal/initializer/Messages.java
deleted file mode 100644
index 4bc7d0d..0000000
--- a/framework/bundles/org.eclipse.equinox.initializer/src/org/eclipse/equinox/internal/initializer/Messages.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Red Hat, Inc. and IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.internal.initializer;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.equinox.internal.initializer.messages"; //$NON-NLS-1$
-
-	// initializer
-	public static String initializer_error;
-
-	// file initializer
-	public static String fileInitializer_fileNotFound;
-	public static String fileInitializer_IOError;
-	public static String fileInitializer_missingFileName;
-
-	static {
-		// load message values from bundle file
-		reloadMessages();
-	}
-
-	public static void reloadMessages() {
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-}

diff --git a/framework/bundles/org.eclipse.equinox.initializer/src/org/eclipse/equinox/internal/initializer/messages.properties b/framework/bundles/org.eclipse.equinox.initializer/src/org/eclipse/equinox/internal/initializer/messages.properties
deleted file mode 100644
index c726f29..0000000
--- a/framework/bundles/org.eclipse.equinox.initializer/src/org/eclipse/equinox/internal/initializer/messages.properties
+++ /dev/null

@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Red Hat, Inc. and IBM Corporation - initial API and implementation
-###############################################################################
-
-### Initializer
-initializer_error=There was a problem running the application {0}.
-
-### File Initiializer
-fileInitializer_fileNotFound={0}: The file {1} was not found.
-fileInitializer_IOError={0}: There was an error reading {1}.
-fileInitializer_missingFileName={0}: The \"file patterns\" file was not specified.

diff --git a/monitoring/bundles/net.sourceforge.mx4j/.project b/monitoring/bundles/net.sourceforge.mx4j/.project
deleted file mode 100644
index 341ebb4..0000000
--- a/monitoring/bundles/net.sourceforge.mx4j/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>net.sourceforge.mx4j</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/monitoring/bundles/net.sourceforge.mx4j/readme.txt b/monitoring/bundles/net.sourceforge.mx4j/readme.txt
deleted file mode 100644
index fda700f..0000000
--- a/monitoring/bundles/net.sourceforge.mx4j/readme.txt
+++ /dev/null

@@ -1,6 +0,0 @@
-This project has been moved from the Equinox Incubator to the Orbit project.
-It can be accessed at:
-
-dev.eclipse.org
-/cvsroot/tools
-org.eclipse.orbit/net.sourceforge.mx4j

diff --git a/monitoring/bundles/org.apache.xmlrpc/.classpath b/monitoring/bundles/org.apache.xmlrpc/.classpath
deleted file mode 100644
index e80a984..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/CDC-1.0%Foundation-1.0"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path=""/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/monitoring/bundles/org.apache.xmlrpc/.project b/monitoring/bundles/org.apache.xmlrpc/.project
deleted file mode 100644
index 6152dd1..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.apache.xmlrpc</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/monitoring/bundles/org.apache.xmlrpc/.settings/org.eclipse.jdt.core.prefs b/monitoring/bundles/org.apache.xmlrpc/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 047ce33..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Fri May 19 13:20:48 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1
-org.eclipse.jdt.core.compiler.compliance=1.3
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=ignore
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/monitoring/bundles/org.apache.xmlrpc/LICENSE.txt b/monitoring/bundles/org.apache.xmlrpc/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/LICENSE.txt
+++ /dev/null

@@ -1,202 +0,0 @@
-
-                                 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.

diff --git a/monitoring/bundles/org.apache.xmlrpc/META-INF/MANIFEST.MF b/monitoring/bundles/org.apache.xmlrpc/META-INF/MANIFEST.MF
deleted file mode 100644
index bd4c80c..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,34 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Apache XML-RPC Plug-in
-Bundle-SymbolicName: org.apache.xmlrpc
-Bundle-Version: 3.0.0
-Bundle-Localization: plugin
-Export-Package: org.apache.xmlrpc,
- org.apache.xmlrpc.client,
- org.apache.xmlrpc.client.util,
- org.apache.xmlrpc.common,
- org.apache.xmlrpc.jaxb,
- org.apache.xmlrpc.metadata,
- org.apache.xmlrpc.parser,
- org.apache.xmlrpc.serializer,
- org.apache.xmlrpc.server,
- org.apache.xmlrpc.util,
- org.apache.xmlrpc.webserver
-Import-Package: javax.xml.bind,
- javax.xml.namespace,
- javax.xml.parsers,
- org.apache.commons.httpclient,
- org.apache.commons.httpclient.auth,
- org.apache.commons.httpclient.methods,
- org.apache.commons.httpclient.params,
- org.apache.commons.logging,
- org.apache.ws.commons.serialize,
- org.apache.ws.commons.util,
- org.w3c.dom,
- org.xml.sax,
- org.xml.sax.helpers
-Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
- J2SE-1.3
-Eclipse-BuddyPolicy: dependent
-

diff --git a/monitoring/bundles/org.apache.xmlrpc/about.html b/monitoring/bundles/org.apache.xmlrpc/about.html
deleted file mode 100644
index 860ed8c..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/about.html
+++ /dev/null

@@ -1,35 +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 (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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</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&rsquo;s license for 
-terms and conditions of use.</p>
-
-</body>
-</html>

diff --git a/monitoring/bundles/org.apache.xmlrpc/build.properties b/monitoring/bundles/org.apache.xmlrpc/build.properties
deleted file mode 100644
index 40775c1..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/build.properties
+++ /dev/null

@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = META-INF/,\
-               LICENSE.txt,\
-               about.html,\
-               org/
-src.includes = about.html
-source.. = .
-output.. = .

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/XmlRpcConfig.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/XmlRpcConfig.class
deleted file mode 100644
index f842fcd..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/XmlRpcConfig.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/XmlRpcConfigImpl.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/XmlRpcConfigImpl.class
deleted file mode 100644
index 2183122..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/XmlRpcConfigImpl.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/XmlRpcException.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/XmlRpcException.class
deleted file mode 100644
index 65704eb..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/XmlRpcException.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/XmlRpcHandler.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/XmlRpcHandler.class
deleted file mode 100644
index a40182f..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/XmlRpcHandler.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/XmlRpcRequest.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/XmlRpcRequest.class
deleted file mode 100644
index 9fa8cfe..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/XmlRpcRequest.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/XmlRpcRequestConfig.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/XmlRpcRequestConfig.class
deleted file mode 100644
index cdebcd7..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/XmlRpcRequestConfig.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/AsyncCallback.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/AsyncCallback.class
deleted file mode 100644
index cd38653..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/AsyncCallback.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/TimingOutCallback$TimeoutException.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/TimingOutCallback$TimeoutException.class
deleted file mode 100644
index d052343..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/TimingOutCallback$TimeoutException.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/TimingOutCallback.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/TimingOutCallback.class
deleted file mode 100644
index fe6f3ea..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/TimingOutCallback.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClient.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClient.class
deleted file mode 100644
index 95f47b0..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClient.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClientConfig.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClientConfig.class
deleted file mode 100644
index 7976bb7..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClientConfig.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClientConfigImpl.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClientConfigImpl.class
deleted file mode 100644
index 6380006..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClientConfigImpl.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClientException.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClientException.class
deleted file mode 100644
index 9b19c55..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClientException.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClientRequestImpl.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClientRequestImpl.class
deleted file mode 100644
index c7f8e55..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClientRequestImpl.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClientWorker$1.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClientWorker$1.class
deleted file mode 100644
index 5a6b993..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClientWorker$1.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClientWorker.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClientWorker.class
deleted file mode 100644
index 659efdb..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClientWorker.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClientWorkerFactory.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClientWorkerFactory.class
deleted file mode 100644
index 5cbace4..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcClientWorkerFactory.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcCommonsTransport$1$1.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcCommonsTransport$1$1.class
deleted file mode 100644
index 0b23123..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcCommonsTransport$1$1.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcCommonsTransport$1$2.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcCommonsTransport$1$2.class
deleted file mode 100644
index fa7be11..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcCommonsTransport$1$2.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcCommonsTransport$1.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcCommonsTransport$1.class
deleted file mode 100644
index b8e6057..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcCommonsTransport$1.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcCommonsTransport.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcCommonsTransport.class
deleted file mode 100644
index 3540660..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcCommonsTransport.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcCommonsTransportFactory.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcCommonsTransportFactory.class
deleted file mode 100644
index bf2b32b..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcCommonsTransportFactory.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcHttpClientConfig.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcHttpClientConfig.class
deleted file mode 100644
index b9cbcc4..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcHttpClientConfig.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcHttpTransport$ByteArrayReqWriter.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcHttpTransport$ByteArrayReqWriter.class
deleted file mode 100644
index e8d8317..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcHttpTransport$ByteArrayReqWriter.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcHttpTransport.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcHttpTransport.class
deleted file mode 100644
index d3fdb62..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcHttpTransport.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLiteHttpTransport$1.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLiteHttpTransport$1.class
deleted file mode 100644
index 2686a09..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLiteHttpTransport$1.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLiteHttpTransport.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLiteHttpTransport.class
deleted file mode 100644
index b062150..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLiteHttpTransport.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLiteHttpTransportFactory.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLiteHttpTransportFactory.class
deleted file mode 100644
index e35c03b..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLiteHttpTransportFactory.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLocalClientConfig.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLocalClientConfig.class
deleted file mode 100644
index f170dca..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLocalClientConfig.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLocalStreamTransport.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLocalStreamTransport.class
deleted file mode 100644
index ef0d399..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLocalStreamTransport.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLocalStreamTransportFactory.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLocalStreamTransportFactory.class
deleted file mode 100644
index fda88d9..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLocalStreamTransportFactory.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLocalTransport.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLocalTransport.class
deleted file mode 100644
index 131983c..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLocalTransport.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLocalTransportFactory.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLocalTransportFactory.class
deleted file mode 100644
index 70b79ac..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcLocalTransportFactory.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcStreamTransport$GzipReqWriter.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcStreamTransport$GzipReqWriter.class
deleted file mode 100644
index ee08fbc..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcStreamTransport$GzipReqWriter.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcStreamTransport$ReqWriter.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcStreamTransport$ReqWriter.class
deleted file mode 100644
index 2e55b8e..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcStreamTransport$ReqWriter.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcStreamTransport$ReqWriterImpl.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcStreamTransport$ReqWriterImpl.class
deleted file mode 100644
index ece868d..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcStreamTransport$ReqWriterImpl.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcStreamTransport.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcStreamTransport.class
deleted file mode 100644
index 01b490a..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcStreamTransport.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcStreamTransportFactory.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcStreamTransportFactory.class
deleted file mode 100644
index 0ce1f72..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcStreamTransportFactory.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcSunHttpTransport.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcSunHttpTransport.class
deleted file mode 100644
index 3a45898..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcSunHttpTransport.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcSunHttpTransportFactory.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcSunHttpTransportFactory.class
deleted file mode 100644
index da4b336..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcSunHttpTransportFactory.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcTransport.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcTransport.class
deleted file mode 100644
index 136fe68..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcTransport.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcTransportFactory.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcTransportFactory.class
deleted file mode 100644
index 3e758f2..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcTransportFactory.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcTransportFactoryImpl.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcTransportFactoryImpl.class
deleted file mode 100644
index 6ca433e..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcTransportFactoryImpl.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcTransportImpl.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcTransportImpl.class
deleted file mode 100644
index d58bb4c..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/XmlRpcTransportImpl.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/util/ClientFactory$1.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/util/ClientFactory$1.class
deleted file mode 100644
index 3327c73..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/util/ClientFactory$1.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/util/ClientFactory.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/util/ClientFactory.class
deleted file mode 100644
index 094937a..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/client/util/ClientFactory.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/LocalStreamConnection$1.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/LocalStreamConnection$1.class
deleted file mode 100644
index 278b35c..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/LocalStreamConnection$1.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/LocalStreamConnection$LocalServerStreamConnection.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/LocalStreamConnection$LocalServerStreamConnection.class
deleted file mode 100644
index 5c30bac..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/LocalStreamConnection$LocalServerStreamConnection.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/LocalStreamConnection.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/LocalStreamConnection.class
deleted file mode 100644
index 0c5abe7..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/LocalStreamConnection.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/ServerStreamConnection.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/ServerStreamConnection.class
deleted file mode 100644
index a3ad2b3..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/ServerStreamConnection.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverter.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverter.class
deleted file mode 100644
index 8a514f3..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverter.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactory.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactory.class
deleted file mode 100644
index 841be8f..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactory.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$1.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$1.class
deleted file mode 100644
index db4a52d..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$1.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$2.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$2.class
deleted file mode 100644
index c6a501a..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$2.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$3.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$3.class
deleted file mode 100644
index 771dca1..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$3.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$4.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$4.class
deleted file mode 100644
index f5223dc..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$4.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$CastCheckingTypeConverter.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$CastCheckingTypeConverter.class
deleted file mode 100644
index ff7642a..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$CastCheckingTypeConverter.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$IdentityTypeConverter.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$IdentityTypeConverter.class
deleted file mode 100644
index 65c97fe..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$IdentityTypeConverter.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$ListTypeConverter.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$ListTypeConverter.class
deleted file mode 100644
index 9c69464..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$ListTypeConverter.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$PrimitiveTypeConverter.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$PrimitiveTypeConverter.class
deleted file mode 100644
index 25b4dce..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl$PrimitiveTypeConverter.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl.class
deleted file mode 100644
index 5e01728..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeConverterFactoryImpl.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeFactory.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeFactory.class
deleted file mode 100644
index 2866231..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeFactory.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeFactoryImpl$1.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeFactoryImpl$1.class
deleted file mode 100644
index 8076cf6..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeFactoryImpl$1.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeFactoryImpl$2.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeFactoryImpl$2.class
deleted file mode 100644
index ad8a07b..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeFactoryImpl$2.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeFactoryImpl.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeFactoryImpl.class
deleted file mode 100644
index 267d72b..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/TypeFactoryImpl.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcController.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcController.class
deleted file mode 100644
index d43d47e..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcController.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcExtensionException.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcExtensionException.class
deleted file mode 100644
index 92a4382..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcExtensionException.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcHttpConfig.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcHttpConfig.class
deleted file mode 100644
index a782006..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcHttpConfig.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcHttpRequestConfig.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcHttpRequestConfig.class
deleted file mode 100644
index f163c15..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcHttpRequestConfig.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcHttpRequestConfigImpl.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcHttpRequestConfigImpl.class
deleted file mode 100644
index 91bbb63..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcHttpRequestConfigImpl.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcLoadException.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcLoadException.class
deleted file mode 100644
index 179d65b..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcLoadException.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcNotAuthorizedException.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcNotAuthorizedException.class
deleted file mode 100644
index 4538243..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcNotAuthorizedException.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcRequestProcessor.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcRequestProcessor.class
deleted file mode 100644
index 908c990..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcRequestProcessor.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcRequestProcessorFactory.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcRequestProcessorFactory.class
deleted file mode 100644
index 10fa5f3..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcRequestProcessorFactory.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcStreamConfig.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcStreamConfig.class
deleted file mode 100644
index 30d88bd..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcStreamConfig.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcStreamRequestConfig.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcStreamRequestConfig.class
deleted file mode 100644
index 426c586..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcStreamRequestConfig.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcStreamRequestProcessor.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcStreamRequestProcessor.class
deleted file mode 100644
index 6778db5..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcStreamRequestProcessor.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcWorker.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcWorker.class
deleted file mode 100644
index 767ad57..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcWorker.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcWorkerFactory.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcWorkerFactory.class
deleted file mode 100644
index 50196d7..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/common/XmlRpcWorkerFactory.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/jaxb/JaxbParser.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/jaxb/JaxbParser.class
deleted file mode 100644
index dd6e5ed..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/jaxb/JaxbParser.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/jaxb/JaxbSerializer$1.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/jaxb/JaxbSerializer$1.class
deleted file mode 100644
index 72b55b5..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/jaxb/JaxbSerializer$1.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/jaxb/JaxbSerializer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/jaxb/JaxbSerializer.class
deleted file mode 100644
index 34d8940..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/jaxb/JaxbSerializer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/jaxb/JaxbTypeFactory.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/jaxb/JaxbTypeFactory.class
deleted file mode 100644
index 3ebf5a0..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/jaxb/JaxbTypeFactory.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/metadata/ReflectiveXmlRpcMetaDataHandler.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/metadata/ReflectiveXmlRpcMetaDataHandler.class
deleted file mode 100644
index 7f4d58d..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/metadata/ReflectiveXmlRpcMetaDataHandler.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/metadata/Util.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/metadata/Util.class
deleted file mode 100644
index ffd1d42..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/metadata/Util.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/metadata/XmlRpcListableHandlerMapping.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/metadata/XmlRpcListableHandlerMapping.class
deleted file mode 100644
index 0a4fce6..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/metadata/XmlRpcListableHandlerMapping.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/metadata/XmlRpcMetaDataHandler.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/metadata/XmlRpcMetaDataHandler.class
deleted file mode 100644
index 01ebc54..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/metadata/XmlRpcMetaDataHandler.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/metadata/XmlRpcSystemImpl.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/metadata/XmlRpcSystemImpl.class
deleted file mode 100644
index a620e58..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/metadata/XmlRpcSystemImpl.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/AtomicParser.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/AtomicParser.class
deleted file mode 100644
index 3341008..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/AtomicParser.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/BigDecimalParser.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/BigDecimalParser.class
deleted file mode 100644
index 41b36ed..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/BigDecimalParser.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/BigIntegerParser.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/BigIntegerParser.class
deleted file mode 100644
index 8fe9084..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/BigIntegerParser.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/BooleanParser.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/BooleanParser.class
deleted file mode 100644
index fc555d3..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/BooleanParser.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/ByteArrayParser$1.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/ByteArrayParser$1.class
deleted file mode 100644
index 17bc88f..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/ByteArrayParser$1.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/ByteArrayParser.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/ByteArrayParser.class
deleted file mode 100644
index 2ab1dd7..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/ByteArrayParser.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/CalendarParser.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/CalendarParser.class
deleted file mode 100644
index 6f3a3a9..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/CalendarParser.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/DateParser.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/DateParser.class
deleted file mode 100644
index 00c0a66..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/DateParser.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/DoubleParser.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/DoubleParser.class
deleted file mode 100644
index eb4d68c..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/DoubleParser.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/ExtParser.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/ExtParser.class
deleted file mode 100644
index 03e1538..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/ExtParser.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/FloatParser.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/FloatParser.class
deleted file mode 100644
index e1607dd..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/FloatParser.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/I1Parser.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/I1Parser.class
deleted file mode 100644
index 1a9a82a..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/I1Parser.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/I2Parser.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/I2Parser.class
deleted file mode 100644
index 8580a86..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/I2Parser.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/I4Parser.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/I4Parser.class
deleted file mode 100644
index 4e84931..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/I4Parser.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/I8Parser.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/I8Parser.class
deleted file mode 100644
index dbe1596..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/I8Parser.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/LongParser.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/LongParser.class
deleted file mode 100644
index 66f66a9..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/LongParser.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/MapParser.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/MapParser.class
deleted file mode 100644
index b699694..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/MapParser.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/NodeParser.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/NodeParser.class
deleted file mode 100644
index ff730ec..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/NodeParser.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/NullParser.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/NullParser.class
deleted file mode 100644
index 5c85250..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/NullParser.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/ObjectArrayParser.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/ObjectArrayParser.class
deleted file mode 100644
index 62628e4..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/ObjectArrayParser.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/RecursiveTypeParserImpl.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/RecursiveTypeParserImpl.class
deleted file mode 100644
index 08fd728..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/RecursiveTypeParserImpl.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/SerializableParser.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/SerializableParser.class
deleted file mode 100644
index 598de89..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/SerializableParser.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/StringParser.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/StringParser.class
deleted file mode 100644
index 5326eba..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/StringParser.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/TypeParser.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/TypeParser.class
deleted file mode 100644
index 96e4ddd..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/TypeParser.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/TypeParserImpl.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/TypeParserImpl.class
deleted file mode 100644
index c84bcab..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/TypeParserImpl.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/XmlRpcRequestParser.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/XmlRpcRequestParser.class
deleted file mode 100644
index 5e07c22..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/XmlRpcRequestParser.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/XmlRpcResponseParser.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/XmlRpcResponseParser.class
deleted file mode 100644
index 1f3d862..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/parser/XmlRpcResponseParser.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/BaseXmlWriterFactory.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/BaseXmlWriterFactory.class
deleted file mode 100644
index ee1524e..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/BaseXmlWriterFactory.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/BigDecimalSerializer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/BigDecimalSerializer.class
deleted file mode 100644
index 6b5a318..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/BigDecimalSerializer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/BigIntegerSerializer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/BigIntegerSerializer.class
deleted file mode 100644
index 5e570bc..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/BigIntegerSerializer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/BooleanSerializer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/BooleanSerializer.class
deleted file mode 100644
index d5c48c1..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/BooleanSerializer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/ByteArraySerializer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/ByteArraySerializer.class
deleted file mode 100644
index 51a42d2..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/ByteArraySerializer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/CalendarSerializer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/CalendarSerializer.class
deleted file mode 100644
index 0f9b76f..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/CalendarSerializer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/CharSetXmlWriterFactory.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/CharSetXmlWriterFactory.class
deleted file mode 100644
index 4ef8378..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/CharSetXmlWriterFactory.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/DateSerializer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/DateSerializer.class
deleted file mode 100644
index a584425..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/DateSerializer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/DefaultXMLWriterFactory.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/DefaultXMLWriterFactory.class
deleted file mode 100644
index 1cda193..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/DefaultXMLWriterFactory.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/DoubleSerializer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/DoubleSerializer.class
deleted file mode 100644
index 0c9ac9f..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/DoubleSerializer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/ExtSerializer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/ExtSerializer.class
deleted file mode 100644
index b0661eb..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/ExtSerializer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/FloatSerializer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/FloatSerializer.class
deleted file mode 100644
index a7c1195..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/FloatSerializer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/I1Serializer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/I1Serializer.class
deleted file mode 100644
index 454d07d..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/I1Serializer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/I2Serializer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/I2Serializer.class
deleted file mode 100644
index fc5350d..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/I2Serializer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/I4Serializer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/I4Serializer.class
deleted file mode 100644
index d9178ba..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/I4Serializer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/I8Serializer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/I8Serializer.class
deleted file mode 100644
index 47a75aa..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/I8Serializer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/ListSerializer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/ListSerializer.class
deleted file mode 100644
index cfafbe7..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/ListSerializer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/MapSerializer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/MapSerializer.class
deleted file mode 100644
index 93c2baa..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/MapSerializer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/NodeSerializer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/NodeSerializer.class
deleted file mode 100644
index dc51b8d..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/NodeSerializer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/NullSerializer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/NullSerializer.class
deleted file mode 100644
index 11474fd..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/NullSerializer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/ObjectArraySerializer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/ObjectArraySerializer.class
deleted file mode 100644
index 9e29e4e..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/ObjectArraySerializer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/SerializableSerializer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/SerializableSerializer.class
deleted file mode 100644
index 05d9fd4..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/SerializableSerializer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/StringSerializer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/StringSerializer.class
deleted file mode 100644
index 5437ac5..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/StringSerializer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/TypeSerializer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/TypeSerializer.class
deleted file mode 100644
index 3b18474..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/TypeSerializer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/TypeSerializerImpl.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/TypeSerializerImpl.class
deleted file mode 100644
index 8cb19ea..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/TypeSerializerImpl.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/XmlRpcWriter.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/XmlRpcWriter.class
deleted file mode 100644
index 2ac0371..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/XmlRpcWriter.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/XmlWriterFactory.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/XmlWriterFactory.class
deleted file mode 100644
index 1cedc22..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/serializer/XmlWriterFactory.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/AbstractReflectiveHandlerMapping$AuthenticationHandler.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/AbstractReflectiveHandlerMapping$AuthenticationHandler.class
deleted file mode 100644
index 03fd0b7..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/AbstractReflectiveHandlerMapping$AuthenticationHandler.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/AbstractReflectiveHandlerMapping.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/AbstractReflectiveHandlerMapping.class
deleted file mode 100644
index 896d549..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/AbstractReflectiveHandlerMapping.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/PropertyHandlerMapping.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/PropertyHandlerMapping.class
deleted file mode 100644
index 845cfd2..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/PropertyHandlerMapping.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/ReflectiveXmlRpcHandler$MethodData.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/ReflectiveXmlRpcHandler$MethodData.class
deleted file mode 100644
index e54e194..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/ReflectiveXmlRpcHandler$MethodData.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/ReflectiveXmlRpcHandler.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/ReflectiveXmlRpcHandler.class
deleted file mode 100644
index b99ca52..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/ReflectiveXmlRpcHandler.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/RequestProcessorFactoryFactory$RequestProcessorFactory.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/RequestProcessorFactoryFactory$RequestProcessorFactory.class
deleted file mode 100644
index 6d62b71..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/RequestProcessorFactoryFactory$RequestProcessorFactory.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/RequestProcessorFactoryFactory$RequestSpecificProcessorFactoryFactory$1.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/RequestProcessorFactoryFactory$RequestSpecificProcessorFactoryFactory$1.class
deleted file mode 100644
index eda6747..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/RequestProcessorFactoryFactory$RequestSpecificProcessorFactoryFactory$1.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/RequestProcessorFactoryFactory$RequestSpecificProcessorFactoryFactory.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/RequestProcessorFactoryFactory$RequestSpecificProcessorFactoryFactory.class
deleted file mode 100644
index 707fd6f..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/RequestProcessorFactoryFactory$RequestSpecificProcessorFactoryFactory.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/RequestProcessorFactoryFactory$StatelessProcessorFactoryFactory$1.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/RequestProcessorFactoryFactory$StatelessProcessorFactoryFactory$1.class
deleted file mode 100644
index 5b0861b..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/RequestProcessorFactoryFactory$StatelessProcessorFactoryFactory$1.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/RequestProcessorFactoryFactory$StatelessProcessorFactoryFactory.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/RequestProcessorFactoryFactory$StatelessProcessorFactoryFactory.class
deleted file mode 100644
index 38ff41b..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/RequestProcessorFactoryFactory$StatelessProcessorFactoryFactory.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/RequestProcessorFactoryFactory.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/RequestProcessorFactoryFactory.class
deleted file mode 100644
index 4156de1..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/RequestProcessorFactoryFactory.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/ServerHttpConnection.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/ServerHttpConnection.class
deleted file mode 100644
index 5f41a40..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/ServerHttpConnection.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcHandlerMapping.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcHandlerMapping.class
deleted file mode 100644
index 33e83f5..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcHandlerMapping.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcHttpServer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcHttpServer.class
deleted file mode 100644
index 788b901..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcHttpServer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcHttpServerConfig.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcHttpServerConfig.class
deleted file mode 100644
index 9c13081..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcHttpServerConfig.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcLocalStreamServer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcLocalStreamServer.class
deleted file mode 100644
index 2381bb8..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcLocalStreamServer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcNoSuchHandlerException.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcNoSuchHandlerException.class
deleted file mode 100644
index c7dd8a5..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcNoSuchHandlerException.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcServer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcServer.class
deleted file mode 100644
index d27e1bb..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcServer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcServerConfig.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcServerConfig.class
deleted file mode 100644
index be978ed..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcServerConfig.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcServerConfigImpl.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcServerConfigImpl.class
deleted file mode 100644
index 6eb828d..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcServerConfigImpl.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcServerWorker.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcServerWorker.class
deleted file mode 100644
index 03569be..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcServerWorker.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcServerWorkerFactory.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcServerWorkerFactory.class
deleted file mode 100644
index 468bce1..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcServerWorkerFactory.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcStreamServer$1.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcStreamServer$1.class
deleted file mode 100644
index 5592801..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcStreamServer$1.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcStreamServer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcStreamServer.class
deleted file mode 100644
index 09838ed..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/server/XmlRpcStreamServer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/HttpUtil.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/HttpUtil.class
deleted file mode 100644
index 0e105ae..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/HttpUtil.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/LimitedInputStream.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/LimitedInputStream.class
deleted file mode 100644
index e73ef3d..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/LimitedInputStream.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/SAXParsers.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/SAXParsers.class
deleted file mode 100644
index 473da2e..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/SAXParsers.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/ThreadPool$MyThread.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/ThreadPool$MyThread.class
deleted file mode 100644
index a8d58b6..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/ThreadPool$MyThread.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/ThreadPool$Task.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/ThreadPool$Task.class
deleted file mode 100644
index 3cf826b..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/ThreadPool$Task.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/ThreadPool.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/ThreadPool.class
deleted file mode 100644
index 0f0ca4c..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/ThreadPool.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/XmlRpcDateTimeDateFormat.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/XmlRpcDateTimeDateFormat.class
deleted file mode 100644
index df927b0..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/XmlRpcDateTimeDateFormat.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/XmlRpcDateTimeFormat.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/XmlRpcDateTimeFormat.class
deleted file mode 100644
index eb2f9ba..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/XmlRpcDateTimeFormat.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/XmlRpcIOException.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/XmlRpcIOException.class
deleted file mode 100644
index f91d266..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/util/XmlRpcIOException.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/Connection$1.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/Connection$1.class
deleted file mode 100644
index d045df7..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/Connection$1.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/Connection$BadRequestException.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/Connection$BadRequestException.class
deleted file mode 100644
index 69989cd..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/Connection$BadRequestException.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/Connection.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/Connection.class
deleted file mode 100644
index f182452..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/Connection.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/ConnectionServer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/ConnectionServer.class
deleted file mode 100644
index 1ddcf11..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/ConnectionServer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/HttpServletRequestImpl$1.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/HttpServletRequestImpl$1.class
deleted file mode 100644
index dc2cd88..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/HttpServletRequestImpl$1.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/HttpServletRequestImpl$2.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/HttpServletRequestImpl$2.class
deleted file mode 100644
index 1283d1b..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/HttpServletRequestImpl$2.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/HttpServletRequestImpl.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/HttpServletRequestImpl.class
deleted file mode 100644
index 3d21c22..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/HttpServletRequestImpl.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/HttpServletResponseImpl.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/HttpServletResponseImpl.class
deleted file mode 100644
index 4448353..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/HttpServletResponseImpl.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/RequestData.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/RequestData.class
deleted file mode 100644
index f568197..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/RequestData.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/ServletConnection.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/ServletConnection.class
deleted file mode 100644
index 1362baa..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/ServletConnection.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.class
deleted file mode 100644
index b26ff6f..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/ServletWebServer$1$1.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/ServletWebServer$1$1.class
deleted file mode 100644
index 4ab38cd..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/ServletWebServer$1$1.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/ServletWebServer$1.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/ServletWebServer$1.class
deleted file mode 100644
index 9d770a1..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/ServletWebServer$1.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/ServletWebServer$Exception.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/ServletWebServer$Exception.class
deleted file mode 100644
index 0f9b6a8..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/ServletWebServer$Exception.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/ServletWebServer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/ServletWebServer.class
deleted file mode 100644
index de3b403..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/ServletWebServer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/WebServer$AddressMatcher.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/WebServer$AddressMatcher.class
deleted file mode 100644
index a2ee693..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/WebServer$AddressMatcher.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/WebServer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/WebServer.class
deleted file mode 100644
index 7611fff..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/WebServer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/XmlRpcServlet.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/XmlRpcServlet.class
deleted file mode 100644
index bd5e09c..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/XmlRpcServlet.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/XmlRpcServletServer$ServletStreamConnection.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/XmlRpcServletServer$ServletStreamConnection.class
deleted file mode 100644
index d65dd95..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/XmlRpcServletServer$ServletStreamConnection.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/XmlRpcServletServer.class b/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/XmlRpcServletServer.class
deleted file mode 100644
index a3b3fe0..0000000
--- a/monitoring/bundles/org.apache.xmlrpc/org/apache/xmlrpc/webserver/XmlRpcServletServer.class
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.core.resources.jmx/.classpath b/monitoring/bundles/org.eclipse.core.resources.jmx/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/monitoring/bundles/org.eclipse.core.resources.jmx/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/monitoring/bundles/org.eclipse.core.resources.jmx/.cvsignore b/monitoring/bundles/org.eclipse.core.resources.jmx/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/monitoring/bundles/org.eclipse.core.resources.jmx/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/monitoring/bundles/org.eclipse.core.resources.jmx/.project b/monitoring/bundles/org.eclipse.core.resources.jmx/.project
deleted file mode 100644
index f53633e..0000000
--- a/monitoring/bundles/org.eclipse.core.resources.jmx/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.core.resources.jmx</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/monitoring/bundles/org.eclipse.core.resources.jmx/.settings/org.eclipse.jdt.core.prefs b/monitoring/bundles/org.eclipse.core.resources.jmx/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 66dc638..0000000
--- a/monitoring/bundles/org.eclipse.core.resources.jmx/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,309 +0,0 @@
-#Thu May 10 13:51:20 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-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.hiddenCatchBlock=warning
-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.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-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.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-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.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=800
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

diff --git a/monitoring/bundles/org.eclipse.core.resources.jmx/.settings/org.eclipse.jdt.ui.prefs b/monitoring/bundles/org.eclipse.core.resources.jmx/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index f6e1e18..0000000
--- a/monitoring/bundles/org.eclipse.core.resources.jmx/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,9 +0,0 @@
-#Mon Feb 26 11:26:04 EST 2007
-eclipse.preferences.version=1
-formatter_profile=_core
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.staticondemandthreshold=99

diff --git a/monitoring/bundles/org.eclipse.core.resources.jmx/META-INF/MANIFEST.MF b/monitoring/bundles/org.eclipse.core.resources.jmx/META-INF/MANIFEST.MF
deleted file mode 100644
index 9091b0b..0000000
--- a/monitoring/bundles/org.eclipse.core.resources.jmx/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Resource Monitoring Core Resources Extensions (Incubation)
-Bundle-SymbolicName: org.eclipse.core.resources.jmx;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Eclipse-LazyStart: true
-Import-Package: javax.management,
- javax.management.remote,
- org.eclipse.core.resources,
- org.eclipse.core.runtime;common=split,
- org.eclipse.core.runtime.jobs,
- org.eclipse.equinox.jmx.common,
- org.eclipse.equinox.jmx.server,
- org.eclipse.osgi.util,
- org.osgi.framework,
- org.osgi.service.log,
- org.osgi.util.tracker
-Bundle-Activator: org.eclipse.core.internal.resources.jmx.Activator
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,
- CDC-1.0/Foundation-1.0,
- J2SE-1.3

diff --git a/monitoring/bundles/org.eclipse.core.resources.jmx/about.html b/monitoring/bundles/org.eclipse.core.resources.jmx/about.html
deleted file mode 100644
index 5d03fd4..0000000
--- a/monitoring/bundles/org.eclipse.core.resources.jmx/about.html
+++ /dev/null

@@ -1,28 +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 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.core.resources.jmx/build.properties b/monitoring/bundles/org.eclipse.core.resources.jmx/build.properties
deleted file mode 100644
index 0e23b66..0000000
--- a/monitoring/bundles/org.eclipse.core.resources.jmx/build.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               icons/,\
-               about.html
-src.includes = about.html
-javacSource=1.3
-javacTarget=1.1

diff --git a/monitoring/bundles/org.eclipse.core.resources.jmx/icons/file.gif b/monitoring/bundles/org.eclipse.core.resources.jmx/icons/file.gif
deleted file mode 100644
index 7ccc6a7..0000000
--- a/monitoring/bundles/org.eclipse.core.resources.jmx/icons/file.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.core.resources.jmx/icons/folder.gif b/monitoring/bundles/org.eclipse.core.resources.jmx/icons/folder.gif
deleted file mode 100644
index 51e703b..0000000
--- a/monitoring/bundles/org.eclipse.core.resources.jmx/icons/folder.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.core.resources.jmx/icons/project.gif b/monitoring/bundles/org.eclipse.core.resources.jmx/icons/project.gif
deleted file mode 100644
index a4ea580..0000000
--- a/monitoring/bundles/org.eclipse.core.resources.jmx/icons/project.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.core.resources.jmx/icons/resources.gif b/monitoring/bundles/org.eclipse.core.resources.jmx/icons/resources.gif
deleted file mode 100644
index 983932f..0000000
--- a/monitoring/bundles/org.eclipse.core.resources.jmx/icons/resources.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.core.resources.jmx/plugin.xml b/monitoring/bundles/org.eclipse.core.resources.jmx/plugin.xml
deleted file mode 100644
index 90635cc..0000000
--- a/monitoring/bundles/org.eclipse.core.resources.jmx/plugin.xml
+++ /dev/null

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   <extension point="org.eclipse.equinox.jmx.server.contribution">
-      <contribution
-            class="org.eclipse.core.internal.resources.jmx.ResourceContributionProvider"
-            isroot="true"/>
-   </extension>
-</plugin>

diff --git a/monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/Activator.java b/monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/Activator.java
deleted file mode 100644
index bc053c1..0000000
--- a/monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/Activator.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.internal.resources.jmx;
-
-import java.net.URL;
-import org.eclipse.core.runtime.*;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.log.LogService;
-import org.osgi.util.tracker.ServiceTracker;
-
-/**
- * The activator class for this bundle.
- * 
- * @since 1.0
- */
-public class Activator implements BundleActivator {
-
-	private static final String BUNDLE_NAME = "org.eclipse.core.resources.jmx"; //$NON-NLS-1$
-	private static BundleContext context;
-	private static ServiceTracker logService;
-
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext bundleContext) throws Exception {
-		context = bundleContext;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext bundleContext) throws Exception {
-		if (logService != null) {
-			logService.close();
-			logService = null;
-		}
-		context = null;
-	}
-
-	/*
-	 * Log the given message and error to the log file.
-	 */
-	public static void log(String message, Exception exception) {
-		if (logService == null) {
-			logService = new ServiceTracker(context, LogService.class.getName(), null);
-			logService.open();
-		}
-		LogService log = (LogService) logService.getService();
-		if (log == null) {
-			System.out.println(BUNDLE_NAME);
-			System.out.println(message);
-			if (exception != null)
-				exception.printStackTrace(System.out);
-		} else
-			log.log(IStatus.ERROR, message, exception);
-	}
-
-	static URL getImageLocation(String path) {
-		return FileLocator.find(context.getBundle(), new Path(path), null);
-	}
-
-}

diff --git a/monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/ContainerContribution.java b/monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/ContainerContribution.java
deleted file mode 100644
index 26d3679..0000000
--- a/monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/ContainerContribution.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.internal.resources.jmx;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * @since 1.0
- */
-public abstract class ContainerContribution extends ResourceContribution {
-
-	private static final IResource[] EMPTY_ARRAY = new IResource[0];
-
-	/*
-	 * Constructor for the class.
-	 */
-	public ContainerContribution(IContainer container) {
-		super(container);
-	}
-
-	private IContainer getDelegate() {
-		return (IContainer) contributionDelegate;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getChildren()
-	 */
-	protected Object[] getChildren() {
-		try {
-			return getDelegate().members();
-		} catch (CoreException e) {
-			return EMPTY_ARRAY;
-		}
-	}
-
-}

diff --git a/monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/FileContribution.java b/monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/FileContribution.java
deleted file mode 100644
index c266c29..0000000
--- a/monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/FileContribution.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.internal.resources.jmx;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-/**
- * @since 1.0
- */
-public class FileContribution extends ResourceContribution {
-
-	private static final IResource[] EMPTY_ARRAY = new IResource[0];
-	private static final String ICON_PATH = "icons/file.gif";//$NON-NLS-1$
-
-	/*
-	 * Constructor for the class.
-	 */
-	public FileContribution(IFile file) {
-		super(file);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.internal.resources.jmx.ResourceContribution#getIconPath()
-	 */
-	protected IPath getIconPath() {
-		return new Path(ICON_PATH);
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getChildren()
-	 */
-	protected Object[] getChildren() {
-		return EMPTY_ARRAY;
-	}
-
-}

diff --git a/monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/FolderContribution.java b/monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/FolderContribution.java
deleted file mode 100644
index f8765b6..0000000
--- a/monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/FolderContribution.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.internal.resources.jmx;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-/**
- * @since 1.0
- */
-public class FolderContribution extends ContainerContribution {
-
-	private static final String ICON_PATH = "icons/folder.gif";//$NON-NLS-1$
-
-	/*
-	 * Constructor for the class.
-	 */
-	public FolderContribution(IFolder folder) {
-		super(folder);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.internal.resources.jmx.ResourceContribution#getIconPath()
-	 */
-	protected IPath getIconPath() {
-		return new Path(ICON_PATH);
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/Messages.java b/monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/Messages.java
deleted file mode 100644
index 23313d3..0000000
--- a/monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/Messages.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.internal.resources.jmx;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Class which is used in the translation of messages.
- * 
- * @since 1.0
- */
-public class Messages extends NLS {
-
-	public static String contributionName;
-	public static String rootName;
-	public static String operation_delete;
-
-	private Messages() {
-		// prevent instantiation
-	}
-
-	// initialize resource bundle
-	static {
-		NLS.initializeMessages("org.eclipse.core.internal.resources.jmx.messages", Messages.class); //$NON-NLS-1$
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/ProjectContribution.java b/monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/ProjectContribution.java
deleted file mode 100644
index 166f2f3..0000000
--- a/monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/ProjectContribution.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.internal.resources.jmx;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-/**
- * @since 1.0
- */
-public class ProjectContribution extends ContainerContribution {
-
-	private static final String ICON_PATH = "icons/project.gif";//$NON-NLS-1$
-
-	/*
-	 * Constructor for the class.
-	 */
-	public ProjectContribution(IProject project) {
-		super(project);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.internal.resources.jmx.ResourceContribution#getIconPath()
-	 */
-	protected IPath getIconPath() {
-		return new Path(ICON_PATH);
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/ResourceContribution.java b/monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/ResourceContribution.java
deleted file mode 100644
index e82a79e..0000000
--- a/monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/ResourceContribution.java
+++ /dev/null

@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * 	Jeff Mesnil - Bug 151266 - [monitoring] Browsing our server in jconsole is really unfriendly
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.internal.resources.jmx;
-
-import java.net.URL;
-import java.util.*;
-import javax.management.*;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.equinox.jmx.common.JMXConstants;
-import org.eclipse.equinox.jmx.server.Contribution;
-
-/**
- * Class which represents an {@link IResource} as a contribution.
- * 
- * @since 1.0
- */
-public abstract class ResourceContribution extends Contribution {
-
-	private static final String METHOD_DELETE = "delete"; //$NON-NLS-1$
-
-	/*
-	 * Constructor for the class. Create a new contribution for the given
-	 * resource.
-	 */
-	public ResourceContribution(IResource delegate) {
-		super(delegate);
-	}
-
-    /* (non-Javadoc)
-     * @see org.eclipse.equinox.jmx.server.Contribution#getObjectName()
-     */
-    protected ObjectName getObjectName() {
-        try {
-            return new ObjectName(JMXConstants.DEFAULT_DOMAIN +":type=Resource,name=" + getDelegate().getFullPath()); //$NON-NLS-1$
-        } catch (Exception e) {
-            return super.getObjectName();
-        }
-    }
-
-	/*
-	 * Return this contribution's delegate. It is stored in the super-class as
-	 * an Object so we need to cast it to our specific type.
-	 */
-	private IResource getDelegate() {
-		return (IResource) contributionDelegate;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getName()
-	 */
-	protected String getName() {
-		return getDelegate().getName();
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getProperties()
-	 */
-	protected Set getProperties() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getImageLocation()
-	 */
-	protected URL getImageLocation() {
-		return Activator.getImageLocation(getIconPath().toOSString());
-	}
-
-	/**
-	 * Return a path to the icon used to represent this contributions. 
-	 * 
-	 * @return a path in the file-system to the icon
-	 */
-	protected abstract IPath getIconPath();
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getMBeanInfo(java.lang.Object)
-	 */
-	protected MBeanInfo getMBeanInfo(Object delegate) {
-		List list = createOperations();
-		MBeanOperationInfo[] operations = (MBeanOperationInfo[]) list.toArray(new MBeanOperationInfo[list.size()]);
-		return new MBeanInfo(getClass().getName(), null, null, null, operations, null);
-	}
-
-	/*
-	 * Return the list of operations known to this contribution type.
-	 * Sub-classes to override. Should call "super" as well. 
-	 */
-	protected List createOperations() {
-		List result = new ArrayList();
-		result.add(new MBeanOperationInfo(METHOD_DELETE, Messages.operation_delete, null, Void.TYPE.getName(), 0));
-		return result;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#invokeOperation(java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	protected Object invokeOperation(String operationName, Object[] args, String[] argTypes) {
-		if (METHOD_DELETE.equals(operationName)) {
-			try {
-				getDelegate().delete(IResource.FORCE, null);
-			} catch (CoreException e) {
-				Activator.log(e.getMessage(), e);
-			}
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String attribute) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-	 */
-	public void setAttribute(Attribute attribute) {
-		// do nothing
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-	 */
-	public AttributeList getAttributes(String[] attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-	 */
-	public AttributeList setAttributes(AttributeList attributes) {
-		return null;
-	}
-
-}

diff --git a/monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/ResourceContributionProvider.java b/monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/ResourceContributionProvider.java
deleted file mode 100644
index d93b809..0000000
--- a/monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/ResourceContributionProvider.java
+++ /dev/null

@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.internal.resources.jmx;
-
-import java.net.URL;
-import java.util.Set;
-import javax.management.*;
-import org.eclipse.core.resources.*;
-import org.eclipse.equinox.jmx.server.Contribution;
-import org.eclipse.equinox.jmx.server.ContributionProvider;
-
-/**
- * @since 1.0
- */
-public class ResourceContributionProvider extends ContributionProvider {
-
-	private static final String ICON_PATH = "icons/resources.gif"; //$NON-NLS-1$
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.ContributionProvider#contributesType(java.lang.Object)
-	 */
-	protected boolean contributesType(Object obj) {
-		return obj instanceof IResource;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.ContributionProvider#providesType(java.lang.Object)
-	 */
-	protected boolean providesType(Object obj) {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.ContributionProvider#createProvider(java.lang.Object)
-	 */
-	protected ContributionProvider createProvider(Object obj) {
-		return providesType(obj) ? new ResourceContributionProvider() : null;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.ContributionProvider#createContribution(java.lang.Object)
-	 */
-	protected Contribution createContribution(Object obj) {
-		if (!contributesType(obj))
-			return null;
-		IResource resource = (IResource) obj;
-		switch (resource.getType()) {
-			case IResource.FILE :
-				return new FileContribution((IFile) obj);
-			case IResource.FOLDER :
-				return new FolderContribution((IFolder) obj);
-			case IResource.PROJECT :
-				return new ProjectContribution((IProject) obj);
-			case IResource.ROOT :
-				return null;
-			default :
-				throw new IllegalArgumentException("Resource type unknown: " + resource.getType()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getName()
-	 */
-	protected String getName() {
-		return Messages.contributionName;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getChildren()
-	 */
-	protected Object[] getChildren() {
-		return ResourcesPlugin.getWorkspace().getRoot().getProjects();
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getProperties()
-	 */
-	protected Set getProperties() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getImageLocation()
-	 */
-	protected URL getImageLocation() {
-		return Activator.getImageLocation(ICON_PATH);
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getMBeanInfo(java.lang.Object)
-	 */
-	protected MBeanInfo getMBeanInfo(Object delegate) {
-		return new MBeanInfo(getClass().getName(), null, null, null, createOperations(), null);
-	}
-
-	protected MBeanOperationInfo[] createOperations() {
-		return new MBeanOperationInfo[0];
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#invokeOperation(java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	protected Object invokeOperation(String operationName, Object[] args, String[] argTypes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String attribute) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-	 */
-	public void setAttribute(Attribute attribute) {
-		// do nothing
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-	 */
-	public AttributeList getAttributes(String[] attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-	 */
-	public AttributeList setAttributes(AttributeList attributes) {
-		return null;
-	}
-
-}

diff --git a/monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/messages.properties b/monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/messages.properties
deleted file mode 100644
index d07617b..0000000
--- a/monitoring/bundles/org.eclipse.core.resources.jmx/src/org/eclipse/core/internal/resources/jmx/messages.properties
+++ /dev/null

@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-contributionName=Workspace Resources
-rootName=/
-
-operation_delete=Delete this resource.
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client.feature/.project b/monitoring/bundles/org.eclipse.equinox.jmx.client.feature/.project
deleted file mode 100644
index 47d122d..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client.feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.jmx.client-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/monitoring/bundles/org.eclipse.equinox.jmx.client.feature/about.html b/monitoring/bundles/org.eclipse.equinox.jmx.client.feature/about.html
deleted file mode 100644
index 5d03fd4..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client.feature/about.html
+++ /dev/null

@@ -1,28 +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 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client.feature/build.properties b/monitoring/bundles/org.eclipse.equinox.jmx.client.feature/build.properties
deleted file mode 100644
index ddfe69f..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client.feature/build.properties
+++ /dev/null

@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# 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/monitoring/bundles/org.eclipse.equinox.jmx.client.feature/feature.xml b/monitoring/bundles/org.eclipse.equinox.jmx.client.feature/feature.xml
deleted file mode 100644
index e583415..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client.feature/feature.xml
+++ /dev/null

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.equinox.jmx.client.feature"
-      label="Resource Monitoring Client Feature (Incubation)"
-      version="1.0.0.qualifier"
-      provider-name="Eclipse.org">
-
-   <description url="http://www.eclipse.org/equinox/incubator/monitoring/index.php">
-      Client-side infrastructure for managing OSGi-based systems using
-JMX.
-   </description>
-
-   <license url="http://www.eclipse.org/org/documents/epl-v10.php">
-      Eclipse Public License v1.0.
-   </license>
-
-   <requires>
-      <import feature="org.eclipse.equinox.jmx.common.feature" version="1.0.0.qualifier"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.equinox.jmx.client"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.jmx.client.rmi"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.jmx.client.xmlrpc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/.classpath b/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/.classpath
deleted file mode 100644
index ce0c7a5..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.0%Foundation-1.0"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/.cvsignore b/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/.project b/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/.project
deleted file mode 100644
index 0bfe663..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.jmx.client.rmi</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/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/.settings/org.eclipse.jdt.core.prefs b/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ac463e1..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,308 +0,0 @@
-#Mon Feb 26 13:38:58 EST 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1
-org.eclipse.jdt.core.compiler.compliance=1.3
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-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.hiddenCatchBlock=warning
-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.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-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.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-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.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=800
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/.settings/org.eclipse.jdt.ui.prefs b/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 04b8fd2..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,8 +0,0 @@
-#Mon Feb 26 11:26:35 EST 2007
-eclipse.preferences.version=1
-formatter_profile=_core
-formatter_settings_version=11
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.staticondemandthreshold=99

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/META-INF/MANIFEST.MF b/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/META-INF/MANIFEST.MF
deleted file mode 100644
index f235cbe..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: RMI Transport Client Plug-in (Incubation)
-Bundle-SymbolicName: org.eclipse.equinox.jmx.client.rmi;singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
- J2SE-1.3,
- J2SE-1.5
-Import-Package: javax.management.remote,
- org.eclipse.equinox.jmx.client

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/about.html b/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/about.html
deleted file mode 100644
index 5d03fd4..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/about.html
+++ /dev/null

@@ -1,28 +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 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/build.properties b/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/build.properties
deleted file mode 100644
index 45384e2..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/build.properties
+++ /dev/null

@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml
-src.includes = about.html

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/plugin.xml b/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/plugin.xml
deleted file mode 100644
index 2042c17..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/plugin.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         point="org.eclipse.equinox.jmx.client.transport">
-      <transport
-            class="org.eclipse.equinox.jmx.client.rmi.RMIConnectorProvider"
-            protocol="rmi"/>
-   </extension>
-
-</plugin>

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/src/org/eclipse/equinox/jmx/client/rmi/RMIConnectorProvider.java b/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/src/org/eclipse/equinox/jmx/client/rmi/RMIConnectorProvider.java
deleted file mode 100644
index 8ebabce..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi/src/org/eclipse/equinox/jmx/client/rmi/RMIConnectorProvider.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.client.rmi;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.Map;
-import javax.management.remote.*;
-import org.eclipse.equinox.jmx.client.IJMXConnectorProvider;
-
-public class RMIConnectorProvider implements IJMXConnectorProvider {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.client.IJMXConnectorProvider#getJMXServiceURL(java.lang.String, int, java.lang.String, java.lang.String)
-	 */
-	public JMXServiceURL getJMXServiceURL(String host, int port, String protocol, String domain) throws MalformedURLException {
-		return new JMXServiceURL("service:jmx:rmi:///jndi/rmi://" + host + ":" + port + "/" + domain);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.remote.JMXConnectorProvider#newJMXConnector(javax.management.remote.JMXServiceURL, java.util.Map)
-	 */
-	public JMXConnector newJMXConnector(JMXServiceURL arg0, Map arg1) throws IOException {
-		return JMXConnectorFactory.newJMXConnector(arg0, arg1);
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/.classpath b/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/.cvsignore b/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/.project b/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/.project
deleted file mode 100644
index 4f6a4f3..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.jmx.client.xmlrpc</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/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/.settings/org.eclipse.jdt.core.prefs b/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index cee7412..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,309 +0,0 @@
-#Mon Feb 26 13:38:25 EST 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-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.hiddenCatchBlock=warning
-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.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-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.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-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.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=800
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/.settings/org.eclipse.jdt.ui.prefs b/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index b5f8efc..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,9 +0,0 @@
-#Mon Feb 26 11:26:45 EST 2007
-eclipse.preferences.version=1
-formatter_profile=_core
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.staticondemandthreshold=99

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/META-INF/MANIFEST.MF b/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/META-INF/MANIFEST.MF
deleted file mode 100644
index 16c0ca7..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: XMLRPC Transport Client Plug-in (Incubation)
-Bundle-SymbolicName: org.eclipse.equinox.jmx.client.xmlrpc;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,
- CDC-1.0/Foundation-1.0,
- J2SE-1.3
-Import-Package: javax.management,
- javax.management.remote,
- javax.security.auth,
- org.apache.xmlrpc,
- org.apache.xmlrpc.client,
- org.eclipse.equinox.jmx.client,
- org.eclipse.equinox.jmx.client.remote,
- org.eclipse.equinox.jmx.common,
- org.eclipse.equinox.jmx.common.util

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/about.html b/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/about.html
deleted file mode 100644
index 5d03fd4..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/about.html
+++ /dev/null

@@ -1,28 +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 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/build.properties b/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/build.properties
deleted file mode 100644
index e17d09b..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/build.properties
+++ /dev/null

@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html
-src.includes = about.html

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/plugin.xml b/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/plugin.xml
deleted file mode 100644
index 3f57b89..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/plugin.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         point="org.eclipse.equinox.jmx.client.transport">
-      <transport
-            class="org.eclipse.equinox.jmx.client.internal.xmlrpc.XMLRPCJMXConnectorProvider"
-            protocol="xmlrpc"/>
-   </extension>
-
-</plugin>

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/src/org/eclipse/equinox/jmx/client/internal/xmlrpc/ClientTransportProvider.java b/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/src/org/eclipse/equinox/jmx/client/internal/xmlrpc/ClientTransportProvider.java
deleted file mode 100644
index 35ce2c9..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/src/org/eclipse/equinox/jmx/client/internal/xmlrpc/ClientTransportProvider.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.client.internal.xmlrpc;
-
-import org.apache.xmlrpc.client.*;
-
-/**
- * Interface for implementors that wish to provider their own xml-rpc transport layer.
- */
-public abstract class ClientTransportProvider {
-
-	/**
-	 * Implementor's are required to supply their specific transport layer
-	 * factory which is used by the client to communicate with the server.
-	 * 
-	 * @return An instance of <code>XmlRpcTransportFactory<code>.
-	 */
-	public abstract XmlRpcTransportFactory getXmlRpcTransportFactory(XmlRpcClient client);
-
-	public abstract XmlRpcClientConfigImpl getConfig();
-
-	/**
-	 * Return the xml-rpc client configured with the implementor's
-	 * transport layer.
-	 * 
-	 * @return A new <code>XmlRpcClient</code>
-	 */
-	public XmlRpcClient getXmlRpcClient() {
-		XmlRpcClient result = new XmlRpcClient();
-		result.setConfig(getConfig());
-		result.setTransportFactory(getXmlRpcTransportFactory(result));
-		return result;
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/src/org/eclipse/equinox/jmx/client/internal/xmlrpc/WebServerTransportProvider.java b/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/src/org/eclipse/equinox/jmx/client/internal/xmlrpc/WebServerTransportProvider.java
deleted file mode 100644
index 78966cc..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/src/org/eclipse/equinox/jmx/client/internal/xmlrpc/WebServerTransportProvider.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.client.internal.xmlrpc;
-
-import java.net.URL;
-import org.apache.xmlrpc.client.*;
-
-public class WebServerTransportProvider extends ClientTransportProvider {
-
-	private URL serverUrl;
-
-	public WebServerTransportProvider(URL serverUrl) {
-		this.serverUrl = serverUrl;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.client.internal.xmlrpc.ClientTransportProvider#getXmlRpcTransportFactory(org.apache.xmlrpc.client.XmlRpcClient)
-	 */
-	public XmlRpcTransportFactory getXmlRpcTransportFactory(XmlRpcClient client) {
-		return new XmlRpcCommonsTransportFactory(client);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.client.internal.xmlrpc.ClientTransportProvider#getConfig()
-	 */
-	public XmlRpcClientConfigImpl getConfig() {
-		XmlRpcClientConfigImpl result = new XmlRpcClientConfigImpl();
-		result.setContentLengthOptional(true);
-		result.setEnabledForExtensions(true);
-		result.setServerURL(serverUrl);
-		return result;
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/src/org/eclipse/equinox/jmx/client/internal/xmlrpc/XMLRPCJMXConnector.java b/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/src/org/eclipse/equinox/jmx/client/internal/xmlrpc/XMLRPCJMXConnector.java
deleted file mode 100644
index 812e59b..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/src/org/eclipse/equinox/jmx/client/internal/xmlrpc/XMLRPCJMXConnector.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.client.internal.xmlrpc;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Map;
-import javax.management.*;
-import javax.management.remote.JMXConnector;
-import javax.security.auth.Subject;
-
-public class XMLRPCJMXConnector implements JMXConnector {
-
-	private final String host;
-	private final int port;
-	private ClientTransportProvider clientProvider;
-	private MBeanServerConnection mbeanServer;
-
-	public XMLRPCJMXConnector(String host, int port) {
-		this.host = host;
-		this.port = port;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.remote.JMXConnector#connect()
-	 */
-	public void connect() throws IOException {
-		connect(null);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.remote.JMXConnector#connect(java.util.Map)
-	 */
-	public void connect(Map arg0) throws IOException {
-		clientProvider = new WebServerTransportProvider(new URL("http://" + host + ":" + port));
-		mbeanServer = new XMLRPCMBeanServerConnection(clientProvider.getXmlRpcClient());
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.remote.JMXConnector#getMBeanServerConnection()
-	 */
-	public MBeanServerConnection getMBeanServerConnection() throws IOException {
-		return mbeanServer;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.remote.JMXConnector#getMBeanServerConnection(javax.security.auth.Subject)
-	 */
-	public MBeanServerConnection getMBeanServerConnection(Subject delegationSubject) throws IOException {
-		return mbeanServer;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.remote.JMXConnector#close()
-	 */
-	public void close() throws IOException {
-		// the xmlrpc http transport creates a new connection for each remote operation
-		// thus there is no global close ability associated with this provider
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.remote.JMXConnector#addConnectionNotificationListener(javax.management.NotificationListener, javax.management.NotificationFilter, java.lang.Object)
-	 */
-	public void addConnectionNotificationListener(NotificationListener listener, NotificationFilter filter, Object handback) {
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.remote.JMXConnector#removeConnectionNotificationListener(javax.management.NotificationListener)
-	 */
-	public void removeConnectionNotificationListener(NotificationListener listener) throws ListenerNotFoundException {
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.remote.JMXConnector#removeConnectionNotificationListener(javax.management.NotificationListener, javax.management.NotificationFilter, java.lang.Object)
-	 */
-	public void removeConnectionNotificationListener(NotificationListener l, NotificationFilter f, Object handback) throws ListenerNotFoundException {
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.remote.JMXConnector#getConnectionId()
-	 */
-	public String getConnectionId() throws IOException {
-		return null;
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/src/org/eclipse/equinox/jmx/client/internal/xmlrpc/XMLRPCJMXConnectorProvider.java b/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/src/org/eclipse/equinox/jmx/client/internal/xmlrpc/XMLRPCJMXConnectorProvider.java
deleted file mode 100644
index 6ccfddb..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/src/org/eclipse/equinox/jmx/client/internal/xmlrpc/XMLRPCJMXConnectorProvider.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.client.internal.xmlrpc;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.Map;
-import javax.management.remote.JMXConnector;
-import javax.management.remote.JMXServiceURL;
-import org.eclipse.equinox.jmx.client.IJMXConnectorProvider;
-
-public class XMLRPCJMXConnectorProvider implements IJMXConnectorProvider {
-
-	/* (non-Javadoc)
-	 * @see javax.management.remote.JMXConnectorProvider#newJMXConnector(javax.management.remote.JMXServiceURL, java.util.Map)
-	 */
-	public JMXConnector newJMXConnector(JMXServiceURL arg0, Map arg1) throws IOException {
-		if (!arg0.getProtocol().equals("xmlrpc")) {
-			throw new IOException("Invalid protocol"); // FIXME
-		}
-		return new XMLRPCJMXConnector(arg0.getHost(), arg0.getPort());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.client.IJMXConnectorProvider#getJMXServiceURL(java.lang.String, int, java.lang.String, java.lang.String)
-	 */
-	public JMXServiceURL getJMXServiceURL(String host, int port, String protocol, String domain) throws MalformedURLException {
-		return new JMXServiceURL("service:jmx:xmlrpc://" + host + ":" + port);
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/src/org/eclipse/equinox/jmx/client/internal/xmlrpc/XMLRPCMBeanServerConnection.java b/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/src/org/eclipse/equinox/jmx/client/internal/xmlrpc/XMLRPCMBeanServerConnection.java
deleted file mode 100644
index 72f47bb..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc/src/org/eclipse/equinox/jmx/client/internal/xmlrpc/XMLRPCMBeanServerConnection.java
+++ /dev/null

@@ -1,265 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.client.internal.xmlrpc;
-
-import java.io.IOException;
-import java.util.Set;
-import javax.management.*;
-import org.apache.xmlrpc.XmlRpcException;
-import org.apache.xmlrpc.client.XmlRpcClient;
-import org.eclipse.equinox.jmx.client.remote.RemoteMBeanConnection;
-import org.eclipse.equinox.jmx.client.remote.RemoteNotificationHandler;
-import org.eclipse.equinox.jmx.common.NamedNotification;
-
-/**
- * A <code>XMLRPCMBeanServerConnection</code> provides an implementation of 
- * <code>MBeanServerConnection</code> that utilizes xml-rpc as a transport
- * provider. 
- */
-public class XMLRPCMBeanServerConnection implements MBeanServerConnection, RemoteMBeanConnection {
-
-	private static final String CREATE_MBEAN = "createMBean"; //$NON-NLS-1$
-	private XmlRpcClient clientConnection;
-	private RemoteNotificationHandler notificationHandler;
-
-	public XMLRPCMBeanServerConnection(XmlRpcClient clientConnection) {
-		this.clientConnection = clientConnection;
-		this.notificationHandler = new RemoteNotificationHandler(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServerConnection#createMBean(java.lang.String, javax.management.ObjectName)
-	 */
-	public ObjectInstance createMBean(String className, ObjectName name) throws ReflectionException, InstanceAlreadyExistsException, MBeanRegistrationException, MBeanException, NotCompliantMBeanException, IOException {
-		try {
-			return (ObjectInstance) clientConnection.execute(CREATE_MBEAN, new Object[] {className, name});
-		} catch (XmlRpcException e) {
-			throw new MBeanException(e);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServerConnection#createMBean(java.lang.String, javax.management.ObjectName, javax.management.ObjectName)
-	 */
-	public ObjectInstance createMBean(String className, ObjectName name, ObjectName loaderName) throws ReflectionException, InstanceAlreadyExistsException, MBeanRegistrationException, MBeanException, NotCompliantMBeanException, InstanceNotFoundException, IOException {
-		try {
-			return (ObjectInstance) clientConnection.execute(CREATE_MBEAN, new Object[] {className, name, loaderName});
-		} catch (XmlRpcException e) {
-			throw new MBeanException(e);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServerConnection#createMBean(java.lang.String, javax.management.ObjectName, java.lang.Object[], java.lang.String[])
-	 */
-	public ObjectInstance createMBean(String className, ObjectName name, Object[] params, String[] signature) throws ReflectionException, InstanceAlreadyExistsException, MBeanRegistrationException, MBeanException, NotCompliantMBeanException, IOException {
-		try {
-			return (ObjectInstance) clientConnection.execute(CREATE_MBEAN, new Object[] {className, name, params, signature});
-		} catch (XmlRpcException e) {
-			throw new MBeanException(e);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServerConnection#createMBean(java.lang.String, javax.management.ObjectName, javax.management.ObjectName, java.lang.Object[], java.lang.String[])
-	 */
-	public ObjectInstance createMBean(String className, ObjectName name, ObjectName loaderName, Object[] params, String[] signature) throws ReflectionException, InstanceAlreadyExistsException, MBeanRegistrationException, MBeanException, NotCompliantMBeanException, InstanceNotFoundException, IOException {
-		try {
-			return (ObjectInstance) clientConnection.execute(CREATE_MBEAN, new Object[] {className, name, loaderName, params, signature});
-		} catch (XmlRpcException e) {
-			throw new MBeanException(e);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServerConnection#unregisterMBean(javax.management.ObjectName)
-	 */
-	public void unregisterMBean(ObjectName name) throws InstanceNotFoundException, MBeanRegistrationException, IOException {
-		try {
-			clientConnection.execute("unregisterMBean", new Object[] {name});
-		} catch (XmlRpcException e) {
-			throw new MBeanRegistrationException(e);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServerConnection#getObjectInstance(javax.management.ObjectName)
-	 */
-	public ObjectInstance getObjectInstance(ObjectName name) throws InstanceNotFoundException, IOException {
-		try {
-			return (ObjectInstance) clientConnection.execute("getObjectInstance", new Object[] {name});
-		} catch (XmlRpcException e) {
-			throw new IOException(e.getMessage());
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServerConnection#queryMBeans(javax.management.ObjectName, javax.management.QueryExp)
-	 */
-	public Set queryMBeans(ObjectName name, QueryExp query) throws IOException {
-		try {
-			return (Set) clientConnection.execute("queryMBeans", new Object[] {name, query});
-		} catch (XmlRpcException e) {
-			throw new IOException(e.getMessage());
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServerConnection#queryNames(javax.management.ObjectName, javax.management.QueryExp)
-	 */
-	public Set queryNames(ObjectName name, QueryExp query) throws IOException {
-		try {
-			return (Set) clientConnection.execute("queryNames", new Object[] {name, query});
-		} catch (XmlRpcException e) {
-			throw new IOException(e.getMessage());
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServerConnection#isRegistered(javax.management.ObjectName)
-	 */
-	public boolean isRegistered(ObjectName name) throws IOException {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServerConnection#getMBeanCount()
-	 */
-	public Integer getMBeanCount() throws IOException {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServerConnection#getAttribute(javax.management.ObjectName, java.lang.String)
-	 */
-	public Object getAttribute(ObjectName name, String attribute) throws MBeanException, AttributeNotFoundException, InstanceNotFoundException, ReflectionException, IOException {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServerConnection#getAttributes(javax.management.ObjectName, java.lang.String[])
-	 */
-	public AttributeList getAttributes(ObjectName name, String[] attributes) throws InstanceNotFoundException, ReflectionException, IOException {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServerConnection#setAttribute(javax.management.ObjectName, javax.management.Attribute)
-	 */
-	public void setAttribute(ObjectName name, Attribute attribute) throws InstanceNotFoundException, AttributeNotFoundException, InvalidAttributeValueException, MBeanException, ReflectionException, IOException {
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServerConnection#setAttributes(javax.management.ObjectName, javax.management.AttributeList)
-	 */
-	public AttributeList setAttributes(ObjectName name, AttributeList attributes) throws InstanceNotFoundException, ReflectionException, IOException {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServerConnection#invoke(javax.management.ObjectName, java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	public Object invoke(ObjectName name, String operationName, Object[] params, String[] signature) throws InstanceNotFoundException, MBeanException, ReflectionException, IOException {
-		try {
-			// split class name from object name to prepend with method name
-			return clientConnection.execute(name + "|" + operationName, params == null ? new Object[0] : params);
-		} catch (Exception e) {
-			throw new IOException(e.getMessage());
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServerConnection#getDefaultDomain()
-	 */
-	public String getDefaultDomain() throws IOException {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServerConnection#getDomains()
-	 */
-	public String[] getDomains() throws IOException {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServerConnection#addNotificationListener(javax.management.ObjectName, javax.management.NotificationListener, javax.management.NotificationFilter, java.lang.Object)
-	 */
-	public void addNotificationListener(ObjectName name, NotificationListener listener, NotificationFilter filter, Object handback) throws InstanceNotFoundException, IOException {
-		notificationHandler.addNotificationListener(name, listener, filter, handback);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServerConnection#addNotificationListener(javax.management.ObjectName, javax.management.ObjectName, javax.management.NotificationFilter, java.lang.Object)
-	 */
-	public void addNotificationListener(ObjectName name, ObjectName listener, NotificationFilter filter, Object handback) throws InstanceNotFoundException, IOException {
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServerConnection#removeNotificationListener(javax.management.ObjectName, javax.management.ObjectName)
-	 */
-	public void removeNotificationListener(ObjectName name, ObjectName listener) throws InstanceNotFoundException, ListenerNotFoundException, IOException {
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServerConnection#removeNotificationListener(javax.management.ObjectName, javax.management.ObjectName, javax.management.NotificationFilter, java.lang.Object)
-	 */
-	public void removeNotificationListener(ObjectName name, ObjectName listener, NotificationFilter filter, Object handback) throws InstanceNotFoundException, ListenerNotFoundException, IOException {
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServerConnection#removeNotificationListener(javax.management.ObjectName, javax.management.NotificationListener)
-	 */
-	public void removeNotificationListener(ObjectName name, NotificationListener listener) throws InstanceNotFoundException, ListenerNotFoundException, IOException {
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServerConnection#removeNotificationListener(javax.management.ObjectName, javax.management.NotificationListener, javax.management.NotificationFilter, java.lang.Object)
-	 */
-	public void removeNotificationListener(ObjectName name, NotificationListener listener, NotificationFilter filter, Object handback) throws InstanceNotFoundException, ListenerNotFoundException, IOException {
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServerConnection#getMBeanInfo(javax.management.ObjectName)
-	 */
-	public MBeanInfo getMBeanInfo(ObjectName name) throws InstanceNotFoundException, IntrospectionException, ReflectionException, IOException {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServerConnection#isInstanceOf(javax.management.ObjectName, java.lang.String)
-	 */
-	public boolean isInstanceOf(ObjectName name, String className) throws InstanceNotFoundException, IOException {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.client.remote.RemoteMBeanConnection#retrieveNotifications(long)
-	 */
-	public NamedNotification[] retrieveNotifications(long startId) {
-		try {
-			Object obj = clientConnection.execute("retrieveNotifications", new Object[] {new Long(startId)});
-			if (obj instanceof Object[]) {
-				Object[] objs = (Object[]) obj;
-				NamedNotification[] result = new NamedNotification[objs.length];
-				for (int i = 0; i < objs.length; i++) {
-					if (objs[i] instanceof NamedNotification) {
-						result[i] = (NamedNotification) objs[i];
-					}
-				}
-				return result;
-
-			}
-		} catch (XmlRpcException e) {
-		}
-		return null;
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/.classpath b/monitoring/bundles/org.eclipse.equinox.jmx.client/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/.cvsignore b/monitoring/bundles/org.eclipse.equinox.jmx.client/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/.project b/monitoring/bundles/org.eclipse.equinox.jmx.client/.project
deleted file mode 100644
index 079e304..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.jmx.client</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/monitoring/bundles/org.eclipse.equinox.jmx.client/.settings/org.eclipse.jdt.core.prefs b/monitoring/bundles/org.eclipse.equinox.jmx.client/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 60f5598..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,309 +0,0 @@
-#Thu May 10 14:05:31 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-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.hiddenCatchBlock=warning
-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.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-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.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-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.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=800
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/.settings/org.eclipse.jdt.ui.prefs b/monitoring/bundles/org.eclipse.equinox.jmx.client/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 381b003..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,9 +0,0 @@
-#Mon Feb 26 11:26:20 EST 2007
-eclipse.preferences.version=1
-formatter_profile=_core
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.staticondemandthreshold=99

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/JMX Client.launch b/monitoring/bundles/org.eclipse.equinox.jmx.client/JMX Client.launch
deleted file mode 100644
index c4544f1..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/JMX Client.launch
+++ /dev/null

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;sourceLookupDirector&gt;&#13;&#10;&lt;sourceContainers duplicates=&quot;true&quot;&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;External Plug-in Libraries&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;org.apache.commons.codec&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=org.apache.commons.codec/commons-codec-1.2.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;org.apache.commons.httpclient&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=org.apache.commons.httpclient/commons-httpclient-3.0-rc2.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;org.apache.commons.logging&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=org.apache.commons.logging/commons-logging.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=org.apache.commons.logging/commons-logging-api.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;org.apache.ws.commons.util&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=org.apache.ws.commons.util/commons-util.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;org.apache.ws.jaxme&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=org.apache.ws.jaxme/jaxme2-0.5.1.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=org.apache.ws.jaxme/jaxme2-rt-0.5.1.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=org.apache.ws.jaxme/jaxmeapi-0.5.1.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=org.apache.ws.jaxme/jaxmejs-0.5.1.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=org.apache.ws.jaxme/jaxmepm-0.5.1.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=org.apache.ws.jaxme/jaxmexs-0.5.1.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;org.apache.xmlrpc&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=org.apache.xmlrpc/xmlrpc-3.0a1.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;org.eclipse.core.resources.jmx&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;org.eclipse.equinox.jmx.client&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;org.eclipse.equinox.jmx.client.rmi&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;org.eclipse.equinox.jmx.client.xmlrpc&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;org.eclipse.equinox.jmx.common&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;org.eclipse.equinox.jmx.server&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;org.eclipse.equinox.jmx.server.rmi&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;org.eclipse.equinox.jmx.server.xmlrpc&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;org.eclipse.equinox.jmx.vm&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;org.eclipse.equinox.preferences.jmx&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;org.eclipse.osgi.jmx&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;org.eclipse.swt.jmx&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;classpathContainer path=&amp;quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_03&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.classpathContainer&quot;/&gt;&#13;&#10;&lt;/sourceContainers&gt;&#13;&#10;&lt;/sourceLookupDirector&gt;&#13;&#10;"/>
-<booleanAttribute key="usefeatures" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<booleanAttribute key="useProduct" value="true"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.equinox.jmx.server.xmlrpc,org.eclipse.swt.jmx,org.eclipse.equinox.jmx.server,org.eclipse.osgi.jmx,org.eclipse.equinox.preferences.jmx,org.eclipse.equinox.jmx.server.rmi,org.eclipse.core.resources.jmx,org.eclipse.equinox.jmx.vm"/>
-<stringAttribute key="vminstall" value="jdk1.5.0_06"/>
-<booleanAttribute key="tracing" value="false"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-</listAttribute>
-<stringAttribute key="selected_target_plugins" value="com.example.ps,com.ibm.icu,com.ibm.icu.source,com.ibm.jxesupport,com.jcraft.jsch,com.teaminabox.eclipse.sortit,org.apache.ant,org.apache.lucene,org.eclipse.ant.core,org.eclipse.ant.ui,org.eclipse.compare,org.eclipse.core.boot,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.expressions,org.eclipse.core.filebuffers,org.eclipse.core.filesystem,org.eclipse.core.filesystem.win32.x86,org.eclipse.core.jobs,org.eclipse.core.resources,org.eclipse.core.resources.compatibility,org.eclipse.core.resources.spysupport,org.eclipse.core.resources.win32,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.core.tools,org.eclipse.core.tools.resources,org.eclipse.core.variables,org.eclipse.debug.core,org.eclipse.debug.ui,org.eclipse.equinox.common,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.help.appserver,org.eclipse.help.base,org.eclipse.help.ui,org.eclipse.help.webapp,org.eclipse.html.editor,org.eclipse.jdt,org.eclipse.jdt.apt.core,org.eclipse.jdt.apt.ui,org.eclipse.jdt.core,org.eclipse.jdt.core.manipulation,org.eclipse.jdt.debug,org.eclipse.jdt.debug.ui,org.eclipse.jdt.doc.isv,org.eclipse.jdt.doc.user,org.eclipse.jdt.junit,org.eclipse.jdt.junit.runtime,org.eclipse.jdt.junit4.runtime,org.eclipse.jdt.launching,org.eclipse.jdt.launching.j9,org.eclipse.jdt.source,org.eclipse.jdt.ui,org.eclipse.jface,org.eclipse.jface.databinding,org.eclipse.jface.text,org.eclipse.ltk.core.refactoring,org.eclipse.ltk.ui.refactoring,org.eclipse.osgi,org.eclipse.osgi.services,org.eclipse.osgi.util,org.eclipse.pde,org.eclipse.pde.build,org.eclipse.pde.core,org.eclipse.pde.doc.user,org.eclipse.pde.junit.runtime,org.eclipse.pde.runtime,org.eclipse.pde.source,org.eclipse.pde.ui,org.eclipse.platform,org.eclipse.platform.doc.isv,org.eclipse.platform.doc.user,org.eclipse.platform.source,org.eclipse.platform.source.win32.win32.x86,org.eclipse.rcp,org.eclipse.rcp.source,org.eclipse.rcp.source.win32.win32.x86,org.eclipse.releng.tools,org.eclipse.sdk,org.eclipse.search,org.eclipse.swt,org.eclipse.swt.win32.win32.x86,org.eclipse.team.core,org.eclipse.team.cvs.core,org.eclipse.team.cvs.ssh,org.eclipse.team.cvs.ssh2,org.eclipse.team.cvs.ui,org.eclipse.team.ui,org.eclipse.text,org.eclipse.tomcat,org.eclipse.ui,org.eclipse.ui.browser,org.eclipse.ui.cheatsheets,org.eclipse.ui.console,org.eclipse.ui.editors,org.eclipse.ui.externaltools,org.eclipse.ui.forms,org.eclipse.ui.ide,org.eclipse.ui.intro,org.eclipse.ui.intro.universal,org.eclipse.ui.navigator,org.eclipse.ui.navigator.resources,org.eclipse.ui.presentations.r21,org.eclipse.ui.views,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.win32,org.eclipse.ui.workbench,org.eclipse.ui.workbench.compatibility,org.eclipse.ui.workbench.texteditor,org.eclipse.update.configurator,org.eclipse.update.core,org.eclipse.update.core.win32,org.eclipse.update.scheduler,org.eclipse.update.ui,org.junit,org.junit4,org.klomp.eclipse.formatjava"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<stringAttribute key="checked" value="[NONE]"/>
-<stringAttribute key="location" value="${system_property:user.home}/runtime-JMX_Client"/>
-<stringAttribute key="configLocation" value=""/>
-<booleanAttribute key="clearws" value="false"/>
-<stringAttribute key="pde.version" value="3.2a"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-consoleLog -nosplash -console"/>
-<stringAttribute key="templateConfig" value=""/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="includeOptional" value="true"/>
-</launchConfiguration>

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/META-INF/MANIFEST.MF b/monitoring/bundles/org.eclipse.equinox.jmx.client/META-INF/MANIFEST.MF
deleted file mode 100644
index c8cc967..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,28 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Resource Monitoring Client Plug-in (Incubation)
-Bundle-SymbolicName: org.eclipse.equinox.jmx.client;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.equinox.jmx.internal.client.Activator
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.ui.forms
-Eclipse-LazyStart: true
-Bundle-Vendor: Eclipse.org
-Import-Package: javax.management,
- javax.management.loading,
- javax.management.modelmbean,
- javax.management.monitor,
- javax.management.openmbean,
- javax.management.relation,
- javax.management.remote,
- javax.management.remote.rmi,
- javax.management.timer,
- org.eclipse.equinox.jmx.common,
- org.eclipse.equinox.jmx.common.util
-Export-Package: org.eclipse.equinox.jmx.client,
- org.eclipse.equinox.jmx.client.remote
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,
- CDC-1.0/Foundation-1.0,
- J2SE-1.3

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/about.html b/monitoring/bundles/org.eclipse.equinox.jmx.client/about.html
deleted file mode 100644
index 5d03fd4..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/about.html
+++ /dev/null

@@ -1,28 +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 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/build.properties b/monitoring/bundles/org.eclipse.equinox.jmx.client/build.properties
deleted file mode 100644
index d918717..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/build.properties
+++ /dev/null

@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               plugin.properties,\
-               icons/,\
-               about.html
-src.includes = about.html

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/icons/contribution_desc_view.gif b/monitoring/bundles/org.eclipse.equinox.jmx.client/icons/contribution_desc_view.gif
deleted file mode 100644
index e4c2a83..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/icons/contribution_desc_view.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/icons/contributions_view.gif b/monitoring/bundles/org.eclipse.equinox.jmx.client/icons/contributions_view.gif
deleted file mode 100644
index 6fe6f0e..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/icons/contributions_view.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/icons/perspective.gif b/monitoring/bundles/org.eclipse.equinox.jmx.client/icons/perspective.gif
deleted file mode 100644
index ec6cca4..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/icons/perspective.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/plugin.properties b/monitoring/bundles/org.eclipse.equinox.jmx.client/plugin.properties
deleted file mode 100644
index 8cff7c6..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/plugin.properties
+++ /dev/null

@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-clientPerspectiveName = JMX Resource Management
-# Connection action set and menu labels
-connectionActionSet = JMX Servers
-connectionMenu = JMX Server
-newConnectionAction = Open Connection
-# View names
-contributionsViewName = Contributions
-mbeanInfoViewName = Contribution MBean Description

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/plugin.xml b/monitoring/bundles/org.eclipse.equinox.jmx.client/plugin.xml
deleted file mode 100644
index 1be9f3f..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/plugin.xml
+++ /dev/null

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   <extension-point id="transport" name="JMX Transport" schema="schema/transport.exsd"/>
-   <extension
-         point="org.eclipse.ui.perspectives">
-      <perspective
-            class="org.eclipse.equinox.jmx.internal.client.ui.ClientPerspectiveFactory"
-            fixed="true"
-            icon="icons/perspective.gif"
-            id="org.eclipse.equinox.jmx.client.ui.ClientPerspectiveFactory"
-            name="%clientPerspectiveName"/>
-   </extension>
-   <!-- Perspective extensions -->
-    <extension
-         point="org.eclipse.ui.perspectiveExtensions">
-      <perspectiveExtension targetID="org.eclipse.equinox.jmx.client.ui.ClientPerspectiveFactory">
-    	 	 <!-- Load perspective specific action set -->
-         <actionSet id="org.eclipse.equinox.jmx.client.ui.actions.ClientActionSet"/>
-      </perspectiveExtension>
-   </extension>
-   <!-- UI Action sets -->
-   <extension
-         point="org.eclipse.ui.actionSets">
-      <actionSet
-            description="Manage JMX Connections"
-            id="org.eclipse.equinox.jmx.client.ui.actions.ClientActionSet"
-            label="%connectionActionSet"
-            visible="false">
-         <menu
-               id="jmxclient.main"
-               label="%connectionMenu"
-               path="additions">
-            <separator name="group1"/>
-         </menu>
-         <action
-               class="org.eclipse.equinox.jmx.internal.client.ui.actions.NewConnectionAction"
-               id="org.eclipse.equinox.jmx.client.ui.actions.NewConnectionAction"
-               label="%newConnectionAction"
-               menubarPath="jmxclient.main/group1"
-               style="push"/>
-      </actionSet>
-   </extension>
-   <extension
-         point="org.eclipse.ui.views">
-      <view
-            allowMultiple="false"
-            class="org.eclipse.equinox.jmx.internal.client.ui.contributionsview.ContributionsViewPart"
-            icon="icons/contributions_view.gif"
-            id="org.eclipse.equinox.jmx.client.ui.contributionsview"
-            name="%contributionsViewName">
-      </view>
-      <view
-            allowMultiple="false"
-            class="org.eclipse.equinox.jmx.internal.client.ui.mbeaninfoview.MBeanInfoViewPart"
-            icon="icons/contribution_desc_view.gif"
-            id="org.eclipse.equinox.jmx.client.ui.mbeaninfoview"
-            name="%mbeanInfoViewName"/>
-      <view
-            allowMultiple="false"
-            class="org.eclipse.equinox.jmx.internal.client.ui.invocationView.InvocationView"
-            icon="icons/perspective.gif"
-            id="org.eclipse.equinox.jmx.client.ui.invocationView"
-            name="Invocation View"/>
-   </extension>
-  
- </plugin>

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/schema/transport.exsd b/monitoring/bundles/org.eclipse.equinox.jmx.client/schema/transport.exsd
deleted file mode 100644
index 6bf155a..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/schema/transport.exsd
+++ /dev/null

@@ -1,112 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.equinox.jmx.client">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.equinox.jmx.client" id="transport" name="JMX Transport"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence minOccurs="0" maxOccurs="unbounded">
-            <element ref="transport"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="transport">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.equinox.jmx.client.IJMXConnectorProvider"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="protocol" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/client/IJMXConnectorProvider.java b/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/client/IJMXConnectorProvider.java
deleted file mode 100644
index 1744414..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/client/IJMXConnectorProvider.java
+++ /dev/null

@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.client;
-
-import java.net.MalformedURLException;
-import javax.management.remote.JMXConnectorProvider;
-import javax.management.remote.JMXServiceURL;
-
-public interface IJMXConnectorProvider extends JMXConnectorProvider {
-	public JMXServiceURL getJMXServiceURL(String host, int port, String protocol, String domain) throws MalformedURLException;
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/client/remote/RemoteMBeanConnection.java b/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/client/remote/RemoteMBeanConnection.java
deleted file mode 100644
index 72d498e..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/client/remote/RemoteMBeanConnection.java
+++ /dev/null

@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.client.remote;
-
-import java.io.IOException;
-import org.eclipse.equinox.jmx.common.NamedNotification;
-
-public interface RemoteMBeanConnection {
-	public NamedNotification[] retrieveNotifications(long startId) throws IOException;
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/client/remote/RemoteNotificationHandler.java b/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/client/remote/RemoteNotificationHandler.java
deleted file mode 100644
index 559765a..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/client/remote/RemoteNotificationHandler.java
+++ /dev/null

@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.client.remote;
-
-import java.util.*;
-import javax.management.*;
-import org.eclipse.equinox.jmx.common.NamedNotification;
-import org.eclipse.equinox.jmx.internal.client.Activator;
-
-public class RemoteNotificationHandler {
-
-	private int NOTIFICATION_RETRIEVAL_INTERVAL = 5000;
-
-	private final Map objectNameListeners = new HashMap();
-	private final NotificationRetriever retriever = new NotificationRetriever();
-	private final NotificationDispatcher dispatcher = new NotificationDispatcher();
-	private final RemoteMBeanConnection connection;
-	private boolean started;
-
-	public RemoteNotificationHandler(RemoteMBeanConnection connection) {
-		this.connection = connection;
-	}
-
-	public void addNotificationListener(ObjectName name, NotificationListener listener, NotificationFilter filter, Object handback) {
-		if (!started) {
-			start();
-		}
-		synchronized (objectNameListeners) {
-			List listeners = null;
-			if ((listeners = (List) objectNameListeners.get(name)) == null) {
-				listeners = new ArrayList();
-				objectNameListeners.put(name, listeners);
-			}
-			listeners.add(listener);
-		}
-	}
-
-	public synchronized void start() {
-		if (started) {
-			return;
-		}
-		started = true;
-		retriever.start();
-		dispatcher.start();
-	}
-
-	public synchronized void stop() {
-		started = false;
-	}
-
-	private void dispatchNotification(NamedNotification notification) {
-		ObjectName name = notification.getObjectName();
-		synchronized (objectNameListeners) {
-			List listeners = (List) objectNameListeners.get(name);
-			if (listeners != null) {
-				Iterator iter = listeners.iterator();
-				while (iter.hasNext()) {
-					((NotificationListener) iter.next()).handleNotification(notification, null);
-				}
-			}
-		}
-	}
-
-	private class NotificationRetriever extends Thread {
-
-		private long startId;
-
-		public NotificationRetriever() {
-			super();
-		}
-
-		public void run() {
-			while (started) {
-				try {
-					NamedNotification[] result = connection.retrieveNotifications(startId);
-					if (result.length > 0) {
-						dispatcher.dispatchNotifications(result);
-						startId = result[result.length - 1].getNotificationId() + 1;
-						synchronized (this) {
-							this.wait(NOTIFICATION_RETRIEVAL_INTERVAL);
-						}
-					}
-				} catch (Exception e) {
-					Activator.log(e);
-					break;
-				}
-			}
-			started = false;
-		}
-	}
-
-	private class NotificationDispatcher extends Thread {
-
-		private List notificationQueue = new ArrayList();
-
-		public NotificationDispatcher() {
-			super();
-		}
-
-		public void dispatchNotifications(NamedNotification[] notifications) {
-			synchronized (notificationQueue) {
-				boolean added = false;
-				for (int i = 0; i < notifications.length; i++) {
-					if (notifications[i] != null) {
-						added |= notificationQueue.add(notifications[i]);
-					}
-				}
-				if (added) {
-					notificationQueue.notifyAll();
-				}
-			}
-		}
-
-		public void run() {
-			outer: while (started && !Thread.currentThread().isInterrupted()) {
-				synchronized (notificationQueue) {
-					while (notificationQueue.isEmpty()) {
-						try {
-							notificationQueue.wait();
-						} catch (InterruptedException e) {
-							Activator.log(e);
-							Thread.currentThread().interrupt();
-							continue outer;
-						}
-					}
-					while (notificationQueue.size() > 0) {
-						NamedNotification nn = (NamedNotification) notificationQueue.remove(0);
-						dispatchNotification(nn);
-					}
-				}
-			}
-			started = false;
-		}
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/Activator.java b/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/Activator.java
deleted file mode 100644
index e77f414..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/Activator.java
+++ /dev/null

@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.client;
-
-import java.util.StringTokenizer;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.jmx.common.JMXConstants;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator for this bundle.
- */
-public class Activator extends AbstractUIPlugin {
-
-	public static final String PI_NAMESPACE = "org.eclipse.equinox.jmx.client"; //$NON-NLS-1$
-	public static final String PT_TRANSPORT = "transport"; //$NON-NLS-1$
-
-	static final String CONNECTION_PREFERENCE_DELIMITER = ","; //$NON-NLS-1$
-	static final String CONNECTION_PREFERENCE_NAME = "jmxserviceurl"; //$NON-NLS-1$
-	static final String DELIM = ":"; //$NON-NLS-1$
-
-	//The shared instance.
-	private static Activator singleton;
-
-	/**
-	 * The constructor.
-	 */
-	public Activator() {
-		singleton = this;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		singleton = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 *
-	 * @return the shared instance.
-	 */
-	public static Activator getDefault() {
-		return singleton;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * bundle relative path.
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(PI_NAMESPACE, path);
-	}
-
-	/**
-	 * Log to this bundle's log file.
-	 * 
-	 * @param message The message to log.
-	 * @param exception The exception to log.
-	 * @param iStatusSeverity The <code>IStatus</code> severity level.
-	 */
-	public static void log(String message, Throwable exception, int iStatusSeverity) {
-		getDefault().getLog().log(new Status(iStatusSeverity, PI_NAMESPACE, 0, message, exception));
-	}
-
-	/**
-	 * Logs the message to this bundle's log file with
-	 * status <code>IStatus.ERROR</code>.
-	 * 
-	 * @param message The message to log.
-	 * @param exception The thrown exception.
-	 */
-	public static void logError(String message, Throwable exception) {
-		log(message, exception, IStatus.ERROR);
-	}
-
-	/**
-	 * Logs the message to this bundle's log file with
-	 * status <code>IStatus.ERROR</code>.
-	 * 
-	 * @param exception The thrown exception.
-	 */
-	public static void logError(Throwable exception) {
-		String message = exception.getMessage();
-		if (message == null)
-			message = "Exception occurred.";
-		log(message, exception, IStatus.ERROR);
-	}
-
-	/**
-	 * Logs the message to this bundle's log file with
-	 * status <code>IStatus.INFO</code>.
-	 * 
-	 * @param message The message to log.
-	 */
-	public static void log(String message) {
-		log(message, null, IStatus.INFO);
-	}
-
-	/**
-	 * Logs the throwable to this bundle's log file with
-	 * status <code>IStatus.INFO</code>.
-	 * 
-	 * @param exception The thrown exception.
-	 */
-	public static void log(Throwable exception) {
-		logError(exception.getMessage(), exception);
-	}
-
-	public String[] getConnectionPreference() {
-		return convertConnectionPreference();
-	}
-
-	private String[] convertConnectionPreference() {
-		StringTokenizer st = new StringTokenizer(getPreferenceStore().getString(CONNECTION_PREFERENCE_NAME), CONNECTION_PREFERENCE_DELIMITER);
-		String[] ret = new String[st.countTokens()];
-		for (int i = 0; i < ret.length; i++) {
-			ret[i] = st.nextToken();
-		}
-		return ret;
-	}
-
-	public String getDefaultConnectionPreference() {
-		return getPreferenceStore().getDefaultString(CONNECTION_PREFERENCE_NAME);
-	}
-
-	public void setConnectionPreferences(String[] connections) {
-		StringBuffer sbuf = new StringBuffer();
-		for (int i = 0; i < connections.length; i++) {
-			sbuf.append(connections[i]).append(CONNECTION_PREFERENCE_DELIMITER);
-		}
-		getPreferenceStore().setValue(CONNECTION_PREFERENCE_NAME, sbuf.toString());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#initializeDefaultPreferences(org.eclipse.jface.preference.IPreferenceStore)
-	 */
-	protected void initializeDefaultPreferences(IPreferenceStore store) {
-		store.setDefault(CONNECTION_PREFERENCE_NAME, "service:jmx:rmi:///jndi/rmi://127.0.0.1:8118/" + JMXConstants.DEFAULT_DOMAIN);
-	}
-}
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/MBeanServerProxy.java b/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/MBeanServerProxy.java
deleted file mode 100644
index a8a779f..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/MBeanServerProxy.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.client;
-
-import java.io.IOException;
-import javax.management.*;
-import org.eclipse.equinox.jmx.common.ContributionProxy;
-import org.eclipse.equinox.jmx.common.RootContribution;
-
-/**
- * Provides a more generic and user-friendly interface
- * to the operations exposed by the jmx server.
- * 
- * @since 1.0
- */
-public class MBeanServerProxy {
-
-	private final MBeanServerConnection server;
-
-	/**
-	 * Allocate a <code>ServiceContributionProxy</code> which interfaces with the provided <code>server</code>.
-	 * 
-	 * @param server The <code>JMXConnectorServer</code> this proxy interfaces with.
-	 */
-	public MBeanServerProxy(MBeanServerConnection server) {
-		this.server = server;
-	}
-
-	/**
-	 * Get the <code>MBeanServerConnection</code> associated with this proxy.
-	 * 
-	 * @return The <code>MBeanServerConnection</code>.
-	 */
-	public MBeanServerConnection getMBeanServerConnection() {
-		return server;
-	}
-
-	/**
-	 * Convenience method for retrieving the <code>ContributionProxy</code> objects which form the root level
-	 * of the contribution view.
-	 * 
-	 * @return The root <code>ContributionProxy</code> objects.
-	 * @throws InstanceNotFoundException
-	 * @throws MBeanException
-	 * @throws ReflectionException
-	 * @throws IOException
-	 */
-	public ContributionProxy[] getRootContributions() throws InstanceNotFoundException, MBeanException, ReflectionException, IOException {
-		Object result = getMBeanServerConnection().invoke(RootContribution.OBJECT_NAME, RootContribution.OP_GET_ROOT_CONTRIBUTIONS, null, null);
-		if (result instanceof ContributionProxy[]) {
-			return (ContributionProxy[]) result;
-		} else if (result instanceof Object[]) {
-			Object objProxies[] = (Object[]) result;
-			ContributionProxy[] proxies = new ContributionProxy[objProxies.length];
-			for (int i = 0; i < objProxies.length; i++) {
-				if (objProxies[i] instanceof ContributionProxy) {
-					proxies[i] = (ContributionProxy) objProxies[i];
-				}
-			}
-			return proxies;
-		}
-		return null;
-	}
-
-	public RootContribution getRootContribution() throws InstanceNotFoundException, MBeanException, ReflectionException, IOException {
-		return (RootContribution) getMBeanServerConnection().invoke(RootContribution.OBJECT_NAME, RootContribution.OP_GET_ROOT_CONTRIBUTION, null, null);
-	}
-
-	/**
-	 * Convenience method for invoking a method on the <code>Contribution</code> resource on the server.  The object name
-	 * of the <code>Contribution</code> mbean is contained within the <code>ContributionProxy</code> that is supplied
-	 * as an argument.
-	 * 
-	 * @param contribution The <code>ContributionProxy</code> which provides the <code>ObjectName</code> of the <code>Contribution</code>
-	 * mbean to invoke.
-	 * @param methodName The name of the method to invoke.
-	 * @param args The list of arguments to the method to invoke.
-	 * @param argsSignature The list of argument types that are provided to the method to invoke.
-	 * @return The <code>Object</code> returned by the method or null if none.
-	 * @throws InstanceNotFoundException
-	 * @throws MBeanException
-	 * @throws ReflectionException
-	 * @throws IOException
-	 * @throws NotCompliantMBeanException
-	 */
-	public Object invokeContributionOperation(ContributionProxy contribution, String methodName, Object[] args, String[] argsSignature) throws InstanceNotFoundException, MBeanException, ReflectionException, IOException, NotCompliantMBeanException {
-		return getMBeanServerConnection().invoke(contribution.getObjectName(), methodName, args, argsSignature);
-	}
-}
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/ClientPerspectiveFactory.java b/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/ClientPerspectiveFactory.java
deleted file mode 100644
index be5f375..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/ClientPerspectiveFactory.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.client.ui;
-
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-
-/**
- * @since 1.0
- */
-public class ClientPerspectiveFactory implements IPerspectiveFactory {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPerspectiveFactory#createInitialLayout(org.eclipse.ui.IPageLayout)
-	 */
-	public void createInitialLayout(IPageLayout layout) {
-		layout.setEditorAreaVisible(false);
-
-		layout.addView(ClientUI.VIEWID_CONTRIBUTIONS, IPageLayout.LEFT, 0.3f, layout.getEditorArea());
-		layout.addView(ClientUI.VIEWID_MBEANINFO, IPageLayout.TOP, 0.75f, layout.getEditorArea());
-		layout.addView(ClientUI.VIEWID_INVOCATION, IPageLayout.BOTTOM, 0.25f, layout.getEditorArea());
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/ClientUI.java b/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/ClientUI.java
deleted file mode 100644
index 484b81c..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/ClientUI.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.client.ui;
-
-/**
- * <p>
- * This class provides static methods and fields only; it is not intended to be
- * instantiated or subclassed by clients.
- * </p>
- * 
- * @since 1.0
- */
-public final class ClientUI {
-
-	// disallow instantiations
-	private ClientUI() {
-		super();
-	}
-
-	//view ids
-	public static final String VIEWID_CONTRIBUTIONS = "org.eclipse.equinox.jmx.client.ui.contributionsview"; //$NON-NLS-1$
-	public static final String VIEWID_MBEANINFO = "org.eclipse.equinox.jmx.client.ui.mbeaninfoview"; //$NON-NLS-1$
-	public static final String VIEWID_INVOCATION = "org.eclipse.equinox.jmx.client.ui.invocationView"; //$NON-NLS-1$
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/actions/ActionMessages.java b/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/actions/ActionMessages.java
deleted file mode 100644
index 913cf17..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/actions/ActionMessages.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.client.ui.actions;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @since 1.0
- */
-public class ActionMessages extends NLS {
-
-	public static String disconnect_action;
-	public static String openconnection_action;
-	public static String connection_closed;
-	public static String server_closed_connection;
-	public static String error_message;
-	public static String info_message;
-	public static String local_mbean_server;
-	public static String host;
-	public static String port;
-	public static String invalid_host;
-	public static String invalid_port;
-	public static String no_url_selected;
-	public static String add_jmx_service_url;
-	public static String url_exists;
-	public static String remove_jmx_service_url;
-	public static String connect_host;
-	public static String connection_selection_dialog_title;
-	public static String no_transports_available;
-
-	// disallow instantiations
-	private ActionMessages() {
-		super();
-	}
-
-	static {
-		NLS.initializeMessages(ActionMessages.class.getName(), ActionMessages.class);
-	}
-}
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/actions/ActionMessages.properties b/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/actions/ActionMessages.properties
deleted file mode 100644
index 6186897..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/actions/ActionMessages.properties
+++ /dev/null

@@ -1,28 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-disconnect_action = Disconnect
-openconnection_action = Open Connection
-connection_closed = Connection closed.
-server_closed_connection = Server closed the connection.
-host = Host
-port = Port
-invalid_host = Invalid host.
-invalid_port = Invalid port number.
-local_mbean_server = A JMX server has been located in the current VM, connect to this server?
-add_jmx_service_url = Add URL
-url_exists = JMX Service URL exists.
-no_url_selected = No URL selected.
-remove_jmx_service_url = Remove URL
-connect_host = Connect
-error_message = Error
-info_message = Information
-connection_selection_dialog_title = Connect to JMX Server
-no_transports_available = No transports available.
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/actions/ConnectionSelectionDialog.java b/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/actions/ConnectionSelectionDialog.java
deleted file mode 100644
index 4f6f954..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/actions/ConnectionSelectionDialog.java
+++ /dev/null

@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.client.ui.actions;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Iterator;
-import java.util.Map;
-import javax.management.remote.JMXConnector;
-import javax.management.remote.JMXServiceURL;
-import org.eclipse.equinox.jmx.client.IJMXConnectorProvider;
-import org.eclipse.equinox.jmx.common.JMXConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.dialogs.SelectionDialog;
-
-/**
- * @since 1.0
- */
-public class ConnectionSelectionDialog extends SelectionDialog {
-
-	// sizing constants
-	private final static int SIZING_SELECTION_WIDGET_HEIGHT = 250;
-	private final static int SIZING_SELECTION_WIDGET_WIDTH = 300;
-
-	private JMXConnector connector;
-
-	private Text hostText, portText;
-	private Combo transport;
-	private Shell parent;
-	private final Map transports;
-
-	public ConnectionSelectionDialog(Shell parentShell, Map transports) {
-		super(parentShell);
-		this.transports = transports;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.SelectionDialog#configureShell(org.eclipse.swt.widgets.Shell)
-	 */
-	protected void configureShell(Shell shell) {
-		super.configureShell(shell);
-		shell.setText(ActionMessages.connection_selection_dialog_title);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createDialogArea(final Composite parent) {
-		this.parent = parent.getShell();
-		Composite composite = (Composite) super.createDialogArea(parent);
-		Font font = parent.getFont();
-		composite.setFont(font);
-
-		createMessageArea(composite);
-
-		GridData data = new GridData(GridData.FILL_BOTH);
-		data.heightHint = SIZING_SELECTION_WIDGET_HEIGHT;
-		data.widthHint = SIZING_SELECTION_WIDGET_WIDTH;
-
-		Composite fieldComposite = new Composite(composite, SWT.NULL);
-		fieldComposite.setLayout(new GridLayout(5, false));
-		// 1 host label
-		Label label = new Label(fieldComposite, SWT.CENTER);
-		label.setText(ActionMessages.host);
-		// 2 host text entry
-		hostText = new Text(fieldComposite, SWT.BORDER);
-		hostText.setText("localhost");
-		hostText.selectAll();
-		data = new GridData();
-		data.widthHint = convertWidthInCharsToPixels(25);
-		hostText.setLayoutData(data);
-		// 3 port label
-		label = new Label(fieldComposite, SWT.CENTER);
-		label.setText(ActionMessages.port);
-		// 4 port text entry
-		portText = new Text(fieldComposite, SWT.BORDER);
-		portText.setTextLimit(5);
-		portText.setText(JMXConstants.DEFAULT_PORT);
-		data = new GridData();
-		data.widthHint = convertWidthInCharsToPixels(6);
-		portText.setLayoutData(data);
-		// 5 protocol selection combo box
-		transport = new Combo(fieldComposite, SWT.DROP_DOWN | SWT.READ_ONLY);
-		// add transport provided as extensions to supported list
-		Iterator iter = transports.keySet().iterator();
-		while (iter.hasNext()) {
-			transport.add((String) iter.next());
-		}
-		transport.select(0);
-		return composite;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-	 */
-	protected void okPressed() {
-		if (hostText.getText().equals("")) { //$NON-NLS-1$
-			MessageDialog.openError(parent.getShell(), ActionMessages.error_message, ActionMessages.invalid_host);
-			return;
-		}
-		try {
-			InetAddress.getByName(hostText.getText());
-		} catch (UnknownHostException e) {
-			MessageDialog.openError(parent.getShell(), ActionMessages.error_message, ActionMessages.invalid_host);
-			return;
-		}
-		if (portText.getText().equals("")) { //$NON-NLS-1$
-			MessageDialog.openError(parent.getShell(), ActionMessages.error_message, ActionMessages.invalid_port);
-			return;
-		}
-		int port;
-		try {
-			port = Integer.parseInt(portText.getText());
-			if (port < 1 || port > 0xffff) {
-				throw new NumberFormatException();
-			}
-		} catch (NumberFormatException e) {
-			MessageDialog.openError(parent.getShell(), ActionMessages.error_message, ActionMessages.invalid_port);
-			return;
-		}
-		try {
-			IJMXConnectorProvider ctorp = (IJMXConnectorProvider) transports.get(transport.getText());
-			JMXServiceURL url = ctorp.getJMXServiceURL(hostText.getText(), port, transport.getText(), JMXConstants.DEFAULT_DOMAIN);
-			connector = ctorp.newJMXConnector(url, null);
-		} catch (Exception e) {
-			MessageDialog.openError(null, ActionMessages.error_message, e.getMessage());
-			super.cancelPressed();
-			return;
-		}
-		super.okPressed();
-	}
-
-	public JMXConnector getJMXConnector() {
-		return connector;
-	}
-}
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/actions/NewConnectionAction.java b/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/actions/NewConnectionAction.java
deleted file mode 100644
index 224f966..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/actions/NewConnectionAction.java
+++ /dev/null

@@ -1,199 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.client.ui.actions;
-
-import java.io.IOException;
-import java.util.*;
-import javax.management.*;
-import javax.management.remote.JMXConnector;
-import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.jmx.client.IJMXConnectorProvider;
-import org.eclipse.equinox.jmx.common.JMXConstants;
-import org.eclipse.equinox.jmx.internal.client.Activator;
-import org.eclipse.equinox.jmx.internal.client.MBeanServerProxy;
-import org.eclipse.equinox.jmx.internal.client.ui.ClientUI;
-import org.eclipse.equinox.jmx.internal.client.ui.contributionsview.ContributionsViewPart;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.ui.*;
-
-/**
- * @since 1.0
- */
-public class NewConnectionAction implements IWorkbenchWindowActionDelegate {
-
-	protected IWorkbenchWindow window;
-	protected JMXConnector connector;
-	private MBeanServerProxy serverProxy;
-	private boolean connected;
-	private boolean isClosing;
-	private boolean isConnecting;
-	//container for available transports
-	private static Map transports;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
-	 */
-	public void init(IWorkbenchWindow window) {
-		this.window = window;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(final IAction action) {
-		// invalidate the server proxy
-		serverProxy = null;
-		if (!connected) {
-			MBeanServer mbeanServer = findLocalMBeanServer();
-			if (mbeanServer != null) {
-				// ask if user wishes to connect to local server
-				if (MessageDialog.openConfirm(window.getShell(), ActionMessages.info_message, ActionMessages.local_mbean_server)) {
-					serverProxy = new MBeanServerProxy(mbeanServer);
-					action.setText(ActionMessages.connect_host);
-					connected = false;
-					loadContributionsView();
-					return;
-				}
-			}
-			// if we did not locate the server locally, prompt for location
-			if (serverProxy == null) {
-				loadTransportExtensions();
-				if (transports.size() == 0) {
-					MessageDialog.openInformation(null, ActionMessages.info_message, ActionMessages.no_transports_available);
-					return;
-				}
-				ConnectionSelectionDialog dialog = new ConnectionSelectionDialog(window.getShell(), transports);
-				if (dialog.open() != Window.OK) {
-					return;
-				}
-				try {
-					connector = dialog.getJMXConnector();
-					isConnecting = true;
-					connector.addConnectionNotificationListener(new NotificationListener() {
-						public void handleNotification(Notification notification, Object handback) {
-							if (isClosing || isConnecting) {
-								// receiving callback from user action
-								return;
-							}
-							connected = false;
-							connector = null;
-							serverProxy = null;
-							action.setText(ActionMessages.connect_host);
-							window.getShell().getDisplay().asyncExec(new Runnable() {
-								public void run() {
-									MessageDialog.openError(window.getShell(), ActionMessages.info_message, ActionMessages.server_closed_connection);
-								}
-							});
-						}
-					}, null, null);
-					connector.connect();
-					isConnecting = false;
-					serverProxy = new MBeanServerProxy(connector.getMBeanServerConnection());
-				} catch (Exception e) {
-					Activator.logError(e.getMessage(), e);
-					MessageDialog.openError(window.getShell(), ActionMessages.error_message, e.getMessage());
-				}
-			}
-			loadContributionsView();
-			connected = true;
-			action.setText(ActionMessages.disconnect_action);
-		} else {
-			// check if we must close a remote conneciton
-			if (connector != null) {
-				try {
-					isClosing = true;
-					connector.close();
-					isClosing = false;
-					connector = null;
-				} catch (IOException e) {
-					MessageDialog.openError(window.getShell(), ActionMessages.error_message, e.getMessage());
-					Activator.log(e);
-				}
-			}
-			connected = false;
-			serverProxy = null;
-			loadContributionsView();
-			action.setText(ActionMessages.connect_host);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
-	 */
-	public void dispose() {
-	}
-
-	private MBeanServer findLocalMBeanServer() {
-		// null returns all mbeans servers in this vm, we do this because otherwise
-		// we would have to specify an agentID that is the domain name appended with
-		// the timestamp that the server was started.
-		ArrayList mbeanServers = MBeanServerFactory.findMBeanServer(null);
-		Iterator iter = mbeanServers.iterator();
-		while (iter.hasNext()) {
-			MBeanServer mbeanServer = (MBeanServer) iter.next();
-			if (mbeanServer.getDefaultDomain().equals(JMXConstants.DEFAULT_DOMAIN)) {
-				return mbeanServer;
-			}
-		}
-		return null;
-	}
-
-	private void loadContributionsView() {
-		try {
-			ContributionsViewPart contributionsView = (ContributionsViewPart) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(ClientUI.VIEWID_CONTRIBUTIONS);
-			if (contributionsView != null) {
-				contributionsView.setMBeanServerProxy(serverProxy);
-			}
-		} catch (PartInitException e) {
-			Activator.log(e);
-		}
-	}
-
-	private static void loadTransportExtensions() {
-		if (transports == null) {
-			transports = new HashMap();
-		}
-		IExtensionPoint point = RegistryFactory.getRegistry().getExtensionPoint(Activator.PI_NAMESPACE, Activator.PT_TRANSPORT);
-		IExtension[] types = point.getExtensions();
-		for (int i = 0; i < types.length; i++) {
-			loadTransportConfigurationElements(types[i].getConfigurationElements());
-		}
-	}
-
-	private static void loadTransportConfigurationElements(IConfigurationElement[] configElems) {
-		for (int j = 0; j < configElems.length; j++) {
-			IConfigurationElement element = configElems[j];
-			final String elementName = element.getName();
-			String transport;
-			if (elementName.equals(Activator.PT_TRANSPORT) && null != element.getAttribute("class") //$NON-NLS-1$
-					&& null != (transport = element.getAttribute("protocol"))) //$NON-NLS-1$
-			{
-				try {
-					Object obj = element.createExecutableExtension("class"); //$NON-NLS-1$
-					if (obj instanceof IJMXConnectorProvider) {
-						transports.put(transport, obj);
-					}
-				} catch (CoreException e) {
-					Activator.log(e);
-				}
-			}
-		}
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/contributionsview/BundleStatusLabelDecorator.java b/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/contributionsview/BundleStatusLabelDecorator.java
deleted file mode 100644
index 8138ff4..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/contributionsview/BundleStatusLabelDecorator.java
+++ /dev/null

@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.client.ui.contributionsview;
-
-import org.eclipse.equinox.jmx.internal.client.ui.viewsupport.*;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.graphics.*;
-
-/**
- * @since 1.0
- */
-public class BundleStatusLabelDecorator implements ILabelDecorator {
-
-	// don't worry about lazy-initialization as bundles are always in a state
-	private ImageRegistry registry = new ImageRegistry();
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ILabelDecorator#decorateImage(org.eclipse.swt.graphics.Image, java.lang.Object)
-	 */
-	public Image decorateImage(Image image, Object element) {
-		int bundleState;
-		if ((bundleState = computeAdornments(element)) == 0) {
-			return image;
-		}
-		ImageDescriptor desc = new ImageImageDescriptor(image);
-		Rectangle rect = image.getBounds();
-		return registry.get(new BundleImageDescriptor(desc, bundleState, new Point(rect.width, rect.height)));
-	}
-
-	private int computeAdornments(Object element) {
-		return 0;//return (element instanceof ManagedBundleMBean) ? ((ManagedBundleMBean)element).getBundleState() : 0;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ILabelDecorator#decorateText(java.lang.String, java.lang.Object)
-	 */
-	public String decorateText(String text, Object element) {
-		return text;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
-	 */
-	public void addListener(ILabelProviderListener listener) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-	 */
-	public void dispose() {
-		// TODO Auto-generated method stub
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
-	 */
-	public boolean isLabelProperty(Object element, String property) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
-	 */
-	public void removeListener(ILabelProviderListener listener) {
-		// TODO Auto-generated method stub
-
-	}
-
-	public void decorate(Object element, IDecoration decoration) {
-		// TODO Auto-generated method stub
-
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/contributionsview/ContributionContentProvider.java b/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/contributionsview/ContributionContentProvider.java
deleted file mode 100644
index 52f2bd9..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/contributionsview/ContributionContentProvider.java
+++ /dev/null

@@ -1,227 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.client.ui.contributionsview;
-
-import java.io.IOException;
-import java.util.*;
-import javax.management.*;
-import org.eclipse.equinox.jmx.common.*;
-import org.eclipse.equinox.jmx.internal.client.Activator;
-import org.eclipse.equinox.jmx.internal.client.MBeanServerProxy;
-import org.eclipse.equinox.jmx.internal.client.ui.ClientUI;
-import org.eclipse.equinox.jmx.internal.client.ui.mbeaninfoview.MBeanInfoViewPart;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @since 1.0
- */
-public class ContributionContentProvider implements ITreeContentProvider, NotificationListener {
-
-	private static final Object[] NO_CHILDS = new Object[0];
-	private MBeanServerProxy serverProxy;
-	private TreeViewer viewer;
-	private Hashtable objNameProxies = new Hashtable();
-
-	/**
-	 * Allocate and a <code>ContributionContentProvider</code>.
-	 */
-	public ContributionContentProvider(TreeViewer viewer, MBeanServerProxy serverProxy) {
-		super();
-		this.viewer = viewer;
-		this.serverProxy = serverProxy;
-	}
-
-	public void setServerContributionProxy(MBeanServerProxy serverProxy) {
-		// receiving updated proxy, clear current objectname table
-		removeListeners();
-		objNameProxies.clear();
-		this.serverProxy = serverProxy;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
-	 */
-	public Object[] getChildren(Object parentElement) {
-		if (parentElement instanceof ContributionProxy) {
-			ContributionProxy parentProxy = (ContributionProxy) parentElement;
-			try {
-				monitorProxies(new ContributionProxy[] {parentProxy});
-				MBeanServerConnection mbServer = serverProxy.getMBeanServerConnection();
-				ContributionProxy[] contribs = parentProxy.getChildContributions(mbServer);
-				monitorProxies(contribs);
-				Object[] ret = null;
-				if (contribs != null && contribs.length > 0) {
-					ret = new Object[contribs.length];
-					System.arraycopy(contribs, 0, ret, 0, ret.length);
-					return ret;
-				}
-			} catch (Exception e) {
-				Activator.logError(e);
-			}
-		} else if (parentElement instanceof ContributionProxy[]) {
-			try {
-				monitorProxies((ContributionProxy[]) parentElement);
-			} catch (Exception e) {
-				Activator.logError(e);
-			}
-			return (ContributionProxy[]) parentElement;
-		}
-		return NO_CHILDS;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
-	 */
-	public Object getParent(Object element) {
-		return element;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
-	 */
-	public boolean hasChildren(Object element) {
-		if (element instanceof ContributionProxyMBean && serverProxy != null) {
-			try {
-				ContributionProxy[] contribs = ((ContributionProxy) element).getChildContributions(serverProxy.getMBeanServerConnection());
-				return (contribs != null && contribs.length > 0);
-			} catch (Exception e) {
-				Activator.logError(e);
-			}
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		if (inputElement instanceof RootContribution) {
-			RootContribution rc = (RootContribution) inputElement;
-			try {
-				monitorProxies(new ContributionProxy[] {rc});
-			} catch (Exception e) {
-				Activator.log(e);
-			}
-			return getChildren(rc.queryRootContributions());
-		}
-		return getChildren(inputElement);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-	 */
-	public void dispose() {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-	 */
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.NotificationListener#handleNotification(javax.management.Notification, java.lang.Object)
-	 */
-	public synchronized void handleNotification(Notification notification, Object handback) {
-		Object obj = notification.getSource();
-		if (!(obj instanceof ObjectName) || serverProxy == null) {
-			return;
-		}
-		final ObjectName objectName = (ObjectName) obj;
-		List proxiesRef = (List) objNameProxies.get(objectName);
-		if (proxiesRef == null) {
-			return;
-		}
-		final List proxies = new ArrayList(proxiesRef);
-		final Iterator iter = proxies.iterator();
-		String type = notification.getType();
-		if (type.equals(ContributionNotificationEvent.NOTIFICATION_UPDATED) || type.equals(ContributionNotificationEvent.NOTIFICATION_ADDED)) {
-			Display.getDefault().asyncExec(new Runnable() {
-				public void run() {
-					// check if updating the root contribution
-					if (proxies.size() == 1 && proxies.get(0) instanceof RootContribution) {
-						try {
-							// remove the previous root proxy from the list of monitored proxies
-							objNameProxies.remove(((RootContribution) viewer.getInput()).getObjectName());
-							viewer.setInput(serverProxy.getRootContribution());
-						} catch (Exception e) {
-							Activator.log(e);
-						}
-						return;
-					}
-					// not updating the root, therefore refresh all nodes
-					// that are references by the same object name
-					while (iter.hasNext()) {
-						ContributionProxy proxy = (ContributionProxy) iter.next();
-						try {
-							proxy.refresh(serverProxy.getMBeanServerConnection());
-							viewer.update(proxy, null);
-							viewer.refresh(proxy);
-						} catch (Exception e) {
-							Activator.log(e);
-						}
-					}
-				}
-			});
-		} else if (type.equals(ContributionNotificationEvent.NOTIFICATION_REMOVED)) {
-			Display.getDefault().asyncExec(new Runnable() {
-				public void run() {
-					objNameProxies.remove(objectName);
-					MBeanInfoViewPart vp = getMBeanInfoViewPart();
-					while (iter.hasNext()) {
-						ContributionProxy proxy = (ContributionProxy) iter.next();
-						// why doesnt remove emit a selection notification for the viewers...
-						// i am required to explicitly close the relevant views
-						viewer.remove(proxy);
-						// if viewing object that was removed, clear ui
-						if (vp != null) {
-							vp.contributionRemoved(proxy);
-						}
-					}
-				}
-
-				private MBeanInfoViewPart getMBeanInfoViewPart() {
-					return (MBeanInfoViewPart) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(ClientUI.VIEWID_MBEANINFO);
-				}
-			});
-		}
-	}
-
-	private void monitorProxies(ContributionProxy[] proxies) throws InstanceNotFoundException, IOException {
-		for (int i = 0; i < proxies.length; i++) {
-			ObjectName name = proxies[i].getObjectName();
-			List l = null;
-			if ((l = (List) objNameProxies.get(name)) == null) {
-				l = new Vector(2);
-				serverProxy.getMBeanServerConnection().addNotificationListener(name, this, null, null);
-				objNameProxies.put(name, l);
-			}
-			l.add(proxies[i]);
-		}
-	}
-
-	private void removeListeners() {
-		if (serverProxy == null) {
-			return;
-		}
-		Iterator iter = objNameProxies.keySet().iterator();
-		try {
-			while (iter.hasNext()) {
-				ObjectName name = (ObjectName) iter.next();
-				serverProxy.getMBeanServerConnection().removeNotificationListener(name, this);
-			}
-		} catch (Exception e) {
-			Activator.log(e);
-		}
-	}
-}
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/contributionsview/ContributionLabelProvider.java b/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/contributionsview/ContributionLabelProvider.java
deleted file mode 100644
index ac9d23a..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/contributionsview/ContributionLabelProvider.java
+++ /dev/null

@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.client.ui.contributionsview;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import javax.management.MBeanInfo;
-import javax.management.MBeanOperationInfo;
-import org.eclipse.equinox.jmx.common.ContributionProxy;
-import org.eclipse.equinox.jmx.common.ContributionProxyMBean;
-import org.eclipse.equinox.jmx.common.util.ByteArrayHolder;
-import org.eclipse.equinox.jmx.internal.client.Activator;
-import org.eclipse.equinox.jmx.internal.client.ui.util.ByteImageRegistry;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @since 1.0
- */
-public class ContributionLabelProvider implements ILabelProvider {
-
-	private ArrayList labelDecorators;
-	private BundleStatusLabelDecorator bundleStatusDecorator = new BundleStatusLabelDecorator();
-	private ByteImageRegistry imageRegistry = new ByteImageRegistry();
-
-	public ContributionLabelProvider() {
-		addLabelDecorator(bundleStatusDecorator);
-	}
-
-	/**
-	 * Add a decorator to this label provider.
-	 */
-	public void addLabelDecorator(ILabelDecorator decorator) {
-		if (labelDecorators == null) {
-			labelDecorators = new ArrayList(2);
-		}
-		labelDecorators.add(decorator);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-	 */
-	public Image getImage(Object element) {
-		if (element instanceof ContributionProxy) {
-			ByteArrayHolder holder = ((ContributionProxy) element).getImageData();
-			byte[] imageData;
-			if (holder != null && (imageData = holder.value) != null) {
-				try {
-					return decorateImage(imageRegistry.getImage(imageData), element);
-				} catch (IOException e) {
-					Activator.log(e);
-				}
-			}
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-	 */
-	public String getText(Object element) {
-		if (element instanceof ContributionProxyMBean) {
-			return decorateText(((ContributionProxyMBean) element).getName(), element);
-		} else if (element instanceof MBeanInfo) {
-			return decorateText(ContributionViewMessages.operations, element);
-		} else if (element instanceof MBeanOperationInfo) {
-			return ((MBeanOperationInfo) element).getName();
-		}
-		return decorateText(element.toString(), element);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
-	 */
-	public void addListener(ILabelProviderListener listener) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-	 */
-	public void dispose() {
-		imageRegistry.dispose();
-		labelDecorators.clear();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
-	 */
-	public boolean isLabelProperty(Object element, String property) {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
-	 */
-	public void removeListener(ILabelProviderListener listener) {
-	}
-
-	protected String decorateText(String text, Object element) {
-		if (labelDecorators != null && text.length() > 0) {
-			Iterator iter = labelDecorators.iterator();
-			while (iter.hasNext()) {
-				ILabelDecorator decorator = (ILabelDecorator) iter.next();
-				text = decorator.decorateText(text, element);
-			}
-		}
-		return text;
-	}
-
-	protected Image decorateImage(Image image, Object element) {
-		if (labelDecorators != null && image != null) {
-			Iterator iter = labelDecorators.iterator();
-			while (iter.hasNext()) {
-				ILabelDecorator decorator = (ILabelDecorator) iter.next();
-				image = decorator.decorateImage(image, element);
-			}
-		}
-		return image;
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/contributionsview/ContributionViewMessages.java b/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/contributionsview/ContributionViewMessages.java
deleted file mode 100644
index 2ff186d..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/contributionsview/ContributionViewMessages.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.client.ui.contributionsview;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @since 1.0
- */
-public class ContributionViewMessages extends NLS {
-
-	public static String operations;
-	public static String error_message;
-
-	// disallow instantiations
-	private ContributionViewMessages() {
-		super();
-	}
-
-	static {
-		NLS.initializeMessages(ContributionViewMessages.class.getName(), ContributionViewMessages.class);
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/contributionsview/ContributionViewMessages.properties b/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/contributionsview/ContributionViewMessages.properties
deleted file mode 100644
index e2fc87b..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/contributionsview/ContributionViewMessages.properties
+++ /dev/null

@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-operations = Operations
-error_message = Error
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/contributionsview/ContributionsViewPart.java b/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/contributionsview/ContributionsViewPart.java
deleted file mode 100644
index acdd291..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/contributionsview/ContributionsViewPart.java
+++ /dev/null

@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.client.ui.contributionsview;
-
-import java.io.IOException;
-import javax.management.*;
-import org.eclipse.equinox.jmx.internal.client.Activator;
-import org.eclipse.equinox.jmx.internal.client.MBeanServerProxy;
-import org.eclipse.equinox.jmx.internal.client.ui.actions.ActionMessages;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.part.ViewPart;
-
-/**
- * @since 1.0
- */
-public class ContributionsViewPart extends ViewPart {
-
-	protected TreeViewer viewer;
-	protected ContributionContentProvider contentProvider;
-	protected ContributionLabelProvider labelProvider;
-	protected MBeanServerProxy serverProxy;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		viewer = new TreeViewer(parent, SWT.SINGLE | SWT.V_SCROLL | SWT.H_SCROLL);
-		viewer.setUseHashlookup(true);
-		viewer.setSorter(new ViewerSorter());
-		setProviders();
-		getSite().setSelectionProvider(viewer);
-	}
-
-	protected ContributionContentProvider createContentProvider() {
-		return new ContributionContentProvider(viewer, null);
-	}
-
-	protected ContributionLabelProvider createLabelProvider() {
-		return new ContributionLabelProvider();
-	}
-
-	protected void setProviders() {
-		contentProvider = createContentProvider();
-		viewer.setContentProvider(contentProvider);
-		labelProvider = createLabelProvider();
-		viewer.setLabelProvider(labelProvider);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
-	 */
-	public void setFocus() {
-		viewer.getTree().setFocus();
-	}
-
-	public void setMBeanServerProxy(MBeanServerProxy proxy) {
-		this.serverProxy = proxy;
-		try {
-			contentProvider.setServerContributionProxy(proxy);
-			updateViewer();
-		} catch (Exception e) {
-			Activator.logError(e);
-		}
-	}
-
-	public MBeanServerProxy getMBeanServerProxy() {
-		return serverProxy;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-	}
-
-	public void connectionClosed(String message) {
-		MessageDialog.openInformation(viewer.getControl().getShell(), ActionMessages.info_message, message);
-	}
-
-	private void updateViewer() throws InstanceNotFoundException, MBeanException, ReflectionException, IOException, NotCompliantMBeanException {
-		if (serverProxy == null) {
-			viewer.setSelection(null);
-			viewer.setInput(null);
-			return;
-		}
-		viewer.setInput(serverProxy.getRootContribution());
-	}
-}
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/invocationView/InvocationView.java b/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/invocationView/InvocationView.java
deleted file mode 100644
index f369c53..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/invocationView/InvocationView.java
+++ /dev/null

@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.client.ui.invocationView;
-
-import javax.management.MBeanOperationInfo;
-import javax.management.MBeanParameterInfo;
-import org.eclipse.equinox.jmx.common.ContributionProxy;
-import org.eclipse.equinox.jmx.common.util.MBeanUtils;
-import org.eclipse.equinox.jmx.internal.client.Activator;
-import org.eclipse.equinox.jmx.internal.client.MBeanServerProxy;
-import org.eclipse.equinox.jmx.internal.client.ui.ClientUI;
-import org.eclipse.equinox.jmx.internal.client.ui.contributionsview.ContributionsViewPart;
-import org.eclipse.equinox.jmx.internal.client.ui.mbeaninfoview.MBeanInfoViewMessages;
-import org.eclipse.equinox.jmx.internal.client.ui.viewsupport.ViewUtil;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.forms.ManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.part.ViewPart;
-
-public class InvocationView extends ViewPart implements ISelectionListener {
-
-	private Composite fInvocationComposite;
-	private ManagedForm fManagedForm;
-	private MBeanOperationInfo fSelectedOperation;
-	private Font fItalicFont;
-	protected ContributionProxy fSelectedContribution;
-	private Composite parentComp;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		parentComp = parent;
-		FontData fd[] = parent.getFont().getFontData();
-		fItalicFont = new Font(parent.getDisplay(), fd[0].getName(), fd[0].getHeight(), SWT.ITALIC);
-		getSite().getPage().addSelectionListener(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#dispose()
-	 */
-	public void dispose() {
-		fItalicFont.dispose();
-		if (fManagedForm != null)
-			fManagedForm.dispose();
-		getSite().getPage().removePostSelectionListener(this);
-		super.dispose();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
-	 */
-	public void setFocus() {
-		if (fManagedForm != null)
-			fManagedForm.setFocus();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-		if (!(selection instanceof IStructuredSelection))
-			return;
-
-		Object obj = ((IStructuredSelection) selection).getFirstElement();
-		String id = part.getSite().getId();
-		if (id.equals(ClientUI.VIEWID_MBEANINFO) && obj instanceof MBeanOperationInfo) {
-			MBeanOperationInfo contrib = (MBeanOperationInfo) obj;
-			if (contrib == fSelectedOperation) {
-				return;
-			}
-			// update the currently selected contribution to the one to be displayed, if null
-			// the controls displayed are still disposed, this is to reflect a removed contribution
-			fSelectedOperation = contrib;
-			drawInvocationDetails(contrib);
-		} else if (id.equals(ClientUI.VIEWID_CONTRIBUTIONS) && obj instanceof ContributionProxy) {
-			fSelectedContribution = (ContributionProxy) obj;
-			clear();
-		}
-	}
-
-	public void clear() {
-		drawInvocationDetails(null);
-	}
-
-	protected void drawInvocationDetails(MBeanOperationInfo opInfo) {
-		if (parentComp != null && !parentComp.isDisposed()) {
-			// remove any controls created from prior selections
-			Control[] childs = parentComp.getChildren();
-			if (childs.length > 0) {
-				for (int i = 0; i < childs.length; i++) {
-					childs[i].dispose();
-				}
-			}
-		}
-		if (opInfo == null) {
-			return;
-		}
-		if (fManagedForm != null) {
-			fManagedForm.dispose();
-		}
-		fManagedForm = new ManagedForm(parentComp);
-		Composite body = fManagedForm.getForm().getBody();
-		body.setLayout(new GridLayout());
-		body.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		fInvocationComposite = ViewUtil.createSection(MBeanInfoViewMessages.InvocationView_0, null, fManagedForm, body, 1, true, false);
-
-		FormToolkit toolkit = fManagedForm.getToolkit();
-		String desc = opInfo.getDescription();
-		if (desc != null && desc.length() > 0) {
-			Composite c = toolkit.createComposite(fInvocationComposite, SWT.NONE);
-			c.setLayout(new GridLayout());
-			toolkit.createLabel(c, desc);
-		}
-		// composite for method signature [ return type | name | Composite(1..n parameters) | invoke button ] 
-		Composite c = toolkit.createComposite(fInvocationComposite, SWT.NONE);
-		c.setLayout(new GridLayout(4, false));
-		// return type
-		toolkit.createLabel(c, opInfo.getReturnType() != null ? opInfo.getReturnType() : "void"); //$NON-NLS-1$
-		// method name
-		toolkit.createLabel(c, opInfo.getName() + ' ').setFont(fItalicFont);
-		// parameters
-		final MBeanParameterInfo[] params = opInfo.getSignature();
-		Text[] textParams = null;
-		if (params.length > 0) {
-			Composite paramsComposite = toolkit.createComposite(c, SWT.NONE);
-			paramsComposite.setLayout(new GridLayout(params.length + 1 /* button */, false));
-			textParams = new Text[params.length];
-			for (int j = 0; j < params.length; j++) {
-				MBeanParameterInfo param = params[j];
-				textParams[j] = new Text(paramsComposite, SWT.SINGLE | SWT.BORDER);
-				textParams[j].setText(param.getType() + "(" + param.getName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
-				textParams[j].setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));
-			}
-			paramsComposite.pack();
-		}
-		new InvokeOperationButton(opInfo.getName(), textParams, params, c, SWT.PUSH);
-		fInvocationComposite.pack();
-		parentComp.layout();
-	}
-
-	private class InvokeOperationButton extends SelectionAdapter {
-
-		private String fMethodName;
-		private Text[] fTextParams;
-		private MBeanParameterInfo[] fParamTypes;
-		private Button fButton;
-
-		public InvokeOperationButton(String methodName, Text[] textParams, MBeanParameterInfo[] paramTypes, Composite parent, int style) {
-			fMethodName = methodName;
-			fTextParams = textParams;
-			fParamTypes = paramTypes;
-			fButton = fManagedForm.getToolkit().createButton(parent, MBeanInfoViewMessages.button_invoke, style);
-			fButton.addSelectionListener(this);
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-		 */
-		public void widgetSelected(SelectionEvent event) {
-			try {
-				Object[] paramList = null;
-				if (fTextParams != null) {
-					String[] strs = new String[fTextParams.length];
-					for (int i = 0; i < strs.length; i++) {
-						strs[i] = fTextParams[i].getText();
-					}
-					paramList = MBeanUtils.getParameters(strs, fParamTypes);
-				}
-				// invoke operation
-				ContributionsViewPart contribsViewPart = ViewUtil.getContributionsView();
-				if (contribsViewPart != null) {
-					MBeanServerProxy serverProxy = contribsViewPart.getMBeanServerProxy();
-					Object result;
-					if (paramList != null) {
-						String[] paramSig = new String[fParamTypes.length];
-						for (int i = 0; i < paramSig.length; i++) {
-							paramSig[i] = fParamTypes[i].getType();
-						}
-						result = serverProxy.invokeContributionOperation(fSelectedContribution, fMethodName, paramList, paramSig);
-					} else {
-						result = serverProxy.invokeContributionOperation(fSelectedContribution, fMethodName, new Object[0], new String[0]);
-					}
-					if (result != null) {
-						String message = result.toString();
-						MessageDialog.openInformation(fManagedForm.getForm().getShell(), MBeanInfoViewMessages.invoke_result, message);
-					}
-				}
-			} catch (Exception e) {
-				Activator.logError(e);
-				MessageDialog.openError(null, MBeanInfoViewMessages.error, e.getMessage());
-			}
-		}
-	}
-
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/mbeaninfoview/MBeanInfoViewMessages.java b/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/mbeaninfoview/MBeanInfoViewMessages.java
deleted file mode 100644
index d8a33e7..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/mbeaninfoview/MBeanInfoViewMessages.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.client.ui.mbeaninfoview;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @since 1.0
- */
-public class MBeanInfoViewMessages extends NLS {
-
-	public static String invoke_result;
-	public static String contribution_name;
-	public static String description;
-	public static String mbean_description;
-	public static String error;
-	public static String button_invoke;
-	public static String MBeanOpTable_returnType;
-	public static String MBeanOpTable_name;
-	public static String MBeanOpTable_params;
-	public static String InvocationView_0;
-	public static String MBeanInfoViewPart_0;
-	public static String MBeanInfoViewPart_1;
-	public static String MBeanInfoViewPart_6;
-	public static String MBeanInfoViewPart_7;
-	public static String MBeanInfoViewPart_8;
-	public static String MBeanInfoViewPart_11;
-
-	private MBeanInfoViewMessages() {
-		// disallow instantiations
-	}
-
-	static {
-		NLS.initializeMessages(MBeanInfoViewMessages.class.getName(), MBeanInfoViewMessages.class);
-	}
-
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/mbeaninfoview/MBeanInfoViewMessages.properties b/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/mbeaninfoview/MBeanInfoViewMessages.properties
deleted file mode 100644
index 53ef1ce..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/mbeaninfoview/MBeanInfoViewMessages.properties
+++ /dev/null

@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-invoke_result = Result
-contribution_name = Contribution Name:
-description = Attributes:
-mbean_description = Contribution Description:
-button_invoke = Invoke
-error = Error
-
-MBeanOpTable_returnType=Return Type
-MBeanOpTable_name=Name
-MBeanOpTable_params=Parameters
-MBeanInfoViewPart_0=Contributor
-MBeanInfoViewPart_1=Properties
-MBeanInfoViewPart_11=Contribution Summary of {0}
-MBeanInfoViewPart_6=Operations
-MBeanInfoViewPart_7=A table of available operations, select one to display invocation options.
-MBeanInfoViewPart_8=Contribution Summary
-InvocationView_0=Invocation Details

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/mbeaninfoview/MBeanInfoViewPart.java b/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/mbeaninfoview/MBeanInfoViewPart.java
deleted file mode 100644
index 0ba3e17..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/mbeaninfoview/MBeanInfoViewPart.java
+++ /dev/null

@@ -1,261 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.client.ui.mbeaninfoview;
-
-import java.util.Iterator;
-import javax.management.*;
-import org.eclipse.equinox.jmx.common.ContributionProxy;
-import org.eclipse.equinox.jmx.common.IContributionStateChangeListener;
-import org.eclipse.equinox.jmx.internal.client.ui.ClientUI;
-import org.eclipse.equinox.jmx.internal.client.ui.invocationView.InvocationView;
-import org.eclipse.equinox.jmx.internal.client.ui.viewsupport.ViewUtil;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.forms.ManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.part.ViewPart;
-
-/**
- * @since 1.0
- */
-public class MBeanInfoViewPart extends ViewPart implements ISelectionListener, IContributionStateChangeListener {
-
-	protected ContributionProxy fSelectedContribution;
-	private ManagedForm fManagedForm;
-	private MBeanOpTable fOpTable;
-	private Font fBFont;
-	private Text fPropertiesText;
-	private Section fContributionSection;
-	private Section fPropertiesSection;
-	private Section fOperationsSection;
-	private Label fC_title;
-	private Label fC_desc;
-	private Text fAttributesText;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		FontData fd[] = parent.getFont().getFontData();
-		fBFont = new Font(parent.getDisplay(), fd[0].getName(), fd[0].getHeight(), SWT.BOLD);
-		fManagedForm = new ManagedForm(parent);
-		fManagedForm.getForm().setText(MBeanInfoViewMessages.MBeanInfoViewPart_8);
-
-		Composite body = fManagedForm.getForm().getBody();
-		body.setLayout(new GridLayout());
-		body.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		createContributionTitleArea(body);
-		createContributionPropertiesArea(body);
-		createOperationsArea(body);
-
-		getSite().getPage().addSelectionListener(this);
-	}
-
-	protected FormToolkit getToolkit() {
-		return fManagedForm.getToolkit();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#dispose()
-	 */
-	public void dispose() {
-		fBFont.dispose();
-		fManagedForm.dispose();
-		getSite().getPage().removePostSelectionListener(this);
-		super.dispose();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
-	 */
-	public void setFocus() {
-		fManagedForm.setFocus();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-		if (!(selection instanceof IStructuredSelection))
-			return;
-
-		Object obj = ((IStructuredSelection) selection).getFirstElement();
-
-		String id = part.getSite().getId();
-		if (id.equals(ClientUI.VIEWID_CONTRIBUTIONS)) {
-			if (obj instanceof ContributionProxy) {
-				ContributionProxy contrib = (ContributionProxy) obj;
-				if (contrib == fSelectedContribution) {
-					return;
-				} else if (fSelectedContribution != null) {
-					// remove listener from previously selected proxy
-					fSelectedContribution.removeStateChangeListener(this);
-				}
-				// update the currently selected contribution to the one to be displayed, if null
-				// the controls displayed are still disposed, this is to reflect a removed contribution
-				fSelectedContribution = contrib;
-				updateContributionTitle(true);
-				updateProperties(true);
-				updateOperations(true);
-				if (fSelectedContribution == null)
-					return;
-				fSelectedContribution.addStateChangeListener(this);
-			} else if (obj == null) {
-				contributionRemoved(fSelectedContribution = null);
-			}
-		}
-	}
-
-	private void createContributionTitleArea(Composite parent) {
-		Composite comp = ViewUtil.createSection(MBeanInfoViewMessages.MBeanInfoViewPart_0, null, fManagedForm, parent, 2, false, true);
-		FormToolkit toolkit = fManagedForm.getToolkit();
-		fContributionSection = (Section) comp.getParent();
-
-		toolkit.createLabel(comp, MBeanInfoViewMessages.contribution_name);
-		fC_title = toolkit.createLabel(comp, ""); //$NON-NLS-1$
-		fC_title.setFont(fBFont);
-		fC_title.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		toolkit.createLabel(comp, MBeanInfoViewMessages.mbean_description);
-		fC_desc = toolkit.createLabel(comp, ""); //$NON-NLS-1$
-		fC_desc.setFont(fBFont);
-		fC_desc.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-	}
-
-	private void updateContributionTitle(boolean forceExpand) {
-		boolean enabled = fSelectedContribution != null;
-
-		fContributionSection.setEnabled(enabled);
-		if (!fContributionSection.isEnabled() || forceExpand)
-			fContributionSection.setExpanded(enabled);
-		if (!enabled)
-			return;
-
-		String name = fSelectedContribution.getName();
-		fC_title.setText(name);
-		fManagedForm.getForm().setText(NLS.bind(MBeanInfoViewMessages.MBeanInfoViewPart_11, name));
-
-		MBeanInfo info = fSelectedContribution.getMBeanInfo();
-		if (info.getDescription() != null)
-			fC_desc.setText(info.getDescription());
-		else
-			fC_desc.setText(""); //$NON-NLS-1$
-	}
-
-	private void createContributionPropertiesArea(Composite parent) {
-		FormToolkit toolkit = fManagedForm.getToolkit();
-		Composite comp = ViewUtil.createSection(MBeanInfoViewMessages.MBeanInfoViewPart_1, null, fManagedForm, parent, 1, false, true);
-		fPropertiesSection = (Section) comp.getParent();
-		fPropertiesText = toolkit.createText(comp, "", SWT.MULTI | SWT.H_SCROLL | SWT.READ_ONLY | SWT.BORDER); //$NON-NLS-1$
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
-		gd.widthHint = 100;
-		fPropertiesText.setLayoutData(gd);
-	}
-
-	private void updateProperties(boolean forceExpand) {
-		boolean enabled = fSelectedContribution != null && fSelectedContribution.getContributionProperties() != null && fSelectedContribution.getContributionProperties().iterator().hasNext();
-
-		fPropertiesSection.setEnabled(enabled);
-		if (!fPropertiesSection.isEnabled() || forceExpand)
-			fPropertiesSection.setExpanded(enabled);
-		if (!enabled)
-			return;
-
-		Iterator iter = fSelectedContribution.getContributionProperties().iterator();
-		StringBuffer sb = new StringBuffer();
-		while (iter.hasNext())
-			sb.append(iter.next().toString() + (iter.hasNext() ? "\n" : "")); //$NON-NLS-1$ //$NON-NLS-2$
-		fPropertiesText.setText(sb.toString());
-	}
-
-	private void createOperationsArea(Composite parent) {
-		Composite comp = ViewUtil.createSection(MBeanInfoViewMessages.MBeanInfoViewPart_6, MBeanInfoViewMessages.MBeanInfoViewPart_7, fManagedForm, parent, 1, true, true);
-		fOperationsSection = (Section) comp.getParent();
-
-		fOpTable = new MBeanOpTable(comp, this);
-
-		FormToolkit toolkit = fManagedForm.getToolkit();
-		toolkit.createLabel(comp, MBeanInfoViewMessages.description);
-		fAttributesText = toolkit.createText(comp, "", SWT.MULTI | SWT.H_SCROLL | SWT.READ_ONLY | SWT.BORDER); //$NON-NLS-1$
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
-		gd.widthHint = 100;
-		gd.heightHint = 30;
-		fAttributesText.setLayoutData(gd);
-	}
-
-	private void updateOperations(boolean forceExpand) {
-		boolean enabled = fSelectedContribution != null && fSelectedContribution.getMBeanInfo() != null && (fSelectedContribution.getMBeanInfo().getOperations().length > 2 || fSelectedContribution.getMBeanInfo().getAttributes().length > 0);
-
-		fOperationsSection.setEnabled(enabled);
-		if (!fOperationsSection.isEnabled() || forceExpand)
-			fOperationsSection.setExpanded(enabled);
-		if (!enabled)
-			return;
-
-		MBeanInfo info = fSelectedContribution.getMBeanInfo();
-
-		MBeanOperationInfo[] ops = info.getOperations();
-		if (ops.length > 0)
-			fOpTable.setInput(fSelectedContribution);
-
-		StringBuffer sb = new StringBuffer();
-		MBeanAttributeInfo[] attrs = info.getAttributes();
-		for (int i = 0; i < attrs.length; i++) {
-			if (i != 0)
-				sb.append('\n');
-			sb.append(attrs[i].getName());
-			sb.append(':');
-			sb.append(' ');
-			sb.append(attrs[i].getDescription());
-		}
-	}
-
-	/**
-	 * This is called when the mbean contribution resource associated with the proxy
-	 * has been removed, it proceeds to invalidate the view.
-	 * 
-	 * @param contribution The contribution proxy that represents the contribution resource removed.
-	 */
-	public void contributionRemoved(ContributionProxy contribution) {
-		fContributionSection.setEnabled(false);
-		fContributionSection.setExpanded(false);
-		fPropertiesSection.setEnabled(false);
-		fPropertiesSection.setExpanded(false);
-		fOperationsSection.setEnabled(false);
-		fOperationsSection.setExpanded(false);
-		InvocationView iv = (InvocationView) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(ClientUI.VIEWID_INVOCATION);
-		if (iv != null) {
-			iv.clear();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.common.IContributionStateChangeListener#stateChanged(org.eclipse.equinox.jmx.common.ContributionProxy)
-	 */
-	public void stateChanged(final ContributionProxy source) {
-		fManagedForm.getForm().getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				fSelectedContribution = source;
-				// only updating properties on state change
-				updateProperties(false);
-			}
-		});
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/mbeaninfoview/MBeanOpTable.java b/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/mbeaninfoview/MBeanOpTable.java
deleted file mode 100644
index 5052a62..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/mbeaninfoview/MBeanOpTable.java
+++ /dev/null

@@ -1,230 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.client.ui.mbeaninfoview;
-
-import javax.management.MBeanOperationInfo;
-import javax.management.MBeanParameterInfo;
-import org.eclipse.equinox.jmx.common.ContributionProxy;
-import org.eclipse.equinox.jmx.internal.client.ui.invocationView.InvocationView;
-import org.eclipse.equinox.jmx.internal.client.ui.viewsupport.ViewUtil;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.*;
-
-public class MBeanOpTable {
-
-	protected class MBeanOpContentProvider implements IStructuredContentProvider {
-		private MBeanOperationInfo[] fOps;
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-		 */
-		public Object[] getElements(Object inputElement) {
-			if (fOps == null)
-				return new Object[0];
-			return fOps;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-		 */
-		public void dispose() {
-			// nothing needs to be disposed
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-		 */
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-			fOps = (MBeanOperationInfo[]) newInput;
-		}
-	}
-
-	protected class MBeanOpLabelProvider extends LabelProvider implements ITableLabelProvider {
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
-		 */
-		public Image getColumnImage(Object element, int columnIndex) {
-			return null;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
-		 */
-		public String getColumnText(Object element, int columnIndex) {
-			if (!(element instanceof MBeanOperationInfo))
-				return super.getText(element);
-
-			MBeanOperationInfo info = (MBeanOperationInfo) element;
-			switch (columnIndex) {
-				case 0 :
-					return ""; //$NON-NLS-1$
-				case 1 :
-					return info.getReturnType() != null ? info.getReturnType() : "void"; //$NON-NLS-1$
-				case 2 :
-					return info.getName();
-				case 3 :
-					MBeanParameterInfo[] params = info.getSignature();
-					StringBuffer sb = new StringBuffer();
-					for (int j = 0; j < params.length; j++) {
-						String type = params[j].getType();
-						if (j != 0)
-							sb.append(", "); //$NON-NLS-1$
-						sb.append(type);
-						sb.append('(');
-						sb.append(params[j].getName());
-						sb.append(')');
-					}
-					return sb.toString();
-			}
-			return getText(element);
-		}
-	}
-
-	protected class MBeanOpViewerFilter extends ViewerFilter {
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-		 */
-		public boolean select(Viewer viewer, Object parentElement, Object element) {
-			if (element instanceof MBeanOperationInfo) {
-				MBeanOperationInfo info = (MBeanOperationInfo) element;
-				return !info.getName().equals("getChildContributions") && !info.getName().equals("createProxy"); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-			return false;
-		}
-	}
-
-	protected class MBeanOpViewerSorter extends ViewerSorter {
-		int fDirection, fIndex;
-
-		protected MBeanOpViewerSorter(int direction, int index) {
-			fDirection = direction == SWT.UP ? -1 : 1;
-			fIndex = index;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ViewerComparator#compare(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-		 */
-		public int compare(Viewer viewer, Object e1, Object e2) {
-			if (e1 instanceof MBeanOperationInfo && e2 instanceof MBeanOperationInfo) {
-				MBeanOperationInfo op1 = (MBeanOperationInfo) e1;
-				MBeanOperationInfo op2 = (MBeanOperationInfo) e2;
-				switch (fIndex) {
-					case 1 :
-						String a1 = op1.getReturnType();
-						String a2 = op2.getReturnType();
-						int p = a1.lastIndexOf('.');
-						if (p != -1)
-							a1 = a1.substring(p + 1);
-						p = a2.lastIndexOf('.');
-						if (p != -1)
-							a2 = a2.substring(p + 1);
-						return fDirection * a1.compareTo(a2);
-					case 2 :
-						return fDirection * op1.getName().compareTo(op2.getName());
-					case 3 :
-						MBeanParameterInfo[] info1 = op1.getSignature();
-						MBeanParameterInfo[] info2 = op2.getSignature();
-						if (info2.length == 0)
-							return fDirection;
-						if (info1.length == 0)
-							return -fDirection;
-
-						return fDirection * (info1[0].getType().compareTo(info2[0].getType()));
-				}
-			}
-			return fDirection * super.compare(viewer, e1, e2);
-		}
-	}
-
-	private TableViewer fViewer;
-
-	public MBeanOpTable(Composite parent, final MBeanInfoViewPart beanView) {
-		final Table opTable = beanView.getToolkit().createTable(parent, SWT.BORDER | SWT.SINGLE | SWT.FLAT | SWT.FULL_SELECTION | SWT.V_SCROLL | SWT.H_SCROLL);
-		createColumns(opTable);
-		opTable.setLayoutData(new GridData(GridData.FILL_BOTH));
-		opTable.setLinesVisible(true);
-		opTable.setHeaderVisible(true);
-		opTable.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (e.item == null || e.item.getData() == null)
-					return;
-				InvocationView view = ViewUtil.getInvocationView();
-				view.selectionChanged(beanView, new StructuredSelection(e.item.getData()));
-			}
-		});
-
-		fViewer = new TableViewer(opTable);
-		fViewer.setContentProvider(new MBeanOpContentProvider());
-		fViewer.setLabelProvider(new MBeanOpLabelProvider());
-		fViewer.addFilter(new MBeanOpViewerFilter());
-	}
-
-	private void createColumns(final Table opTable) {
-		TableColumn blankCol = new TableColumn(opTable, SWT.NONE);
-		blankCol.setText(""); //$NON-NLS-1$
-		blankCol.setWidth(20);
-		final TableColumn returnType = new TableColumn(opTable, SWT.NONE);
-		returnType.setText(MBeanInfoViewMessages.MBeanOpTable_returnType);
-		returnType.setWidth(100);
-		final TableColumn opName = new TableColumn(opTable, SWT.NONE);
-		opName.setText(MBeanInfoViewMessages.MBeanOpTable_name);
-		opName.setWidth(150);
-		final TableColumn params = new TableColumn(opTable, SWT.NONE);
-		params.setText(MBeanInfoViewMessages.MBeanOpTable_params);
-		params.setWidth(300);
-
-		Listener sortListener = new Listener() {
-			public void handleEvent(Event e) {
-				// determine new sort column and direction
-				TableColumn sortColumn = opTable.getSortColumn();
-				TableColumn currentColumn = (TableColumn) e.widget;
-
-				int dir = opTable.getSortDirection();
-				if (sortColumn == currentColumn) {
-					dir = dir == SWT.UP ? SWT.DOWN : SWT.UP;
-				} else {
-					opTable.setSortColumn(currentColumn);
-					dir = SWT.UP;
-				}
-				int colIndex;
-				if (currentColumn == returnType)
-					colIndex = 1;
-				else if (currentColumn == opName)
-					colIndex = 2;
-				else if (currentColumn == params)
-					colIndex = 3;
-				else
-					return;
-
-				// sort the data based on column and direction
-				opTable.setSortDirection(dir);
-				fViewer.setSorter(new MBeanOpViewerSorter(dir, colIndex));
-			}
-		};
-		returnType.addListener(SWT.Selection, sortListener);
-		opName.addListener(SWT.Selection, sortListener);
-		params.addListener(SWT.Selection, sortListener);
-		opTable.setSortColumn(opName);
-		opTable.setSortDirection(SWT.UP);
-	}
-
-	protected void setInput(ContributionProxy input) {
-		if (input == null || input.getMBeanInfo() == null)
-			fViewer.setInput(null);
-		else
-			fViewer.setInput(input.getMBeanInfo().getOperations());
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/util/ByteImageRegistry.java b/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/util/ByteImageRegistry.java
deleted file mode 100644
index d4c4746..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/util/ByteImageRegistry.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.client.ui.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import org.eclipse.equinox.jmx.internal.client.ui.viewsupport.ImageRegistry;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-
-/**
- * Extended image registry to support byte array keys.
- * 
- * @since 1.0
- */
-public class ByteImageRegistry extends ImageRegistry {
-
-	Map cache;
-
-	public Image getImage(byte[] imageData) throws IOException {
-		Image result = (Image) getCache().get(imageData);
-		if (result == null) {
-			getCache().put(imageData, result = super.get(createImageDescriptorFromByteArray(imageData)));
-		}
-		return result;
-	}
-
-	public Map getCache() {
-		if (cache == null) {
-			cache = new HashMap(10);
-		}
-		return cache;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.internal.client.ui.viewsupport.ImageRegistry#dispose()
-	 */
-	public void dispose() {
-		getCache().clear();
-		super.dispose();
-	}
-
-	public static ImageDescriptor createImageDescriptorFromByteArray(byte[] imageData) throws IOException {
-		ByteArrayInputStream is = new ByteArrayInputStream(imageData);
-		ImageDescriptor desc = ImageDescriptor.createFromImageData(new ImageData(is));
-		is.close();
-		return desc;
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/viewsupport/BundleImageDescriptor.java b/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/viewsupport/BundleImageDescriptor.java
deleted file mode 100644
index ef2b5eb..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/viewsupport/BundleImageDescriptor.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.client.ui.viewsupport;
-
-import org.eclipse.jface.resource.CompositeImageDescriptor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
-import org.osgi.framework.Bundle;
-
-/**
- * @since 1.0
- */
-public class BundleImageDescriptor extends CompositeImageDescriptor {
-
-	private ImageDescriptor baseDescriptor;
-	private int bundleState;
-	private Point size;
-
-	public BundleImageDescriptor(ImageDescriptor baseDescriptor, int bundleState, Point size) {
-		this.baseDescriptor = baseDescriptor;
-		this.bundleState = bundleState;
-		this.size = size;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.resource.CompositeImageDescriptor#drawCompositeImage(int, int)
-	 */
-	protected void drawCompositeImage(int width, int height) {
-		ImageData bg = getImageData(baseDescriptor);
-		// draw the base image as background
-		drawImage(bg, 0, 0);
-		// draw the status overlay in the bottom left
-		drawBottomLeft();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.resource.CompositeImageDescriptor#getSize()
-	 */
-	protected Point getSize() {
-		return size;
-	}
-
-	private void drawBottomLeft() {
-		Point size = getSize();
-		int x = 0; // apply additional icons?
-		ImageData data = null;
-		switch (bundleState) {
-			case Bundle.ACTIVE :
-				data = getImageData(JMXPluginImages.IMGDESC_OVR_BUNDLE_ACTIVE);
-				break;
-			case Bundle.INSTALLED :
-				data = getImageData(JMXPluginImages.IMGDESC_OVR_BUNDLE_INSTALLED);
-				break;
-			case Bundle.RESOLVED :
-				data = getImageData(JMXPluginImages.IMGDESC_OVR_BUNDLE_RESOLVED);
-				break;
-			default :
-				return;
-		}
-		drawImage(data, x, size.y - data.height);
-		x += data.width;
-	}
-
-	private ImageData getImageData(ImageDescriptor descriptor) {
-		ImageData data = descriptor.getImageData();
-		if (data == null) {
-			data = DEFAULT_IMAGE_DATA;
-		}
-		return data;
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/viewsupport/ImageImageDescriptor.java b/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/viewsupport/ImageImageDescriptor.java
deleted file mode 100644
index 0cbd671..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/viewsupport/ImageImageDescriptor.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.client.ui.viewsupport;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-
-/**
- * @since 1.0
- */
-public class ImageImageDescriptor extends ImageDescriptor {
-
-	private Image image;
-
-	/**
-	 * Constructor for ImagImageDescriptor.
-	 */
-	public ImageImageDescriptor(Image image) {
-		super();
-		this.image = image;
-	}
-
-	/* (non-Javadoc)
-	 * @see ImageDescriptor#getImageData()
-	 */
-	public ImageData getImageData() {
-		return image.getImageData();
-	}
-
-	/* (non-Javadoc)
-	 * @see Object#equals(Object)
-	 */
-	public boolean equals(Object obj) {
-		return (obj != null) && getClass().equals(obj.getClass()) && image.equals(((ImageImageDescriptor) obj).image);
-	}
-
-	/* (non-Javadoc)
-	 * @see Object#hashCode()
-	 */
-	public int hashCode() {
-		return image.hashCode();
-	}
-
-}
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/viewsupport/ImageRegistry.java b/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/viewsupport/ImageRegistry.java
deleted file mode 100644
index 3854c63..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/viewsupport/ImageRegistry.java
+++ /dev/null

@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.client.ui.viewsupport;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * A registry that maps <code>ImageDescriptors</code> to <code>Image</code>.
- * 
- * @since 1.0
- */
-public class ImageRegistry {
-
-	private HashMap registry = new HashMap(10);
-	private Display display;
-
-	/**
-	 * Creates a new image descriptor registry for the current or default display,
-	 * respectively.
-	 */
-	public ImageRegistry() {
-		this(getStandardDisplay());
-	}
-
-	/**
-	 * Creates a new image descriptor registry for the given display. All images
-	 * managed by this registry will be disposed when the display gets disposed.
-	 * 
-	 * @param display the display the images managed by this registry are allocated for 
-	 */
-	public ImageRegistry(Display display) {
-		this.display = display;
-		Assert.isNotNull(display);
-		hookDisplay();
-	}
-
-	/**
-	 * Returns the image associated with the given image descriptor.
-	 * 
-	 * @param descriptor the image descriptor for which the registry manages an image
-	 * @return the image associated with the image descriptor or <code>null</code>
-	 *  if the image descriptor can't create the requested image.
-	 */
-	public Image get(ImageDescriptor descriptor) {
-		Image result = (Image) registry.get(descriptor);
-		if (result != null) {
-			return result;
-		}
-		Assert.isTrue(display == getStandardDisplay(), "Allocating image for wrong display."); //$NON-NLS-1$
-		result = descriptor.createImage();
-		if (result != null) {
-			registry.put(descriptor, result);
-		}
-		return result;
-	}
-
-	/**
-	 * Disposes all images managed by this registry.
-	 */
-	public void dispose() {
-		for (Iterator iter = registry.values().iterator(); iter.hasNext();) {
-			Image image = (Image) iter.next();
-			image.dispose();
-		}
-		registry.clear();
-	}
-
-	// free all image resources on dispose
-	private void hookDisplay() {
-		display.disposeExec(new Runnable() {
-			public void run() {
-				dispose();
-			}
-		});
-	}
-
-	/**
-	 * Returns the standard display to be used. The method first checks, if
-	 * the thread calling this method has an associated disaply. If so, this
-	 * display is returned. Otherwise the method returns the default display.
-	 */
-	public static Display getStandardDisplay() {
-		Display display;
-		display = Display.getCurrent();
-		if (display == null)
-			display = Display.getDefault();
-		return display;
-	}
-}
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/viewsupport/JMXPluginImages.java b/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/viewsupport/JMXPluginImages.java
deleted file mode 100644
index 07647d1..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/viewsupport/JMXPluginImages.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.client.ui.viewsupport;
-
-import java.net.URL;
-import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.jmx.internal.client.Activator;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.osgi.framework.Bundle;
-
-/**
- * @since 1.0
- */
-public class JMXPluginImages {
-
-	public static final IPath ICONS_PATH = new Path("$nl$/icons/"); //$NON-NLS-1$
-	public static final IPath ICONS_MB_PATH = new Path(ICONS_PATH.append("mb/").toString()); //$NON-NLS-1$
-
-	private static ImageRegistry registry;
-
-	public static final Image IMG_MANAGED_BUNDLE = createManaged(ICONS_MB_PATH, "bundle.gif"); //$NON-NLS-1$
-	public static final Image IMG_MANAGED_COMPONENT = createManaged(ICONS_MB_PATH, "component.gif"); //$NON-NLS-1$
-	public static final Image IMG_MBEAN_OPERATION = createManaged(ICONS_MB_PATH, "mbean_operation.gif"); //$NON-NLS-1$
-	public static final Image IMG_MBEAN_OPERATIONS = createManaged(ICONS_MB_PATH, "mbean_operations.gif"); //$NON-NLS-1$
-	public static final Image IMG_MBEAN_OPERATIONS_NONE = createManaged(ICONS_MB_PATH, "mbean_operation_none.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor IMGDESC_OVR_BUNDLE_ACTIVE = create("mb/", "ovr_bundle_active.gif", true); //$NON-NLS-1$ //$NON-NLS-2$
-	public static final ImageDescriptor IMGDESC_OVR_BUNDLE_INSTALLED = create("mb/", "ovr_bundle_installed.gif", true); //$NON-NLS-1$ //$NON-NLS-2$
-	public static final ImageDescriptor IMGDESC_OVR_BUNDLE_RESOLVED = create("mb/", "ovr_bundle_resolved.gif", true); //$NON-NLS-1$ //$NON-NLS-2$
-
-	public static Image createManaged(IPath path, String name) {
-		ImageDescriptor desc = createImageDescriptor(Activator.getDefault().getBundle(), path.append(name), true);
-		if (registry == null) {
-			registry = new ImageRegistry();
-		}
-		return registry.get(desc);
-	}
-
-	public Image getImage(ImageDescriptor descriptor) {
-		return registry.get(descriptor);
-	}
-
-	public static ImageDescriptor createImageDescriptor(Bundle bundle, IPath path, boolean useMissingImageDescriptor) {
-		URL url = FileLocator.find(bundle, path, null);
-		if (url != null) {
-			return ImageDescriptor.createFromURL(url);
-		}
-		if (useMissingImageDescriptor) {
-			return ImageDescriptor.getMissingImageDescriptor();
-		}
-		return null;
-	}
-
-	private static ImageDescriptor create(String prefix, String name, boolean useMissingImageDescriptor) {
-		IPath path = ICONS_PATH.append(prefix).append(name);
-		return createImageDescriptor(Activator.getDefault().getBundle(), path, useMissingImageDescriptor);
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/viewsupport/ViewUtil.java b/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/viewsupport/ViewUtil.java
deleted file mode 100644
index 791bac2..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.client/src/org/eclipse/equinox/jmx/internal/client/ui/viewsupport/ViewUtil.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.client.ui.viewsupport;
-
-import org.eclipse.equinox.jmx.internal.client.ui.ClientUI;
-import org.eclipse.equinox.jmx.internal.client.ui.contributionsview.ContributionsViewPart;
-import org.eclipse.equinox.jmx.internal.client.ui.invocationView.InvocationView;
-import org.eclipse.equinox.jmx.internal.client.ui.mbeaninfoview.MBeanInfoViewPart;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.SectionPart;
-import org.eclipse.ui.forms.widgets.*;
-
-public class ViewUtil {
-
-	public static Composite createSection(String sectionTitle, String description, IManagedForm form, Composite parent, int cols, boolean fillBoth, boolean twistie) {
-		FormToolkit toolkit = form.getToolkit();
-		int flags = ExpandableComposite.TITLE_BAR;
-		if (twistie)
-			flags |= ExpandableComposite.TWISTIE;
-		if (description != null)
-			flags |= Section.DESCRIPTION;
-		SectionPart sectionPart = new SectionPart(parent, toolkit, flags);
-		sectionPart.initialize(form);
-		Section section = sectionPart.getSection();
-		section.setText(sectionTitle);
-		if (description != null)
-			section.setDescription(description);
-		flags = fillBoth ? GridData.FILL_BOTH : GridData.FILL_HORIZONTAL;
-		section.setLayoutData(new GridData(flags));
-		Composite composite = toolkit.createComposite(section);
-		composite.setLayout(new GridLayout(cols, false));
-		composite.setLayoutData(new GridData(flags));
-		section.setClient(composite);
-		if (twistie) {
-			section.setEnabled(false);
-			section.setExpanded(false);
-		}
-		return composite;
-	}
-
-	public static ContributionsViewPart getContributionsView() {
-		return (ContributionsViewPart) getView(ClientUI.VIEWID_CONTRIBUTIONS);
-	}
-
-	public static InvocationView getInvocationView() {
-		return (InvocationView) getView(ClientUI.VIEWID_INVOCATION);
-	}
-
-	public static MBeanInfoViewPart getBeanInfoView() {
-		return (MBeanInfoViewPart) getView(ClientUI.VIEWID_MBEANINFO);
-	}
-
-	private static IViewPart getView(String viewId) {
-		return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(viewId);
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.common.feature/.project b/monitoring/bundles/org.eclipse.equinox.jmx.common.feature/.project
deleted file mode 100644
index 741dd81..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.common.feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.jmx.common.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/monitoring/bundles/org.eclipse.equinox.jmx.common.feature/about.html b/monitoring/bundles/org.eclipse.equinox.jmx.common.feature/about.html
deleted file mode 100644
index 5d03fd4..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.common.feature/about.html
+++ /dev/null

@@ -1,28 +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 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.common.feature/build.properties b/monitoring/bundles/org.eclipse.equinox.jmx.common.feature/build.properties
deleted file mode 100644
index 4442ec0..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.common.feature/build.properties
+++ /dev/null

@@ -1,3 +0,0 @@
-bin.includes = feature.xml,\
-               about.html
-src.includes = about.html

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.common.feature/feature.xml b/monitoring/bundles/org.eclipse.equinox.jmx.common.feature/feature.xml
deleted file mode 100644
index a338e18..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.common.feature/feature.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.equinox.jmx.common.feature"
-      label="Resource Monitoring Common Feature (Incubation)"
-      version="1.0.0.qualifier"
-      provider-name="Eclipse.org">
-
-   <description url="http://www.eclipse.org/equinox/incubator/monitoring/index.php">
-      Common infrastructure for managing OSGi-based systems using JMX.
-   </description>
-
-   <license url="http://www.eclipse.org/org/documents/epl-v10.php">
-      Eclipse Public License v1.0.
-   </license>
-
-   <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.apache.ws.commons.util"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.ws.jaxme"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.xmlrpc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.jmx.common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.management"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.management.remote"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server.feature/.project b/monitoring/bundles/org.eclipse.equinox.jmx.server.feature/.project
deleted file mode 100644
index 6e7150e..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server.feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.jmx.server-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/monitoring/bundles/org.eclipse.equinox.jmx.server.feature/about.html b/monitoring/bundles/org.eclipse.equinox.jmx.server.feature/about.html
deleted file mode 100644
index 5d03fd4..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server.feature/about.html
+++ /dev/null

@@ -1,28 +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 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server.feature/build.properties b/monitoring/bundles/org.eclipse.equinox.jmx.server.feature/build.properties
deleted file mode 100644
index ddfe69f..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server.feature/build.properties
+++ /dev/null

@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# 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/monitoring/bundles/org.eclipse.equinox.jmx.server.feature/feature.xml b/monitoring/bundles/org.eclipse.equinox.jmx.server.feature/feature.xml
deleted file mode 100644
index 648cb27..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server.feature/feature.xml
+++ /dev/null

@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.equinox.jmx.server.feature"
-      label="Resource Monitoring Server Feature (Incubation)"
-      version="1.0.0.qualifier"
-      provider-name="Eclipse.org">
-
-   <description url="http://www.eclipse.org/equinox/incubator/monitoring/index.php">
-      Server-side infrastructure for managing OSGi-based systems using JMX.
-   </description>
-
-   <license url="http://www.eclipse.org/org/documents/epl-v10.php">
-      Eclipse Public License v1.0.
-   </license>
-
-   <requires>
-      <import feature="org.eclipse.equinox.jmx.common.feature" version="1.0.0.qualifier"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.core.resources.jmx"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.jmx.server"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.preferences.jmx"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.osgi.jmx"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.jmx.vm"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.swt.jmx"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.jmx.server.rmi"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.jmx.server.xmlrpc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.registry.jmx"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.mortbay.jetty"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.servlet"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/.classpath b/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/.cvsignore b/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/.project b/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/.project
deleted file mode 100644
index fc2cf9f..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.jmx.server.rmi</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/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/.settings/org.eclipse.jdt.core.prefs b/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8dac44b..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,309 +0,0 @@
-#Thu May 10 13:52:24 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-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.hiddenCatchBlock=warning
-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.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-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.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-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.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=800
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/.settings/org.eclipse.jdt.ui.prefs b/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index f3694a5..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,9 +0,0 @@
-#Thu Feb 22 14:20:17 EST 2007
-eclipse.preferences.version=1
-formatter_profile=_core
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.staticondemandthreshold=99

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/META-INF/MANIFEST.MF b/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/META-INF/MANIFEST.MF
deleted file mode 100644
index 1ec702c..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: RMI Transport Server Plug-in (Incubation)
-Bundle-SymbolicName: org.eclipse.equinox.jmx.server.rmi;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Localization: plugin
-Import-Package: javax.management,
- javax.management.remote,
- org.eclipse.core.runtime;common=split,
- org.osgi.framework,
- org.eclipse.equinox.jmx.server
-Eclipse-LazyStart: true
-Bundle-Activator: org.eclipse.equinox.jmx.internal.rmi.Activator
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,
- CDC-1.0/Foundation-1.0,
- J2SE-1.3
-Bundle-Vendor: Eclipse.org

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/about.html b/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/about.html
deleted file mode 100644
index 5d03fd4..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/about.html
+++ /dev/null

@@ -1,28 +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 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/build.properties b/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/build.properties
deleted file mode 100644
index 3a4d457..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/build.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               server.policy,\
-               about.html
-src.includes = about.html
-javacSource=1.3
-javacTarget=1.1

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/plugin.xml b/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/plugin.xml
deleted file mode 100644
index af780d6..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/plugin.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         point="org.eclipse.equinox.jmx.server.provider">
-      <provider
-            class="org.eclipse.equinox.jmx.internal.rmi.RMIServer"
-            protocol="rmi"/>
-   </extension>
-
-</plugin>

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/server.policy b/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/server.policy
deleted file mode 100644
index a5709c0..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/server.policy
+++ /dev/null

@@ -1 +0,0 @@
-grant { permission java.security.AllPermission; };
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/src/org/eclipse/equinox/jmx/internal/rmi/Activator.java b/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/src/org/eclipse/equinox/jmx/internal/rmi/Activator.java
deleted file mode 100644
index 9a40603..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/src/org/eclipse/equinox/jmx/internal/rmi/Activator.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.rmi;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class Activator implements BundleActivator {
-
-	private static BundleContext context;
-
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext bundleContext) throws Exception {
-		Activator.context = bundleContext;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext bundleContext) throws Exception {
-		Activator.context = null;
-	}
-
-	public static BundleContext getBundleContext() {
-		return context;
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/src/org/eclipse/equinox/jmx/internal/rmi/RMIServer.java b/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/src/org/eclipse/equinox/jmx/internal/rmi/RMIServer.java
deleted file mode 100644
index f940d05..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi/src/org/eclipse/equinox/jmx/internal/rmi/RMIServer.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.rmi;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.rmi.RMISecurityManager;
-import java.rmi.registry.LocateRegistry;
-import java.util.Map;
-import javax.management.MBeanServer;
-import javax.management.remote.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.jmx.server.IJMXConnectorServerProvider;
-
-public class RMIServer implements IJMXConnectorServerProvider {
-
-	private int port;
-
-	public JMXServiceURL getJMXServiceURL(String host, int port, String protocol, String domain) throws MalformedURLException {
-		this.port = port;
-		return new JMXServiceURL("service:jmx:rmi:///jndi/rmi://" + host + ":" + port + "/" + domain);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.remote.JMXConnectorServerProvider#newJMXConnectorServer(javax.management.remote.JMXServiceURL, java.util.Map, javax.management.MBeanServer)
-	 */
-	public JMXConnectorServer newJMXConnectorServer(JMXServiceURL arg0, Map arg1, MBeanServer arg2) throws IOException {
-		initialize();
-		return JMXConnectorServerFactory.newJMXConnectorServer(arg0, arg1, arg2);
-	}
-
-	private void initialize() throws IOException {
-		// load the security policy from the bundle install location
-		IPath serverPolicyFileName = new Path("server.policy"); //$NON-NLS-1$
-		URL serverPolicyBundleURL = FileLocator.find(Activator.getBundleContext().getBundle(), serverPolicyFileName, null);
-		if (serverPolicyBundleURL == null)
-			throw new FileNotFoundException("Unable to find server policy file.");
-		serverPolicyBundleURL = FileLocator.toFileURL(serverPolicyBundleURL);
-		System.setProperty("java.security.policy", serverPolicyBundleURL.getFile()); //$NON-NLS-1$
-		// must register port and rmi security manager
-		LocateRegistry.createRegistry(port);
-		System.setSecurityManager(new RMISecurityManager());
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/.classpath b/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/.cvsignore b/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/.project b/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/.project
deleted file mode 100644
index a121d9c..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.jmx.server.xmlrpc</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/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/.settings/org.eclipse.jdt.core.prefs b/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1e525e6..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,311 +0,0 @@
-#Mon Feb 26 11:27:25 EST 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1
-org.eclipse.jdt.core.compiler.compliance=1.3
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=ignore
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-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.hiddenCatchBlock=warning
-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.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-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.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-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.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_comments=false
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=800
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/.settings/org.eclipse.jdt.ui.prefs b/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 5da134c..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,9 +0,0 @@
-#Mon Feb 26 11:27:25 EST 2007
-eclipse.preferences.version=1
-formatter_profile=_core
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.staticondemandthreshold=99

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/META-INF/MANIFEST.MF b/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/META-INF/MANIFEST.MF
deleted file mode 100644
index 2303527..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: XMLRPC Transport Server Plug-in (Incubation)
-Bundle-SymbolicName: org.eclipse.equinox.jmx.server.xmlrpc;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,
- CDC-1.0/Foundation-1.0,
- J2SE-1.3
-Import-Package: javax.management,
- javax.management.loading,
- javax.management.remote,
- org.apache.xmlrpc,
- org.apache.xmlrpc.server,
- org.apache.xmlrpc.webserver,
- org.eclipse.equinox.jmx.common,
- org.eclipse.equinox.jmx.common.util,
- org.eclipse.equinox.jmx.server,
- javax.servlet;version="[2.4.0,2.5.0)",
- javax.servlet.http;version="[2.4.0,2.5.0)",
- org.mortbay.http;version="[5.1.0,6.0.0)",
- org.mortbay.jetty.servlet;version="[5.1.0,6.0.0)",
- org.mortbay.util;version="[5.1.0,6.0.0)"

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/about.html b/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/about.html
deleted file mode 100644
index 5d03fd4..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/about.html
+++ /dev/null

@@ -1,28 +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 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/build.properties b/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/build.properties
deleted file mode 100644
index cd0aa26..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/build.properties
+++ /dev/null

@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html
-src.includes = about.html
-javacSource=1.3
-javacTarget=1.1

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/plugin.xml b/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/plugin.xml
deleted file mode 100644
index 5ff3aab..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/plugin.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         point="org.eclipse.equinox.jmx.server.provider">
-      <provider
-            class="org.eclipse.equinox.jmx.server.internal.xmlrpc.XMLRPCServer"
-            protocol="xmlrpc"/>
-   </extension>
-
-</plugin>

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/src/org/eclipse/equinox/jmx/server/internal/xmlrpc/XMLRPCJMXConnectorServer.java b/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/src/org/eclipse/equinox/jmx/server/internal/xmlrpc/XMLRPCJMXConnectorServer.java
deleted file mode 100644
index 473888b..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/src/org/eclipse/equinox/jmx/server/internal/xmlrpc/XMLRPCJMXConnectorServer.java
+++ /dev/null

@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.server.internal.xmlrpc;
-
-import java.io.IOException;
-import java.util.Map;
-import javax.management.MBeanServer;
-import javax.management.remote.JMXConnectorServer;
-import javax.management.remote.JMXServiceURL;
-
-public class XMLRPCJMXConnectorServer extends JMXConnectorServer {
-
-	private JMXServiceURL url;
-	private XMLRPCMBeanServerAdapter xmlrpcServer;
-
-	public XMLRPCJMXConnectorServer(JMXServiceURL url, MBeanServer mbeanServer) {
-		this.url = url;
-		xmlrpcServer = new XMLRPCMBeanServerAdapter(url.getPort(), mbeanServer);
-		super.setMBeanServerForwarder(xmlrpcServer);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.remote.JMXConnectorServerMBean#start()
-	 */
-	public synchronized void start() throws IOException {
-		xmlrpcServer.start();
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.remote.JMXConnectorServerMBean#stop()
-	 */
-	public synchronized void stop() throws IOException {
-		xmlrpcServer.stop();
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.remote.JMXConnectorServerMBean#isActive()
-	 */
-	public synchronized boolean isActive() {
-		return xmlrpcServer.isActive();
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.remote.JMXConnectorServerMBean#getAddress()
-	 */
-	public JMXServiceURL getAddress() {
-		return url;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.remote.JMXConnectorServerMBean#getAttributes()
-	 */
-	public Map getAttributes() {
-		return null;
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/src/org/eclipse/equinox/jmx/server/internal/xmlrpc/XMLRPCMBeanServerAdapter.java b/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/src/org/eclipse/equinox/jmx/server/internal/xmlrpc/XMLRPCMBeanServerAdapter.java
deleted file mode 100644
index 64b3082..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/src/org/eclipse/equinox/jmx/server/internal/xmlrpc/XMLRPCMBeanServerAdapter.java
+++ /dev/null

@@ -1,541 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.server.internal.xmlrpc;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.lang.reflect.Method;
-import java.util.*;
-import javax.management.*;
-import javax.management.loading.ClassLoaderRepository;
-import javax.management.remote.MBeanServerForwarder;
-import javax.servlet.*;
-import org.apache.xmlrpc.*;
-import org.apache.xmlrpc.server.XmlRpcHandlerMapping;
-import org.apache.xmlrpc.server.XmlRpcNoSuchHandlerException;
-import org.apache.xmlrpc.webserver.XmlRpcServlet;
-import org.eclipse.equinox.jmx.common.NamedNotification;
-import org.eclipse.equinox.jmx.common.util.RingBuffer;
-import org.mortbay.http.*;
-import org.mortbay.jetty.servlet.ServletHandler;
-import org.mortbay.jetty.servlet.ServletHolder;
-
-public class XMLRPCMBeanServerAdapter implements MBeanServerForwarder, NotificationListener {
-
-	private static final int NOTIFICATIONS_BUFFER_SIZE = 100;
-	private static final String INTERNAL_CONTEXT_CLASSLOADER = "internal.ContextClassLoader"; //$NON-NLS-1$
-	private static final String INTERNAL_MAPPING = "internal.Mapping"; //$NON-NLS-1$
-
-	private final Map notificationBroadcasters = new HashMap();
-	private final RingBuffer notificationsBuffer = new RingBuffer(NOTIFICATIONS_BUFFER_SIZE);
-	private final HttpServer webServer;
-	private final XmlRpcHandlerMappingImpl mapping;
-	private MBeanServer mbs;
-	private boolean started;
-
-	/**
-	 * XML-RPC Web server adapter that allows for dynamic adding of handlers.  It
-	 * is important to note that any handler mapping registered with the server
-	 * is replaced with our custom handler mapping implementation.
-	 * 
-	 * @param webServer The webserver to adapt.
-	 */
-	public XMLRPCMBeanServerAdapter(int port, MBeanServer mbs) {
-		this.webServer = new HttpServer();
-		this.mbs = mbs;
-		mapping = new XmlRpcHandlerMappingImpl();
-		// support retrieval of notifications from clients
-		mapping.addNameHandler("retrieveNotifications"); //$NON-NLS-1$
-		SocketListener httpListener = new SocketListener();
-		httpListener.setPort(port);
-		if (httpListener != null)
-			webServer.addListener(httpListener);
-
-		ServletHandler servlets = new ServletHandler();
-		servlets.setAutoInitializeServlets(true);
-
-		ServletHolder holder = servlets.addServlet("/", InternalHttpServiceServlet.class.getName()); //$NON-NLS-1$
-		holder.setInitOrder(0);
-		holder.setInitParameter("enabledForExtensions", "true"); //$NON-NLS-1$ //$NON-NLS-2$
-
-		HttpContext httpContext = new HttpContext();
-		httpContext.setAttribute(INTERNAL_CONTEXT_CLASSLOADER, Thread.currentThread().getContextClassLoader());
-		httpContext.setAttribute(INTERNAL_MAPPING, mapping);
-		httpContext.setClassLoader(this.getClass().getClassLoader());
-		httpContext.setContextPath("/"); //$NON-NLS-1$
-		httpContext.addHandler(servlets);
-
-		webServer.addContext(httpContext);
-	}
-
-	public void start() throws IOException {
-		try {
-			webServer.start();
-		} catch (IOException e) {
-			throw e;
-		}catch (Exception e) {
-			e.printStackTrace();
-			return;
-		}
-		started = true;
-	}
-
-	public void stop() {
-		try {
-			webServer.stop();
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-			return;
-		}
-		started = false;
-	}
-
-	public boolean isActive() {
-		return started;
-	}
-
-	public static class InternalHttpServiceServlet extends XmlRpcServlet {
-		private static final long serialVersionUID = 6297772804215794345L;
-		private ClassLoader contextLoader;
-		private XmlRpcHandlerMappingImpl mapping;
-
-		public void init(ServletConfig config) throws ServletException {
-			ServletContext context = config.getServletContext();
-			contextLoader = (ClassLoader) context.getAttribute(INTERNAL_CONTEXT_CLASSLOADER);
-			mapping = (XmlRpcHandlerMappingImpl) context.getAttribute(INTERNAL_MAPPING);
-
-			Thread thread = Thread.currentThread();
-			ClassLoader current = thread.getContextClassLoader();
-			thread.setContextClassLoader(contextLoader);
-			try {
-				super.init(config);
-			} finally {
-				thread.setContextClassLoader(current);
-			}
-		}
-
-		public void destroy() {
-			Thread thread = Thread.currentThread();
-			ClassLoader current = thread.getContextClassLoader();
-			thread.setContextClassLoader(contextLoader);
-			try {
-				super.destroy();
-			} finally {
-				thread.setContextClassLoader(current);
-			}
-			contextLoader = null;
-		}
-
-		public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException {
-			Thread thread = Thread.currentThread();
-			ClassLoader current = thread.getContextClassLoader();
-			thread.setContextClassLoader(contextLoader);
-			try {
-				super.service(req, res);
-			} finally {
-				thread.setContextClassLoader(current);
-			}
-		}
-		
-		protected XmlRpcHandlerMapping newXmlRpcHandlerMapping() {
-			return mapping;
-		}
-		
-	}
-	
-	private class XmlRpcHandlerMappingImpl implements XmlRpcHandlerMapping {
-
-		// use hashtable as synchronization is required
-		private final Map handlerMap = new Hashtable();
-		private final Handler handler = new Handler();
-
-		public void addNameHandler(String name) {
-			handlerMap.put(name, handler);
-		}
-
-		public void addObjectHandler(ObjectName name, Object obj) {
-			handlerMap.put(name.toString(), handler);
-			// if we are to handle the object, we must attempt to register with it 
-			// to receive notifications so we are able to forward them to connected clients.
-			if (obj instanceof NotificationBroadcaster) {
-				((NotificationBroadcaster) obj).addNotificationListener(XMLRPCMBeanServerAdapter.this, null, null);
-				// cache the broadcaster and its associated object name 
-				notificationBroadcasters.put(obj, name);
-			}
-		}
-
-		/* (non-Javadoc)
-		 * @see org.apache.xmlrpc.server.XmlRpcHandlerMapping#getHandler(java.lang.String)
-		 */
-		public XmlRpcHandler getHandler(String handlerName) throws XmlRpcNoSuchHandlerException, XmlRpcException {
-			XmlRpcHandler result = (XmlRpcHandler) handlerMap.get(parseRequest(handlerName)[0]);
-			return result;
-		}
-
-		private String[] parseRequest(String requestName) {
-			int delimIdx = requestName.indexOf('|');
-			String[] result = null;
-			if (delimIdx != -1) {
-				result = new String[2];
-				result[0] = requestName.substring(0, delimIdx);
-				result[1] = requestName.substring(delimIdx + 1);
-			} else {
-				result = new String[] {requestName};
-			}
-			return result;
-		}
-
-		private class Handler implements XmlRpcHandler {
-
-			public Handler() {
-			}
-
-			public Object execute(XmlRpcRequest pRequest) throws XmlRpcException {
-				String request[] = parseRequest(pRequest.getMethodName());
-				String methodName = null;
-				if (request.length == 1) {
-					// mbean server request
-					methodName = request[0];
-				} else if (request.length == 2) {
-					// mbean request
-					methodName = request[1];
-				} else {
-					// unsupported request format
-					return null;
-				}
-				int nParams = pRequest.getParameterCount();
-				Class paramTypes[] = new Class[nParams];
-				Object params[] = new Object[nParams];
-				String signature[] = new String[nParams];
-				for (int i = 0; i < nParams; i++) {
-					Object iParam = pRequest.getParameter(i);
-					paramTypes[i] = iParam.getClass();
-					params[i] = iParam;
-					signature[i] = iParam.getClass().getName();
-				}
-				try {
-					if (request.length == 1) {
-						Method method = XMLRPCMBeanServerAdapter.this.getClass().getMethod(methodName, paramTypes);
-						return method.invoke(XMLRPCMBeanServerAdapter.this, params);
-					}
-					// invoke operation on object instance
-					return invoke(ObjectName.getInstance(request[0]), methodName, params, signature);
-				} catch (Exception e) {
-					throw new XmlRpcException(e.getMessage(), e);
-				}
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.remote.MBeanServerForwarder#getMBeanServer()
-	 */
-	public MBeanServer getMBeanServer() {
-		return this;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.remote.MBeanServerForwarder#setMBeanServer(javax.management.MBeanServer)
-	 */
-	public void setMBeanServer(MBeanServer mbs) {
-		if (this.mbs == null) {
-			this.mbs = mbs;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#createMBean(java.lang.String, javax.management.ObjectName)
-	 */
-	public ObjectInstance createMBean(String className, ObjectName name) throws ReflectionException, InstanceAlreadyExistsException, MBeanRegistrationException, MBeanException, NotCompliantMBeanException {
-		return mbs.createMBean(className, name);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#createMBean(java.lang.String, javax.management.ObjectName, javax.management.ObjectName)
-	 */
-	public ObjectInstance createMBean(String className, ObjectName name, ObjectName loaderName) throws ReflectionException, InstanceAlreadyExistsException, MBeanRegistrationException, MBeanException, NotCompliantMBeanException, InstanceNotFoundException {
-		return mbs.createMBean(className, name, loaderName);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#createMBean(java.lang.String, javax.management.ObjectName, java.lang.Object[], java.lang.String[])
-	 */
-	public ObjectInstance createMBean(String className, ObjectName name, Object[] params, String[] signature) throws ReflectionException, InstanceAlreadyExistsException, MBeanRegistrationException, MBeanException, NotCompliantMBeanException {
-		return mbs.createMBean(className, name, params, signature);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#createMBean(java.lang.String, javax.management.ObjectName, javax.management.ObjectName, java.lang.Object[], java.lang.String[])
-	 */
-	public ObjectInstance createMBean(String className, ObjectName name, ObjectName loaderName, Object[] params, String[] signature) throws ReflectionException, InstanceAlreadyExistsException, MBeanRegistrationException, MBeanException, NotCompliantMBeanException, InstanceNotFoundException {
-		return mbs.createMBean(className, name, loaderName, params, signature);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#registerMBean(java.lang.Object, javax.management.ObjectName)
-	 */
-	public ObjectInstance registerMBean(Object object, ObjectName name) throws InstanceAlreadyExistsException, MBeanRegistrationException, NotCompliantMBeanException {
-		mapping.addObjectHandler(name, object);
-		return mbs.registerMBean(object, name);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#unregisterMBean(javax.management.ObjectName)
-	 */
-	public void unregisterMBean(ObjectName name) throws InstanceNotFoundException, MBeanRegistrationException {
-		mbs.unregisterMBean(name);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#getObjectInstance(javax.management.ObjectName)
-	 */
-	public ObjectInstance getObjectInstance(ObjectName name) throws InstanceNotFoundException {
-		return mbs.getObjectInstance(name);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#queryMBeans(javax.management.ObjectName, javax.management.QueryExp)
-	 */
-	public Set queryMBeans(ObjectName name, QueryExp query) {
-		return mbs.queryMBeans(name, query);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#queryNames(javax.management.ObjectName, javax.management.QueryExp)
-	 */
-	public Set queryNames(ObjectName name, QueryExp query) {
-		return mbs.queryNames(name, query);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#isRegistered(javax.management.ObjectName)
-	 */
-	public boolean isRegistered(ObjectName name) {
-		return mbs.isRegistered(name);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#getMBeanCount()
-	 */
-	public Integer getMBeanCount() {
-		return mbs.getMBeanCount();
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#getAttribute(javax.management.ObjectName, java.lang.String)
-	 */
-	public Object getAttribute(ObjectName name, String attribute) throws MBeanException, AttributeNotFoundException, InstanceNotFoundException, ReflectionException {
-		return mbs.getAttribute(name, attribute);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#getAttributes(javax.management.ObjectName, java.lang.String[])
-	 */
-	public AttributeList getAttributes(ObjectName name, String[] attributes) throws InstanceNotFoundException, ReflectionException {
-		return mbs.getAttributes(name, attributes);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#setAttribute(javax.management.ObjectName, javax.management.Attribute)
-	 */
-	public void setAttribute(ObjectName name, Attribute attribute) throws InstanceNotFoundException, AttributeNotFoundException, InvalidAttributeValueException, MBeanException, ReflectionException {
-		mbs.setAttribute(name, attribute);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#setAttributes(javax.management.ObjectName, javax.management.AttributeList)
-	 */
-	public AttributeList setAttributes(ObjectName name, AttributeList attributes) throws InstanceNotFoundException, ReflectionException {
-		return mbs.setAttributes(name, attributes);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#invoke(javax.management.ObjectName, java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	public Object invoke(ObjectName name, String operationName, Object[] params, String[] signature) throws InstanceNotFoundException, MBeanException, ReflectionException {
-		return mbs.invoke(name, operationName, params, signature);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#getDefaultDomain()
-	 */
-	public String getDefaultDomain() {
-		return mbs.getDefaultDomain();
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#getDomains()
-	 */
-	public String[] getDomains() {
-		return mbs.getDomains();
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#addNotificationListener(javax.management.ObjectName, javax.management.NotificationListener, javax.management.NotificationFilter, java.lang.Object)
-	 */
-	public void addNotificationListener(ObjectName name, NotificationListener listener, NotificationFilter filter, Object handback) throws InstanceNotFoundException {
-		mbs.addNotificationListener(name, listener, filter, handback);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#addNotificationListener(javax.management.ObjectName, javax.management.ObjectName, javax.management.NotificationFilter, java.lang.Object)
-	 */
-	public void addNotificationListener(ObjectName name, ObjectName listener, NotificationFilter filter, Object handback) throws InstanceNotFoundException {
-		mbs.addNotificationListener(name, listener, filter, handback);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#removeNotificationListener(javax.management.ObjectName, javax.management.ObjectName)
-	 */
-	public void removeNotificationListener(ObjectName name, ObjectName listener) throws InstanceNotFoundException, ListenerNotFoundException {
-		mbs.removeNotificationListener(name, listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#removeNotificationListener(javax.management.ObjectName, javax.management.ObjectName, javax.management.NotificationFilter, java.lang.Object)
-	 */
-	public void removeNotificationListener(ObjectName name, ObjectName listener, NotificationFilter filter, Object handback) throws InstanceNotFoundException, ListenerNotFoundException {
-		mbs.removeNotificationListener(name, listener, filter, handback);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#removeNotificationListener(javax.management.ObjectName, javax.management.NotificationListener)
-	 */
-	public void removeNotificationListener(ObjectName name, NotificationListener listener) throws InstanceNotFoundException, ListenerNotFoundException {
-		mbs.removeNotificationListener(name, listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#removeNotificationListener(javax.management.ObjectName, javax.management.NotificationListener, javax.management.NotificationFilter, java.lang.Object)
-	 */
-	public void removeNotificationListener(ObjectName name, NotificationListener listener, NotificationFilter filter, Object handback) throws InstanceNotFoundException, ListenerNotFoundException {
-		mbs.removeNotificationListener(name, listener, filter, handback);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#getMBeanInfo(javax.management.ObjectName)
-	 */
-	public MBeanInfo getMBeanInfo(ObjectName name) throws InstanceNotFoundException, IntrospectionException, ReflectionException {
-		return mbs.getMBeanInfo(name);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#isInstanceOf(javax.management.ObjectName, java.lang.String)
-	 */
-	public boolean isInstanceOf(ObjectName name, String className) throws InstanceNotFoundException {
-		return mbs.isInstanceOf(name, className);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#instantiate(java.lang.String)
-	 */
-	public Object instantiate(String className) throws ReflectionException, MBeanException {
-		return mbs.instantiate(className);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#instantiate(java.lang.String, javax.management.ObjectName)
-	 */
-	public Object instantiate(String className, ObjectName loaderName) throws ReflectionException, MBeanException, InstanceNotFoundException {
-		return mbs.instantiate(className, loaderName);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#instantiate(java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	public Object instantiate(String className, Object[] params, String[] signature) throws ReflectionException, MBeanException {
-		return mbs.instantiate(className, params, signature);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#instantiate(java.lang.String, javax.management.ObjectName, java.lang.Object[], java.lang.String[])
-	 */
-	public Object instantiate(String className, ObjectName loaderName, Object[] params, String[] signature) throws ReflectionException, MBeanException, InstanceNotFoundException {
-		return mbs.instantiate(className, loaderName, params, signature);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#deserialize(javax.management.ObjectName, byte[])
-	 */
-	public ObjectInputStream deserialize(ObjectName name, byte[] data) throws InstanceNotFoundException, OperationsException {
-		return mbs.deserialize(name, data);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#deserialize(java.lang.String, byte[])
-	 */
-	public ObjectInputStream deserialize(String className, byte[] data) throws OperationsException, ReflectionException {
-		return mbs.deserialize(className, data);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#deserialize(java.lang.String, javax.management.ObjectName, byte[])
-	 */
-	public ObjectInputStream deserialize(String className, ObjectName loaderName, byte[] data) throws InstanceNotFoundException, OperationsException, ReflectionException {
-		return mbs.deserialize(className, loaderName, data);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#getClassLoaderFor(javax.management.ObjectName)
-	 */
-	public ClassLoader getClassLoaderFor(ObjectName mbeanName) throws InstanceNotFoundException {
-		return mbs.getClassLoaderFor(mbeanName);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#getClassLoader(javax.management.ObjectName)
-	 */
-	public ClassLoader getClassLoader(ObjectName loaderName) throws InstanceNotFoundException {
-		return mbs.getClassLoader(loaderName);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.MBeanServer#getClassLoaderRepository()
-	 */
-	public ClassLoaderRepository getClassLoaderRepository() {
-		return mbs.getClassLoaderRepository();
-	}
-
-	public synchronized NamedNotification[] retrieveNotifications(Long startId) {
-		int nextPos = notificationsBuffer.getNextPosition();
-		if (nextPos == 0) {
-			return new NamedNotification[0];
-		}
-		NamedNotification lastNotification = (NamedNotification) notificationsBuffer.getObject(nextPos - 1);
-		long pStartId = startId.longValue();
-		if (lastNotification.getNotificationId() < pStartId) {
-			return new NamedNotification[0];
-		}
-		pStartId %= notificationsBuffer.getSize();
-		List result = new ArrayList(1);
-		for (; pStartId != nextPos; pStartId++) {
-			NamedNotification nn = (NamedNotification) notificationsBuffer.getObject((int) pStartId);
-			if (pStartId == notificationsBuffer.getSize()) {
-				pStartId %= notificationsBuffer.getSize();
-			}
-			result.add(nn);
-		}
-		return (NamedNotification[]) result.toArray(new NamedNotification[result.size()]);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.NotificationListener#handleNotification(javax.management.Notification, java.lang.Object)
-	 */
-	public synchronized void handleNotification(Notification notification, Object handback) {
-		// if the source of the notification is registered as a known broadcaster
-		// we store this notification and its object name for requesting clients
-		Object source = notification.getSource();
-		ObjectName broadcasterName = null;
-		if (source != null && (broadcasterName = (ObjectName) notificationBroadcasters.get(source)) != null) {
-			notificationsBuffer.add(new NamedNotification(broadcasterName, notification));
-		}
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/src/org/eclipse/equinox/jmx/server/internal/xmlrpc/XMLRPCServer.java b/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/src/org/eclipse/equinox/jmx/server/internal/xmlrpc/XMLRPCServer.java
deleted file mode 100644
index 461f158..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc/src/org/eclipse/equinox/jmx/server/internal/xmlrpc/XMLRPCServer.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.server.internal.xmlrpc;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.Map;
-import javax.management.MBeanServer;
-import javax.management.remote.JMXConnectorServer;
-import javax.management.remote.JMXServiceURL;
-import org.eclipse.equinox.jmx.server.IJMXConnectorServerProvider;
-
-public class XMLRPCServer implements IJMXConnectorServerProvider {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.IJMXConnectorServerProvider#getJMXServiceURL(java.lang.String, int, java.lang.String, java.lang.String)
-	 */
-	public JMXServiceURL getJMXServiceURL(String host, int port, String protocol, String domain) throws MalformedURLException {
-		return new JMXServiceURL("service:jmx:xmlrpc://" + host + ":" + port + "/" + (domain == null ? "" : domain));
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.remote.JMXConnectorServerProvider#newJMXConnectorServer(javax.management.remote.JMXServiceURL, java.util.Map, javax.management.MBeanServer)
-	 */
-	public JMXConnectorServer newJMXConnectorServer(JMXServiceURL arg0, Map arg1, MBeanServer arg2) throws IOException {
-		return new XMLRPCJMXConnectorServer(arg0, arg2);
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/.classpath b/monitoring/bundles/org.eclipse.equinox.jmx.server/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/.cvsignore b/monitoring/bundles/org.eclipse.equinox.jmx.server/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/.project b/monitoring/bundles/org.eclipse.equinox.jmx.server/.project
deleted file mode 100644
index 12e9097..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.jmx.server</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/monitoring/bundles/org.eclipse.equinox.jmx.server/.settings/org.eclipse.jdt.core.prefs b/monitoring/bundles/org.eclipse.equinox.jmx.server/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 3cb7d5a..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,313 +0,0 @@
-#Thu May 10 13:52:46 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-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.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-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.hiddenCatchBlock=warning
-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.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-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.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-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.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=800
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/.settings/org.eclipse.jdt.ui.prefs b/monitoring/bundles/org.eclipse.equinox.jmx.server/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 53164af..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,9 +0,0 @@
-#Thu Feb 22 14:20:16 EST 2007
-eclipse.preferences.version=1
-formatter_profile=_core
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.staticondemandthreshold=99

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/JMX Server n Client.launch b/monitoring/bundles/org.eclipse.equinox.jmx.server/JMX Server n Client.launch
deleted file mode 100644
index 07ea160..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/JMX Server n Client.launch
+++ /dev/null

@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="usefeatures" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<booleanAttribute key="useProduct" value="true"/>
-<stringAttribute key="vminstall" value="jdk1.5.0_06"/>
-<booleanAttribute key="tracing" value="true"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-</listAttribute>
-<mapAttribute key="tracingOptions">
-<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
-<mapEntry key="org.eclipse.equinox.registry/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/>
-<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/>
-<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
-<mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
-<mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/packages" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/content_assist/extensions" value="1000"/>
-<mapEntry key="org.eclipse.ui.ide/debug/gc" value="false"/>
-<mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/showSystemJobs" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/shutdown" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.init" value="800"/>
-<mapEntry key="org.eclipse.equinox.preferences/get" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.create" value="800"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/locks" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/swtdebug" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/set" value="false"/>
-<mapEntry key="org.eclipse.team.core/streams" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
-<mapEntry key="org.eclipse.equinox.registry/debug/events" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
-<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore" value="false"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/checkConditions" value="300"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/beginend" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/>
-<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
-<mapEntry key="org.eclipse.core.resources/build/interrupt" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
-<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/contentTypes" value="200"/>
-<mapEntry key="org.eclipse.ui/trace/commands" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/>
-<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
-<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
-<mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javamodel/cache" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/>
-<mapEntry key="org.eclipse.jdt.core.manipulation/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/general" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/reconcile" value="1000"/>
-<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
-<mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
-<mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
-<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/>
-<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/>
-<mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewer_cache_debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/debug" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser/inprocess" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.control" value="800"/>
-<mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/>
-<mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/>
-<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
-<mapEntry key="org.eclipse.team.core/threading" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/packageadmin/timing" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/>
-<mapEntry key="org.eclipse.help/debug/context" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/content_assist_sorters/extensions" value=""/>
-<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/services" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/preferences/plugin" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/timing" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
-<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
-<mapEntry key="org.eclipse.help/debug/protocols" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ResultCollector" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/>
-<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
-<mapEntry key="org.eclipse.help.base/debug/search" value="false"/>
-<mapEntry key="org.eclipse.core.resources/natures" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
-<mapEntry key="org.eclipse.pde.core/cache" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
-<mapEntry key="org.eclipse.team.core/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/declaredImages" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/monitorbundles" value="false"/>
-<mapEntry key="org.eclipse.pde.build/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
-<mapEntry key="org.eclipse.help.base/debug" value="true"/>
-<mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/>
-<mapEntry key="org.eclipse.core.jobs/jobs" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/sources" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/uijob" value="200"/>
-<mapEntry key="org.eclipse.core.resources/strings" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPartReference" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.activate" value="200"/>
-<mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/javadeltalistener" value="500"/>
-<mapEntry key="org.eclipse.core.runtime/perf" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
-<mapEntry key="org.eclipse.core.contenttype/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
-<mapEntry key="org.eclipse.core.resources/contenttype" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/operations" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/>
-<mapEntry key="org.eclipse.ui/debug/contributions" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
-<mapEntry key="org.eclipse.core.resources/history" value="false"/>
-<mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
-<mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/>
-<mapEntry key="org.eclipse.debug.core/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
-<mapEntry key="org.eclipse.help/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
-<mapEntry key="org.eclipse.jface.text.source/debug/RevisionRulerColumn" value="false"/>
-<mapEntry key="org.eclipse.ui/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
-<mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/trace/classLoading" value="true"/>
-<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/FastPartitioner/PositionCache" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.performance" value="false"/>
-<mapEntry key="org.eclipse.pde.core/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
-<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/formatter/enable_new" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
-<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
-<mapEntry key="org.eclipse.ui/experimental/menus" value="false"/>
-<mapEntry key="org.eclipse.pde.core/classpath" value="false"/>
-</mapAttribute>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="selectedPlugin" value="org.eclipse.osgi"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<stringAttribute key="checked" value="[NONE]"/>
-<stringAttribute key="location" value="${system_property:user.home}/runtime-JMX_Server"/>
-<stringAttribute key="configLocation" value=""/>
-<booleanAttribute key="clearws" value="false"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-console -consoleLog -nosplash"/>
-<stringAttribute key="templateConfig" value=""/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="includeOptional" value="false"/>
-</launchConfiguration>

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/JMX Server.launch b/monitoring/bundles/org.eclipse.equinox.jmx.server/JMX Server.launch
deleted file mode 100644
index 4f9c757..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/JMX Server.launch
+++ /dev/null

@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;sourceLookupDirector&gt;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#10;&amp;lt;classpathContainer path=&amp;quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/j2sdk1.4.2_09&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.classpathContainer&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#10;&amp;lt;default/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#10;&lt;/sourceContainers&gt;&#10;&lt;/sourceLookupDirector&gt;&#10;"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="usefeatures" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<booleanAttribute key="useProduct" value="true"/>
-<stringAttribute key="vminstall" value="jdk1.5.0_06"/>
-<booleanAttribute key="tracing" value="true"/>
-<stringAttribute key="deselected_workspace_plugins" value="com.example.jmx.client,org.eclipsercp.jury,com.example.jmx.server,org.eclipse.core.resource.jmx.common,org.eclipse.core.runtime.jmx.server,org.eclipse.core.resource.jmx.client,org.eclipse.core.runtime.jmx.client,com.example.jmx.common,org.eclipse.core.resource.jmx.server,org.eclipse.core.runtime.jmx.common"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-</listAttribute>
-<stringAttribute key="selected_target_plugins" value="com.example.ps,com.ibm.icu,com.ibm.icu.source,com.ibm.jxesupport,com.jcraft.jsch,com.teaminabox.eclipse.sortit,org.apache.ant,org.apache.lucene,org.eclipse.ant.core,org.eclipse.ant.ui,org.eclipse.compare,org.eclipse.core.boot,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.expressions,org.eclipse.core.filebuffers,org.eclipse.core.filesystem,org.eclipse.core.filesystem.win32.x86,org.eclipse.core.jobs,org.eclipse.core.resources,org.eclipse.core.resources.compatibility,org.eclipse.core.resources.spysupport,org.eclipse.core.resources.win32,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.core.tools,org.eclipse.core.tools.resources,org.eclipse.core.variables,org.eclipse.debug.core,org.eclipse.debug.ui,org.eclipse.equinox.common,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.help.appserver,org.eclipse.help.base,org.eclipse.help.ui,org.eclipse.help.webapp,org.eclipse.html.editor,org.eclipse.jdt,org.eclipse.jdt.apt.core,org.eclipse.jdt.apt.ui,org.eclipse.jdt.core,org.eclipse.jdt.core.manipulation,org.eclipse.jdt.debug,org.eclipse.jdt.debug.ui,org.eclipse.jdt.doc.isv,org.eclipse.jdt.doc.user,org.eclipse.jdt.junit,org.eclipse.jdt.junit.runtime,org.eclipse.jdt.junit4.runtime,org.eclipse.jdt.launching,org.eclipse.jdt.launching.j9,org.eclipse.jdt.source,org.eclipse.jdt.ui,org.eclipse.jface,org.eclipse.jface.databinding,org.eclipse.jface.text,org.eclipse.ltk.core.refactoring,org.eclipse.ltk.ui.refactoring,org.eclipse.osgi,org.eclipse.osgi.services,org.eclipse.osgi.util,org.eclipse.pde,org.eclipse.pde.build,org.eclipse.pde.core,org.eclipse.pde.doc.user,org.eclipse.pde.junit.runtime,org.eclipse.pde.runtime,org.eclipse.pde.source,org.eclipse.pde.ui,org.eclipse.platform,org.eclipse.platform.doc.isv,org.eclipse.platform.doc.user,org.eclipse.platform.source,org.eclipse.platform.source.win32.win32.x86,org.eclipse.rcp,org.eclipse.rcp.source,org.eclipse.rcp.source.win32.win32.x86,org.eclipse.releng.tools,org.eclipse.sdk,org.eclipse.search,org.eclipse.swt,org.eclipse.swt.win32.win32.x86,org.eclipse.team.core,org.eclipse.team.cvs.core,org.eclipse.team.cvs.ssh,org.eclipse.team.cvs.ssh2,org.eclipse.team.cvs.ui,org.eclipse.team.ui,org.eclipse.text,org.eclipse.tomcat,org.eclipse.ui,org.eclipse.ui.browser,org.eclipse.ui.cheatsheets,org.eclipse.ui.console,org.eclipse.ui.editors,org.eclipse.ui.externaltools,org.eclipse.ui.forms,org.eclipse.ui.ide,org.eclipse.ui.intro,org.eclipse.ui.intro.universal,org.eclipse.ui.navigator,org.eclipse.ui.navigator.resources,org.eclipse.ui.presentations.r21,org.eclipse.ui.views,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.win32,org.eclipse.ui.workbench,org.eclipse.ui.workbench.compatibility,org.eclipse.ui.workbench.texteditor,org.eclipse.update.configurator,org.eclipse.update.core,org.eclipse.update.core.win32,org.eclipse.update.scheduler,org.eclipse.update.ui,org.junit,org.junit4,org.klomp.eclipse.formatjava"/>
-<mapAttribute key="tracingOptions">
-<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
-<mapEntry key="org.eclipse.equinox.registry/debug" value="false"/>
-<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/>
-<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
-<mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
-<mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/content_assist/extensions" value="1000"/>
-<mapEntry key="org.eclipse.osgi/debug/packages" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug/gc" value="false"/>
-<mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/showSystemJobs" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/shutdown" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.init" value="800"/>
-<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/get" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.create" value="800"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/locks" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/swtdebug" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/set" value="false"/>
-<mapEntry key="org.eclipse.team.core/streams" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
-<mapEntry key="org.eclipse.equinox.registry/debug/events" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
-<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/checkConditions" value="300"/>
-<mapEntry key="org.eclipse.core.resources/restore" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
-<mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/beginend" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
-<mapEntry key="org.eclipse.core.resources/build/interrupt" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
-<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/contentTypes" value="200"/>
-<mapEntry key="org.eclipse.ui/trace/commands" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug" value="true"/>
-<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/>
-<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
-<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
-<mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javamodel/cache" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
-<mapEntry key="org.eclipse.jdt.core.manipulation/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/general" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/reconcile" value="1000"/>
-<mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
-<mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
-<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
-<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/>
-<mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/>
-<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewer_cache_debug" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser/inprocess" value="false"/>
-<mapEntry key="org.eclipse.core.resources/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/>
-<mapEntry key="org.eclipse.ui/perf/part.control" value="800"/>
-<mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/>
-<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener" value="false"/>
-<mapEntry key="org.eclipse.team.core/threading" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/packageadmin/timing" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/>
-<mapEntry key="org.eclipse.help/debug/context" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/content_assist_sorters/extensions" value=""/>
-<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/services" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/preferences/plugin" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/timing" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
-<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
-<mapEntry key="org.eclipse.help/debug/protocols" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ResultCollector" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/>
-<mapEntry key="org.eclipse.core.resources/natures" value="false"/>
-<mapEntry key="org.eclipse.help.base/debug/search" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
-<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
-<mapEntry key="org.eclipse.pde.core/cache" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
-<mapEntry key="org.eclipse.team.core/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/>
-<mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/declaredImages" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/monitorbundles" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/>
-<mapEntry key="org.eclipse.pde.build/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
-<mapEntry key="org.eclipse.help.base/debug" value="true"/>
-<mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/>
-<mapEntry key="org.eclipse.ui/trace/sources" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/uijob" value="200"/>
-<mapEntry key="org.eclipse.core.resources/strings" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPartReference" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.activate" value="200"/>
-<mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/javadeltalistener" value="500"/>
-<mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/perf" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
-<mapEntry key="org.eclipse.core.contenttype/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
-<mapEntry key="org.eclipse.core.resources/contenttype" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/>
-<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/operations" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/contributions" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
-<mapEntry key="org.eclipse.core.resources/history" value="false"/>
-<mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
-<mapEntry key="org.eclipse.debug.core/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
-<mapEntry key="org.eclipse.help/debug" value="true"/>
-<mapEntry key="org.eclipse.jface.text.source/debug/RevisionRulerColumn" value="false"/>
-<mapEntry key="org.eclipse.ui/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
-<mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/classLoading" value="true"/>
-<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.jface.text/debug/FastPartitioner/PositionCache" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.performance" value="false"/>
-<mapEntry key="org.eclipse.pde.core/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
-<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/formatter/enable_new" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
-<mapEntry key="org.eclipse.ui/experimental/menus" value="false"/>
-<mapEntry key="org.eclipse.pde.core/classpath" value="false"/>
-</mapAttribute>
-<booleanAttribute key="automaticValidate" value="true"/>
-<stringAttribute key="selectedPlugin" value="org.eclipse.osgi"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<stringAttribute key="checked" value="[NONE]"/>
-<stringAttribute key="location" value="${system_property:user.home}/runtime-JMX_Server5"/>
-<stringAttribute key="selected_workspace_plugins" value="org.apache.commons.codec,org.apache.xmlrpc,org.eclipse.equinox.jmx.server.xmlrpc,org.eclipse.swt.jmx,org.eclipse.equinox.jmx.server,org.apache.commons.logging,org.apache.ws.commons.util,org.eclipse.osgi.jmx,org.eclipse.equinox.preferences.jmx,org.eclipse.equinox.jmx.server.rmi,org.eclipse.core.resources.jmx,org.apache.commons.httpclient,org.eclipse.equinox.jmx.common,org.eclipse.equinox.jmx.vm,org.apache.ws.jaxme"/>
-<stringAttribute key="configLocation" value=""/>
-<booleanAttribute key="clearws" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-console -consoleLog -nosplash -clean"/>
-<stringAttribute key="pde.version" value="3.2a"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.equinox.jmx.server.protocol2=xmlrpc"/>
-<stringAttribute key="templateConfig" value=""/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="includeOptional" value="true"/>
-</launchConfiguration>

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/META-INF/MANIFEST.MF b/monitoring/bundles/org.eclipse.equinox.jmx.server/META-INF/MANIFEST.MF
deleted file mode 100644
index 3618ce8..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,33 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Resource Monitoring Server Bundle (Incubation)
-Bundle-SymbolicName: org.eclipse.equinox.jmx.server;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Localization: plugin
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.equinox.jmx.server
-Bundle-Activator: org.eclipse.equinox.jmx.internal.server.Activator
-Bundle-Vendor: Eclipse.org
-Import-Package: javax.management,
- javax.management.loading,
- javax.management.modelmbean,
- javax.management.monitor,
- javax.management.openmbean,
- javax.management.relation,
- javax.management.remote,
- javax.management.remote.rmi,
- javax.management.timer,
- org.eclipse.core.runtime,
- org.eclipse.equinox.jmx.common,
- org.eclipse.equinox.jmx.common.util,
- org.eclipse.osgi.util,
- org.osgi.framework,
- org.osgi.service.log,
- org.osgi.util.tracker,
- org.xml.sax,
- org.xml.sax.ext,
- org.xml.sax.helpers
-Require-Bundle: org.eclipse.ui;resolution:=optional
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,
- CDC-1.0/Foundation-1.0,
- J2SE-1.3

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/about.html b/monitoring/bundles/org.eclipse.equinox.jmx.server/about.html
deleted file mode 100644
index 5d03fd4..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/about.html
+++ /dev/null

@@ -1,28 +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 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/build.properties b/monitoring/bundles/org.eclipse.equinox.jmx.server/build.properties
deleted file mode 100644
index fe07776..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/build.properties
+++ /dev/null

@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               readme.txt
-src.includes = about.html,\
-               schema/
-javacSource=1.3
-javacTarget=1.1

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/plugin.xml b/monitoring/bundles/org.eclipse.equinox.jmx.server/plugin.xml
deleted file mode 100644
index fe129ca..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/plugin.xml
+++ /dev/null

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-	<extension-point id="contribution" name="Contribution" schema="schema/contribution.exsd"/>
-	<extension-point id="provider" name="provider" schema="schema/provider.exsd"/>
-	<extension point="org.eclipse.ui.startup">
-		<startup class="org.eclipse.equinox.jmx.internal.server.UIStarter"/>
-	</extension>
-	<extension
-			id="application"
-			point="org.eclipse.core.runtime.applications">
-		<application>
-			<run class="org.eclipse.equinox.jmx.internal.server.Application"/>
-		</application>
-	</extension>
-	<extension
-			id="product"
-			point="org.eclipse.core.runtime.products">
-		<product
-			application="org.eclipse.equinox.jmx.server.application"
-			name="JMX Server">
-		</product>
-	</extension>
-</plugin>

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/readme.txt b/monitoring/bundles/org.eclipse.equinox.jmx.server/readme.txt
deleted file mode 100644
index f9ba117..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/readme.txt
+++ /dev/null

@@ -1,9 +0,0 @@
-Server Readme
--------------------
-
-By default the server starts on port 8118 and uses RMI as its transport. Both of
-these values can be changed via the following system properties:
-	org.eclipse.equinox.jmx.server.protocol
-	org.eclipse.equinox.jmx.server.port
-
-Currently you can only have one server running at a time, either RMI or XMLRPC.

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/schema/contribution.exsd b/monitoring/bundles/org.eclipse.equinox.jmx.server/schema/contribution.exsd
deleted file mode 100644
index e79dbdf..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/schema/contribution.exsd
+++ /dev/null

@@ -1,133 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.equinox.jmx.server.core">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.equinox.jmx.server.core" id="contribution" name="Contribution"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="contribution" minOccurs="1" maxOccurs="unbounded"/>
-            <sequence>
-               <element ref="extendsClass" minOccurs="0" maxOccurs="unbounded"/>
-            </sequence>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="contribution">
-      <complexType>
-         <sequence>
-            <element ref="extendsClass" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The class name of the contribution.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.equinox.jmx.server.core.ContributionProvider"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="isroot" type="boolean">
-            <annotation>
-               <documentation>
-                  Contribution extensions declare providers for specific class types.  The class attribute specifies the class that the provider is to be associated with.  The isroot attribute describes whether this provider is to be included as a root contribution, typically this would be set to true if the provider contributes child contributions; by default, if not set, it is assumed this provider does not contribute child contributions.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="extendsClass">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/schema/provider.exsd b/monitoring/bundles/org.eclipse.equinox.jmx.server/schema/provider.exsd
deleted file mode 100644
index b4d5802..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/schema/provider.exsd
+++ /dev/null

@@ -1,112 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.equinox.jmx.server">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.equinox.jmx.server" id="provider" name="provider"/>
-      </appInfo>
-      <documentation>
-         JMX protocol provider extension point.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="provider"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="provider">
-      <complexType>
-         <attribute name="class" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.equinox.jmx.server.IJMXConnectorServerProvider"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="protocol" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/server-1.4.product b/monitoring/bundles/org.eclipse.equinox.jmx.server/server-1.4.product
deleted file mode 100644
index fa8fb2c..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/server-1.4.product
+++ /dev/null

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.1"?>
-
-<product name="JMX Server" id="org.eclipse.equinox.jmx.server.product" application="org.eclipse.equinox.jmx.server.application" useFeatures="false">
-
-   <configIni use="default"/>
-
-   <launcherArgs>
-   </launcherArgs>
-
-   <windowImages/>
-
-   <launcher>
-      <solaris/>
-      <win useIco="false">
-         <bmp/>
-      </win>
-   </launcher>
-
-   <vm>
-   </vm>
-
-   <plugins>
-      <plugin id="javax.servlet"/>
-      <plugin id="net.sourceforge.mx4j"/>
-      <plugin id="org.apache.commons.codec"/>
-      <plugin id="org.apache.commons.httpclient"/>
-      <plugin id="org.apache.commons.logging"/>
-      <plugin id="org.apache.ws.commons.util"/>
-      <plugin id="org.apache.ws.jaxme"/>
-      <plugin id="org.apache.xmlrpc"/>
-      <plugin id="org.eclipse.ant.core"/>
-      <plugin id="org.eclipse.core.contenttype"/>
-      <plugin id="org.eclipse.core.expressions"/>
-      <plugin id="org.eclipse.core.filesystem"/>
-      <plugin id="org.eclipse.core.filesystem.win32.x86" fragment="true"/>
-      <plugin id="org.eclipse.core.jobs"/>
-      <plugin id="org.eclipse.core.resources"/>
-      <plugin id="org.eclipse.core.resources.jmx"/>
-      <plugin id="org.eclipse.core.resources.win32" fragment="true"/>
-      <plugin id="org.eclipse.core.runtime"/>
-      <plugin id="org.eclipse.core.runtime.compatibility.auth"/>
-      <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
-      <plugin id="org.eclipse.equinox.app"/>
-      <plugin id="org.eclipse.equinox.common"/>
-      <plugin id="org.eclipse.equinox.jmx.common"/>
-      <plugin id="org.eclipse.equinox.jmx.server"/>
-      <plugin id="org.eclipse.equinox.jmx.server.rmi"/>
-      <plugin id="org.eclipse.equinox.jmx.server.xmlrpc"/>
-      <plugin id="org.eclipse.equinox.preferences"/>
-      <plugin id="org.eclipse.equinox.preferences.jmx"/>
-      <plugin id="org.eclipse.equinox.registry"/>
-      <plugin id="org.eclipse.equinox.registry.jmx"/>
-      <plugin id="org.eclipse.osgi"/>
-      <plugin id="org.eclipse.osgi.jmx"/>
-      <plugin id="org.eclipse.osgi.services"/>
-      <plugin id="org.mortbay.jetty"/>
-   </plugins>
-
-</product>

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/server-1.5.product b/monitoring/bundles/org.eclipse.equinox.jmx.server/server-1.5.product
deleted file mode 100644
index 02dcb24..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/server-1.5.product
+++ /dev/null

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.1"?>
-
-<product name="JMX Server" id="org.eclipse.equinox.jmx.server.product" application="org.eclipse.equinox.jmx.server.application" useFeatures="false">
-
-   <configIni use="default"/>
-
-   <launcherArgs>
-   </launcherArgs>
-
-   <windowImages/>
-
-   <launcher>
-      <solaris/>
-      <win useIco="false">
-         <bmp/>
-      </win>
-   </launcher>
-
-   <vm>
-   </vm>
-
-   <plugins>
-      <plugin id="javax.servlet"/>
-      <plugin id="org.apache.commons.codec"/>
-      <plugin id="org.apache.commons.httpclient"/>
-      <plugin id="org.apache.commons.logging"/>
-      <plugin id="org.apache.ws.commons.util"/>
-      <plugin id="org.apache.ws.jaxme"/>
-      <plugin id="org.apache.xmlrpc"/>
-      <plugin id="org.eclipse.ant.core"/>
-      <plugin id="org.eclipse.core.contenttype"/>
-      <plugin id="org.eclipse.core.expressions"/>
-      <plugin id="org.eclipse.core.filesystem"/>
-      <plugin id="org.eclipse.core.filesystem.win32.x86" fragment="true"/>
-      <plugin id="org.eclipse.core.jobs"/>
-      <plugin id="org.eclipse.core.resources"/>
-      <plugin id="org.eclipse.core.resources.jmx"/>
-      <plugin id="org.eclipse.core.resources.win32" fragment="true"/>
-      <plugin id="org.eclipse.core.runtime"/>
-      <plugin id="org.eclipse.core.runtime.compatibility.auth"/>
-      <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
-      <plugin id="org.eclipse.equinox.app"/>
-      <plugin id="org.eclipse.equinox.common"/>
-      <plugin id="org.eclipse.equinox.jmx.common"/>
-      <plugin id="org.eclipse.equinox.jmx.server"/>
-      <plugin id="org.eclipse.equinox.jmx.server.rmi"/>
-      <plugin id="org.eclipse.equinox.jmx.server.xmlrpc"/>
-      <plugin id="org.eclipse.equinox.preferences"/>
-      <plugin id="org.eclipse.equinox.preferences.jmx"/>
-      <plugin id="org.eclipse.equinox.registry"/>
-      <plugin id="org.eclipse.equinox.registry.jmx"/>
-      <plugin id="org.eclipse.osgi"/>
-      <plugin id="org.eclipse.osgi.jmx"/>
-      <plugin id="org.eclipse.osgi.services"/>
-      <plugin id="org.mortbay.jetty"/>
-   </plugins>
-
-</product>

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/server-ppro.product b/monitoring/bundles/org.eclipse.equinox.jmx.server/server-ppro.product
deleted file mode 100644
index f147117..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/server-ppro.product
+++ /dev/null

@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.1"?>
-
-<product name="JMX Server" id="org.eclipse.equinox.jmx.server.product" application="org.eclipse.equinox.jmx.server.application" useFeatures="false">
-
-
-   <configIni use="default"/>
-
-   <launcherArgs>
-   </launcherArgs>
-
-   <windowImages/>
-
-
-   <launcher>
-      <solaris/>
-      <win useIco="false">
-         <bmp/>
-      </win>
-   </launcher>
-
-
-   <vm>
-   </vm>
-
-   <plugins>
-      <plugin id="javax.servlet"/>
-      <plugin id="net.sourceforge.mx4j"/>
-      <plugin id="org.apache.commons.codec"/>
-      <plugin id="org.apache.commons.httpclient"/>
-      <plugin id="org.apache.commons.logging"/>
-      <plugin id="org.apache.ws.commons.util"/>
-      <plugin id="org.apache.ws.jaxme"/>
-      <plugin id="org.apache.xmlrpc"/>
-      <plugin id="org.eclipse.core.contenttype"/>
-      <plugin id="org.eclipse.core.jobs"/>
-      <plugin id="org.eclipse.core.runtime"/>
-      <plugin id="org.eclipse.core.runtime.compatibility.auth"/>
-      <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
-      <plugin id="org.eclipse.equinox.app"/>
-      <plugin id="org.eclipse.equinox.common"/>
-      <plugin id="org.eclipse.equinox.http.jetty"/>
-      <plugin id="org.eclipse.equinox.http.servlet"/>
-      <plugin id="org.eclipse.equinox.jmx.common"/>
-      <plugin id="org.eclipse.equinox.jmx.server"/>
-      <plugin id="org.eclipse.equinox.jmx.server.xmlrpc"/>
-      <plugin id="org.eclipse.equinox.launcher"/>
-      <plugin id="org.eclipse.equinox.preferences"/>
-      <plugin id="org.eclipse.equinox.preferences.jmx"/>
-      <plugin id="org.eclipse.equinox.registry"/>
-      <plugin id="org.eclipse.equinox.registry.jmx"/>
-      <plugin id="org.eclipse.ercp.xml" fragment="true"/>
-      <plugin id="org.eclipse.ercp.xmlParserAPIs" fragment="true"/>
-      <plugin id="org.eclipse.osgi"/>
-      <plugin id="org.eclipse.osgi.jmx"/>
-      <plugin id="org.eclipse.osgi.services"/>
-      <plugin id="org.mortbay.jetty"/>
-      <plugin id="org.mortbay.jetty.security" fragment="true"/>
-   </plugins>
-
-</product>

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/Activator.java b/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/Activator.java
deleted file mode 100644
index cbed865..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/Activator.java
+++ /dev/null

@@ -1,268 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.server;
-
-import java.util.*;
-import javax.management.*;
-import javax.management.remote.JMXConnectorServer;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.equinox.jmx.common.*;
-import org.eclipse.equinox.jmx.internal.server.ServerExtensionManager.ContributionExtensionDefinition;
-import org.eclipse.equinox.jmx.server.ContributionProvider;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.log.LogService;
-import org.osgi.util.tracker.ServiceTracker;
-
-/**
- * The plug-in startup class for the jmx server plug-in.
- * 
- * @since 1.0
- */
-public class Activator implements BundleActivator {
-
-	static final String PLUGIN_ID = "org.eclipse.equinox.jmx.server"; //$NON-NLS-1$;
-	static final String PI_NAMESPACE = PLUGIN_ID;
-	static final String PT_CONTRIBUTION = "contribution"; //$NON-NLS-1$
-	static final String PT_PROVIDER = "provider"; //$NON-NLS-1$
-
-	static final String PROTOCOL_PROPERTY_KEY = PI_NAMESPACE + ".protocol"; //$NON-NLS-1$
-	static final String PORT_PROPERTY_KEY = PI_NAMESPACE + ".port"; //$NON-NLS-1$
-	static final String DOMAIN_PROPERTY_KEY = PI_NAMESPACE + ".domain"; //$NON-NLS-1$
-
-	//The shared instance.
-	private static Activator instance;
-	private static BundleContext bundleContext;
-	private static JMXConnectorServer jmxServer;
-	private static RootContribution rootContribution;
-	private static ServiceTracker logService;
-
-	/**
-	 * The constructor.
-	 */
-	public Activator() {
-		instance = this;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		bundleContext = context;
-		if (jmxServer == null) {
-			createServer();
-		}
-		jmxServer.start();
-	}
-
-	/**
-	 * Create the jmx server.  This should only be invoked once - the first time this bundle is started.
-	 * 
-	 * @throws Exception If an exception occurs when attempting to start the server.
-	 */
-	public void createServer() throws Exception {
-		// determine which protocol to use
-		String protocol = System.getProperty(PROTOCOL_PROPERTY_KEY);
-		if (protocol == null) {
-			protocol = JMXConstants.DEFAULT_PROTOCOL;
-		}
-		// determine port to listen on
-		int port;
-		String strPort = System.getProperty(PORT_PROPERTY_KEY);
-		if (strPort == null) {
-			port = JMXConstants.DEFAULT_PORT_AS_INT;
-		} else {
-			try {
-				port = Integer.parseInt(strPort);
-			} catch (NumberFormatException nfe) {
-				log(nfe);
-				port = JMXConstants.DEFAULT_PORT_AS_INT;
-			}
-		}
-		String domain = System.getProperty(DOMAIN_PROPERTY_KEY);
-		if (domain == null) {
-			domain = JMXConstants.DEFAULT_DOMAIN;
-		}
-		jmxServer = JMXServerFactory.createJMXServer("127.0.0.1", port, protocol, JMXConstants.DEFAULT_DOMAIN, null);
-		registerContributions();
-	}
-
-	private void registerContributions() throws IntrospectionException, ReflectionException, MBeanRegistrationException, NotCompliantMBeanException {
-		final MBeanServer mbeanServer = jmxServer.getMBeanServer();
-		try {
-			mbeanServer.getMBeanInfo(RootContribution.OBJECT_NAME);
-		} catch (Exception e) {
-			//load extensions and add to contribution model
-			Collection providers = ServerExtensionManager.getInstance().getContributionExtensionDefinitions();
-			Iterator iter = providers.iterator();
-			List proxiesToRegister = new ArrayList();
-			while (iter.hasNext()) {
-				ContributionExtensionDefinition defn = (ContributionExtensionDefinition) iter.next();
-				ContributionProvider provider = defn.getContributionProvider();
-				// register the providers with the mbean server
-				provider.registerContribution(mbeanServer);
-				if (defn.isRootProvider()) {
-					proxiesToRegister.add(provider.createProxy());
-				}
-			}
-			rootContribution = new RootContribution((ContributionProxy[]) proxiesToRegister.toArray(new ContributionProxy[proxiesToRegister.size()]));
-			try {
-				mbeanServer.registerMBean(rootContribution, RootContribution.OBJECT_NAME);
-			} catch (Exception e1) {
-				// should not occur since we previously checked for existence
-			}
-			ServerExtensionManager.getInstance().addObserver(new Observer() {
-				public void update(Observable o, Object arg) {
-					if (!(arg instanceof ContributionExtensionDefinition)) {
-						return;
-					}
-					ContributionExtensionDefinition defn = (ContributionExtensionDefinition) arg;
-					ContributionProvider rootProvider = defn.getContributionProvider();
-					if (ServerExtensionManager.getInstance().getContributionExtensionDefinition(defn.getProviderClassName()) == null) {
-						// root provider has been removed
-						rootContribution.unregisterContributionProxy(rootProvider.createProxy());
-						rootProvider.sendNotification(new Notification(ContributionNotificationEvent.NOTIFICATION_REMOVED, rootProvider, 0));
-					} else {
-						// new root provider installed or updated
-						try {
-							rootProvider.registerContribution(mbeanServer);
-							rootContribution.registerContributionProxy(rootProvider.createProxy());
-							rootContribution.sendNotification(new Notification(ContributionNotificationEvent.NOTIFICATION_UPDATED, rootContribution, 0));
-						} catch (Exception e) {
-							log(e);
-						}
-					}
-				}
-			});
-		}
-	}
-
-	public static RootContribution getRootContribution() {
-		return rootContribution;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		jmxServer.stop();
-		if (logService != null) {
-			logService.close();
-			logService = null;
-		}
-		instance = null;
-	}
-
-	/**
-	 * @return The bundle context.
-	 */
-	public BundleContext getBundleContext() {
-		return bundleContext;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static Activator getDefault() {
-		return instance;
-	}
-
-	/**
-	 * Return the underlying <code>Server</code> which provides an interface to the jmx agent.
-	 * 
-	 * @return The server.
-	 */
-	public MBeanServer getServer() {
-		return jmxServer.getMBeanServer();
-	}
-
-	/**
-	 * Log the given message and exception to the log file.
-	 * 
-	 * @param message The message to log.
-	 * @param exception The exception to log.
-	 * @param iStatusSeverity The <code>IStatus</code> severity level.
-	 */
-	public static void log(String message, Throwable exception, int iStatusSeverity) {
-		if (message == null) {
-			message = exception.getMessage();
-			if (message == null)
-				message = ServerMessages.exception_occurred;
-		}
-		if (logService == null) {
-			logService = new ServiceTracker(bundleContext, LogService.class.getName(), null);
-			logService.open();
-		}
-		LogService log = (LogService) logService.getService();
-		int severity = LogService.LOG_INFO;
-		switch (iStatusSeverity) {
-			case IStatus.ERROR :
-				severity = LogService.LOG_ERROR;
-				break;
-			case IStatus.WARNING :
-				severity = LogService.LOG_WARNING;
-				break;
-			case IStatus.INFO :
-			default :
-				severity = LogService.LOG_INFO;
-				break;
-		}
-		if (log == null) {
-			System.out.println(PLUGIN_ID);
-			System.out.println(severity);
-			System.out.println(message);
-			if (exception != null)
-				exception.printStackTrace(System.out);
-		} else
-			log.log(severity, message, exception);
-	}
-
-	/**
-	 * Log the given message and exception to the log file with a
-	 * status code of <code>IStatus.ERROR</code>.
-	 * 
-	 * @param message The message to log.
-	 * @param exception The thrown exception.
-	 */
-	public static void logError(String message, Throwable exception) {
-		log(message, exception, IStatus.ERROR);
-	}
-
-	/**
-	 * Log the given exception to the log file with a
-	 * status code of <code>IStatus.ERROR</code>.
-	 * 
-	 * @param exception The thrown exception.
-	 */
-	public static void logError(Throwable exception) {
-		log(exception.getMessage(), exception, IStatus.ERROR);
-	}
-
-	/**
-	 * Log the given message to the log file with a
-	 * status code of <code>IStatus.INFO</code>.
-	 * 
-	 * @param message The message to log.
-	 */
-	public static void log(String message) {
-		log(message, null, IStatus.INFO);
-	}
-
-	/**
-	 * Log the given exception to the log file with a
-	 * status code of <code>IStatus.INFO</code>.
-	 * 
-	 * @param exception The thrown exception.
-	 */
-	public static void log(Throwable exception) {
-		log(exception.getMessage(), exception, IStatus.INFO);
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/Application.java b/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/Application.java
deleted file mode 100644
index 73c2fae..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/Application.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.server;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-
-/**
- * This class controls all aspects of the application's execution
- */
-public class Application implements IPlatformRunnable {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IPlatformRunnable#run(java.lang.Object)
-	 */
-	public Object run(Object args) throws Exception {
-		// our bundle should already be started if we are running this 
-		// code, so just loop
-		while (true) {
-			Thread.sleep(1000);
-		}
-	}
-}
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/ContributionMessages.java b/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/ContributionMessages.java
deleted file mode 100644
index 2f6dff2..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/ContributionMessages.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.server;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @since 1.0
- */
-public class ContributionMessages extends NLS {
-
-	public static String desc_getcontribs;
-
-	// exceptions
-	public static String excep_typeprovider_exists;
-	public static String excep_null_mbeanserver;
-	public static String excep_null_server_on_createself;
-	public static String excep_contrib_reg_with_diff_server;
-	public static String excep_contrib_delegate_exists;
-
-	// disallow instantiations
-	private ContributionMessages() {
-		super();
-	}
-
-	static {
-		NLS.initializeMessages(ContributionMessages.class.getName(), ContributionMessages.class);
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/ContributionMessages.properties b/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/ContributionMessages.properties
deleted file mode 100644
index ecfd583..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/ContributionMessages.properties
+++ /dev/null

@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-desc_getcontribs = Get contributions.
-
-# exceptions
-excep_null_mbeanserver = Expected non-null mbean server.
-excep_contrib_reg_with_diff_server = Attempt to register contribution with another mbean server.
-excep_contrib_delegate_exists = Contribution delegate exists.
-excep_typeprovider_exists = Provider for type exists.
-excep_null_server_on_createself = Expected non-null MBean server.
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/IJMXServer.java b/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/IJMXServer.java
deleted file mode 100644
index ceeda46..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/IJMXServer.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.server;
-
-import javax.management.remote.JMXConnectorServer;
-
-/**
- * Required interface for supported JMX server types.
- * 
- * @since 1.0
- */
-public interface IJMXServer {
-
-	/**
-	 * Initialize the JMX server prior to startup.
-	 * 
-	 * @param host The hostname or ip address of the server.
-	 * @param port The port to listen on.
-	 * @param domain The jmx service url domain.
-	 * @throws Exception If an exception occurs during initialization.
-	 */
-	public void initialize(String host, int port, String domain) throws Exception;
-
-	/**
-	 * Start the JMX Server.
-	 * 
-	 * @throws Exception If an exception occurs when attempting to start the server.
-	 */
-	public void start() throws Exception;
-
-	/**
-	 * Stop the JMX Server.
-	 * 
-	 * @throws Exception If an exception occurs when attempting to stop the server.
-	 */
-	public void stop() throws Exception;
-
-	/**
-	 * Get the <code>JMXConnectorServer</code> associated with the JMX server.
-	 * 
-	 * @return The <code>JMXConnectorServer</code>
-	 */
-	public JMXConnectorServer getJMXConnectorServer();
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/JMXServerFactory.java b/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/JMXServerFactory.java
deleted file mode 100644
index e5efe28..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/JMXServerFactory.java
+++ /dev/null

@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.server;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-import javax.management.remote.JMXConnectorServer;
-import javax.management.remote.JMXServiceURL;
-import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.jmx.server.IJMXConnectorServerProvider;
-import org.eclipse.osgi.util.NLS;
-
-public class JMXServerFactory {
-
-	private static final String ATTRIBUTE_CLASS = "class"; //$NON-NLS-1$
-	private static final String ATTRIBUTE_INITIALIZER_CLASS = "initializerClass"; //$NON-NLS-1$
-	private static final String ATTRIBUTE_PROTOCOL = "protocol"; //$NON-NLS-1$
-
-	private static Map jmxProviderCache;
-
-	private JMXServerFactory() {
-		super();
-	}
-
-	/**
-	 * Create and return a new JMXConnectorServer instance with the given parameters.
-	 * Throw an exception if there is an error or if the given protocol doesn't have a valid 
-	 * registered transport extension.
-	 */
-	public static JMXConnectorServer createJMXServer(String host, int port, String protocol, String domain, Map environment) throws IOException {
-		IJMXConnectorServerProvider provider = getProvider(protocol);
-		if (provider == null)
-			throw new IOException(NLS.bind(ServerMessages.protocol_not_available, protocol));
-		MBeanServer mbeanServer = MBeanServerFactory.createMBeanServer(domain);
-		JMXServiceURL providerURL = provider.getJMXServiceURL(host, port, protocol, domain);
-		if (providerURL == null)
-			providerURL = new JMXServiceURL(protocol, host, port);
-		return provider.newJMXConnectorServer(providerURL, environment, mbeanServer);
-	}
-
-	private static IJMXConnectorServerProvider getProvider(String protocol) {
-		final Class providerClass = (Class) getJMXProviderCache().get(protocol);
-		if (providerClass != null) {
-			try {
-				return (IJMXConnectorServerProvider) providerClass.newInstance();
-			} catch (Exception e) {
-				Activator.log(e);
-			}
-		}
-		return null;
-	}
-
-	private static void loadProviderExtensions() {
-		IExtensionPoint point = RegistryFactory.getRegistry().getExtensionPoint(Activator.PI_NAMESPACE, Activator.PT_PROVIDER);
-		IExtension[] types = point.getExtensions();
-		for (int i = 0; i < types.length; i++) {
-			loadProviderConfigurationElements(types[i].getConfigurationElements());
-		}
-	}
-
-	private static void loadProviderConfigurationElements(IConfigurationElement[] configElems) {
-		for (int j = 0; j < configElems.length; j++) {
-			IConfigurationElement element = configElems[j];
-			final String elementName = element.getName();
-			String className, protocol;
-			if (elementName.equals(Activator.PT_PROVIDER) && null != (className = element.getAttribute(ATTRIBUTE_CLASS)) && null != (protocol = element.getAttribute(ATTRIBUTE_PROTOCOL))) {
-				try {
-					// attempt to load initializer before instantiating provider class
-					String initializer = element.getAttribute(ATTRIBUTE_INITIALIZER_CLASS);
-					if (initializer != null)
-						element.createExecutableExtension(ATTRIBUTE_INITIALIZER_CLASS);
-					Object obj = element.createExecutableExtension(ATTRIBUTE_CLASS);
-					// cache provider class name for protocol
-					if (jmxProviderCache.containsKey(protocol)) {
-						Activator.log(NLS.bind(ServerMessages.duplicate_protocol_provider, className));
-						continue;
-					}
-					jmxProviderCache.put(protocol, obj.getClass());
-				} catch (CoreException e) {
-					Activator.log(e);
-				}
-			}
-		}
-	}
-
-	private static Map getJMXProviderCache() {
-		if (jmxProviderCache == null) {
-			jmxProviderCache = new HashMap();
-			loadProviderExtensions();
-			RegistryFactory.getRegistry().addRegistryChangeListener(new JMXProviderExtensionListener(), Activator.PI_NAMESPACE + "." + Activator.PT_PROVIDER);
-		}
-		return jmxProviderCache;
-	}
-
-	private static class JMXProviderExtensionListener implements IRegistryChangeListener {
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.runtime.IRegistryChangeListener#registryChanged(org.eclipse.core.runtime.IRegistryChangeEvent)
-		 */
-		public void registryChanged(IRegistryChangeEvent event) {
-			IExtensionDelta[] deltas = event.getExtensionDeltas(Activator.PI_NAMESPACE, Activator.PT_PROVIDER);
-			for (int i = 0; i < deltas.length; i++) {
-				IExtensionDelta delta = deltas[i];
-				loadProviderConfigurationElements(delta.getExtensionPoint().getConfigurationElements());
-			}
-		}
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/ServerExtensionManager.java b/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/ServerExtensionManager.java
deleted file mode 100644
index a7ba13d..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/ServerExtensionManager.java
+++ /dev/null

@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.server;
-
-import java.util.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.jmx.server.ContributionProvider;
-
-public class ServerExtensionManager extends Observable implements IRegistryChangeListener {
-
-	public static class ContributionExtensionDefinition {
-
-		private static final String ATTRIBUTE_CLASS = "class"; //$NON-NLS-1$
-		private static final String ATTRIBUTE_IS_ROOT = "isroot"; //$NON-NLS-1$
-		private static final String ELEMENT_CONTRIBUTION = "contribution"; //$NON-NLS-1$
-		private static final String ELEMENT_EXTENDS_CLASS = "extendsClass"; //$NON-NLS-1$
-
-		private String providerClassName;
-		private boolean isRootProvider;
-		private Set extendsClasses;
-		private ContributionProvider provider;
-
-		ContributionExtensionDefinition(final IConfigurationElement contribElem) {
-			final String elementName = contribElem.getName();
-			// check for require mbean element and associated class attribute
-			if (elementName.equalsIgnoreCase(ELEMENT_CONTRIBUTION) && (providerClassName = contribElem.getAttribute(ATTRIBUTE_CLASS)) != null) {
-				try {
-					Object obj = contribElem.createExecutableExtension(ATTRIBUTE_CLASS);
-					if (obj instanceof ContributionProvider) {
-						provider = (ContributionProvider) obj;
-						// check if provider is a root provider and set flag appropriately
-						String attrIsRoot = null;
-						if ((attrIsRoot = contribElem.getAttribute(ATTRIBUTE_IS_ROOT)) != null) {
-							isRootProvider = attrIsRoot.equals("true"); //$NON-NLS-1$
-						}
-						// cache any types which this provider extends
-						IConfigurationElement[] extendsElems = contribElem.getChildren(ELEMENT_EXTENDS_CLASS);
-						extendsClasses = new TreeSet();
-						for (int j = 0; j < extendsElems.length; j++) {
-							IConfigurationElement extendsElem = extendsElems[j];
-							extendsClasses.add(extendsElem.getAttribute(ATTRIBUTE_CLASS));
-						}
-					}
-				} catch (CoreException e) {
-					Activator.logError(e);
-				}
-			} else {
-				throw new IllegalArgumentException();
-			}
-		}
-
-		public String getProviderClassName() {
-			return providerClassName;
-		}
-
-		public boolean isRootProvider() {
-			return isRootProvider;
-		}
-
-		public ContributionProvider getContributionProvider() {
-			return provider;
-		}
-
-		public Set getExtendsClasses() {
-			return extendsClasses;
-		}
-	}
-
-	private static Map providers;
-	private static ServerExtensionManager instance;
-
-	private ServerExtensionManager() {
-		providers = new Hashtable();
-		initExtensions();
-	}
-
-	public static ServerExtensionManager getInstance() {
-		if (instance == null) {
-			instance = new ServerExtensionManager();
-		}
-		return instance;
-	}
-
-	public Collection getContributionExtensionDefinitions() {
-		return providers.values();
-	}
-
-	public ContributionExtensionDefinition getContributionExtensionDefinition(String providerClassName) {
-		return (ContributionExtensionDefinition) providers.get(providerClassName);
-	}
-
-	private void initExtensions() {
-		registerContributions();
-		RegistryFactory.getRegistry().addRegistryChangeListener(this);
-	}
-
-	private void registerContributions() {
-		IExtensionPoint point = RegistryFactory.getRegistry().getExtensionPoint(Activator.PI_NAMESPACE, Activator.PT_CONTRIBUTION);
-		IExtension[] types = point.getExtensions();
-		for (int i = 0; i < types.length; i++) {
-			registerContribution(types[i]);
-		}
-	}
-
-	private void registerContribution(IExtension ext) {
-		IConfigurationElement[] configElems = ext.getConfigurationElements();
-		for (int j = 0; j < configElems.length; j++) {
-			ContributionExtensionDefinition defn = new ContributionExtensionDefinition(configElems[j]);
-			if (defn.getContributionProvider() == null) {
-				// extension was removed or an error loading the class occurred
-				// remove from map if exists
-				defn = (ContributionExtensionDefinition) providers.remove(defn.getProviderClassName());
-			} else {
-				providers.put(defn.getProviderClassName(), defn);
-			}
-			setChanged();
-			notifyObservers(defn);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IRegistryChangeListener#registryChanged(org.eclipse.core.runtime.IRegistryChangeEvent)
-	 */
-	public void registryChanged(IRegistryChangeEvent event) {
-		IExtensionDelta[] deltas = event.getExtensionDeltas(Activator.PI_NAMESPACE, Activator.PT_CONTRIBUTION);
-		for (int i = 0; i < deltas.length; i++) {
-			IExtensionDelta delta = deltas[i];
-			registerContribution(delta.getExtension());
-		}
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/ServerMessages.java b/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/ServerMessages.java
deleted file mode 100644
index 120f376..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/ServerMessages.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.server;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @since 1.0
- */
-public final class ServerMessages extends NLS {
-
-	public static String server_started;
-	public static String server_stopped;
-	public static String invalid_port;
-	public static String invalid_jmx_server;
-	public static String expected_non_null_jmxconnector;
-	public static String duplicate_protocol_provider;
-	public static String exception_occurred;
-	public static String protocol_not_available;
-
-	private ServerMessages() {
-		// disallow instantiations
-	}
-
-	static {
-		NLS.initializeMessages(ServerMessages.class.getName(), ServerMessages.class);
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/ServerMessages.properties b/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/ServerMessages.properties
deleted file mode 100644
index 91456b1..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/ServerMessages.properties
+++ /dev/null

@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-server_started = Server started, JMX service url: {0}
-server_stopped = Server stopped.
-invalid_jmx_server = Invalid JMX server:
-invalid_port = Invalid port.
-expected_non_null_jmxconnector = Expected non-null JMX connector server.
-duplicate_protocol_provider = Duplicate protocol provider class: {0}
-exception_occurred = An exception occurred.
-protocol_not_available = The protocol \"{0}\" is not registered as a valid transport.
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/UIStarter.java b/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/UIStarter.java
deleted file mode 100644
index 8d74d2f..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/internal/server/UIStarter.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.server;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.ui.IStartup;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-
-public class UIStarter implements IStartup {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IStartup#earlyStartup()
-	 */
-	public void earlyStartup() {
-		// we really don't need to do anything as the plugin.xml is configured such that
-		// the Activator's start() has is invoked (before earlyStartup()) when a class belonging 
-		// to this plugin is loaded, but we will make sure that no one has disabled that option and perform
-		// the check...
-		Bundle bundle = Activator.getDefault().getBundleContext().getBundle();
-		Assert.isNotNull(bundle); // this should not be null as this code exists within the referenced bundle
-		if ((bundle.getState() & (Bundle.STARTING | Bundle.ACTIVE)) == 0) {
-			// start the bundle
-			try {
-				bundle.start();
-			} catch (BundleException e) {
-				Activator.log(e);
-			}
-		}
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/server/Contribution.java b/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/server/Contribution.java
deleted file mode 100644
index e7bbd3f..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/server/Contribution.java
+++ /dev/null

@@ -1,377 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Jeff Mesnil - Bug 151266 - [monitoring] Browsing our server in jconsole is really unfriendly
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.server;
-
-import java.io.*;
-import java.net.URL;
-import java.util.*;
-import javax.management.*;
-import org.eclipse.equinox.jmx.common.*;
-import org.eclipse.equinox.jmx.common.util.ByteArrayHolder;
-import org.eclipse.equinox.jmx.internal.server.Activator;
-import org.eclipse.equinox.jmx.internal.server.ContributionMessages;
-
-/**
- * A <code>Contribution</code> acts as a mediator between the objects which users would like to
- * provide, and the server which exposes those objects.  To expose the contribution to clients,
- * a <code>ContributionProxy</code> is created which encapsulates all the required information
- * in order for this contribution to be used remotely.  This proxy, which is implemented
- * as a standard mbean exposes an operation to retrieve the <code>ObjectName</code> of this
- * contribution.  Succinctly, the <code>ContributionProxy</code> delegates all operations
- * to the <code>Contribution</code> associated with it's <code>ObjectName</code> on
- * the server.
- * 
- * @see com.jmx.common.ContributionProvider
- * @since 1.0
- */
-
-public abstract class Contribution extends NotificationBroadcasterSupport implements DynamicMBean {
-
-	private static long sequenceNumber;
-
-	// container for all contributions' delegate objects, weak insurance for contributions
-	// attempting to utilize the same delegate
-	private static Map contributionDelegates = new Hashtable();
-
-	// contribution image cache
-	private static Map imageCache = new Hashtable();
-
-	// current proxy for this contribution which is exposed to clients
-	private ContributionProxy proxy;
-
-	// set true when the implementing contribution fires a state changed event, calling create proxy with this set to true would result in a new proxy being allocated
-	private boolean stateChanged;
-
-	// the unique object name of this contribution that is registered with the server
-	private ObjectName objectName;
-
-	/**
-	 * The <code>Object</code> delegate that is associated with this <code>Contribution</code>.
-	 * <p>
-	 * The delegate is provided in the constructor by implementing classes, and is accessible by
-	 * those classes for use.  The delegate is declared as final to enforce and make 
-	 * explicit its consistency.
-	 */
-	protected final Object contributionDelegate;
-
-	/**
-	 * Default constructor.
-	 * 
-	 * @see Contribution#Contribution(Object) where <code>Object</code> is null.
-	 */
-	public Contribution() {
-		this(null);
-	}
-
-	/**
-	 * Allocate a <code>Contribution</code> which provides an interface to the
-	 * operations provided by the <code>contributionDelegate</code>.  The 
-	 * <code>contributionDelegate</code> may be null, this is typical of 
-	 * <code>ContributionProvider</code>s who usually don't manipulate
-	 * any underlying resource.
-	 * 
-	 * @param contributionDelegate The object which the contribution delegates its operations, null if not applicable.
-	 */
-	public Contribution(Object contributionDelegate) {
-		this.contributionDelegate = contributionDelegate;
-		Contribution priorContrib = null;
-		if (contributionDelegate != null) {
-			priorContrib = (Contribution) contributionDelegates.get(contributionDelegate);
-		}
-		if (priorContrib != null) {
-			objectName = priorContrib.getObjectName();
-		} else {
-			try {
-				String objectNameStr = JMXConstants.DEFAULT_DOMAIN + ":type=" + getClass().getName() + hashCode(); //$NON-NLS-1$
-				objectName = ObjectName.getInstance(objectNameStr);
-			} catch (MalformedObjectNameException e) {
-				Activator.logError(e);
-			}
-			if (contributionDelegate != null) {
-				contributionDelegates.put(this.contributionDelegate, this);
-			}
-		}
-	}
-
-	/**
-	 * Get the name of this contribution.
-	 * 
-	 * @return The name of this contribution.
-	 */
-	protected abstract String getName();
-
-	/**
-	 * Get the list of objects which this <code>Contribution</code>
-	 * wishes to contribute as sub-contributions.  The objects 
-	 * returned may or may not be available to clients; their availability depends
-	 * on a supporting <code>ContributionProvider</code> existing.
-	 * 
-	 * @return The objects this <code>Contribution</code> wishes to contribute.
-	 */
-	protected abstract Object[] getChildren();
-
-	/**
-	 * Derived classes have the option to provide list of properties
-	 * associated with this contribution to be displayed in the UI.
-	 * 
-	 * @return The properties of the contribution to be displayed in the UI, or <code>null</code> if none.
-	 */
-	protected abstract Set getProperties();
-
-	/**
-	 * Get the location for the image to be associated with this contribution.
-	 * 
-	 * @return The location of the image.
-	 */
-	protected abstract URL getImageLocation();
-
-	/**
-	 * Derived classes must return an <code>MBeanInfo</code> object 
-	 * which contains the operations intended to be exposed.  The object
-	 * returned is manipulated to include <code>Contribution</code> specific
-	 * operations to support traversal.
-	 * 
-	 * @param delegate The delegate object associated with this contribution.
-	 * @return The MBeanInfo object which encapsulates the functionality of the derived contribution.
-	 */
-	protected abstract MBeanInfo getMBeanInfo(Object delegate);
-
-	/**
-	 * This method is forwarded by the contribution to the derived <code>Contribution</code> when a operation
-	 * is to be invoked.
-	 * 
-	 * @param operationName The name of the operation to invoke.
-	 * @param args List of arguments of the operation to invoke.
-	 * @param argTypes List of argument types of the operation to invoke.
-	 * @return The Object result of the operation, null if not relevant.
-	 */
-	protected abstract Object invokeOperation(String operationName, Object[] args, String[] argTypes);
-
-	/**
-	 * Get the object delegate that is associated with this contribution.  The
-	 * delegate may be null; this is typical for provider contributions..
-	 * 
-	 * @return The object delegate for this contribution, may be null.
-	 */
-	public Object getContributionDelegate() {
-		return contributionDelegate;
-	}
-
-	/**
-	 * Allocate a <code>ContributionProxy</code> from this <code>Contribution</code>.
-	 * 
-	 * @see org.eclipse.equinox.jmx.common.ContributionProxy
-	 * @return A newly allocated <code>ContributionProxy</code>.
-	 */
-	public final ContributionProxy createProxy() {
-		if (proxy == null || stateChanged) {
-			ByteArrayHolder holder = null;
-			URL imageUrl = getImageLocation();
-			// image URL may be null depending on contribution state
-			if (imageUrl != null) {
-				if ((holder = (ByteArrayHolder) imageCache.get(imageUrl)) == null) {
-					// create byte array holder from image data and add to cache
-					InputStream in = null;
-					try {
-						in = imageUrl.openStream();
-						ByteArrayOutputStream bout = new ByteArrayOutputStream();
-						byte[] buf = new byte[512];
-						int nread;
-						while ((nread = in.read(buf)) != -1) {
-							bout.write(buf, 0, nread);
-						}
-						holder = new ByteArrayHolder(bout.toByteArray());
-						imageCache.put(imageUrl, holder);
-					} catch (IOException e) {
-						Activator.logError(e);
-					} finally {
-						if (in != null) {
-							try {
-								in.close();
-							} catch (IOException e) {
-								Activator.logError(e);
-							}
-						}
-					}
-				}
-			}
-			proxy = new ContributionProxy(getName(), getProperties(), holder, getObjectName(), getMBeanInfo());
-			stateChanged = false;
-		}
-		return proxy;
-	}
-
-	/**
-	 * Get this contribution's list of child contributions as type <code>ContributionProxy</code>.
-	 * A <code>Contribution</code>s children are only registered with the server if
-	 * <code>ContributionProvider</code> exists which can wrap each child returned by
-	 * the <code>Contribution</code>.
-	 * 
-	 * @return The list of child contributions, null if no children.
-	 */
-	public final ContributionProxy[] getChildContributions() {
-		ContributionProxy[] result = getChildContributionProxies();
-		if (!(this instanceof ContributionProvider)) {
-			// attempt to locate any providers which may also contribute to
-			// this contributions's delegate.
-			if (contributionDelegate != null) {
-				ContributionProxy[] delegateProxies = null;
-				ContributionProvider[] delegateProviders = ContributionProvider.getExtendingProviders(contributionDelegate);
-				if (delegateProviders != null) {
-					delegateProxies = getChildContributions(delegateProviders);
-				}
-				if (delegateProxies != null) {
-					ContributionProxy[] oldResult = (result == null ? (result = new ContributionProxy[0]) : result);
-					result = new ContributionProxy[result.length + delegateProxies.length];
-					System.arraycopy(oldResult, 0, result, 0, oldResult.length);
-					System.arraycopy(delegateProxies, 0, result, oldResult.length, delegateProxies.length);
-				}
-			}
-		}
-		return result;
-	}
-
-	private ContributionProxy[] getChildContributionProxies() {
-		List proxies = null;
-		Object[] childs = getChildren();
-		if (childs != null) {
-			for (int i = 0; i < childs.length; i++) {
-				ContributionProvider provider = null;
-				if (this instanceof ContributionProvider && ((ContributionProvider) this).contributesType(childs[i])) {
-					provider = (ContributionProvider) this;
-				} else {
-					provider = ContributionProvider.getProvider(childs[i]);
-				}
-				if (provider == null) {
-					continue;
-				}
-				try {
-					Contribution contrib = provider.createContribution(childs[i]);
-					contrib.registerContribution(Activator.getDefault().getServer());
-					if (proxies == null) {
-						proxies = new ArrayList();
-					}
-					proxies.add(contrib.createProxy());
-				} catch (Exception e) {
-					Activator.log(e);
-				}
-			}
-		}
-		return proxies == null ? null : (ContributionProxy[]) proxies.toArray(new ContributionProxy[proxies.size()]);
-	}
-
-	/**
-	 * Register this contribution with the <code>server</code> provided.
-	 * 
-	 * @param server The server to register this contribution with.
-	 * @throws InstanceAlreadyExistsException If the contribution's object name has already been registered with the server.
-	 * @throws MBeanRegistrationException
-	 * @throws NotCompliantMBeanException
-	 */
-	public final void registerContribution(MBeanServer mbeanServer) throws MBeanRegistrationException, NotCompliantMBeanException {
-		if (!mbeanServer.isRegistered(getObjectName())) {
-			try {
-				mbeanServer.registerMBean(this, getObjectName());
-			} catch (InstanceAlreadyExistsException e) {
-				// previously checked for registration, this should not occur
-				Activator.logError(e);
-			}
-		}
-	}
-
-	/**
-	 * Invoked by the underlying <code>Contribution</code> when its internal state
-	 * has changed and a new <code>ContributionProxy</code> should be created
-	 * to reflect this change.
-	 * 
-	 * @param event The event describing the state transition.
-	 */
-	protected void contributionStateChanged(ContributionNotificationEvent event) {
-		if (event == null) {
-			return;
-		}
-		if (event.getType().equals(ContributionNotificationEvent.NOTIFICATION_REMOVED)) {
-			// self from currently contributed objects and release hold on delegate
-			contributionDelegates.remove(contributionDelegate);
-		} else if (event.getType().equals(ContributionNotificationEvent.NOTIFICATION_ADDED)) {
-			// not required to add contribution and delegate to map, this is handled in getChildren
-		} else if (event.getType().equals(ContributionNotificationEvent.NOTIFICATION_UPDATED)) {
-			// currently not required to perform any operations
-		}
-		stateChanged = true;
-		sendNotification(new Notification(event.getType(), this, sequenceNumber++, new Date().getTime()));
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getMBeanInfo()
-	 */
-	public MBeanInfo getMBeanInfo() {
-		// retrieve implementors exposed operations
-		MBeanInfo info = getMBeanInfo(contributionDelegate);
-		if (info != null) {
-			// insert our required getContributions() operation
-			MBeanOperationInfo[] ops = info.getOperations();
-			MBeanOperationInfo[] opsNew = new MBeanOperationInfo[ops.length + 2];
-			System.arraycopy(ops, 0, opsNew, 0, ops.length);
-			try {
-				opsNew[opsNew.length - 2] = new MBeanOperationInfo(ContributionMessages.desc_getcontribs, Contribution.class.getMethod("getChildContributions", new Class[0])); //$NON-NLS-1$
-				opsNew[opsNew.length - 1] = new MBeanOperationInfo("", Contribution.class.getMethod("createProxy", new Class[0])); //$NON-NLS-1$ //$NON-NLS-2$
-				return new MBeanInfo(info.getClassName(), info.getDescription(), info.getAttributes(), info.getConstructors(), opsNew /* our customized operations */, info.getNotifications());
-			} catch (Exception e) {
-				Activator.logError(e);
-			}
-		} else {
-			info = new MBeanInfo(getClass().getName(), getName(), new MBeanAttributeInfo[0], new MBeanConstructorInfo[0], new MBeanOperationInfo[0], new MBeanNotificationInfo[0]);
-		}
-		return info;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#invoke(java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	public Object invoke(String arg0, Object[] arg1, String[] arg2) throws MBeanException, ReflectionException {
-		if (arg0.equals(ContributionProxy.OP_GET_CHILD_CONTRIBUTIONS)) {
-			return getChildContributions();
-		} else if (arg0.equals(ContributionProxy.OP_REFRESH_PROXY)) {
-			return createProxy();
-		} else if (arg0.equals(ContributionProxy.OP_GET_CONTRIBUTION_UI_URL)) {
-			//return UIContributionRegistry.getInstance().getContributionUIUrl(contributionDelegate.getClass());
-		}
-		// delegate to implementing class
-		return invokeOperation(arg0, arg1, arg2);
-	}
-
-	protected ObjectName getObjectName() {
-		return objectName;
-	}
-
-	private final ContributionProxy[] getChildContributions(ContributionProvider[] delegateProviders) {
-		try {
-			List delegateProviderList = new ArrayList();
-			for (int i = 0; i < delegateProviders.length; i++) {
-				ContributionProvider delegateProvider = delegateProviders[i];
-				ContributionProxy[] proxies = delegateProvider.getChildContributions();
-				if (proxies != null && proxies.length > 0) {
-					delegateProvider.registerContribution(Activator.getDefault().getServer());
-					delegateProviderList.add(delegateProvider.createProxy());
-				}
-			}
-			if (delegateProviderList.size() == 0) {
-				return null;
-			}
-			return (ContributionProxy[]) delegateProviderList.toArray(new ContributionProxy[delegateProviderList.size()]);
-		} catch (Exception e) {
-			Activator.logError(e);
-		}
-		return null;
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/server/ContributionProvider.java b/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/server/ContributionProvider.java
deleted file mode 100644
index fa2f9af..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/server/ContributionProvider.java
+++ /dev/null

@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.server;
-
-import java.util.*;
-import javax.management.MalformedObjectNameException;
-import org.eclipse.equinox.jmx.internal.server.ServerExtensionManager;
-import org.eclipse.equinox.jmx.internal.server.ServerExtensionManager.ContributionExtensionDefinition;
-
-/**
- * Required base class for all classes extending the <code>org.eclipse.equinox.jmx.server.contribution</code> extension point.
- * <p>
- * A <code>ContributionProvider</code> has the ability to create concrete <code>Contribution</code>s
- * from a given <code>Object</code> type.  After creation, the <code>ContributionProvider</code> is added
- * to an internal registry of known providers.  Any <code>Object</code>s wishing to be contributed must
- * first locate a supported provider. 
- * 
- * @see Contribution
- * @since 1.0
- */
-public abstract class ContributionProvider extends Contribution {
-
-	/**
-	 * Default constructor for all derived <code>ContributionProviders</code>.  Adds
-	 * this provider to the list of available contribution providers.
-	 * 
-	 * @param contributionDelegate
-	 */
-	public ContributionProvider() {
-		super();
-	}
-
-	/**
-	 * Returns <code>true</code> if this provider supports creating a <code>Contribution</code>
-	 * from the provided object.
-	 * 
-	 * @param obj The object to contribute.
-	 * @return <code>true</code> if the object is supported by this provider and 
-	 * 	<code>false</code> otherwise
-	 */
-	protected abstract boolean contributesType(Object obj);
-
-	/**
-	 * Returns <code>true</code> if this provider supports the {@link #createProvider(Object)} operation
-	 * for the supplied object.  Providing a type typically implies that the provider
-	 * bases its decision on which objects to return as children using logic associated
-	 * with the object provided.
-	 * 
-	 * @param obj The object to provide for.
-	 * @return <code>true</code> if the object is provided by this provider and
-	 * 	<code>false</code> otherwise
-	 */
-	protected abstract boolean providesType(Object obj);
-
-	/**
-	 * Allocate a <code>ContributionProvider</code> that is specialized 
-	 * with the provided object.
-	 * 
-	 * @param obj The object to associate the allocated provider with.
-	 * @return The newly allocated specialized provider.
-	 */
-	protected abstract ContributionProvider createProvider(Object obj);
-
-	/**
-	 * Allocate a <code>Contribution</code> from the object provided. If the 
-	 * implementing <code>ContributionProvider</code> does not support the 
-	 * type of object provided, <code>null</code> is returned.
-	 * 
-	 * @param obj The object to to contribute.
-	 * @return A <code>Contribution</code> object or null if the object type is not supported.
-	 * @throws MalformedObjectNameException
-	 */
-	protected abstract Contribution createContribution(Object obj) throws MalformedObjectNameException;
-
-	/**
-	 * Convenience method for classes to query the provider registry to determine
-	 * if a <code>ContributionProvider</code> exists for the object provided.  The first
-	 * provider found that supports contributing the object type is returned.
-	 * 
-	 * @param obj The object to located a provider for.
-	 * @return A <code>ContributionProvider</code> which supports the provided object, null if no such provider exists.
-	 */
-	public static ContributionProvider getProvider(Object obj) {
-		Collection contribDefns = ServerExtensionManager.getInstance().getContributionExtensionDefinitions();
-		Iterator iter = contribDefns.iterator();
-		while (iter.hasNext()) {
-			ContributionProvider provider = ((ContributionExtensionDefinition) iter.next()).getContributionProvider();
-			if (provider.contributesType(obj)) {
-				return provider;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns a list of the <code>ContributionProvider</code>s that supports the {@link #providesType(Object)}
-	 * method for the supplied object.
-	 * 
-	 * @param obj The object for which to locate a <code>ContributionProvider</code>.
-	 * @return The list of identified providers.
-	 */
-	public static ContributionProvider[] getExtendingProviders(Object obj) {
-		Collection contribDefns = ServerExtensionManager.getInstance().getContributionExtensionDefinitions();
-		Iterator iter = contribDefns.iterator();
-		List providers = null;
-		while (iter.hasNext()) {
-			ContributionExtensionDefinition defn = (ContributionExtensionDefinition) iter.next();
-			// iterate over definitions list of supported class types and for assignable match
-			ContributionProvider provider = defn.getContributionProvider();
-			if (provider.providesType(obj)) {
-				if (providers == null) {
-					providers = new ArrayList(2);
-				}
-				providers.add(provider.createProvider(obj));
-			}
-		}
-		ContributionProvider[] ret = null;
-		if (providers != null) {
-			ret = (ContributionProvider[]) providers.toArray(new ContributionProvider[providers.size()]);
-		}
-		return ret;
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/server/IJMXConnectorServerProvider.java b/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/server/IJMXConnectorServerProvider.java
deleted file mode 100644
index d5c209e..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.server/src/org/eclipse/equinox/jmx/server/IJMXConnectorServerProvider.java
+++ /dev/null

@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.server;
-
-import java.net.MalformedURLException;
-import javax.management.remote.JMXConnectorServerProvider;
-import javax.management.remote.JMXServiceURL;
-
-public interface IJMXConnectorServerProvider extends JMXConnectorServerProvider {
-	public JMXServiceURL getJMXServiceURL(String host, int port, String protocol, String domain) throws MalformedURLException;
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.vm/.classpath b/monitoring/bundles/org.eclipse.equinox.jmx.vm/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.vm/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.vm/.cvsignore b/monitoring/bundles/org.eclipse.equinox.jmx.vm/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.vm/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.vm/.project b/monitoring/bundles/org.eclipse.equinox.jmx.vm/.project
deleted file mode 100644
index a82fbe1..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.vm/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.jmx.vm</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/monitoring/bundles/org.eclipse.equinox.jmx.vm/.settings/org.eclipse.jdt.core.prefs b/monitoring/bundles/org.eclipse.equinox.jmx.vm/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b67b95f..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.vm/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,311 +0,0 @@
-#Mon Feb 26 11:27:34 EST 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1
-org.eclipse.jdt.core.compiler.compliance=1.3
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=ignore
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-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.hiddenCatchBlock=warning
-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.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-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.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-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.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_comments=false
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=800
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.vm/.settings/org.eclipse.jdt.ui.prefs b/monitoring/bundles/org.eclipse.equinox.jmx.vm/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index a5427b0..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.vm/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,9 +0,0 @@
-#Mon Feb 26 11:27:34 EST 2007
-eclipse.preferences.version=1
-formatter_profile=_core
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.staticondemandthreshold=99

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.vm/META-INF/MANIFEST.MF b/monitoring/bundles/org.eclipse.equinox.jmx.vm/META-INF/MANIFEST.MF
deleted file mode 100644
index 343343c..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.vm/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Resource Monitoring VM Extensions (Incubation)
-Bundle-SymbolicName: org.eclipse.equinox.jmx.vm;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Localization: plugin
-Import-Package: javax.management,
- javax.management.remote,
- org.eclipse.core.runtime; common=split,
- org.eclipse.equinox.jmx.common,
- org.eclipse.equinox.jmx.common.util,
- org.eclipse.equinox.jmx.server,
- org.eclipse.osgi.util,
- org.osgi.framework
-Bundle-Vendor: Eclipse.org
-Eclipse-LazyStart: true
-Bundle-Activator: org.eclipse.equinox.jmx.internal.vm.Activator
-Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.vm/about.html b/monitoring/bundles/org.eclipse.equinox.jmx.vm/about.html
deleted file mode 100644
index 5d03fd4..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.vm/about.html
+++ /dev/null

@@ -1,28 +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 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.vm/build.properties b/monitoring/bundles/org.eclipse.equinox.jmx.vm/build.properties
deleted file mode 100644
index f57342a..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.vm/build.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               icons/,\
-               about.html
-src.includes = about.html
-javacSource=1.5
-javacTarget=1.5

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.vm/icons/classloading.gif b/monitoring/bundles/org.eclipse.equinox.jmx.vm/icons/classloading.gif
deleted file mode 100644
index f1ee8cf..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.vm/icons/classloading.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.vm/icons/compilation.gif b/monitoring/bundles/org.eclipse.equinox.jmx.vm/icons/compilation.gif
deleted file mode 100644
index 7134210..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.vm/icons/compilation.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.vm/icons/memory.gif b/monitoring/bundles/org.eclipse.equinox.jmx.vm/icons/memory.gif
deleted file mode 100644
index 7ce1112..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.vm/icons/memory.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.vm/icons/os.gif b/monitoring/bundles/org.eclipse.equinox.jmx.vm/icons/os.gif
deleted file mode 100644
index 9d70301..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.vm/icons/os.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.vm/icons/runtime.gif b/monitoring/bundles/org.eclipse.equinox.jmx.vm/icons/runtime.gif
deleted file mode 100644
index 95f87ea..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.vm/icons/runtime.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.vm/icons/vmstats.gif b/monitoring/bundles/org.eclipse.equinox.jmx.vm/icons/vmstats.gif
deleted file mode 100644
index a598f60..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.vm/icons/vmstats.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.vm/plugin.xml b/monitoring/bundles/org.eclipse.equinox.jmx.vm/plugin.xml
deleted file mode 100644
index d4b1d6d..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.vm/plugin.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   <extension
-         point="org.eclipse.equinox.jmx.server.contribution">
-      <contribution
-            class="org.eclipse.equinox.jmx.internal.vm.VMStatsProvider"
-            isroot="true"/>
-   </extension>
-
-</plugin>

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/Activator.java b/monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/Activator.java
deleted file mode 100644
index fed88af..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/Activator.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.vm;
-
-import java.net.URL;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class Activator implements BundleActivator {
-
-	private static BundleContext context;
-
-	static URL getImageLocation(String path) {
-		return FileLocator.find(context.getBundle(), new Path(path), null);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext bundleContext) throws Exception {
-		Activator.context = bundleContext;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext bundleContext) throws Exception {
-		Activator.context = null;
-	}
-
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/ClassLoadingContribution.java b/monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/ClassLoadingContribution.java
deleted file mode 100644
index d4f3f07..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/ClassLoadingContribution.java
+++ /dev/null

@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.vm;
-
-import java.lang.management.ClassLoadingMXBean;
-import java.net.URL;
-import java.util.HashSet;
-import java.util.Set;
-import javax.management.*;
-import org.eclipse.equinox.jmx.common.util.MBeanInfoWrapper;
-import org.eclipse.equinox.jmx.server.Contribution;
-
-public class ClassLoadingContribution extends Contribution {
-
-	private static final String ICON_PATH = "icons/classloading.gif"; //$NON-NLS-1$
-	private MBeanInfo mbeanInfo;
-
-	public ClassLoadingContribution(ClassLoadingMXBean delegate) {
-		super(delegate);
-		mbeanInfo = MBeanInfoWrapper.createMBeanInfo(delegate.getClass(), delegate.toString(), new MBeanAttributeInfo[0], new MBeanNotificationInfo[0]);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getName()
-	 */
-	protected String getName() {
-		return VMStatsMessages.cl_title;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getChildren()
-	 */
-	protected Object[] getChildren() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getProperties()
-	 */
-	protected Set getProperties() {
-		Set result = new HashSet();
-		ClassLoadingMXBean mbean = (ClassLoadingMXBean) contributionDelegate;
-		result.add(VMStatsMessages.cl_loadedclscnt + ": " + mbean.getLoadedClassCount()); //$NON-NLS-1$
-		result.add(VMStatsMessages.cl_totloadedclscnt + ": " + mbean.getTotalLoadedClassCount()); //$NON-NLS-1$
-		result.add(VMStatsMessages.cl_totunloadedclscnt + ": " + mbean.getUnloadedClassCount()); //$NON-NLS-1$
-		return result;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getMBeanInfo(java.lang.Object)
-	 */
-	protected MBeanInfo getMBeanInfo(Object delegate) {
-		return mbeanInfo;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#invokeOperation(java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	protected Object invokeOperation(String operationName, Object[] args, String[] argTypes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String attribute) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-	 */
-	public void setAttribute(Attribute attribute) {
-		// do nothing
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-	 */
-	public AttributeList getAttributes(String[] attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-	 */
-	public AttributeList setAttributes(AttributeList attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getImageLocation()
-	 */
-	protected URL getImageLocation() {
-		return Activator.getImageLocation(ICON_PATH);
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/CompilationContribution.java b/monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/CompilationContribution.java
deleted file mode 100644
index 18847dc..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/CompilationContribution.java
+++ /dev/null

@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.vm;
-
-import java.lang.management.CompilationMXBean;
-import java.net.URL;
-import java.util.HashSet;
-import java.util.Set;
-import javax.management.*;
-import org.eclipse.equinox.jmx.common.util.MBeanInfoWrapper;
-import org.eclipse.equinox.jmx.server.Contribution;
-
-public class CompilationContribution extends Contribution {
-
-	private static final String ICON_PATH = "icons/compilation.gif"; //$NON-NLS-1$
-	private MBeanInfo mbeanInfo;
-
-	public CompilationContribution(CompilationMXBean delegate) {
-		super(delegate);
-		mbeanInfo = MBeanInfoWrapper.createMBeanInfo(delegate.getClass(), delegate.toString(), new MBeanAttributeInfo[0], new MBeanNotificationInfo[0]);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getName()
-	 */
-	protected String getName() {
-		return VMStatsMessages.cmp_title;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getChildren()
-	 */
-	protected Object[] getChildren() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getProperties()
-	 */
-	protected Set getProperties() {
-		Set result = new HashSet();
-		CompilationMXBean mbean = (CompilationMXBean) contributionDelegate;
-		result.add(VMStatsMessages.cmp_jitname + ": " + mbean.getName()); //$NON-NLS-1$
-		result.add(VMStatsMessages.cmp_tottime + ": " + mbean.getTotalCompilationTime()); //$NON-NLS-1$
-		return result;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getMBeanInfo(java.lang.Object)
-	 */
-	protected MBeanInfo getMBeanInfo(Object delegate) {
-		return mbeanInfo;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#invokeOperation(java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	protected Object invokeOperation(String operationName, Object[] args, String[] argTypes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String attribute) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-	 */
-	public void setAttribute(Attribute attribute) {
-		// do nothing
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-	 */
-	public AttributeList getAttributes(String[] attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-	 */
-	public AttributeList setAttributes(AttributeList attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getImageLocation()
-	 */
-	protected URL getImageLocation() {
-		return Activator.getImageLocation(ICON_PATH);
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/MemoryContribution.java b/monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/MemoryContribution.java
deleted file mode 100644
index 9b35b37..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/MemoryContribution.java
+++ /dev/null

@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.vm;
-
-import java.lang.management.MemoryMXBean;
-import java.lang.management.MemoryUsage;
-import java.net.URL;
-import java.util.Set;
-import java.util.TreeSet;
-import javax.management.*;
-import org.eclipse.equinox.jmx.common.ContributionNotificationEvent;
-import org.eclipse.equinox.jmx.common.util.MBeanInfoWrapper;
-import org.eclipse.equinox.jmx.server.Contribution;
-
-public class MemoryContribution extends Contribution implements NotificationListener {
-
-	private static final String ICON_PATH = "icons/memory.gif"; //$NON-NLS-1$
-	private long heapCommited, heapInit, heapMax, heapUsed;
-	private long nonHeapCommited, nonHeapInit, nonHeapMax, nonHeapUsed;
-	private MBeanInfo mbeanInfo;
-
-	public MemoryContribution(MemoryMXBean delegate) {
-		super(delegate);
-		NotificationEmitter emitter = (NotificationEmitter) delegate;
-		emitter.addNotificationListener(this, null, null);
-		mbeanInfo = MBeanInfoWrapper.createMBeanInfo(delegate.getClass(), delegate.toString(), new MBeanAttributeInfo[0], new MBeanNotificationInfo[0]);
-
-		new Thread() {
-			public void run() {
-				while (true) {
-					if (MemoryContribution.this.memUsageChanged()) {
-						MemoryContribution.this.contributionStateChanged(new ContributionNotificationEvent(ContributionNotificationEvent.NOTIFICATION_UPDATED));
-					}
-					try {
-						sleep(1500);
-					} catch (InterruptedException e) {
-					}
-				}
-			}
-		}.start();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getName()
-	 */
-	protected String getName() {
-		return VMStatsMessages.mem_title;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getChildren()
-	 */
-	protected Object[] getChildren() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getProperties()
-	 */
-	protected Set getProperties() {
-		Set result = new TreeSet();
-		MemoryMXBean memDelegate = (MemoryMXBean) contributionDelegate;
-
-		MemoryUsage mu = memDelegate.getHeapMemoryUsage();
-		result.add(VMStatsMessages.mem_heapusage);
-		result.add(VMStatsMessages.mem_commited + ": " + (mu.getCommitted() >> 10) + "KB");
-		result.add(VMStatsMessages.mem_initreq + ": " + (mu.getInit() >> 10) + "KB");
-		result.add(VMStatsMessages.mem_max + ": " + (mu.getMax() >> 10) + "KB");
-		result.add(VMStatsMessages.mem_used + ": " + (mu.getUsed() >> 10) + "KB");
-
-		mu = memDelegate.getNonHeapMemoryUsage();
-		result.add(VMStatsMessages.mem_noheapusage);
-		result.add(VMStatsMessages.mem_commited + ": " + (mu.getCommitted() >> 10) + "KB");
-		result.add(VMStatsMessages.mem_initreq + ": " + (mu.getInit() >> 10) + "KB");
-		result.add(VMStatsMessages.mem_max + ": " + (mu.getMax() >> 10) + "KB");
-		result.add(VMStatsMessages.mem_used + ": " + (mu.getUsed() >> 10) + "KB");
-		return result;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getMBeanInfo(java.lang.Object)
-	 */
-	protected MBeanInfo getMBeanInfo(Object delegate) {
-		return mbeanInfo;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#invokeOperation(java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	protected Object invokeOperation(String operationName, Object[] args, String[] argTypes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String attribute) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-	 */
-	public void setAttribute(Attribute attribute) {
-		//
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-	 */
-	public AttributeList getAttributes(String[] attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-	 */
-	public AttributeList setAttributes(AttributeList attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.NotificationListener#handleNotification(javax.management.Notification, java.lang.Object)
-	 */
-	public void handleNotification(Notification notification, Object handback) {
-		super.contributionStateChanged(new ContributionNotificationEvent(ContributionNotificationEvent.NOTIFICATION_UPDATED));
-	}
-
-	private boolean memUsageChanged() {
-		MemoryMXBean mbean = (MemoryMXBean) contributionDelegate;
-		MemoryUsage m = mbean.getHeapMemoryUsage();
-		boolean changed = false;
-		if (m.getCommitted() != heapCommited || m.getInit() != heapInit || m.getMax() != heapMax || m.getUsed() != heapUsed) {
-			changed = true;
-			heapCommited = m.getCommitted();
-			heapInit = m.getInit();
-			heapMax = m.getMax();
-			heapUsed = m.getUsed();
-		}
-		m = mbean.getNonHeapMemoryUsage();
-		if (m.getCommitted() != nonHeapCommited || m.getInit() != nonHeapInit || m.getMax() != nonHeapMax || m.getUsed() != nonHeapUsed) {
-			changed = true;
-			nonHeapCommited = m.getCommitted();
-			nonHeapInit = m.getInit();
-			nonHeapMax = m.getMax();
-			nonHeapUsed = m.getUsed();
-		}
-		return changed;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getImageLocation()
-	 */
-	protected URL getImageLocation() {
-		return Activator.getImageLocation(ICON_PATH);
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/OperatingSystemContribution.java b/monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/OperatingSystemContribution.java
deleted file mode 100644
index b66a189..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/OperatingSystemContribution.java
+++ /dev/null

@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.vm;
-
-import java.lang.management.OperatingSystemMXBean;
-import java.net.URL;
-import java.util.HashSet;
-import java.util.Set;
-import javax.management.*;
-import org.eclipse.equinox.jmx.common.util.MBeanInfoWrapper;
-import org.eclipse.equinox.jmx.server.Contribution;
-
-public class OperatingSystemContribution extends Contribution {
-
-	private static final String ICON_PATH = "icons/os.gif"; //$NON-NLS-1$
-	private MBeanInfo mbeanInfo;
-
-	public OperatingSystemContribution(OperatingSystemMXBean delegate) {
-		super(delegate);
-		mbeanInfo = MBeanInfoWrapper.createMBeanInfo(delegate.getClass(), delegate.toString(), new MBeanAttributeInfo[0], new MBeanNotificationInfo[0]);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getName()
-	 */
-	protected String getName() {
-		return VMStatsMessages.os_title;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getChildren()
-	 */
-	protected Object[] getChildren() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getProperties()
-	 */
-	protected Set getProperties() {
-		Set result = new HashSet();
-		OperatingSystemMXBean mbean = (OperatingSystemMXBean) contributionDelegate;
-		result.add(VMStatsMessages.os_name + ": " + mbean.getName()); //$NON-NLS-1$
-		result.add(VMStatsMessages.os_version + ": " + mbean.getVersion()); //$NON-NLS-1$
-		result.add(VMStatsMessages.os_arch + ": " + mbean.getArch()); //$NON-NLS-1$
-		result.add(VMStatsMessages.os_ncpus + ": " + mbean.getAvailableProcessors()); //$NON-NLS-1$
-		return result;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getMBeanInfo(java.lang.Object)
-	 */
-	protected MBeanInfo getMBeanInfo(Object delegate) {
-		return mbeanInfo;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#invokeOperation(java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	protected Object invokeOperation(String operationName, Object[] args, String[] argTypes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String attribute) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-	 */
-	public void setAttribute(Attribute attribute) {
-		//
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-	 */
-	public AttributeList getAttributes(String[] attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-	 */
-	public AttributeList setAttributes(AttributeList attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getImageLocation()
-	 */
-	protected URL getImageLocation() {
-		return Activator.getImageLocation(ICON_PATH);
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/RuntimeContribution.java b/monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/RuntimeContribution.java
deleted file mode 100644
index 9d751eb..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/RuntimeContribution.java
+++ /dev/null

@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.vm;
-
-import java.lang.management.RuntimeMXBean;
-import java.net.URL;
-import java.util.*;
-import javax.management.*;
-import org.eclipse.equinox.jmx.common.util.MBeanInfoWrapper;
-import org.eclipse.equinox.jmx.server.Contribution;
-
-public class RuntimeContribution extends Contribution {
-
-	private static final String ICON_PATH = "icons/runtime.gif"; //$NON-NLS-1$
-	private MBeanInfo mbeanInfo;
-
-	public RuntimeContribution(RuntimeMXBean delegate) {
-		super(delegate);
-		mbeanInfo = MBeanInfoWrapper.createMBeanInfo(delegate.getClass(), delegate.toString(), new MBeanAttributeInfo[0], new MBeanNotificationInfo[0]);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getName()
-	 */
-	protected String getName() {
-		return VMStatsMessages.rt_title;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getChildren()
-	 */
-	protected Object[] getChildren() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getProperties()
-	 */
-	protected Set getProperties() {
-		Set result = new HashSet();
-		RuntimeMXBean mbean = (RuntimeMXBean) contributionDelegate;
-		result.add(VMStatsMessages.rt_vmname + ": " + mbean.getVmName()); //$NON-NLS-1$
-		result.add(VMStatsMessages.rt_vmvendor + ": " + mbean.getVmVendor()); //$NON-NLS-1$
-		result.add(VMStatsMessages.rt_vmversion + ": " + mbean.getVmVersion()); //$NON-NLS-1$
-		result.add(VMStatsMessages.rt_starttime + ": " + new Date(mbean.getStartTime())); //$NON-NLS-1$
-		result.add(VMStatsMessages.rt_uptime + ": " + new Date(mbean.getUptime())); //$NON-NLS-1$
-		result.add(VMStatsMessages.rt_bootclasspath + ": " + mbean.getBootClassPath()); //$NON-NLS-1$
-		result.add(VMStatsMessages.rt_systemclasspath + ": " + mbean.getClassPath()); //$NON-NLS-1$
-		result.add(VMStatsMessages.rt_inputargs + ": " + Arrays.toString(mbean.getInputArguments().toArray())); //$NON-NLS-1$
-		result.add(VMStatsMessages.rt_ldpath + ": " + mbean.getLibraryPath()); //$NON-NLS-1$
-		result.add(VMStatsMessages.rt_mgmtspecver + ": " + mbean.getManagementSpecVersion()); //$NON-NLS-1$
-		return result;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getMBeanInfo(java.lang.Object)
-	 */
-	protected MBeanInfo getMBeanInfo(Object delegate) {
-		return mbeanInfo;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#invokeOperation(java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	protected Object invokeOperation(String operationName, Object[] args, String[] argTypes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String attribute) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-	 */
-	public void setAttribute(Attribute attribute) {
-		//
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-	 */
-	public AttributeList getAttributes(String[] attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-	 */
-	public AttributeList setAttributes(AttributeList attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getImageLocation()
-	 */
-	protected URL getImageLocation() {
-		return Activator.getImageLocation(ICON_PATH);
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/VMStatsMessages.java b/monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/VMStatsMessages.java
deleted file mode 100644
index 2cc9c9f..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/VMStatsMessages.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.vm;
-
-import org.eclipse.osgi.util.NLS;
-
-public class VMStatsMessages extends NLS {
-
-	public static String title;
-
-	// memory mbean data
-	public static String mem_title;
-	public static String mem_heapusage;
-	public static String mem_noheapusage;
-	public static String mem_commited;
-	public static String mem_initreq;
-	public static String mem_max;
-	public static String mem_used;
-
-	// classloading mbean data
-	public static String cl_title;
-	public static String cl_loadedclscnt;
-	public static String cl_totloadedclscnt;
-	public static String cl_totunloadedclscnt;
-
-	// operating system mbean data
-	public static String os_title;
-	public static String os_arch;
-	public static String os_ncpus;
-	public static String os_name;
-	public static String os_version;
-
-	// compilation mbean data
-	public static String cmp_title;
-	public static String cmp_tottime;
-	public static String cmp_jitname;
-
-	// runtime mbean data
-	public static String rt_title;
-	public static String rt_bootclasspath;
-	public static String rt_systemclasspath;
-	public static String rt_inputargs;
-	public static String rt_ldpath;
-	public static String rt_mgmtspecver;
-	public static String rt_vmname;
-	public static String rt_vmvendor;
-	public static String rt_vmversion;
-	public static String rt_starttime;
-	public static String rt_uptime;
-
-	private VMStatsMessages() {
-		// prevent instantiation
-	}
-
-	static {
-		NLS.initializeMessages(VMStatsMessages.class.getName(), VMStatsMessages.class);
-	}
-
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/VMStatsMessages.properties b/monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/VMStatsMessages.properties
deleted file mode 100644
index 90d1e1b..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/VMStatsMessages.properties
+++ /dev/null

@@ -1,51 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-title = VM Stats
-
-# memory contribution
-mem_title = Memory Usage
-mem_heapusage = Heap Memory Usage
-mem_noheapusage = Non-Heap Memory Usage
-mem_commited = Commited
-mem_initreq = Initially Requested
-mem_max = Max
-mem_used = Used
-
-# classloading contribution
-cl_title = ClassLoading Stats.
-cl_loadedclscnt = Currently Loaded Class Count
-cl_totloadedclscnt = Total Number of Classes Loaded
-cl_totunloadedclscnt = Total Number of Classes Unloaded.
-
-# os contribution
-os_title = Operating System
-os_name = Name
-os_version = Version
-os_arch = Archtype
-os_ncpus = Available CPUs
-
-# compilation contribution
-cmp_title = Compilation Stats
-cmp_tottime = Total Elapsed Compilation Time (in millis)
-cmp_jitname = JIT Name
-
-# runtime contribution
-rt_title = Runtime
-rt_bootclasspath = Boot ClassPath
-rt_systemclasspath = System ClassPath
-rt_inputargs = Input Args
-rt_ldpath = Library Path
-rt_mgmtspecver = Managment Spec. Version
-rt_vmname = VM Name
-rt_vmvendor = VM Vendor
-rt_vmversion = VM Version
-rt_starttime = Start Time
-rt_uptime = Uptime
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/VMStatsProvider.java b/monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/VMStatsProvider.java
deleted file mode 100644
index 00ba45a..0000000
--- a/monitoring/bundles/org.eclipse.equinox.jmx.vm/src/org/eclipse/equinox/jmx/internal/vm/VMStatsProvider.java
+++ /dev/null

@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.jmx.internal.vm;
-
-import java.lang.management.*;
-import java.net.URL;
-import java.util.HashSet;
-import java.util.Set;
-import javax.management.*;
-import org.eclipse.equinox.jmx.server.Contribution;
-import org.eclipse.equinox.jmx.server.ContributionProvider;
-
-public class VMStatsProvider extends ContributionProvider {
-
-	static final String BUNDLE_NAME = "org.eclipse.equinox.jmx.vm"; //$NON-NLS-1$
-	private static final String ICON_PATH = "icons/vmstats.gif"; //$NON-NLS-1$
-
-	public VMStatsProvider() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.ContributionProvider#contributesType(java.lang.Object)
-	 */
-	protected boolean contributesType(Object obj) {
-		return obj instanceof ClassLoadingMXBean || obj instanceof CompilationMXBean || obj instanceof MemoryMXBean || obj instanceof OperatingSystemMXBean || obj instanceof RuntimeMXBean;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.ContributionProvider#providesType(java.lang.Object)
-	 */
-	protected boolean providesType(Object obj) {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.ContributionProvider#createProvider(java.lang.Object)
-	 */
-	protected ContributionProvider createProvider(Object obj) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.ContributionProvider#createContribution(java.lang.Object)
-	 */
-	protected Contribution createContribution(Object obj) {
-		if (contributesType(obj)) {
-			if (obj instanceof ClassLoadingMXBean) {
-				return new ClassLoadingContribution(ManagementFactory.getClassLoadingMXBean());
-			} else if (obj instanceof CompilationMXBean) {
-				return new CompilationContribution(ManagementFactory.getCompilationMXBean());
-			} else if (obj instanceof MemoryMXBean) {
-				return new MemoryContribution(ManagementFactory.getMemoryMXBean());
-			} else if (obj instanceof OperatingSystemMXBean) {
-				return new OperatingSystemContribution(ManagementFactory.getOperatingSystemMXBean());
-			} else if (obj instanceof RuntimeMXBean) {
-				return new RuntimeContribution(ManagementFactory.getRuntimeMXBean());
-			}
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getName()
-	 */
-	protected String getName() {
-		return VMStatsMessages.title;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getChildren()
-	 */
-	protected Object[] getChildren() {
-		return new Object[] {ManagementFactory.getClassLoadingMXBean(), ManagementFactory.getCompilationMXBean(), ManagementFactory.getMemoryMXBean(), ManagementFactory.getOperatingSystemMXBean(), ManagementFactory.getRuntimeMXBean()};
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getProperties()
-	 */
-	protected Set getProperties() {
-		return new HashSet();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getMBeanInfo(java.lang.Object)
-	 */
-	protected MBeanInfo getMBeanInfo(Object delegate) {
-		return new MBeanInfo(getClass().getName(), null, null, null, null, null);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#invokeOperation(java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	protected Object invokeOperation(String operationName, Object[] args, String[] argTypes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String attribute) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-	 */
-	public void setAttribute(Attribute attribute) {
-		//
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-	 */
-	public AttributeList getAttributes(String[] attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-	 */
-	public AttributeList setAttributes(AttributeList attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getImageLocation()
-	 */
-	protected URL getImageLocation() {
-		return Activator.getImageLocation(ICON_PATH);
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/.classpath b/monitoring/bundles/org.eclipse.equinox.preferences.jmx/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/.cvsignore b/monitoring/bundles/org.eclipse.equinox.preferences.jmx/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/.project b/monitoring/bundles/org.eclipse.equinox.preferences.jmx/.project
deleted file mode 100644
index b781b8d..0000000
--- a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.preferences.jmx</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/monitoring/bundles/org.eclipse.equinox.preferences.jmx/.settings/org.eclipse.jdt.core.prefs b/monitoring/bundles/org.eclipse.equinox.preferences.jmx/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 3ac334b..0000000
--- a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,309 +0,0 @@
-#Thu May 10 13:52:09 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-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.hiddenCatchBlock=warning
-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.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-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.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-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.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=800
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

diff --git a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/.settings/org.eclipse.jdt.ui.prefs b/monitoring/bundles/org.eclipse.equinox.preferences.jmx/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index d38f664..0000000
--- a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,9 +0,0 @@
-#Mon Feb 26 11:27:46 EST 2007
-eclipse.preferences.version=1
-formatter_profile=_core
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.staticondemandthreshold=99

diff --git a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/META-INF/MANIFEST.MF b/monitoring/bundles/org.eclipse.equinox.preferences.jmx/META-INF/MANIFEST.MF
deleted file mode 100644
index 5765d4c..0000000
--- a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Resource Monitoring Preferences Extensions (Incubation)
-Bundle-SymbolicName: org.eclipse.equinox.preferences.jmx;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: Eclipse.org
-Eclipse-LazyStart: true
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.equinox.internal.preferences.jmx.Activator
-Import-Package: javax.management,
- javax.management.remote,
- org.eclipse.core.runtime; common=split,
- org.eclipse.core.runtime.preferences,
- org.eclipse.equinox.jmx.common,
- org.eclipse.equinox.jmx.server,
- org.eclipse.osgi.util,
- org.osgi.framework,
- org.osgi.service.log,
- org.osgi.service.prefs,
- org.osgi.util.tracker
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,
- CDC-1.0/Foundation-1.0,
- J2SE-1.3
-

diff --git a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/about.html b/monitoring/bundles/org.eclipse.equinox.preferences.jmx/about.html
deleted file mode 100644
index 5d03fd4..0000000
--- a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/about.html
+++ /dev/null

@@ -1,28 +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 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/build.properties b/monitoring/bundles/org.eclipse.equinox.preferences.jmx/build.properties
deleted file mode 100644
index d6c916d..0000000
--- a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/build.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               icons/,\
-               about.html
-src.includes = about.html
-javacSource=1.3
-javacTarget=1.1
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/icons/kvp.gif b/monitoring/bundles/org.eclipse.equinox.preferences.jmx/icons/kvp.gif
deleted file mode 100644
index 33be7d8..0000000
--- a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/icons/kvp.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/icons/node.gif b/monitoring/bundles/org.eclipse.equinox.preferences.jmx/icons/node.gif
deleted file mode 100644
index 51e703b..0000000
--- a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/icons/node.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/icons/preferences.gif b/monitoring/bundles/org.eclipse.equinox.preferences.jmx/icons/preferences.gif
deleted file mode 100644
index 33be7d8..0000000
--- a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/icons/preferences.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/plugin.xml b/monitoring/bundles/org.eclipse.equinox.preferences.jmx/plugin.xml
deleted file mode 100644
index 9a212c1..0000000
--- a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/plugin.xml
+++ /dev/null

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-	<extension point="org.eclipse.equinox.jmx.server.contribution">
-		<contribution
-        class="org.eclipse.equinox.internal.preferences.jmx.PreferenceContributionProvider"
-        isroot="true">
-     <extendsClass class="org.osgi.service.prefs.Preferences"/>
-  </contribution>
-		<contribution
-        class="org.eclipse.equinox.internal.preferences.jmx.KVPContributionProvider"
-        isroot="false">
-     <extendsClass class="org.eclipse.equinox.internal.preferences.jmx.KVP"/>
-  </contribution>
-	</extension>
-</plugin>

diff --git a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/Activator.java b/monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/Activator.java
deleted file mode 100644
index 8d8f75a..0000000
--- a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/Activator.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.internal.preferences.jmx;
-
-import org.eclipse.core.runtime.preferences.IPreferencesService;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.log.LogService;
-import org.osgi.util.tracker.ServiceTracker;
-
-/**
- * @since 1.0
- */
-public class Activator implements BundleActivator {
-
-	static final String BUNDLE_NAME = "org.eclipse.equinox.preferences.jmx"; //$NON-NLS-1$
-
-	private static BundleContext context = null;
-	private static ServiceTracker preferenceService = null;
-	private static ServiceTracker logService = null;
-
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext bundleContext) throws Exception {
-		context = bundleContext;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext bundleContext) throws Exception {
-		if (preferenceService != null) {
-			preferenceService.close();
-			preferenceService = null;
-		}
-		if (logService != null) {
-			logService.close();
-			logService = null;
-		}
-		context = null;
-	}
-
-	/*
-	 * Return the preference service, if available.
-	 */
-	public static IPreferencesService getPreferenceService() {
-		if (preferenceService == null) {
-			preferenceService = new ServiceTracker(context, IPreferencesService.class.getName(), null);
-			preferenceService.open();
-		}
-		return (IPreferencesService) preferenceService.getService();
-	}
-
-	/*
-	 * Log the given error.
-	 */
-	public static void log(String message, Exception exception) {
-		if (logService == null) {
-			logService = new ServiceTracker(context, LogService.class.getName(), null);
-			logService.open();
-		}
-		LogService log = (LogService) logService.getService();
-		if (log == null) {
-			System.out.println(message);
-			if (exception != null)
-				exception.printStackTrace(System.out);
-		} else
-			log.log(LogService.LOG_ERROR, message, exception);
-	}
-
-	public static BundleContext getContext() {
-		return context;
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/KVP.java b/monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/KVP.java
deleted file mode 100644
index fba4ac7..0000000
--- a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/KVP.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.internal.preferences.jmx;
-
-import org.osgi.service.prefs.Preferences;
-
-/**
- * This class represents a key/value pair in the preferences.
- * 
- * @since 1.0
- */
-public class KVP {
-
-	private Preferences node;
-	private String key;
-	private String value;
-
-	/*
-	 * Constructor. Make a new key/value pair with the given values.
-	 */
-	public KVP(Preferences node, String key, String value) {
-		super();
-		this.node = node;
-		this.key = key;
-		this.value = value;
-	}
-
-	/*
-	 * Return the key.
-	 */
-	public String getKey() {
-		return this.key;
-	}
-
-	/*
-	 * Return the value.
-	 */
-	public String getValue() {
-		return this.value;
-	}
-
-	/*
-	 * Return the preference node which is associated with this key/value pair.
-	 */
-	public Preferences getNode() {
-		return this.node;
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/KVPContributionProvider.java b/monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/KVPContributionProvider.java
deleted file mode 100644
index ce0a48a..0000000
--- a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/KVPContributionProvider.java
+++ /dev/null

@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.internal.preferences.jmx;
-
-import java.net.URL;
-import java.util.Set;
-import javax.management.*;
-import org.eclipse.equinox.jmx.server.Contribution;
-import org.eclipse.equinox.jmx.server.ContributionProvider;
-
-/**
- * @since 1.0
- */
-public class KVPContributionProvider extends ContributionProvider {
-
-	public KVPContributionProvider() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.ContributionProvider#createContribution(java.lang.Object)
-	 */
-	protected Contribution createContribution(Object obj) {
-		return contributesType(obj) ? new KeyValuePairContribution((KVP) obj) : null;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.ContributionProvider#createProvider(java.lang.Object)
-	 */
-	protected ContributionProvider createProvider(Object obj) {
-		return providesType(obj) ? new KVPContributionProvider() : null;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getName()
-	 */
-	protected String getName() {
-		return Messages.kvpContributionName;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getChildren()
-	 */
-	protected Object[] getChildren() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getProperties()
-	 */
-	protected Set getProperties() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getMBeanInfo(java.lang.Object)
-	 */
-	protected MBeanInfo getMBeanInfo(Object delegate) {
-		return new MBeanInfo(getClass().getName(), null, null, null, null, null);
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#invokeOperation(java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	protected Object invokeOperation(String operationName, Object[] args, String[] argTypes) {
-		// do nothing
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String attribute) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-	 */
-	public void setAttribute(Attribute attribute) {
-		// do nothing
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-	 */
-	public AttributeList getAttributes(String[] attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-	 */
-	public AttributeList setAttributes(AttributeList attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.ContributionProvider#contributesType(java.lang.Object)
-	 */
-	protected boolean contributesType(Object obj) {
-		return obj instanceof KVP;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.ContributionProvider#providesType(java.lang.Object)
-	 */
-	protected boolean providesType(Object obj) {
-		return obj instanceof KVP;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getImageLocation()
-	 */
-	protected URL getImageLocation() {
-		return null;
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/KeyValuePairContribution.java b/monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/KeyValuePairContribution.java
deleted file mode 100644
index 726eb83..0000000
--- a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/KeyValuePairContribution.java
+++ /dev/null

@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * 	Jeff Mesnil - Bug 151266 - [monitoring] Browsing our server in jconsole is really unfriendly
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.internal.preferences.jmx;
-
-import java.net.URL;
-import java.util.*;
-import javax.management.*;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.equinox.jmx.common.JMXConstants;
-import org.eclipse.equinox.jmx.server.Contribution;
-import org.osgi.service.prefs.Preferences;
-
-/**
- * @since 1.0
- */
-public class KeyValuePairContribution extends Contribution {
-
-	private static final String KVP_IMAGE_PATH = "icons/kvp.gif"; //$NON-NLS-1$
-	private static final String METHOD_REMOVE = "remove"; //$NON-NLS-1$
-
-	public KeyValuePairContribution(KVP delegate) {
-		super(delegate);
-	}
-
-    /* (non-Javadoc)
-     * @see org.eclipse.equinox.jmx.server.Contribution#getObjectName()
-     */
-    protected ObjectName getObjectName() {
-        try {
-            return new ObjectName(JMXConstants.DEFAULT_DOMAIN + ":type=KVPair,Preference=" + getDelegate().getNode().name() //$NON-NLS-1$
-            		+ "name=" + getDelegate().getKey()); //$NON-NLS-1$
-        } catch (Exception e) {
-            return super.getObjectName();
-        }
-    }
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getName()
-	 */
-	protected String getName() {
-		return getDelegate().getKey() + '=' + getDelegate().getValue();
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getChildren()
-	 */
-	protected Object[] getChildren() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getProperties()
-	 */
-	protected Set getProperties() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getMBeanInfo(java.lang.Object)
-	 */
-	protected MBeanInfo getMBeanInfo(Object delegate) {
-		return new MBeanInfo(getClass().getName(), null, null, null, createOperations(), null);
-	}
-
-	/*
-	 * Return the list of operations available to this contribution.
-	 */
-	private MBeanOperationInfo[] createOperations() {
-		List result = new ArrayList();
-		result.add(createRemoveOperation());
-		return (MBeanOperationInfo[]) result.toArray(new MBeanOperationInfo[result.size()]);
-	}
-
-	/*
-	 * Create and return an operation to delete this key/value pair.
-	 */
-	private MBeanOperationInfo createRemoveOperation() {
-		return new MBeanOperationInfo(METHOD_REMOVE, Messages.operation_removeKVP, null, Void.TYPE.getName(), 0);
-	}
-
-	/*
-	 * Return this contribution's delegate.
-	 */
-	private KVP getDelegate() {
-		return (KVP) contributionDelegate;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#invokeOperation(java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	protected Object invokeOperation(String operationName, Object[] args, String[] argTypes) {
-		if (METHOD_REMOVE.equals(operationName)) {
-			Preferences node = getDelegate().getNode();
-			node.remove(getDelegate().getKey());
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String attribute) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-	 */
-	public void setAttribute(Attribute attribute) {
-		// do nothing
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-	 */
-	public AttributeList getAttributes(String[] attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-	 */
-	public AttributeList setAttributes(AttributeList attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getImageLocation()
-	 */
-	protected URL getImageLocation() {
-		return FileLocator.find(Activator.getContext().getBundle(), new Path(KVP_IMAGE_PATH), null);
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/Messages.java b/monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/Messages.java
deleted file mode 100644
index 9d0b91e..0000000
--- a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/Messages.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.internal.preferences.jmx;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @since 1.0
- */
-public class Messages extends NLS {
-	public static String preferenceContributionName;
-	public static String kvpContributionName;
-
-	public static String operation_addChild;
-	public static String operation_put;
-	public static String operation_removeNode;
-	public static String operation_removeKVP;
-
-	public static String parm_childName_desc;
-	public static String parm_key_desc;
-	public static String parm_value_desc;
-
-	private Messages() {
-		// prevent instantiation
-	}
-
-	// initialize resource bundle
-	static {
-		NLS.initializeMessages("org.eclipse.equinox.internal.preferences.jmx.messages", Messages.class); //$NON-NLS-1$
-	}
-
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/PreferenceContribution.java b/monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/PreferenceContribution.java
deleted file mode 100644
index 953e05c..0000000
--- a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/PreferenceContribution.java
+++ /dev/null

@@ -1,235 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * 	Jeff Mesnil - Bug 151266 - [monitoring] Browsing our server in jconsole is really unfriendly
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.internal.preferences.jmx;
-
-import java.net.URL;
-import java.util.*;
-import javax.management.*;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.equinox.jmx.common.JMXConstants;
-import org.eclipse.equinox.jmx.server.Contribution;
-import org.osgi.service.prefs.BackingStoreException;
-import org.osgi.service.prefs.Preferences;
-
-/**
- * @since 1.0
- */
-public class PreferenceContribution extends Contribution {
-
-	// path to the icon
-	private static final String IMAGE_PATH = "icons/node.gif"; //$NON-NLS-1$
-	private static final String EMPTY_STRING = ""; //$NON-NLS-1$
-
-	private static final String METHOD_ADD_CHILD = "addChild"; //$NON-NLS-1$
-	private static final String METHOD_PUT = "put"; //$NON-NLS-1$
-	private static final String METHOD_REMOVE_NODE = "removeNode"; //$NON-NLS-1$
-
-	private static final String PARM_NAME = "name"; //$NON-NLS-1$
-	private static final String PARM_KEY = "key"; //$NON-NLS-1$
-	private static final String PARM_VALUE = "value"; //$NON-NLS-1$
-
-	private static final String TYPE_STRING = "java.lang.String"; //$NON-NLS-1$
-
-	/*
-	 * Constructor for the class. Create a contribution for the given preference node.
-	 */
-	public PreferenceContribution(Preferences delegate) {
-		super(delegate.absolutePath());
-	}
-
-    /* (non-Javadoc)
-     * @see org.eclipse.equinox.jmx.server.Contribution#getObjectName()
-     */
-    protected ObjectName getObjectName() {
-        try {
-            return new ObjectName(JMXConstants.DEFAULT_DOMAIN + ":type=Preferences,name=" + contributionDelegate); //$NON-NLS-1$
-        } catch (Exception e) {
-            return super.getObjectName();
-        }
-    }
-
-	/*
-	 * Return the delegate associated with this contribution.
-	 */
-	private Preferences getDeletgate() {
-		return Activator.getPreferenceService().getRootNode().node((String) contributionDelegate);
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getName()
-	 */
-	protected String getName() {
-		return getDeletgate().name();
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getChildren()
-	 */
-	protected Object[] getChildren() {
-		String[] children = new String[0];
-		try {
-			children = getDeletgate().childrenNames();
-		} catch (BackingStoreException e) {
-			// ignore and try and add the key/value pairs
-		}
-
-		String[] keys = new String[0];
-		try {
-			keys = getDeletgate().keys();
-		} catch (BackingStoreException e) {
-			// ignore
-		}
-		Object[] result = new Object[children.length + keys.length];
-		for (int i = 0; i < children.length; i++)
-			result[i] = getDeletgate().node(children[i]);
-		for (int i = children.length; i < keys.length; i++)
-			result[i] = new KVP(getDeletgate(), keys[i], getDeletgate().get(keys[i], EMPTY_STRING));
-		return result;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getProperties()
-	 */
-	protected Set getProperties() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getMBeanInfo(java.lang.Object)
-	 */
-	protected MBeanInfo getMBeanInfo(Object delegate) {
-		return new MBeanInfo(getClass().getName(), null, null, null, createOperations(), null);
-	}
-
-	/*
-	 * Return an array of operations which are applicable to this contribution.
-	 */
-	private MBeanOperationInfo[] createOperations() {
-		List result = new ArrayList();
-		result.add(createAddChildOperation());
-		result.add(createRemoveNodeOperation());
-		result.add(createPutOperation());
-		return (MBeanOperationInfo[]) result.toArray(new MBeanOperationInfo[result.size()]);
-	}
-
-	/*
-	 * Create and return an MBean operation that adds a key/value pair
-	 * to the current preference node.
-	 */
-	private MBeanOperationInfo createPutOperation() {
-		MBeanParameterInfo[] parms = new MBeanParameterInfo[] { //
-		new MBeanParameterInfo(PARM_KEY, TYPE_STRING, Messages.parm_key_desc), //
-				new MBeanParameterInfo(PARM_VALUE, TYPE_STRING, Messages.parm_value_desc) //
-		};
-		return new MBeanOperationInfo(METHOD_PUT, Messages.operation_put, parms, Void.TYPE.getName(), 0);
-	}
-
-	/*
-	 * Create and return an MBean operation that will remove the current preference node.
-	 */
-	private MBeanOperationInfo createRemoveNodeOperation() {
-		return new MBeanOperationInfo(METHOD_REMOVE_NODE, Messages.operation_removeNode, null, Void.TYPE.getName(), 0);
-	}
-
-	/*
-	 * Create and return an MBean operation that will add a child to the current preference node.
-	 */
-	private MBeanOperationInfo createAddChildOperation() {
-		MBeanParameterInfo[] parms = new MBeanParameterInfo[] { //
-		new MBeanParameterInfo(PARM_NAME, TYPE_STRING, Messages.parm_childName_desc) //
-		};
-		return new MBeanOperationInfo(METHOD_ADD_CHILD, Messages.operation_addChild, parms, Void.TYPE.getName(), 0);
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#invokeOperation(java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	protected Object invokeOperation(String operationName, Object[] args, String[] argTypes) {
-		if (METHOD_ADD_CHILD.equals(operationName)) {
-			handleAddChildOperation(args);
-		} else if (METHOD_REMOVE_NODE.equals(operationName)) {
-			handleRemoveNodeOperation();
-		} else if (METHOD_PUT.equals(operationName)) {
-			handlePutOperation(args);
-		}
-		return null;
-	}
-
-	/*
-	 * Add the given key/value pair to the current preference node.
-	 */
-	private void handlePutOperation(Object[] args) {
-		if (args == null || args.length != 2)
-			return;
-		if (!(args[0] instanceof String) || !(args[1] instanceof String))
-			return;
-		getDeletgate().put((String) args[0], (String) args[1]);
-	}
-
-	/*
-	 * Add a child with the given name to the current preference node.
-	 */
-	private void handleAddChildOperation(Object[] args) {
-		if (args == null || args.length != 1)
-			return;
-		if (!(args[0] instanceof String))
-			return;
-		getDeletgate().node((String) args[0]);
-	}
-
-	/*
-	 * Remove this preference node.
-	 */
-	private void handleRemoveNodeOperation() {
-		try {
-			getDeletgate().removeNode();
-		} catch (BackingStoreException e) {
-			Activator.log(e.getMessage(), e);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String attribute) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-	 */
-	public void setAttribute(Attribute attribute) {
-		// do nothing
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-	 */
-	public AttributeList getAttributes(String[] attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-	 */
-	public AttributeList setAttributes(AttributeList attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getImageLocation()
-	 */
-	protected URL getImageLocation() {
-		return FileLocator.find(Activator.getContext().getBundle(), new Path(IMAGE_PATH), null);
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/PreferenceContributionProvider.java b/monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/PreferenceContributionProvider.java
deleted file mode 100644
index 8231c79..0000000
--- a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/PreferenceContributionProvider.java
+++ /dev/null

@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.internal.preferences.jmx;
-
-import java.net.URL;
-import java.util.Set;
-import javax.management.*;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.preferences.IPreferencesService;
-import org.eclipse.equinox.jmx.server.Contribution;
-import org.eclipse.equinox.jmx.server.ContributionProvider;
-import org.osgi.service.prefs.BackingStoreException;
-import org.osgi.service.prefs.Preferences;
-
-/**
- * @since 1.0
- */
-public class PreferenceContributionProvider extends ContributionProvider {
-
-	// path to the icon
-	private static final String ICON_PATH = "icons/preferences.gif"; //$NON-NLS-1$
-
-	/*
-	 * Constructor for this provider.
-	 */
-	public PreferenceContributionProvider() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.ContributionProvider#providesType(java.lang.Object)
-	 */
-	protected boolean providesType(Object obj) {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.ContributionProvider#createContribution(java.lang.Object)
-	 */
-	protected Contribution createContribution(Object obj) {
-		return contributesType(obj) ? new PreferenceContribution((Preferences) obj) : null;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.ContributionProvider#createProvider(java.lang.Object)
-	 */
-	protected ContributionProvider createProvider(Object obj) {
-		return providesType(obj) ? new PreferenceContributionProvider() : null;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getName()
-	 */
-	protected String getName() {
-		return Messages.preferenceContributionName;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getChildren()
-	 */
-	protected Object[] getChildren() {
-		IPreferencesService service = Activator.getPreferenceService();
-		if (service == null)
-			return new Object[0];
-		Preferences root = service.getRootNode();
-		String[] children;
-		try {
-			children = root.childrenNames();
-		} catch (BackingStoreException e) {
-			return new Preferences[0];
-		}
-		Preferences[] result = new Preferences[children.length];
-		for (int i = 0; i < children.length; i++)
-			result[i] = root.node(children[i]);
-		return result;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getProperties()
-	 */
-	protected Set getProperties() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getMBeanInfo(java.lang.Object)
-	 */
-	protected MBeanInfo getMBeanInfo(Object delegate) {
-		return new MBeanInfo(getClass().getName(), null, null, null, null, null);
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#invokeOperation(java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	protected Object invokeOperation(String operationName, Object[] args, String[] argTypes) {
-		// do nothing
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String attribute) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-	 */
-	public void setAttribute(Attribute attribute) {
-		// do nothing
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-	 */
-	public AttributeList getAttributes(String[] attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-	 */
-	public AttributeList setAttributes(AttributeList attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.ContributionProvider#contributesType(java.lang.Object)
-	 */
-	protected boolean contributesType(Object obj) {
-		return obj instanceof Preferences;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getImageLocation()
-	 */
-	protected URL getImageLocation() {
-		return FileLocator.find(Activator.getContext().getBundle(), new Path(ICON_PATH), null);
-	}
-
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/messages.properties b/monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/messages.properties
deleted file mode 100644
index 57ef960..0000000
--- a/monitoring/bundles/org.eclipse.equinox.preferences.jmx/src/org/eclipse/equinox/internal/preferences/jmx/messages.properties
+++ /dev/null

@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-preferenceContributionName=Preferences
-kvpContributionName=Key/Value pair
-
-operation_addChild=Add a child node with the given name.
-operation_put=Add the given key/value pair to this node.
-operation_removeNode=Remove this node.
-operation_removeKVP=Remove this key/value pair.
-
-parm_childName_desc=Child name.
-parm_key_desc=Preference key.
-parm_value_desc=Preference value.
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.registry.jmx/.classpath b/monitoring/bundles/org.eclipse.equinox.registry.jmx/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/monitoring/bundles/org.eclipse.equinox.registry.jmx/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/monitoring/bundles/org.eclipse.equinox.registry.jmx/.cvsignore b/monitoring/bundles/org.eclipse.equinox.registry.jmx/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/monitoring/bundles/org.eclipse.equinox.registry.jmx/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/monitoring/bundles/org.eclipse.equinox.registry.jmx/.project b/monitoring/bundles/org.eclipse.equinox.registry.jmx/.project
deleted file mode 100644
index 98cb9b6..0000000
--- a/monitoring/bundles/org.eclipse.equinox.registry.jmx/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.registry.jmx</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/monitoring/bundles/org.eclipse.equinox.registry.jmx/.settings/org.eclipse.jdt.core.prefs b/monitoring/bundles/org.eclipse.equinox.registry.jmx/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 45e55d9..0000000
--- a/monitoring/bundles/org.eclipse.equinox.registry.jmx/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,259 +0,0 @@
-#Thu May 10 13:51:59 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=800
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

diff --git a/monitoring/bundles/org.eclipse.equinox.registry.jmx/.settings/org.eclipse.jdt.ui.prefs b/monitoring/bundles/org.eclipse.equinox.registry.jmx/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 8195fe9..0000000
--- a/monitoring/bundles/org.eclipse.equinox.registry.jmx/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,8 +0,0 @@
-#Mon Feb 26 11:27:54 EST 2007
-eclipse.preferences.version=1
-formatter_profile=_core
-formatter_settings_version=11
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.staticondemandthreshold=99

diff --git a/monitoring/bundles/org.eclipse.equinox.registry.jmx/META-INF/MANIFEST.MF b/monitoring/bundles/org.eclipse.equinox.registry.jmx/META-INF/MANIFEST.MF
deleted file mode 100644
index 6f9e126..0000000
--- a/monitoring/bundles/org.eclipse.equinox.registry.jmx/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Resource Monitoring Equinox Registry Extensions (Incubation)
-Bundle-SymbolicName: org.eclipse.equinox.registry.jmx;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.equinox.internal.registry.jmx.Activator
-Bundle-Localization: plugin
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,
- CDC-1.0/Foundation-1.0,
- J2SE-1.3
-Import-Package: javax.management,
- org.eclipse.core.runtime,
- org.eclipse.equinox.jmx.server,
- org.osgi.framework,
- org.osgi.util.tracker

diff --git a/monitoring/bundles/org.eclipse.equinox.registry.jmx/build.properties b/monitoring/bundles/org.eclipse.equinox.registry.jmx/build.properties
deleted file mode 100644
index d807a3d..0000000
--- a/monitoring/bundles/org.eclipse.equinox.registry.jmx/build.properties
+++ /dev/null

@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               icons/
-javacSource=1.3
-javacTarget=1.1
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.equinox.registry.jmx/icons/ext_point.gif b/monitoring/bundles/org.eclipse.equinox.registry.jmx/icons/ext_point.gif
deleted file mode 100644
index 52f4e5e..0000000
--- a/monitoring/bundles/org.eclipse.equinox.registry.jmx/icons/ext_point.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.equinox.registry.jmx/icons/extension.gif b/monitoring/bundles/org.eclipse.equinox.registry.jmx/icons/extension.gif
deleted file mode 100644
index e8abf43..0000000
--- a/monitoring/bundles/org.eclipse.equinox.registry.jmx/icons/extension.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.equinox.registry.jmx/icons/plugin_registry.gif b/monitoring/bundles/org.eclipse.equinox.registry.jmx/icons/plugin_registry.gif
deleted file mode 100644
index eedacd2..0000000
--- a/monitoring/bundles/org.eclipse.equinox.registry.jmx/icons/plugin_registry.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.equinox.registry.jmx/plugin.xml b/monitoring/bundles/org.eclipse.equinox.registry.jmx/plugin.xml
deleted file mode 100644
index fcd4623..0000000
--- a/monitoring/bundles/org.eclipse.equinox.registry.jmx/plugin.xml
+++ /dev/null

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-	<extension point="org.eclipse.equinox.jmx.server.contribution">
-		<contribution
-				class="org.eclipse.equinox.internal.registry.jmx.ExtensionRegistryContributionProvider"
-				isroot="false">
-			<extendsClass class="org.eclipse.core.runtime.IExtensionRegistry"/>
-		</contribution>
-		<contribution
-				class="org.eclipse.equinox.internal.registry.jmx.ExtensionPointContributionProvider"
-				isroot="true">
-			<extendsClass class="org.eclipse.core.runtime.IExtensionPoint"/>
-		</contribution>
-		<contribution
-				class="org.eclipse.equinox.internal.registry.jmx.ExtensionContributionProvider"
-				isroot="false">
-			<extendsClass class="org.eclipse.core.runtime.IExtension"/>
-	</contribution>
-	</extension>
-
-</plugin>

diff --git a/monitoring/bundles/org.eclipse.equinox.registry.jmx/src/org/eclipse/equinox/internal/registry/jmx/Activator.java b/monitoring/bundles/org.eclipse.equinox.registry.jmx/src/org/eclipse/equinox/internal/registry/jmx/Activator.java
deleted file mode 100644
index 0c54264..0000000
--- a/monitoring/bundles/org.eclipse.equinox.registry.jmx/src/org/eclipse/equinox/internal/registry/jmx/Activator.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.internal.registry.jmx;
-
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.util.tracker.ServiceTracker;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator implements BundleActivator {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.equinox.registry.jmx"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-
-	private static BundleContext context;
-	private ServiceTracker tracker;
-
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-		plugin = this;
-	}
-
-	public static BundleContext getContext() {
-		return context;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext bundleContext) throws Exception {
-		context = bundleContext;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext bundleContext) throws Exception {
-		if (tracker != null) {
-			tracker.close();
-			tracker = null;
-		}
-		plugin = null;
-		context = null;
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	public IExtensionRegistry getRegistry() {
-		if (tracker == null) {
-			tracker = new ServiceTracker(context, IExtensionRegistry.class.getName(), null);
-			tracker.open();
-		}
-		return (IExtensionRegistry) tracker.getService();
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.registry.jmx/src/org/eclipse/equinox/internal/registry/jmx/ExtensionContribution.java b/monitoring/bundles/org.eclipse.equinox.registry.jmx/src/org/eclipse/equinox/internal/registry/jmx/ExtensionContribution.java
deleted file mode 100644
index 4538013..0000000
--- a/monitoring/bundles/org.eclipse.equinox.registry.jmx/src/org/eclipse/equinox/internal/registry/jmx/ExtensionContribution.java
+++ /dev/null

@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * 	Jeff Mesnil - Bug 151266 - [monitoring] Browsing our server in jconsole is really unfriendly
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.internal.registry.jmx;
-
-import java.net.URL;
-import java.util.Set;
-import javax.management.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.jmx.server.Contribution;
-
-/**
- * @since 3.2
- */
-public class ExtensionContribution extends Contribution {
-
-	public ExtensionContribution(Object obj) {
-		super(obj);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getChildren()
-	 */
-	protected Object[] getChildren() {
-		return new Object[0];
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getImageLocation()
-	 */
-	protected URL getImageLocation() {
-		return FileLocator.find(Activator.getContext().getBundle(), new Path("icons/extension.gif"), null); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getMBeanInfo(java.lang.Object)
-	 */
-	protected MBeanInfo getMBeanInfo(Object delegate) {
-		return null;
-	}
-
-	private IExtension getDelegate() {
-		return (IExtension) contributionDelegate;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getName()
-	 */
-	protected String getName() {
-		String name = getDelegate().getUniqueIdentifier();
-		if (name != null)
-			return name;
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("anonymous "); //$NON-NLS-1$
-		IContributor contributor = getDelegate().getContributor();
-		if (contributor != null) {
-			buffer.append('[');
-			buffer.append(contributor.getName());
-			buffer.append(']');
-		}
-		return buffer.toString();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getObjectName()
-	 */
-	protected ObjectName getObjectName() {
-		try {
-			return new ObjectName("jmxserver:type=Extension,ExtensionPoint=" + getDelegate().getExtensionPointUniqueIdentifier() //$NON-NLS-1$
-					+ ",name=" + getName()); //$NON-NLS-1$
-		} catch (Exception e) {
-			return super.getObjectName();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getProperties()
-	 */
-	protected Set getProperties() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#invokeOperation(java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	protected Object invokeOperation(String operationName, Object[] args, String[] argTypes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String arg0) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-	 */
-	public AttributeList getAttributes(String[] arg0) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-	 */
-	public void setAttribute(Attribute arg0) {
-		//
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-	 */
-	public AttributeList setAttributes(AttributeList arg0) {
-		return null;
-	}
-
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.registry.jmx/src/org/eclipse/equinox/internal/registry/jmx/ExtensionContributionProvider.java b/monitoring/bundles/org.eclipse.equinox.registry.jmx/src/org/eclipse/equinox/internal/registry/jmx/ExtensionContributionProvider.java
deleted file mode 100644
index 32558d7..0000000
--- a/monitoring/bundles/org.eclipse.equinox.registry.jmx/src/org/eclipse/equinox/internal/registry/jmx/ExtensionContributionProvider.java
+++ /dev/null

@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.internal.registry.jmx;
-
-import java.net.URL;
-import java.util.Set;
-import javax.management.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.jmx.server.Contribution;
-import org.eclipse.equinox.jmx.server.ContributionProvider;
-
-/**
- * @since 3.2
- */
-public class ExtensionContributionProvider extends ContributionProvider {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.ContributionProvider#contributesType(java.lang.Object)
-	 */
-	protected boolean contributesType(Object obj) {
-		return obj instanceof IExtension;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.ContributionProvider#createContribution(java.lang.Object)
-	 */
-	protected Contribution createContribution(Object obj) {
-		return contributesType(obj) ? new ExtensionContribution(obj) : null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.ContributionProvider#createProvider(java.lang.Object)
-	 */
-	protected ContributionProvider createProvider(Object obj) {
-		return new ExtensionContributionProvider();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.ContributionProvider#providesType(java.lang.Object)
-	 */
-	protected boolean providesType(Object obj) {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getChildren()
-	 */
-	protected Object[] getChildren() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getImageLocation()
-	 */
-	protected URL getImageLocation() {
-		return FileLocator.find(Activator.getContext().getBundle(), new Path("icons/extension.gif"), null); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getMBeanInfo(java.lang.Object)
-	 */
-	protected MBeanInfo getMBeanInfo(Object delegate) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getName()
-	 */
-	protected String getName() {
-		return "Extension";
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getProperties()
-	 */
-	protected Set getProperties() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#invokeOperation(java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	protected Object invokeOperation(String operationName, Object[] args, String[] argTypes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String arg0) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-	 */
-	public AttributeList getAttributes(String[] arg0) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-	 */
-	public void setAttribute(Attribute arg0) {
-		//
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-	 */
-	public AttributeList setAttributes(AttributeList arg0) {
-		return null;
-	}
-
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.registry.jmx/src/org/eclipse/equinox/internal/registry/jmx/ExtensionPointContribution.java b/monitoring/bundles/org.eclipse.equinox.registry.jmx/src/org/eclipse/equinox/internal/registry/jmx/ExtensionPointContribution.java
deleted file mode 100644
index 8c01133..0000000
--- a/monitoring/bundles/org.eclipse.equinox.registry.jmx/src/org/eclipse/equinox/internal/registry/jmx/ExtensionPointContribution.java
+++ /dev/null

@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * 	Jeff Mesnil - Bug 151266 - [monitoring] Browsing our server in jconsole is really unfriendly
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.internal.registry.jmx;
-
-import java.net.URL;
-import java.util.Set;
-import javax.management.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.jmx.server.Contribution;
-
-/**
- * @since 3.2
- */
-public class ExtensionPointContribution extends Contribution {
-
-	public ExtensionPointContribution(Object obj) {
-		super(obj);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getChildren()
-	 */
-	protected Object[] getChildren() {
-		return getDeletgate().getExtensions();
-	}
-
-	private IExtensionPoint getDeletgate() {
-		return (IExtensionPoint) contributionDelegate;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getImageLocation()
-	 */
-	protected URL getImageLocation() {
-		return FileLocator.find(Activator.getContext().getBundle(), new Path("icons/ext_point.gif"), null); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getMBeanInfo(java.lang.Object)
-	 */
-	protected MBeanInfo getMBeanInfo(Object delegate) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getName()
-	 */
-	protected String getName() {
-		return getDeletgate().getUniqueIdentifier();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getObjectName()
-	 */
-	protected ObjectName getObjectName() {
-		try {
-			return new ObjectName("jmxserver:type=ExtensionPoint,name=" + getName()); //$NON-NLS-1$
-		} catch (Exception e) {
-			return super.getObjectName();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getProperties()
-	 */
-	protected Set getProperties() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#invokeOperation(java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	protected Object invokeOperation(String operationName, Object[] args, String[] argTypes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String attribute) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-	 */
-	public AttributeList getAttributes(String[] attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-	 */
-	public void setAttribute(Attribute attribute) {
-		//
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-	 */
-	public AttributeList setAttributes(AttributeList attributes) {
-		return null;
-	}
-
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.registry.jmx/src/org/eclipse/equinox/internal/registry/jmx/ExtensionPointContributionProvider.java b/monitoring/bundles/org.eclipse.equinox.registry.jmx/src/org/eclipse/equinox/internal/registry/jmx/ExtensionPointContributionProvider.java
deleted file mode 100644
index 7c7bd84..0000000
--- a/monitoring/bundles/org.eclipse.equinox.registry.jmx/src/org/eclipse/equinox/internal/registry/jmx/ExtensionPointContributionProvider.java
+++ /dev/null

@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.internal.registry.jmx;
-
-import java.net.URL;
-import java.util.Set;
-import javax.management.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.jmx.server.Contribution;
-import org.eclipse.equinox.jmx.server.ContributionProvider;
-
-/**
- * @since 3.2
- */
-public class ExtensionPointContributionProvider extends ContributionProvider {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.ContributionProvider#contributesType(java.lang.Object)
-	 */
-	protected boolean contributesType(Object obj) {
-		return obj instanceof IExtensionPoint;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.ContributionProvider#createContribution(java.lang.Object)
-	 */
-	protected Contribution createContribution(Object obj) {
-		return contributesType(obj) ? new ExtensionPointContribution(obj) : null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.ContributionProvider#createProvider(java.lang.Object)
-	 */
-	protected ContributionProvider createProvider(Object obj) {
-		return new ExtensionPointContributionProvider();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.ContributionProvider#providesType(java.lang.Object)
-	 */
-	protected boolean providesType(Object obj) {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getChildren()
-	 */
-	protected Object[] getChildren() {
-		return Activator.getDefault().getRegistry().getExtensionPoints();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getImageLocation()
-	 */
-	protected URL getImageLocation() {
-		return FileLocator.find(Activator.getContext().getBundle(), new Path("icons/plugin_registry.gif"), null); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getMBeanInfo(java.lang.Object)
-	 */
-	protected MBeanInfo getMBeanInfo(Object delegate) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getName()
-	 */
-	protected String getName() {
-		return "Extension Points";
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getProperties()
-	 */
-	protected Set getProperties() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#invokeOperation(java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	protected Object invokeOperation(String operationName, Object[] args, String[] argTypes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String arg0) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-	 */
-	public AttributeList getAttributes(String[] arg0) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-	 */
-	public void setAttribute(Attribute arg0) {
-		//
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-	 */
-	public AttributeList setAttributes(AttributeList arg0) {
-		return null;
-	}
-
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.registry.jmx/src/org/eclipse/equinox/internal/registry/jmx/ExtensionRegistryContribution.java b/monitoring/bundles/org.eclipse.equinox.registry.jmx/src/org/eclipse/equinox/internal/registry/jmx/ExtensionRegistryContribution.java
deleted file mode 100644
index 4039aca..0000000
--- a/monitoring/bundles/org.eclipse.equinox.registry.jmx/src/org/eclipse/equinox/internal/registry/jmx/ExtensionRegistryContribution.java
+++ /dev/null

@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * 	Jeff Mesnil - Bug 151266 - [monitoring] Browsing our server in jconsole is really unfriendly
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.internal.registry.jmx;
-
-import java.net.URL;
-import java.util.Set;
-import javax.management.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.jmx.server.Contribution;
-
-/**
- * @since 3.2
- */
-public class ExtensionRegistryContribution extends Contribution {
-
-	public ExtensionRegistryContribution(Object obj) {
-		super(obj);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getChildren()
-	 */
-	protected Object[] getChildren() {
-		// TODO
-		return new Object[0];
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getImageLocation()
-	 */
-	protected URL getImageLocation() {
-		return FileLocator.find(Activator.getContext().getBundle(), new Path("icons/plugin_registry.gif"), null); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getMBeanInfo(java.lang.Object)
-	 */
-	protected MBeanInfo getMBeanInfo(Object delegate) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getName()
-	 */
-	protected String getName() {
-		return "Extension Registry";
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getObjectName()
-	 */
-	protected ObjectName getObjectName() {
-		try {
-			return new ObjectName("jmxserver:type=ExtensionRegistry,name=" + getName()); //$NON-NLS-1$
-		} catch (Exception e) {
-			return super.getObjectName();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getProperties()
-	 */
-	protected Set getProperties() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#invokeOperation(java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	protected Object invokeOperation(String operationName, Object[] args, String[] argTypes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String attribute) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-	 */
-	public AttributeList getAttributes(String[] attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-	 */
-	public void setAttribute(Attribute attribute) {
-		//
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-	 */
-	public AttributeList setAttributes(AttributeList attributes) {
-		return null;
-	}
-
-}

diff --git a/monitoring/bundles/org.eclipse.equinox.registry.jmx/src/org/eclipse/equinox/internal/registry/jmx/ExtensionRegistryContributionProvider.java b/monitoring/bundles/org.eclipse.equinox.registry.jmx/src/org/eclipse/equinox/internal/registry/jmx/ExtensionRegistryContributionProvider.java
deleted file mode 100644
index 22b0ffb..0000000
--- a/monitoring/bundles/org.eclipse.equinox.registry.jmx/src/org/eclipse/equinox/internal/registry/jmx/ExtensionRegistryContributionProvider.java
+++ /dev/null

@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.internal.registry.jmx;
-
-import java.net.URL;
-import java.util.*;
-import javax.management.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.jmx.server.Contribution;
-import org.eclipse.equinox.jmx.server.ContributionProvider;
-
-/**
- * @since 3.2
- */
-public class ExtensionRegistryContributionProvider extends ContributionProvider {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.ContributionProvider#contributesType(java.lang.Object)
-	 */
-	protected boolean contributesType(Object obj) {
-		return obj instanceof IExtensionRegistry;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.ContributionProvider#createContribution(java.lang.Object)
-	 */
-	protected Contribution createContribution(Object obj) {
-		return contributesType(obj) ? new ExtensionRegistryContribution(obj) : null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.ContributionProvider#createProvider(java.lang.Object)
-	 */
-	protected ContributionProvider createProvider(Object obj) {
-		return new ExtensionRegistryContributionProvider();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.ContributionProvider#providesType(java.lang.Object)
-	 */
-	protected boolean providesType(Object obj) {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getChildren()
-	 */
-	protected Object[] getChildren() {
-		return new Object[] {new ExtensionPointContributionProvider(), new ExtensionContributionProvider()};
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getImageLocation()
-	 */
-	protected URL getImageLocation() {
-		return FileLocator.find(Activator.getContext().getBundle(), new Path("icons/plugin_registry.gif"), null); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getMBeanInfo(java.lang.Object)
-	 */
-	protected MBeanInfo getMBeanInfo(Object delegate) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getName()
-	 */
-	protected String getName() {
-		return "Extension Registry";
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getProperties()
-	 */
-	protected Set getProperties() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#invokeOperation(java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	protected Object invokeOperation(String operationName, Object[] args, String[] argTypes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String arg0) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-	 */
-	public AttributeList getAttributes(String[] arg0) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-	 */
-	public void setAttribute(Attribute arg0) {
-		//
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-	 */
-	public AttributeList setAttributes(AttributeList arg0) {
-		return null;
-	}
-
-}

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/.classpath b/monitoring/bundles/org.eclipse.osgi.jmx/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/.cvsignore b/monitoring/bundles/org.eclipse.osgi.jmx/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/.project b/monitoring/bundles/org.eclipse.osgi.jmx/.project
deleted file mode 100644
index 9005d9e..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.osgi.jmx</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/monitoring/bundles/org.eclipse.osgi.jmx/.settings/org.eclipse.jdt.core.prefs b/monitoring/bundles/org.eclipse.osgi.jmx/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b4f3d12..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,309 +0,0 @@
-#Thu May 10 13:51:44 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-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.hiddenCatchBlock=warning
-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.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-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.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-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.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=800
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/.settings/org.eclipse.jdt.ui.prefs b/monitoring/bundles/org.eclipse.osgi.jmx/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 3f677eb..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,9 +0,0 @@
-#Mon Feb 26 11:28:03 EST 2007
-eclipse.preferences.version=1
-formatter_profile=_core
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.staticondemandthreshold=99

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/META-INF/MANIFEST.MF b/monitoring/bundles/org.eclipse.osgi.jmx/META-INF/MANIFEST.MF
deleted file mode 100644
index ccb0cdf..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Resource Monitoring OSGi Extensions (Incubation)
-Bundle-SymbolicName: org.eclipse.osgi.jmx;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.osgi.jmx.internal.Activator
-Bundle-Localization: plugin
-Eclipse-LazyStart: true
-Bundle-Vendor: Eclipse.org
-Import-Package: javax.management,
- org.eclipse.core.runtime; common=split,
- org.eclipse.equinox.jmx.common,
- org.eclipse.equinox.jmx.common.util,
- org.eclipse.equinox.jmx.server,
- org.eclipse.osgi.service.pluginconversion,
- org.eclipse.osgi.service.resolver,
- org.eclipse.osgi.util,
- org.osgi.framework,
- org.osgi.service.packageadmin,
- org.osgi.util.tracker
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,
- CDC-1.0/Foundation-1.0,
- J2SE-1.3

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/about.html b/monitoring/bundles/org.eclipse.osgi.jmx/about.html
deleted file mode 100644
index 5d03fd4..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/about.html
+++ /dev/null

@@ -1,28 +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 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/build.properties b/monitoring/bundles/org.eclipse.osgi.jmx/build.properties
deleted file mode 100644
index a0c5bdd..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/build.properties
+++ /dev/null

@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               icons/
-src.includes = about.html
-javacSource=1.3
-javacTarget=1.1

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/bundle.gif b/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/bundle.gif
deleted file mode 100644
index f2ef78c..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/bundle.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/bundle_provider.gif b/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/bundle_provider.gif
deleted file mode 100644
index e9a6bd9..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/bundle_provider.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/bundle_service.gif b/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/bundle_service.gif
deleted file mode 100644
index 6cb185c..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/bundle_service.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/component.gif b/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/component.gif
deleted file mode 100644
index a831fe7..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/component.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/mbean_operation.gif b/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/mbean_operation.gif
deleted file mode 100644
index 92075a8..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/mbean_operation.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/mbean_operation_none.gif b/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/mbean_operation_none.gif
deleted file mode 100644
index 2d30266..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/mbean_operation_none.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/mbean_operations.gif b/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/mbean_operations.gif
deleted file mode 100644
index 49f9a93..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/mbean_operations.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/ovr_bundle_active.gif b/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/ovr_bundle_active.gif
deleted file mode 100644
index 95f87ea..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/ovr_bundle_active.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/ovr_bundle_resolved.gif b/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/ovr_bundle_resolved.gif
deleted file mode 100644
index d6344db..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/ovr_bundle_resolved.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/ovr_bundle_stopped.gif b/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/ovr_bundle_stopped.gif
deleted file mode 100644
index 1683fca..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/icons/bundles/ovr_bundle_stopped.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/icons/services/bundle_reg_service.gif b/monitoring/bundles/org.eclipse.osgi.jmx/icons/services/bundle_reg_service.gif
deleted file mode 100644
index 76ad5cf..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/icons/services/bundle_reg_service.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/icons/services/bundle_reg_service.png b/monitoring/bundles/org.eclipse.osgi.jmx/icons/services/bundle_reg_service.png
deleted file mode 100644
index c38bfce..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/icons/services/bundle_reg_service.png
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/icons/services/bundle_use_reg_service.gif b/monitoring/bundles/org.eclipse.osgi.jmx/icons/services/bundle_use_reg_service.gif
deleted file mode 100644
index 6947605..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/icons/services/bundle_use_reg_service.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/icons/services/bundle_use_reg_service.png b/monitoring/bundles/org.eclipse.osgi.jmx/icons/services/bundle_use_reg_service.png
deleted file mode 100644
index 83f7b57..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/icons/services/bundle_use_reg_service.png
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/icons/services/bundle_use_service.gif b/monitoring/bundles/org.eclipse.osgi.jmx/icons/services/bundle_use_service.gif
deleted file mode 100644
index aa526d3..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/icons/services/bundle_use_service.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/icons/services/bundle_use_service.png b/monitoring/bundles/org.eclipse.osgi.jmx/icons/services/bundle_use_service.png
deleted file mode 100644
index 17b5d74..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/icons/services/bundle_use_service.png
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/icons/services/service.gif b/monitoring/bundles/org.eclipse.osgi.jmx/icons/services/service.gif
deleted file mode 100644
index a831fe7..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/icons/services/service.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/icons/services/service_provider.gif b/monitoring/bundles/org.eclipse.osgi.jmx/icons/services/service_provider.gif
deleted file mode 100644
index 5ba5b91..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/icons/services/service_provider.gif
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/plugin.xml b/monitoring/bundles/org.eclipse.osgi.jmx/plugin.xml
deleted file mode 100644
index 208b3ec..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/plugin.xml
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   <extension
-         point="org.eclipse.equinox.jmx.server.contribution">
-      <contribution
-            class="org.eclipse.osgi.jmx.internal.BundleContributionProvider"
-            isroot="true">
-         <extendsClass class="org.osgi.framework.ServiceReference"/>
-      </contribution>
-      <contribution
-            class="org.eclipse.osgi.jmx.internal.ServiceContributionProvider"
-            isroot="true">
-         <extendsClass class="org.osgi.framework.Bundle"/>
-      </contribution>
-      <contribution
-            class="org.eclipse.osgi.jmx.internal.BundleRequiresProvider"
-            isroot="false">
-         <extendsClass class="org.osgi.framework.Bundle"/>
-      </contribution>
-      <contribution
-            class="org.eclipse.osgi.jmx.internal.BundlePackagesProvider"
-            isroot="false">
-         <extendsClass class="org.osgi.framework.Bundle"/>
-      </contribution>
-   </extension>
-
-</plugin>

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/Activator.java b/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/Activator.java
deleted file mode 100644
index eb91e22..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/Activator.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osgi.jmx.internal;
-
-import org.osgi.framework.*;
-import org.osgi.service.packageadmin.PackageAdmin;
-import org.osgi.util.tracker.ServiceTracker;
-
-/**
- * The activator for this bundle.
- * 
- * @since 1.0
- */
-public class Activator implements BundleActivator {
-
-	private static BundleContext context;
-	private static ServiceTracker bundleTracker;
-
-	/**
-	 * The constructor.
-	 */
-	public Activator() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext bundleContext) throws Exception {
-		Activator.context = bundleContext;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext bundleContext) throws Exception {
-		if (bundleTracker != null) {
-			bundleTracker.close();
-			bundleTracker = null;
-		}
-		Activator.context = null;
-	}
-
-	/**
-	 * @return The bundle context.
-	 */
-	public static BundleContext getBundleContext() {
-		return context;
-	}
-
-	public static Bundle getBundle() {
-		return context.getBundle();
-	}
-
-	/**
-	 * Return the resolved bundle with the specified symbolic name.
-	 * 
-	 * @see PackageAdmin#getBundles(String, String)
-	 */
-	public static Bundle getBundle(String symbolicName) {
-		if (bundleTracker == null) {
-			bundleTracker = new ServiceTracker(getBundleContext(), PackageAdmin.class.getName(), null);
-			bundleTracker.open();
-		}
-		PackageAdmin admin = (PackageAdmin) bundleTracker.getService();
-		if (admin == null)
-			return null;
-		Bundle[] bundles = admin.getBundles(symbolicName, null);
-		if (bundles == null)
-			return null;
-		//Return the first bundle that is not installed or uninstalled
-		for (int i = 0; i < bundles.length; i++) {
-			if ((bundles[i].getState() & (Bundle.INSTALLED | Bundle.UNINSTALLED)) == 0) {
-				return bundles[i];
-			}
-		}
-		return null;
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleContribution.java b/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleContribution.java
deleted file mode 100644
index f7584fb..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleContribution.java
+++ /dev/null

@@ -1,475 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Jeff Mesnil - Bug 151266 - [monitoring] Browsing our server in jconsole is really unfriendly
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osgi.jmx.internal;
-
-import java.net.URL;
-import java.util.*;
-import javax.management.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.jmx.common.ContributionNotificationEvent;
-import org.eclipse.equinox.jmx.common.JMXConstants;
-import org.eclipse.equinox.jmx.server.Contribution;
-import org.osgi.framework.*;
-
-/**
- * A <code>BundleContribution</code> exposes a <code>Bundle</code> as a <code>Contribution</code>.
- * 
- * @since 1.0
- */
-public class BundleContribution extends Contribution implements BundleListener {
-	private static final long serialVersionUID = 1180032465513448129L;
-	private static final String BUNDLE_IMG_PATH = "icons/bundles/bundle.gif"; //$NON-NLS-1$
-	private static final Map stateStrings = new HashMap();
-	static {
-		stateStrings.put(new Integer(Bundle.ACTIVE), "ACTIVE"); //$NON-NLS-1$
-		stateStrings.put(new Integer(Bundle.INSTALLED), "INSTALLED"); //$NON-NLS-1$
-		stateStrings.put(new Integer(Bundle.RESOLVED), "RESOLVED"); //$NON-NLS-1$
-		stateStrings.put(new Integer(Bundle.STARTING), "STARTING"); //$NON-NLS-1$
-		stateStrings.put(new Integer(Bundle.STOPPING), "STOPPING"); //$NON-NLS-1$
-		stateStrings.put(new Integer(Bundle.UNINSTALLED), "UNINSTALLED"); //$NON-NLS-1$
-	}
-	private ServiceReference service;
-
-	/**
-	 * Allocate a <code>BundleContribution</code> from the <code>bundle</code> provided.
-	 * 
-	 * @param bundle The bundle to expose as a contribution.
-	 */
-	public BundleContribution(Bundle bundle) {
-		this(bundle, null);
-	}
-
-	/**
-	 * Allocate a <code>BundleContribution</code> from the <code>bundle</code> that
-	 * is associated with the <code>service</code> provided.
-	 * 
-	 * @param bundle The bundle to expose as a contribution.
-	 * @param service The service associated with this contribution.
-	 */
-	public BundleContribution(Bundle bundle, ServiceReference service) {
-		super(bundle);
-		this.bundle = bundle;
-		this.service = service;
-		setProperties(bundle);
-		Activator.getBundleContext().addBundleListener(this);
-	}
-
-    /* (non-Javadoc)
-     * @see org.eclipse.equinox.jmx.server.Contribution#getObjectName()
-     */
-    protected ObjectName getObjectName() {
-        try {
-            return new ObjectName(JMXConstants.DEFAULT_DOMAIN + ":type=Bundle,name=" + getName()); //$NON-NLS-1$
-        } catch (Exception e) {
-            return super.getObjectName();
-        }
-    }
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getChildren()
-	 */
-	protected Object[] getChildren() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getProperties()
-	 */
-	protected Set getProperties() {
-		Set ret = new TreeSet();
-		ret.add("Symbolic-name: " + symbolicName); //$NON-NLS-1$
-		ret.add("Bundle ID: " + Long.toString(id)); //$NON-NLS-1$
-		ret.add("Description: " + description); //$NON-NLS-1$
-		ret.add("State: " + (String) stateStrings.get(new Integer(getState()))); //$NON-NLS-1$
-		ret.add("Vendor: " + vendor); //$NON-NLS-1$
-		ret.add("Contact Address: " + contactAddress); //$NON-NLS-1$
-		ret.add("Location: " + location); //$NON-NLS-1$
-		ret.add("DocURL: " + docURL); //$NON-NLS-1$
-		return ret;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getImageLocation()
-	 */
-	protected URL getImageLocation() {
-		String imgPath = BUNDLE_IMG_PATH;
-		if (service != null) {
-			// check if we are a providing this bundle
-			if (service.getBundle() == bundle) {
-				imgPath = ServiceContribution.IMG_REG_SERVICE_PATH;
-				// check if we are also using this bundle
-				Bundle[] usingBundles = service.getUsingBundles();
-				if (usingBundles != null) {
-					for (int i = 0; i < usingBundles.length; i++) {
-						if (usingBundles[i] == bundle) {
-							imgPath = ServiceContribution.IMG_USE_REG_SERVICE_PATH;
-							break;
-						}
-					}
-				}
-			} else {
-				// bundle is merely a consumer of this service
-				imgPath = ServiceContribution.IMG_USE_SERVICE_PATH;
-			}
-		}
-		return FileLocator.find(Activator.getBundle(), new Path(imgPath), null);
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#invokeOperation(java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	protected Object invokeOperation(String operationName, Object[] args, String[] argTypes) {
-		if (args.length == 0 && argTypes.length == 0) {
-			try {
-				if (operationName.equals("start")) { //$NON-NLS-1$
-					bundle.start();
-				} else if (operationName.equals("stop")) { //$NON-NLS-1$
-					bundle.stop();
-				} else if (operationName.equals("uninstall")) { //$NON-NLS-1$
-					bundle.uninstall();
-					//BundleContributionProvider.refreshPackages(new Bundle[] {bundle});
-				}
-			} catch (Exception e) {
-				return e.getMessage();
-			}
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleListener#bundleChanged(org.osgi.framework.BundleEvent)
-	 */
-	public void bundleChanged(BundleEvent event) {
-		Bundle b = (Bundle) event.getSource();
-		if (b != bundle && event.getType() != getState()) {
-			return;
-		}
-		setProperties(bundle);
-		ContributionNotificationEvent cEvent = null;
-		switch (event.getType()) {
-			case BundleEvent.UNINSTALLED :
-				cEvent = new ContributionNotificationEvent(ContributionNotificationEvent.NOTIFICATION_REMOVED);
-				break;
-			case BundleEvent.STARTED :
-			case BundleEvent.STOPPED :
-				cEvent = new ContributionNotificationEvent(ContributionNotificationEvent.NOTIFICATION_UPDATED);
-				break;
-			default :
-				return;
-		}
-		super.contributionStateChanged(cEvent);
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getName()
-	 */
-	public String getName() {
-		return symbolicName + "-" + version; //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String attribute) throws AttributeNotFoundException, MBeanException, ReflectionException {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-	 */
-	public void setAttribute(Attribute attribute) throws AttributeNotFoundException, InvalidAttributeValueException, MBeanException, ReflectionException {
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-	 */
-	public AttributeList getAttributes(String[] attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-	 */
-	public AttributeList setAttributes(AttributeList attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getMBeanInfo(java.lang.Object)
-	 */
-	public MBeanInfo getMBeanInfo(Object delegate) {
-		MBeanInfo info = new MBeanInfo(getClass().getName(), BundleContributionMessages.bundle_description, getAttributes(), getConstructorInfo(), getOperationInfo(), getNotificationInfo());
-		return info;
-	}
-
-	/**
-	 * Returns the <code>contactAddress</code> for this bundle, or <code>null</code> if one doesn't exist.
-	 * 
-	 * @see org.osgi.framework.Bundle#getHeaders()
-	 * @return The <code>contactAddress</code> of a specific bundle
-	 */
-	public String getContactAddress() {
-		return contactAddress;
-	}
-
-	/**
-	 * Sets the <code>contactAddress</code> for this bundle.
-	 * 
-	 * @see org.osgi.framework.Bundle#getHeaders() 
-	 * @param contactAddress is a <code>String<code> which specifying the <code>contactAddress</code> of a specific bundle
-	 */
-	public void setContactAddress(String contactAddress) {
-		this.contactAddress = contactAddress;
-	}
-
-	/**
-	 * Returns the <code>description</code> for this bundle, or null if one doesn't exist.
-	 * 
-	 * @see org.osgi.framework.Bundle#getHeaders()
-	 * @return The <code>description</code> of a specific bundle
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * Sets the <code>description</code> for this bundle.
-	 * 
-	 * @see org.osgi.framework.Bundle#getHeaders()
-	 * @param description is a <code>String</code> which specifying the <code>description</code> of a specific bundle
-	 */
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	/**
-	 * Returns the <code>dorURL</code> for this bundles, or <code>null</code> if one doesn't exist.
-	 * 
-	 * @see org.osgi.framework.Bundle#getHeaders()
-	 * @return The <code>dorURL</code> of a specific bundle
-	 */
-	public String getDocURL() {
-		return docURL;
-	}
-
-	/**
-	 * Sets the <code>docURL</code> for this bundle.
-	 * 
-	 * @see org.osgi.framework.Bundle#getHeaders() 
-	 * @param docURL is a <code>String</code> which specifying the <code>DocURL</code> of a specific bundle
-	 */
-	public void setDocURL(String docURL) {
-		this.docURL = docURL;
-	}
-
-	/**
-	 * Returns the identifier for this bundle.
-	 * 
-	 * @see org.osgi.framework.Bundle#getBundleId()
-	 * @return The <code>id</code> is a unique identifier of a specific bundle
-	 */
-	public long getId() {
-		return id;
-	}
-
-	/**
-	 * Sets the bundle's identifier for this bundle.
-	 * 
-	 * @see org.osgi.framework.Bundle#getBundleId()
-	 * @param id is a <code>long<code> that specifying the identifier of a specific bundle
-	 * @exception <code>IllegalArgumentException</code> if input id smaller than 0
-	 */
-	public void setId(long id) throws IllegalArgumentException {
-		Assert.isLegal(id >= 0);
-		this.id = id;
-	}
-
-	/**
-	 * Returns the date when this bundle was last modified.
-	 * 
-	 * @see org.osgi.framework.Bundle#getLastModified()
-	 * @return The <code>lastModified</code> which indicates when this bundle was last modified
-	 */
-	public long getLastModified() {
-		return lastModified;
-	}
-
-	/**
-	 * Sets the time when this bundle was last modified.
-	 * 
-	 * @see org.osgi.framework.Bundle#getLastModified()
-	 * @param lastModified the bundle's last modified time
-	 */
-	public void setLastModified(long lastModified) {
-		this.lastModified = lastModified;
-	}
-
-	/**
-	 * Returns the <code>location</code> for this bundle.
-	 * 
-	 * @see org.osgi.framework.Bundle#getLocation()
-	 * @return The <code>location</code> of a specific bundle
-	 */
-	public String getLocation() {
-		return location;
-	}
-
-	/**
-	 * Sets the <code>location</code> of a specific bundle.
-	 * 
-	 * @see org.osgi.framework.Bundle#getLocation()
-	 * @param location is a <code>String<code> which specifying the <code>location</code> 
-	 *        of a specific bundle
-	 * @exception IllegalArgumentException if <code>location<code> is null or empty string
-	 */
-	public void setLocation(String location) throws IllegalArgumentException {
-		Assert.isLegal(location != null && !location.equals("")); //$NON-NLS-1$
-		this.location = location;
-	}
-
-	/**
-	 * Return the <code>state</code> for this bundle.
-	 * 
-	 * @see org.osgi.framework.Bundle#getState()
-	 * @return The current <code>state</code> of a specific bundle
-	 */
-	public int getState() {
-		return state;
-	}
-
-	/**
-	 * Sets the <code>state</code> for this bundle.
-	 * 
-	 * @see org.osgi.framework.Bundle#getState()
-	 * @param state is a <code>int</code> which specifying the <code>state</code> of a specific bundle
-	 */
-	public void setState(int state) {
-		this.state = state;
-	}
-
-	/**
-	 * Returns the </code>symbolicName</code> for this bundle, or <code>null</code> if one doesn't exist.
-	 * 
-	 * @see org.osgi.framework.Bundle#getSymbolicName()
-	 * @return The symbolic name of a specific bundle
-	 */
-	public String getSymbolicName() {
-		return symbolicName;
-	}
-
-	/**
-	 * Sets the </code>symbolicName</code> of for this bundle.
-	 * 
-	 * @see org.osgi.framework.Bundle#getSymbolicName()
-	 * @param symbolicName is a <code>String</code> which specifying the <code>symbolicName<code> of a specific bundle
-	 */
-	public void setSymbolicName(String symbolicName) {
-		this.symbolicName = symbolicName;
-	}
-
-	/**
-	 * Returns the <code>vendor</code> for this bundle, or <code>null</code> if one doesn't exist.
-	 * 
-	 * @see org.osgi.framework.Bundle#getHeaders()
-	 * @return The <code>vendor</code> of a specific bundle
-	 */
-	public String getVendor() {
-		return vendor;
-	}
-
-	/**
-	 * Sets the <code>vendor</code> for this bundle.
-	 * 
-	 * @see org.osgi.framework.Bundle#getHeaders()
-	 * @param vendor specifying the vendor for the bundle.
-	 */
-	public void setVendor(String vendor) {
-		this.vendor = vendor;
-	}
-
-	/**
-	 * Returns the <code>version</code> for this bundle.
-	 * 
-	 * @see org.osgi.framework.Bundle#getHeaders()
-	 * @return version of a specific bundle
-	 */
-	public Version getVersion() {
-		return version;
-	}
-
-	/**
-	 * Sets the <code>version</code> of a specific bundle.
-	 * 
-	 * @see org.osgi.framework.Bundle#getHeaders()
-	 * @param version is a <code>Version</code> that specifying the <code>version</code> for a specific bundle
-	 * @exception <code>IllegalArgumentException</code> if given version is <code>null</code> 
-	 */
-	public void setVersion(Version version) throws IllegalArgumentException {
-		Assert.isLegal(version != null);
-		this.version = version;
-	}
-
-	private MBeanAttributeInfo[] getAttributes() {
-		MBeanAttributeInfo[] ret = new MBeanAttributeInfo[0];
-		return ret;
-	}
-
-	private MBeanConstructorInfo[] getConstructorInfo() {
-		MBeanConstructorInfo[] ret = new MBeanConstructorInfo[0];
-		return ret;
-	}
-
-	private MBeanOperationInfo[] getOperationInfo() {
-		if (BundleContributionProvider.isPluginDependency(bundle)) {
-			// expose no operations
-			return new MBeanOperationInfo[0];
-		}
-		return new MBeanOperationInfo[] {createStartOperation(), createStopOperation(), createUninstallOperation()};
-	}
-
-	private void setProperties(Bundle bundle) {
-		setContactAddress((String) bundle.getHeaders().get("Bundle-ContactAddress")); //$NON-NLS-1$
-		setDescription((String) bundle.getHeaders().get("Bundle-Description")); //$NON-NLS-1$
-		setDocURL((String) bundle.getHeaders().get("Bundle-DocURL")); //$NON-NLS-1$
-		setId(bundle.getBundleId());
-		setLastModified(bundle.getLastModified());
-		setLocation(bundle.getLocation());
-		setState(bundle.getState());
-		setSymbolicName(bundle.getSymbolicName());
-		setVendor((String) bundle.getHeaders().get("Bundle-Vendor")); //$NON-NLS-1$
-		setVersion(new Version((String) bundle.getHeaders().get("Bundle-Version"))); //$NON-NLS-1$
-	}
-
-	private static MBeanOperationInfo createStartOperation() {
-		return new MBeanOperationInfo("start", BundleContributionMessages.start_operation_desc, new MBeanParameterInfo[0], Void.TYPE.getName(), 0);//$NON-NLS-1$
-	}
-
-	private static MBeanOperationInfo createStopOperation() {
-		return new MBeanOperationInfo("stop", BundleContributionMessages.stop_operation_desc, new MBeanParameterInfo[0], Void.TYPE.getName(), 0); //$NON-NLS-1$
-	}
-
-	private static MBeanOperationInfo createUninstallOperation() {
-		return new MBeanOperationInfo("uninstall", BundleContributionMessages.stop_operation_desc, new MBeanParameterInfo[0], Void.TYPE.getName(), 0); //$NON-NLS-1$
-	}
-
-	private long id;
-	private long lastModified;
-	private int state;
-	private Version version;
-	private String symbolicName;
-	private String vendor;
-	private String description;
-	private String docURL;
-	private String contactAddress;
-	private String location;
-	private Bundle bundle;
-}

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleContributionMessages.java b/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleContributionMessages.java
deleted file mode 100644
index eff2b32..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleContributionMessages.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osgi.jmx.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @since 1.0
- */
-public class BundleContributionMessages extends NLS {
-
-	public static String bundle_contribution_name;
-	public static String service_bundle_contribution_name;
-	public static String bundle_description;
-	public static String start_operation_desc;
-	public static String stop_operation_desc;
-	public static String install_operation_desc;
-	public static String uninstall_operation_desc;
-	public static String bundle_url_desc;
-	public static String excep_null_install_url;
-
-	private BundleContributionMessages() {
-		// disallow instantiations
-	}
-
-	static {
-		NLS.initializeMessages(BundleContributionMessages.class.getName(), BundleContributionMessages.class);
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleContributionMessages.properties b/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleContributionMessages.properties
deleted file mode 100644
index 80ec309..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleContributionMessages.properties
+++ /dev/null

@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bundle_contribution_name = Bundles
-service_bundle_contribution_name = Bundles [ Service: {0} ]
-bundle_description = Eclipse OSGI Bundle
-start_operation_desc = Start the bundle.
-stop_operation_desc = Stop the bundle.
-install_operation_desc = Install bundle.
-uninstall_operation_desc = Uninstall the bundle.
-bundle_url_desc = Bundle location.
-excep_null_install_url = Expected non-null install url.
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleContributionProvider.java b/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleContributionProvider.java
deleted file mode 100644
index 647b7c4..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleContributionProvider.java
+++ /dev/null

@@ -1,221 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osgi.jmx.internal;
-
-import java.net.URL;
-import java.util.*;
-import javax.management.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.jmx.common.ContributionNotificationEvent;
-import org.eclipse.equinox.jmx.server.Contribution;
-import org.eclipse.equinox.jmx.server.ContributionProvider;
-import org.eclipse.osgi.util.NLS;
-import org.osgi.framework.*;
-import org.osgi.service.packageadmin.PackageAdmin;
-
-/**
- * @since 1.0
- */
-public class BundleContributionProvider extends ContributionProvider implements BundleListener {
-
-	private static final long serialVersionUID = -8497760387909218802L;
-	private static final String BUNDLE_IMG_PATH = "icons/bundles/bundle.gif"; //$NON-NLS-1$
-	private static Set serverPluginDependencies;
-	private ServiceReference serviceReference;
-
-	/**
-	 * Default constructor.
-	 */
-	public BundleContributionProvider() {
-		this(null);
-	}
-
-	public BundleContributionProvider(ServiceReference serviceReference) {
-		this.serviceReference = serviceReference;
-		if (serverPluginDependencies == null) {
-			try {
-				serverPluginDependencies = BundleUtils.computeDependencies(Activator.getBundle(), Activator.getBundleContext());
-			} catch (Exception e) {
-				e.printStackTrace();
-				throw new RuntimeException(e.getMessage());
-			}
-		}
-	}
-
-	public static boolean isPluginDependency(Bundle bundle) {
-		Assert.isNotNull(serverPluginDependencies);
-		Iterator iter = serverPluginDependencies.iterator();
-		while (iter.hasNext()) {
-			String name = (String) iter.next();
-			if (null != bundle.getSymbolicName() && bundle.getSymbolicName().equals(name)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.ContributionProvider#providesType(java.lang.Object)
-	 */
-	protected boolean providesType(Object obj) {
-		return obj instanceof ServiceReference;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.ContributionProvider#isProviderForType(java.lang.Object)
-	 */
-	protected boolean contributesType(Object obj) {
-		return obj instanceof Bundle;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.ContributionProvider#createProvider(java.lang.Object)
-	 */
-	protected ContributionProvider createProvider(Object obj) {
-		return providesType(obj) ? new BundleContributionProvider((ServiceReference) obj) : null;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.ContributionProvider#createContribution(java.lang.Object)
-	 */
-	protected Contribution createContribution(Object obj) throws MalformedObjectNameException, NullPointerException {
-		// if this service provider is associated with a bundle, we wrap the service contribution in a specialized type to display bundle associated information
-		if (contributesType(obj)) {
-			if (serviceReference != null) {
-				return new BundleContribution((Bundle) obj, serviceReference);
-			}
-			return new BundleContribution((Bundle) obj);
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getChildren()
-	 */
-	public Object[] getChildren() {
-		Set result = null;
-		if (serviceReference != null) {
-			result = new TreeSet();
-			Object[] usingBundles = serviceReference.getUsingBundles();
-			if (usingBundles != null) {
-				for (int i = 0; i < usingBundles.length; i++) {
-					result.add(usingBundles[i]);
-				}
-			}
-			// add service provider bundle
-			result.add(serviceReference.getBundle());
-		}
-		return result == null ? Activator.getBundleContext().getBundles() : result.toArray();
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getName()
-	 */
-	public String getName() {
-		return serviceReference == null ? BundleContributionMessages.bundle_contribution_name : NLS.bind(BundleContributionMessages.service_bundle_contribution_name, ServiceContribution.getServiceReferenceName(serviceReference));
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getProperties()
-	 */
-	public Set getProperties() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getImageLocation()
-	 */
-	protected URL getImageLocation() {
-		return FileLocator.find(Activator.getBundle(), new Path(BUNDLE_IMG_PATH), null);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String arg0) throws AttributeNotFoundException, MBeanException, ReflectionException {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-	 */
-	public void setAttribute(Attribute arg0) throws AttributeNotFoundException, InvalidAttributeValueException, MBeanException, ReflectionException {
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-	 */
-	public AttributeList getAttributes(String[] arg0) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-	 */
-	public AttributeList setAttributes(AttributeList arg0) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.ContributionProvider#getMBeanInfo(java.lang.Object)
-	 */
-	public MBeanInfo getMBeanInfo(Object delegate) {
-		return new MBeanInfo(getClass().getName(), null, null, null, new MBeanOperationInfo[] {createInstallOperation()}, null);
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#invokeOperation(java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	public Object invokeOperation(String operationName, Object[] args, String[] argTypes) {
-		if (operationName.equals("install") && args.length == 1 && argTypes.length == 1 && args[0] instanceof String) { //$NON-NLS-1$
-			String installUrl = (String) args[0];
-			try {
-				Bundle bundle = Activator.getBundleContext().installBundle(installUrl);
-				refreshPackages(new Bundle[] {bundle});
-			} catch (BundleException e) {
-				return e.getMessage();
-			}
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleListener#bundleChanged(org.osgi.framework.BundleEvent)
-	 */
-	public void bundleChanged(BundleEvent event) {
-		switch (event.getType()) {
-			case BundleEvent.INSTALLED :
-				super.contributionStateChanged(new ContributionNotificationEvent(ContributionNotificationEvent.NOTIFICATION_ADDED));
-				return;
-		}
-	}
-
-	public static void refreshPackages(Bundle[] bundles) {
-		if (bundles.length == 0) {
-			return;
-		}
-		BundleContext context = Activator.getBundleContext();
-		ServiceReference packageAdminRef = context.getServiceReference(PackageAdmin.class.getName());
-		PackageAdmin packageAdmin = null;
-		if (packageAdminRef != null) {
-			packageAdmin = (PackageAdmin) context.getService(packageAdminRef);
-			if (packageAdmin == null) {
-				return;
-			}
-		}
-		packageAdmin.refreshPackages(bundles);
-		context.ungetService(packageAdminRef);
-	}
-
-	private static MBeanOperationInfo createInstallOperation() {
-		return new MBeanOperationInfo("install", BundleContributionMessages.install_operation_desc, new MBeanParameterInfo[] {new MBeanParameterInfo("bundleURLAsString", String.class.getName(), BundleContributionMessages.bundle_url_desc)}, Void.TYPE.getName(), 0); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleMessages.java b/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleMessages.java
deleted file mode 100644
index 8d41faf..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleMessages.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osgi.jmx.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-public class BundleMessages extends NLS {
-
-	public static String requires_name;
-	public static String packages_name;
-
-	private BundleMessages() {
-		// disallow instantiations
-	}
-
-	static {
-		NLS.initializeMessages(BundleMessages.class.getName(), BundleMessages.class);
-	}
-}
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleMessages.properties b/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleMessages.properties
deleted file mode 100644
index 63d2a33..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleMessages.properties
+++ /dev/null

@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-requires_name = Required Bundles
-packages_name = Imported Packages
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundlePackagesProvider.java b/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundlePackagesProvider.java
deleted file mode 100644
index bd9e6fe..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundlePackagesProvider.java
+++ /dev/null

@@ -1,221 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osgi.jmx.internal;
-
-import java.net.URL;
-import java.util.Set;
-import javax.management.*;
-import org.eclipse.equinox.jmx.server.Contribution;
-import org.eclipse.equinox.jmx.server.ContributionProvider;
-import org.eclipse.osgi.service.resolver.BundleDescription;
-import org.eclipse.osgi.service.resolver.ImportPackageSpecification;
-import org.osgi.framework.Bundle;
-
-/**
- * @since 1.0
- */
-public class BundlePackagesProvider extends ContributionProvider {
-
-	// the bundle being provided for
-	private Bundle bundle;
-
-	/**
-	 * Default Constructor.
-	 */
-	public BundlePackagesProvider() {
-		this(null);
-	}
-
-	/**
-	 * Constructor specifying the bundle which this provider is associated with.
-	 * 
-	 * @param bundle The providers associated bundle.
-	 */
-	public BundlePackagesProvider(Bundle bundle) {
-		this.bundle = bundle;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.ContributionProvider#contributesType(java.lang.Object)
-	 */
-	protected boolean contributesType(Object obj) {
-		return obj instanceof ImportPackageSpecification;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.ContributionProvider#createContribution(java.lang.Object)
-	 */
-	protected Contribution createContribution(Object obj) throws MalformedObjectNameException {
-		return contributesType(obj) ? new Contribution(obj) {
-
-			/* (non-Javadoc)
-			 * @see org.eclipse.equinox.jmx.server.Contribution#getChildren()
-			 */
-			protected Object[] getChildren() {
-				return null;
-			}
-
-			/* (non-Javadoc)
-			 * @see org.eclipse.equinox.jmx.server.Contribution#getImageLocation()
-			 */
-			protected URL getImageLocation() {
-				return null;
-			}
-
-			/* (non-Javadoc)
-			 * @see org.eclipse.equinox.jmx.server.Contribution#getMBeanInfo(java.lang.Object)
-			 */
-			protected MBeanInfo getMBeanInfo(Object contributionDelegate) {
-				return null;
-			}
-
-			/* (non-Javadoc)
-			 * @see org.eclipse.equinox.jmx.server.Contribution#getName()
-			 */
-			protected String getName() {
-				return contributionDelegate.toString();
-			}
-
-			/* (non-Javadoc)
-			 * @see org.eclipse.equinox.jmx.server.Contribution#getProperties()
-			 */
-			protected Set getProperties() {
-				return null;
-			}
-
-			/* (non-Javadoc)
-			 * @see org.eclipse.equinox.jmx.server.Contribution#invokeOperation(java.lang.String, java.lang.Object[], java.lang.String[])
-			 */
-			protected Object invokeOperation(String operationName, Object[] args, String[] argTypes) {
-				return null;
-			}
-
-			/* (non-Javadoc)
-			 * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-			 */
-			public Object getAttribute(String attribute) throws AttributeNotFoundException, MBeanException, ReflectionException {
-				return null;
-			}
-
-			/* (non-Javadoc)
-			 * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-			 */
-			public AttributeList getAttributes(String[] attributes) {
-				return null;
-			}
-
-			/* (non-Javadoc)
-			 * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-			 */
-			public void setAttribute(Attribute attribute) throws AttributeNotFoundException, InvalidAttributeValueException, MBeanException, ReflectionException {
-
-			}
-
-			/* (non-Javadoc)
-			 * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-			 */
-			public AttributeList setAttributes(AttributeList attributes) {
-				return null;
-			}
-		} : null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.ContributionProvider#createProvider(java.lang.Object)
-	 */
-	protected ContributionProvider createProvider(Object obj) {
-		return providesType(obj) ? new BundlePackagesProvider((Bundle) obj) : null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.ContributionProvider#providesType(java.lang.Object)
-	 */
-	protected boolean providesType(Object obj) {
-		return obj instanceof Bundle;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getChildren()
-	 */
-	protected Object[] getChildren() {
-		Object[] ret = null;
-		if (bundle != null) {
-			try {
-				BundleDescription desc = BundleUtils.getBundleDescription(bundle, Activator.getBundleContext());
-				return desc.getImportPackages();
-			} catch (Exception e) {
-			}
-		}
-		return ret;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getImageLocation()
-	 */
-	protected URL getImageLocation() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getMBeanInfo(java.lang.Object)
-	 */
-	protected MBeanInfo getMBeanInfo(Object delegate) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getName()
-	 */
-	protected String getName() {
-		return BundleMessages.packages_name;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getProperties()
-	 */
-	protected Set getProperties() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#invokeOperation(java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	protected Object invokeOperation(String operationName, Object[] args, String[] argTypes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String attribute) throws AttributeNotFoundException, MBeanException, ReflectionException {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-	 */
-	public AttributeList getAttributes(String[] attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-	 */
-	public void setAttribute(Attribute attribute) throws AttributeNotFoundException, InvalidAttributeValueException, MBeanException, ReflectionException {
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-	 */
-	public AttributeList setAttributes(AttributeList attributes) {
-		return null;
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleRequiresProvider.java b/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleRequiresProvider.java
deleted file mode 100644
index 7f5f63d..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleRequiresProvider.java
+++ /dev/null

@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osgi.jmx.internal;
-
-import java.net.URL;
-import java.util.*;
-import javax.management.*;
-import org.eclipse.equinox.jmx.server.Contribution;
-import org.eclipse.equinox.jmx.server.ContributionProvider;
-import org.eclipse.osgi.service.resolver.BundleDescription;
-import org.eclipse.osgi.service.resolver.BundleSpecification;
-import org.osgi.framework.Bundle;
-
-/**
- * @since 1.0
- */
-public class BundleRequiresProvider extends ContributionProvider {
-
-	// the bundle being provided for
-	private Bundle bundle;
-
-	/**
-	 * Default Constructor.
-	 */
-	public BundleRequiresProvider() {
-		this(null);
-	}
-
-	/**
-	 * Constructor specifying the bundle which this provider is associated with.
-	 * 
-	 * @param bundle The providers associated bundle.
-	 */
-	public BundleRequiresProvider(Bundle bundle) {
-		this.bundle = bundle;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.ContributionProvider#contributesType(java.lang.Object)
-	 */
-	protected boolean contributesType(Object obj) {
-		return obj instanceof BundleSpecification;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.ContributionProvider#createContribution(java.lang.Object)
-	 */
-	protected Contribution createContribution(Object obj) throws MalformedObjectNameException {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.ContributionProvider#createProvider(java.lang.Object)
-	 */
-	protected ContributionProvider createProvider(Object obj) {
-		return providesType(obj) ? new BundleRequiresProvider((Bundle) obj) : null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.ContributionProvider#providesType(java.lang.Object)
-	 */
-	protected boolean providesType(Object obj) {
-		return obj instanceof Bundle;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getChildren()
-	 */
-	protected Object[] getChildren() {
-		if (bundle == null)
-			return new Object[0];
-		List result = new ArrayList();
-		try {
-			BundleDescription desc = BundleUtils.getBundleDescription(bundle, Activator.getBundleContext());
-			BundleSpecification[] specs = desc.getRequiredBundles();
-			for (int i = 0; i < specs.length; i++)
-				result.add(Activator.getBundle(specs[i].getName()));
-		} catch (Exception e) {
-		}
-		return result.toArray(new Object[result.size()]);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getImageLocation()
-	 */
-	protected URL getImageLocation() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getMBeanInfo(java.lang.Object)
-	 */
-	protected MBeanInfo getMBeanInfo(Object delegate) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getName()
-	 */
-	protected String getName() {
-		return BundleMessages.requires_name;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getProperties()
-	 */
-	protected Set getProperties() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#invokeOperation(java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	protected Object invokeOperation(String operationName, Object[] args, String[] argTypes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String attribute) throws AttributeNotFoundException, MBeanException, ReflectionException {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-	 */
-	public AttributeList getAttributes(String[] attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-	 */
-	public void setAttribute(Attribute attribute) throws AttributeNotFoundException, InvalidAttributeValueException, MBeanException, ReflectionException {
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-	 */
-	public AttributeList setAttributes(AttributeList attributes) {
-		return null;
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleUtils.java b/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleUtils.java
deleted file mode 100644
index da5e7a5..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/BundleUtils.java
+++ /dev/null

@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osgi.jmx.internal;
-
-import java.io.*;
-import java.net.URL;
-import java.util.*;
-import java.util.jar.*;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-import org.eclipse.core.runtime.*;
-import org.eclipse.osgi.service.pluginconversion.PluginConversionException;
-import org.eclipse.osgi.service.pluginconversion.PluginConverter;
-import org.eclipse.osgi.service.resolver.*;
-import org.osgi.framework.*;
-import org.osgi.util.tracker.ServiceTracker;
-
-public class BundleUtils {
-
-	public static Set computeDependencies(Bundle bundle, BundleContext bundleContext) throws PluginConversionException, CoreException, IOException {
-		Map disjointSets = new HashMap();
-
-		Bundle[] installedBundles = bundleContext.getBundles();
-		for (int i = 0; i < installedBundles.length; i++) {
-			BundleDescription desc = getBundleDescription(installedBundles[i], bundleContext);
-			if (desc == null) {
-				continue;
-			}
-			// add bundle to map with initial empty dependency list
-			List descDeps = new ArrayList();
-			disjointSets.put(desc.getName(), descDeps);
-			BundleSpecification[] specs = desc.getRequiredBundles();
-			for (int j = 0; j < specs.length; j++) {
-				descDeps.add(specs[j].getName());
-			}
-		}
-		Set bundleDeps = new HashSet();
-		BundleDescription rootDesc = getBundleDescription(bundle, bundleContext);
-		BundleSpecification[] rootSpecs = rootDesc.getRequiredBundles();
-		for (int i = 0; i < rootSpecs.length; i++) {
-			bundleDeps.add(rootSpecs[i].getName());
-			List specDeps = (List) disjointSets.get(rootSpecs[i].getName());
-			if (specDeps == null) {
-				continue;
-			}
-			mergeDependencies(bundleDeps, specDeps, disjointSets);
-		}
-		return bundleDeps;
-	}
-
-	private static void mergeDependencies(Set bundleDeps, List deps, Map disjointSets) {
-		if (deps != null) {
-			// merge dependencies
-			bundleDeps.addAll(deps);
-			Iterator iter = deps.iterator();
-			while (iter.hasNext()) {
-				String name = (String) iter.next();
-				mergeDependencies(bundleDeps, (List) disjointSets.get(name), disjointSets);
-			}
-		}
-	}
-
-	public static BundleDescription getBundleDescription(Bundle bundle, BundleContext bundleContext) throws PluginConversionException, CoreException, IOException {
-		String bundleRootLoc = getBundleRoot(bundle);
-		//FIXME hack for loading jar files
-		int protoIdx = bundleRootLoc.indexOf("file:"); //$NON-NLS-1$
-		bundleRootLoc = bundleRootLoc.substring(protoIdx == -1 ? 0 : protoIdx + 5);
-		if (bundleRootLoc.endsWith("jar!/")) { //$NON-NLS-1$
-			bundleRootLoc = bundleRootLoc.substring(0, bundleRootLoc.length() - 2);
-		}
-		File bundleLocation = new File(bundleRootLoc);
-		Dictionary manifest = loadManifest(bundleLocation);
-		long bundleId = bundle.getBundleId();
-		boolean hasBundleStructure = manifest != null && manifest.get(Constants.BUNDLE_SYMBOLICNAME) != null;
-		if (!hasBundleStructure) {
-			if (!bundleLocation.isFile() && !new File(bundleLocation, "plugin.xml").exists() //$NON-NLS-1$
-					&& !new File(bundleLocation, "fragment.xml").exists()) { //$NON-NLS-1$
-				return null;
-			}
-			PluginConverter converter = acquirePluginConverter(bundleContext);
-			manifest = converter.convertManifest(bundleLocation, false, null, false, null);
-			if (manifest == null || Constants.BUNDLE_SYMBOLICNAME == null) {
-				return null;
-			}
-		}
-		try {
-			return getBundleDescription(manifest, bundleLocation, bundleId);
-		} catch (BundleException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	public static String getBundleRoot(Bundle bundle) throws IOException {
-		URL url = FileLocator.find(bundle, new Path("/"), null); //$NON-NLS-1$
-		URL resolvedUrl = FileLocator.resolve(url);
-		return resolvedUrl.getPath();
-	}
-
-	public static BundleDescription getBundleDescription(Dictionary manifest, File bundleLocation, long bundleId) throws BundleException {
-		BundleContext context = Activator.getBundleContext();
-		ServiceReference platformAdminReference = context.getServiceReference(PlatformAdmin.class.getName());
-		if (platformAdminReference == null)
-			return null;
-		PlatformAdmin admin = (PlatformAdmin) context.getService(platformAdminReference);
-		StateObjectFactory stateObjectFactory = admin.getFactory();
-
-		State state = stateObjectFactory.createState(false);
-		BundleDescription descriptor = stateObjectFactory.createBundleDescription(state, manifest, bundleLocation.getAbsolutePath(), bundleId);
-		context.ungetService(platformAdminReference);
-		return descriptor;
-	}
-
-	public static Dictionary loadManifest(File bundleLocation) throws IOException {
-		ZipFile jarFile = null;
-		InputStream manifestStream = null;
-		try {
-			String extension = new Path(bundleLocation.getName()).getFileExtension();
-			bundleLocation = new File(bundleLocation.getAbsolutePath());
-			if (extension != null && (extension.equals("jar") || extension.equals("jar!")) && bundleLocation.isFile()) { //$NON-NLS-1$ //$NON-NLS-2$
-				jarFile = new ZipFile(bundleLocation, ZipFile.OPEN_READ);
-				ZipEntry manifestEntry = jarFile.getEntry(JarFile.MANIFEST_NAME);
-				if (manifestEntry != null) {
-					manifestStream = jarFile.getInputStream(manifestEntry);
-				}
-			} else {
-				File file = new File(bundleLocation, JarFile.MANIFEST_NAME);
-				if (file.exists())
-					manifestStream = new FileInputStream(file);
-			}
-		} catch (IOException e) {
-		}
-		if (manifestStream == null)
-			return null;
-		try {
-			Manifest m = new Manifest(manifestStream);
-			return manifestToProperties(m.getMainAttributes());
-		} finally {
-			try {
-				manifestStream.close();
-			} catch (IOException e1) {
-			}
-			try {
-				if (jarFile != null)
-					jarFile.close();
-			} catch (IOException e2) {
-			}
-		}
-	}
-
-	public static Properties manifestToProperties(Attributes d) {
-		Iterator iter = d.keySet().iterator();
-		Properties result = new Properties();
-		while (iter.hasNext()) {
-			Attributes.Name key = (Attributes.Name) iter.next();
-			result.put(key.toString(), d.get(key));
-		}
-		return result;
-	}
-
-	public static PluginConverter acquirePluginConverter(BundleContext bundleContext) {
-		ServiceTracker tracker = new ServiceTracker(bundleContext, PluginConverter.class.getName(), null);
-		tracker.open();
-		PluginConverter converter = (PluginConverter) tracker.getService();
-		tracker.close();
-		return converter;
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/ServiceContribution.java b/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/ServiceContribution.java
deleted file mode 100644
index 7754669..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/ServiceContribution.java
+++ /dev/null

@@ -1,241 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Jeff Mesnil - Bug 151266 - [monitoring] Browsing our server in jconsole is really unfriendly
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osgi.jmx.internal;
-
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.util.HashSet;
-import java.util.Set;
-import javax.management.*;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.equinox.jmx.common.ContributionNotificationEvent;
-import org.eclipse.equinox.jmx.common.util.MBeanInfoWrapper;
-import org.eclipse.equinox.jmx.server.Contribution;
-import org.osgi.framework.*;
-import org.osgi.util.tracker.ServiceTracker;
-
-/**
- * @since 1.0
- */
-public class ServiceContribution extends Contribution implements ServiceListener {
-
-	static final String IMG_REG_SERVICE_PATH = "icons/services/bundle_reg_service.png"; //$NON-NLS-1$
-	static final String IMG_USE_REG_SERVICE_PATH = "icons/services/bundle_use_reg_service.png"; //$NON-NLS-1$
-	static final String IMG_USE_SERVICE_PATH = "icons/services/bundle_use_service.png"; //$NON-NLS-1$
-
-	private static final String IMG_SERVICE_PATH = "icons/services/service.gif"; //$NON-NLS-1$
-
-	private final MBeanInfo mbeanInfo;
-	private final ServiceReference serviceDelegate;
-	private final Bundle bundle;
-	private Class serviceDelegateImplClass;
-
-	public ServiceContribution(ServiceReference serviceDelegate) {
-		this(serviceDelegate, null);
-	}
-
-	public ServiceContribution(ServiceReference serviceDelegate, Bundle bundle) {
-		super(serviceDelegate);
-		if (serviceDelegate == null) {
-			throw new IllegalArgumentException();
-		}
-		this.serviceDelegate = serviceDelegate;
-		this.bundle = bundle;
-		try {
-			serviceDelegateImplClass = getClass().getClassLoader().loadClass(getName());
-		} catch (ClassNotFoundException e) {
-			serviceDelegateImplClass = serviceDelegate.getClass();
-		}
-		mbeanInfo = MBeanInfoWrapper.createMBeanInfo(serviceDelegateImplClass, ServiceContributionMessages.service_contribution_name, new MBeanAttributeInfo[0], new MBeanNotificationInfo[0]);
-		Activator.getBundleContext().addServiceListener(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getObjectName()
-	 */
-	protected ObjectName getObjectName() {
-		try {
-			return new ObjectName("jmxserver:type=Service,name=" + getName()); //$NON-NLS-1$
-		} catch (Exception e) {
-			return super.getObjectName();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getName()
-	 */
-	protected String getName() {
-		return ServiceContribution.getServiceReferenceName(serviceDelegate);
-
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getProperties()
-	 */
-	protected Set getProperties() {
-		Set ret = new HashSet();
-		String[] propKeys = serviceDelegate.getPropertyKeys();
-		for (int i = 0; i < propKeys.length; i++) {
-			ret.add(propKeys[i] + ":" + serviceDelegate.getProperty(propKeys[i]).toString()); //$NON-NLS-1$
-		}
-		return ret;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getImageLocation()
-	 */
-	protected URL getImageLocation() {
-		String imgPath = IMG_SERVICE_PATH;
-		if (bundle != null) {
-			boolean isUsingService = false, hasRegisteredService = false;
-			ServiceReference[] servicesInUse = bundle.getServicesInUse();
-			for (int i = 0; i < servicesInUse.length; i++) {
-				if (serviceDelegate == servicesInUse[i]) {
-					isUsingService = true;
-				}
-			}
-			ServiceReference[] registeredServices = bundle.getRegisteredServices();
-			for (int i = 0; i < registeredServices.length; i++) {
-				if (serviceDelegate == registeredServices[i]) {
-					hasRegisteredService = true;
-				}
-			}
-			if (isUsingService || hasRegisteredService) {
-				if (isUsingService && hasRegisteredService) {
-					imgPath = IMG_USE_REG_SERVICE_PATH;
-				} else if (isUsingService) {
-					imgPath = IMG_USE_SERVICE_PATH;
-				} else {
-					imgPath = IMG_REG_SERVICE_PATH;
-				}
-			}
-		}
-		return FileLocator.find(Activator.getBundle(), new Path(imgPath), null);
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getChildren()
-	 */
-	protected Object[] getChildren() {
-		Object[] ret = null;
-		if (serviceDelegate.getUsingBundles() != null) {
-			ret = new Object[serviceDelegate.getUsingBundles().length + 1];
-			System.arraycopy(serviceDelegate.getUsingBundles(), 0, ret, 0, serviceDelegate.getUsingBundles().length);
-		} else {
-			ret = new Object[1];
-		}
-		System.arraycopy(new Object[] {serviceDelegate.getBundle()}, 0, ret, (serviceDelegate.getUsingBundles() == null ? 0 : serviceDelegate.getUsingBundles().length), 1);
-		return ret;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#invokeOperation(java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	protected Object invokeOperation(String operationName, Object[] args, String[] argTypes) {
-		Object ret = null;
-		// determine if bundle has registered the exposed service
-		BundleContext context = Activator.getBundleContext();
-		if (context != null) {
-			// attempt to locate service
-			ServiceTracker st = new ServiceTracker(context, serviceDelegate, null);
-			st.open();
-			Object serviceImpl = st.getService(serviceDelegate);
-			if (serviceImpl != null) {
-				try {
-					Method[] methods = serviceImpl.getClass().getMethods();
-					for (int i = 0; i < methods.length; i++) {
-						if (methods[i].getName().equals(operationName)) {
-							ret = methods[i].invoke(serviceImpl, args);
-							break;
-						}
-					}
-				} catch (Exception e) {
-					ret = e.getMessage();
-				}
-				st.close();
-				st = null;
-			}
-		} else {
-			// bundle which contains service has not been started
-			ret = new String(ServiceContributionMessages.controlling_bundle_stopped);
-		}
-		return ret;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String attribute) throws AttributeNotFoundException, MBeanException, ReflectionException {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-	 */
-	public void setAttribute(Attribute attribute) throws AttributeNotFoundException, InvalidAttributeValueException, MBeanException, ReflectionException {
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-	 */
-	public AttributeList getAttributes(String[] attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-	 */
-	public AttributeList setAttributes(AttributeList attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getMBeanInfo(java.lang.Object)
-	 */
-	public MBeanInfo getMBeanInfo(Object delegate) {
-		return mbeanInfo;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.ServiceListener#serviceChanged(org.osgi.framework.ServiceEvent)
-	 */
-	public void serviceChanged(ServiceEvent event) {
-		if (serviceDelegate != event.getServiceReference()) {
-			return;
-		}
-		ContributionNotificationEvent cEvent = null;
-		switch (event.getType()) {
-			case ServiceEvent.MODIFIED :
-				cEvent = new ContributionNotificationEvent(ContributionNotificationEvent.NOTIFICATION_UPDATED);
-				break;
-			case ServiceEvent.UNREGISTERING :
-				cEvent = new ContributionNotificationEvent(ContributionNotificationEvent.NOTIFICATION_REMOVED);
-				break;
-			default :
-				return;
-		}
-		super.contributionStateChanged(cEvent);
-	}
-
-	public static String getServiceReferenceName(ServiceReference serviceReference) {
-		Object prop = serviceReference.getProperty("objectClass"); //$NON-NLS-1$
-		if (prop instanceof String[]) {
-			String[] props = (String[]) prop;
-			if (props.length == 1) {
-				return props[0];
-			}
-		}
-		return serviceReference.toString();
-	}
-
-}

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/ServiceContributionMessages.java b/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/ServiceContributionMessages.java
deleted file mode 100644
index ffe32f0..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/ServiceContributionMessages.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osgi.jmx.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @since 1.0
- */
-public class ServiceContributionMessages extends NLS {
-
-	public static String service_contribution_name;
-	public static String bundle_service_contribution_name;
-	public static String bundleservice_contribution_name;
-	public static String controlling_bundle_stopped;
-
-	private ServiceContributionMessages() {
-		// disallow instantiations
-	}
-
-	static {
-		NLS.initializeMessages(ServiceContributionMessages.class.getName(), ServiceContributionMessages.class);
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/ServiceContributionMessages.properties b/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/ServiceContributionMessages.properties
deleted file mode 100644
index 38c64e5..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/ServiceContributionMessages.properties
+++ /dev/null

@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-service_contribution_name = Services
-bundle_service_contribution_name = Services [ Bundle: {0} ]
-bundleservice_contribution_name = Dependent Services
-controlling_bundle_stopped = Controlling bundle stopped.
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/ServiceContributionProvider.java b/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/ServiceContributionProvider.java
deleted file mode 100644
index 455edca..0000000
--- a/monitoring/bundles/org.eclipse.osgi.jmx/src/org/eclipse/osgi/jmx/internal/ServiceContributionProvider.java
+++ /dev/null

@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osgi.jmx.internal;
-
-import java.net.URL;
-import java.util.HashSet;
-import java.util.Set;
-import javax.management.*;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.equinox.jmx.server.Contribution;
-import org.eclipse.equinox.jmx.server.ContributionProvider;
-import org.eclipse.osgi.util.NLS;
-import org.osgi.framework.*;
-
-/**
- * Eclipse service contribution provider.  Determines the available services
- * and exports supported services for remote inspection.  
- *  
- * @since 1.0
- */
-public class ServiceContributionProvider extends ContributionProvider {
-
-	private static final String SERVICE_IMG_PATH = "icons/services/service.gif"; //$NON-NLS-1$
-
-	private Bundle bundle;
-
-	public ServiceContributionProvider() {
-		this(null);
-	}
-
-	public ServiceContributionProvider(Bundle bundle) {
-		this.bundle = bundle;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getName()
-	 */
-	protected String getName() {
-		return bundle == null ? ServiceContributionMessages.service_contribution_name : NLS.bind(ServiceContributionMessages.bundle_service_contribution_name, bundle.getSymbolicName());
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getProperties()
-	 */
-	protected Set getProperties() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getImageLocation()
-	 */
-	protected URL getImageLocation() {
-		return FileLocator.find(Activator.getBundle(), new Path(SERVICE_IMG_PATH), null);
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.ContributionProvider#contributesType(java.lang.Object)
-	 */
-	protected boolean contributesType(Object obj) {
-		return obj instanceof ServiceReference;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.ContributionProvider#providesType(java.lang.Object)
-	 */
-	protected boolean providesType(Object obj) {
-		return obj instanceof Bundle;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.ContributionProvider#createProvider(java.lang.Object)
-	 */
-	protected ContributionProvider createProvider(Object obj) {
-		return providesType(obj) ? new ServiceContributionProvider((Bundle) obj) : null;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.ContributionProvider#createContribution(java.lang.Object)
-	 */
-	protected Contribution createContribution(Object obj) throws MalformedObjectNameException, NullPointerException {
-		// if this service provider is associated with a bundle, we wrap the service contribution in a specialized type to display bundle associated information
-		if (contributesType(obj)) {
-			if (bundle != null) {
-				return new ServiceContribution((ServiceReference) obj, bundle);
-			}
-			return new ServiceContribution((ServiceReference) obj);
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getChildren()
-	 */
-	protected Object[] getChildren() {
-		if (bundle != null) {
-			Set services = null;
-			if (bundle.getRegisteredServices() != null && bundle.getServicesInUse() != null) {
-				services = new HashSet();
-				if (bundle.getRegisteredServices() != null) {
-					for (int i = 0; i < bundle.getRegisteredServices().length; i++) {
-						services.add(bundle.getRegisteredServices()[i]);
-					}
-				}
-				if (bundle.getServicesInUse() != null) {
-					for (int i = 0; i < bundle.getServicesInUse().length; i++) {
-						services.add(bundle.getServicesInUse()[i]);
-					}
-				}
-			}
-			return services == null ? null : services.toArray();
-		}
-		BundleContext bc = Activator.getBundleContext();
-		try {
-			return bc.getServiceReferences(null, null);
-		} catch (InvalidSyntaxException e) {
-			// invalid syntax on null, null...
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#invokeOperation(java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	protected Object invokeOperation(String operationName, Object[] args, String[] argTypes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String arg0) throws AttributeNotFoundException, MBeanException, ReflectionException {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-	 */
-	public void setAttribute(Attribute arg0) throws AttributeNotFoundException, InvalidAttributeValueException, MBeanException, ReflectionException {
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-	 */
-	public AttributeList getAttributes(String[] arg0) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-	 */
-	public AttributeList setAttributes(AttributeList arg0) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.jmx.server.contrib.Contribution#getMBeanInfo(java.lang.Object)
-	 */
-	public MBeanInfo getMBeanInfo(Object obj) {
-		return new MBeanInfo(getClass().getName(), null, null, null, null, null);
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.swt.jmx/.classpath b/monitoring/bundles/org.eclipse.swt.jmx/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/monitoring/bundles/org.eclipse.swt.jmx/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/monitoring/bundles/org.eclipse.swt.jmx/.cvsignore b/monitoring/bundles/org.eclipse.swt.jmx/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/monitoring/bundles/org.eclipse.swt.jmx/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/monitoring/bundles/org.eclipse.swt.jmx/.options b/monitoring/bundles/org.eclipse.swt.jmx/.options
deleted file mode 100644
index 8979064..0000000
--- a/monitoring/bundles/org.eclipse.swt.jmx/.options
+++ /dev/null

@@ -1,2 +0,0 @@
-org.eclipse.ui/debug=true 
-org.eclipse.ui/trace/graphics=true
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.swt.jmx/.project b/monitoring/bundles/org.eclipse.swt.jmx/.project
deleted file mode 100644
index 30391b8..0000000
--- a/monitoring/bundles/org.eclipse.swt.jmx/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.swt.jmx</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/monitoring/bundles/org.eclipse.swt.jmx/.settings/org.eclipse.jdt.core.prefs b/monitoring/bundles/org.eclipse.swt.jmx/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 31fdcbf..0000000
--- a/monitoring/bundles/org.eclipse.swt.jmx/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,309 +0,0 @@
-#Thu May 10 13:51:34 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-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.hiddenCatchBlock=warning
-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.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-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.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-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.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=800
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

diff --git a/monitoring/bundles/org.eclipse.swt.jmx/.settings/org.eclipse.jdt.ui.prefs b/monitoring/bundles/org.eclipse.swt.jmx/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index bb0a68b..0000000
--- a/monitoring/bundles/org.eclipse.swt.jmx/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,9 +0,0 @@
-#Mon Feb 26 11:28:09 EST 2007
-eclipse.preferences.version=1
-formatter_profile=_core
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.staticondemandthreshold=99

diff --git a/monitoring/bundles/org.eclipse.swt.jmx/META-INF/MANIFEST.MF b/monitoring/bundles/org.eclipse.swt.jmx/META-INF/MANIFEST.MF
deleted file mode 100644
index 8931c6f..0000000
--- a/monitoring/bundles/org.eclipse.swt.jmx/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Resource Monitoring SWT Extensions (Incubation)
-Bundle-SymbolicName: org.eclipse.swt.jmx;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Localization: plugin
-Eclipse-LazyStart: true
-Import-Package: javax.management,
- javax.management.remote,
- org.eclipse.core.runtime; common=split,
- org.eclipse.equinox.jmx.common,
- org.eclipse.osgi.util,
- org.eclipse.swt.graphics,
- org.eclipse.swt.widgets,
- org.osgi.framework,
- org.eclipse.equinox.jmx.server
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,
- CDC-1.0/Foundation-1.0,
- J2SE-1.3
-Bundle-Activator: org.eclipse.swt.jmx.internal.Activator

diff --git a/monitoring/bundles/org.eclipse.swt.jmx/about.html b/monitoring/bundles/org.eclipse.swt.jmx/about.html
deleted file mode 100644
index 5d03fd4..0000000
--- a/monitoring/bundles/org.eclipse.swt.jmx/about.html
+++ /dev/null

@@ -1,28 +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 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/monitoring/bundles/org.eclipse.swt.jmx/build.properties b/monitoring/bundles/org.eclipse.swt.jmx/build.properties
deleted file mode 100644
index b8f0ab6..0000000
--- a/monitoring/bundles/org.eclipse.swt.jmx/build.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               icons/
-src.includes = about.html
-javacSource=1.3
-javacTarget=1.1

diff --git a/monitoring/bundles/org.eclipse.swt.jmx/icons/sleak.png b/monitoring/bundles/org.eclipse.swt.jmx/icons/sleak.png
deleted file mode 100644
index 1a9271c..0000000
--- a/monitoring/bundles/org.eclipse.swt.jmx/icons/sleak.png
+++ /dev/null
Binary files differ

diff --git a/monitoring/bundles/org.eclipse.swt.jmx/plugin.xml b/monitoring/bundles/org.eclipse.swt.jmx/plugin.xml
deleted file mode 100644
index af5f296..0000000
--- a/monitoring/bundles/org.eclipse.swt.jmx/plugin.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         point="org.eclipse.equinox.jmx.server.contribution">
-      <contribution
-            class="org.eclipse.swt.jmx.internal.SleakContributionProvider"
-            isroot="true"/>
-   </extension>
-
-</plugin>

diff --git a/monitoring/bundles/org.eclipse.swt.jmx/src/org/eclipse/swt/jmx/internal/Activator.java b/monitoring/bundles/org.eclipse.swt.jmx/src/org/eclipse/swt/jmx/internal/Activator.java
deleted file mode 100644
index c8e2f3e..0000000
--- a/monitoring/bundles/org.eclipse.swt.jmx/src/org/eclipse/swt/jmx/internal/Activator.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.jmx.internal;
-
-import org.osgi.framework.*;
-
-public class Activator implements BundleActivator {
-
-	private static BundleContext bundleContext;
-
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		bundleContext = context;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		bundleContext = null;
-	}
-
-	public static Bundle getBundle() {
-		return bundleContext == null ? null : bundleContext.getBundle();
-	}
-
-}

diff --git a/monitoring/bundles/org.eclipse.swt.jmx/src/org/eclipse/swt/jmx/internal/SleakContributionProvider.java b/monitoring/bundles/org.eclipse.swt.jmx/src/org/eclipse/swt/jmx/internal/SleakContributionProvider.java
deleted file mode 100644
index 9937101..0000000
--- a/monitoring/bundles/org.eclipse.swt.jmx/src/org/eclipse/swt/jmx/internal/SleakContributionProvider.java
+++ /dev/null

@@ -1,282 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.jmx.internal;
-
-import java.net.URL;
-import java.util.Set;
-import java.util.TreeSet;
-import javax.management.*;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.equinox.jmx.common.ContributionNotificationEvent;
-import org.eclipse.equinox.jmx.server.Contribution;
-import org.eclipse.equinox.jmx.server.ContributionProvider;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.Display;
-
-public class SleakContributionProvider extends ContributionProvider {
-
-	private static int DEFAULT_REFRESH_INTERVAL = 10000;
-	private static final String SLEAK_IMG_PATH = "icons/sleak.png"; //$NON-NLS-1$
-
-	private int colors, cursors, fonts, gcs, images, regions;
-	private boolean started;
-	private int refreshInterval = DEFAULT_REFRESH_INTERVAL;
-	private Object mutex = new Object();
-
-	public SleakContributionProvider() {
-		new Sleak().start();
-	}
-
-	/**
-	 * Start monitoring graphics resources.
-	 */
-	public void start() {
-		synchronized (mutex) {
-			started = true;
-			mutex.notify();
-		}
-	}
-
-	/**
-	 * Stop monitoring graphics resources.
-	 */
-	public synchronized void stop() {
-		synchronized (mutex) {
-			started = false;
-		}
-	}
-
-	public void setPollInterval(Integer interval) {
-		refreshInterval = interval.intValue();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.ContributionProvider#contributesType(java.lang.Object)
-	 */
-	protected boolean contributesType(Object obj) {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.ContributionProvider#providesType(java.lang.Object)
-	 */
-	protected boolean providesType(Object obj) {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.ContributionProvider#createProvider(java.lang.Object)
-	 */
-	protected ContributionProvider createProvider(Object obj) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.ContributionProvider#createContribution(java.lang.Object)
-	 */
-	protected Contribution createContribution(Object obj) throws MalformedObjectNameException {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getName()
-	 */
-	protected String getName() {
-		return SleakMessages.name;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getChildren()
-	 */
-	protected Object[] getChildren() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getProperties()
-	 */
-	protected Set getProperties() {
-		Set result = new TreeSet();
-		result.add(SleakMessages.colors + " " + colors); //$NON-NLS-1$
-		result.add(SleakMessages.cursors + " " + cursors); //$NON-NLS-1$
-		result.add(SleakMessages.fonts + " " + fonts); //$NON-NLS-1$
-		result.add(SleakMessages.gcs + " " + gcs); //$NON-NLS-1$
-		result.add(SleakMessages.images + " " + images); //$NON-NLS-1$
-		result.add(SleakMessages.regions + " " + regions); //$NON-NLS-1$
-		return result;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getImageLocation()
-	 */
-	protected URL getImageLocation() {
-		return FileLocator.find(Activator.getBundle(), new Path(SLEAK_IMG_PATH), null);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#getMBeanInfo(java.lang.Object)
-	 */
-	protected MBeanInfo getMBeanInfo(Object delegate) {
-		MBeanOperationInfo[] ops = new MBeanOperationInfo[3];
-		ops[0] = createStartOperation();
-		ops[1] = createStopOperation();
-		ops[2] = createSetPollIntervalOperation();
-		return new MBeanInfo(SleakContributionProvider.class.getName(), SleakMessages.description, null, null, ops, null);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.jmx.server.Contribution#invokeOperation(java.lang.String, java.lang.Object[], java.lang.String[])
-	 */
-	protected Object invokeOperation(String operationName, Object[] args, String[] argTypes) {
-		if (operationName.equals("start")) {
-			start();
-		} else if (operationName.equals("stop")) {
-			stop();
-		} else if (operationName.equals("setPollInterval") && args.length == 1 && args[0] instanceof Integer) {
-			try {
-				setPollInterval((Integer) args[0]);
-			} catch (NumberFormatException e) {
-			}
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String attribute) throws AttributeNotFoundException, MBeanException, ReflectionException {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-	 */
-	public void setAttribute(Attribute attribute) throws AttributeNotFoundException, InvalidAttributeValueException, MBeanException, ReflectionException {
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-	 */
-	public AttributeList getAttributes(String[] attributes) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-	 */
-	public AttributeList setAttributes(AttributeList attributes) {
-		return null;
-	}
-
-	private static MBeanOperationInfo createStartOperation() {
-		return new MBeanOperationInfo("start", SleakMessages.start_monitoring, new MBeanParameterInfo[0], Void.TYPE.getName(), 0);//$NON-NLS-1$
-	}
-
-	private static MBeanOperationInfo createStopOperation() {
-		return new MBeanOperationInfo("stop", SleakMessages.stop_monitoring, new MBeanParameterInfo[0], Void.TYPE.getName(), 0); //$NON-NLS-1$
-	}
-
-	private static MBeanOperationInfo createSetPollIntervalOperation() {
-		try {
-			return new MBeanOperationInfo(SleakMessages.poll_interval_desc, SleakContributionProvider.class.getMethod("setPollInterval", new Class[] {Integer.class}));
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	private class Sleak extends Thread {
-
-		Object[] oldObjects = new Object[0];
-		Error[] oldErrors = new Error[0];
-		Object[] objects = new Object[0];
-		Error[] errors = new Error[0];
-
-		ContributionNotificationEvent event = new ContributionNotificationEvent(ContributionNotificationEvent.NOTIFICATION_UPDATED);
-
-		public Sleak() {
-		}
-
-		public void run() {
-			while (true) {
-				synchronized (mutex) {
-					try {
-						if (!started) {
-							mutex.wait();
-						}
-						refreshDifference();
-					} catch (InterruptedException e) {
-					}
-				}
-				try {
-					contributionStateChanged(event);
-					Thread.sleep(refreshInterval);
-				} catch (InterruptedException e) {
-				}
-			}
-		}
-
-		void refreshCounters() {
-			colors = cursors = fonts = gcs = images = regions = 0;
-			for (int i = 0; i < objects.length; i++) {
-				Object object = objects[i];
-				if (object instanceof Color)
-					colors++;
-				if (object instanceof Cursor)
-					cursors++;
-				if (object instanceof Font)
-					fonts++;
-				if (object instanceof GC)
-					gcs++;
-				if (object instanceof Image)
-					images++;
-				if (object instanceof Region)
-					regions++;
-			}
-		}
-
-		void refreshDifference() {
-			final Display display = Display.getDefault();
-			display.asyncExec(new Runnable() {
-				public void run() {
-					DeviceData info = display.getDeviceData();
-					if (!info.tracking) {
-						return;
-					}
-					Object[] newObjects = info.objects;
-					Error[] newErrors = info.errors;
-					Object[] diffObjects = new Object[newObjects.length];
-					Error[] diffErrors = new Error[newErrors.length];
-					int count = 0;
-					for (int i = 0; i < newObjects.length; i++) {
-						int index = 0;
-						while (index < oldObjects.length) {
-							if (newObjects[i] == oldObjects[index])
-								break;
-							index++;
-						}
-						if (index == oldObjects.length) {
-							diffObjects[count] = newObjects[i];
-							diffErrors[count] = newErrors[i];
-							count++;
-						}
-					}
-					objects = new Object[count];
-					errors = new Error[count];
-					System.arraycopy(diffObjects, 0, objects, 0, count);
-					System.arraycopy(diffErrors, 0, errors, 0, count);
-					refreshCounters();
-				}
-			});
-		}
-	}
-}

diff --git a/monitoring/bundles/org.eclipse.swt.jmx/src/org/eclipse/swt/jmx/internal/SleakMessages.java b/monitoring/bundles/org.eclipse.swt.jmx/src/org/eclipse/swt/jmx/internal/SleakMessages.java
deleted file mode 100644
index b12bcd8..0000000
--- a/monitoring/bundles/org.eclipse.swt.jmx/src/org/eclipse/swt/jmx/internal/SleakMessages.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.jmx.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-public class SleakMessages extends NLS {
-
-	public static String name;
-	public static String description;
-	public static String start_monitoring;
-	public static String stop_monitoring;
-	public static String colors;
-	public static String cursors;
-	public static String fonts;
-	public static String images;
-	public static String regions;
-	public static String gcs;
-	public static String poll_interval_desc;
-
-	private SleakMessages() {
-		// disallow instantiations
-	}
-
-	static {
-		NLS.initializeMessages(SleakMessages.class.getName(), SleakMessages.class);
-	}
-
-}

diff --git a/monitoring/bundles/org.eclipse.swt.jmx/src/org/eclipse/swt/jmx/internal/SleakMessages.properties b/monitoring/bundles/org.eclipse.swt.jmx/src/org/eclipse/swt/jmx/internal/SleakMessages.properties
deleted file mode 100644
index 8b0261a..0000000
--- a/monitoring/bundles/org.eclipse.swt.jmx/src/org/eclipse/swt/jmx/internal/SleakMessages.properties
+++ /dev/null

@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-name = Sleak
-description = Graphic resources monitor
-start_monitoring = Start monitoring
-stop_monitoring = Stop monitoring
-colors = Colors:
-cursors = Cursors:
-fonts = Fonts:
-images = Images:
-gcs = GCs:
-regions = Regions:
-poll_interval_desc = Polling interval.
\ No newline at end of file

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/.classpath b/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/.project b/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/.project
deleted file mode 100644
index 0bf931b..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.frameworkadmin.examples</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/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/.settings/org.eclipse.jdt.core.prefs b/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9d4c66f..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,12 +0,0 @@
-#Wed Jan 31 17:43:51 EST 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.3
-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.problem.assertIdentifier=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=ignore
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/.settings/org.eclipse.pde.core.prefs b/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index d585358..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/.settings/org.eclipse.pde.core.prefs
+++ /dev/null

@@ -1,3 +0,0 @@
-#Fri Nov 10 15:17:03 EST 2006
-eclipse.preferences.version=1
-pluginProject.extensions=false

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/FwAdmin.launch b/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/FwAdmin.launch
deleted file mode 100644
index c6fa66c..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/FwAdmin.launch
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">
-<intAttribute key="default_start_level" value="4"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.equinox.prov.metadata.repository,org.eclipse.ecf.provider.filetransfer,org.eclipse.equinox.prov.engine,org.eclipse.equinox.simpleconfigurator,org.eclipse.ecf.provider,org.eclipse.equinox.prov.touchpoint.natives,org.eclipse.equinox.prov.metadata.generator,com.thoughtworks.xstream,org.mozilla.rhino,org.eclipse.ecf,org.eclipse.ecf.sharedobject,org.eclipse.equinox.prov.operations,org.eclipse.equinox.prov.director,org.eclipse.equinox.prov.artifact.repository,org.eclipse.equinox.prov.download,org.eclipse.ecf.identity,org.eclipse.equinox.prov.core,org.eclipse.equinox.prov.touchpoint.eclipse,org.eclipse.equinox.prov.examplarysetup,org.eclipse.ecf.filetransfer,org.eclipse.equinox.prov.test,org.eclipse.equinox.prov.metadata"/>
-<booleanAttribute key="tracing" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-console"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="target_bundles" value="com.ibm.icu@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility.registry@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.osgi@:,org.eclipse.osgi.services@default:default,org.junit@default:default"/>
-<stringAttribute key="workspace_bundles" value="org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.frameworkadmin.equinox@2:default,org.eclipse.equinox.frameworkadmin.examples@default:default,org.eclipse.equinox.frameworkadmin.felix@2:default,org.eclipse.equinox.frameworkadmin.knopflerfish@2:default,org.eclipse.equinox.simpleconfigurator.manipulator@1:default"/>
-<booleanAttribute key="default_auto_start" value="true"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="configLocation" value=""/>
-</launchConfiguration>

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/META-INF/MANIFEST.MF b/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/META-INF/MANIFEST.MF
deleted file mode 100644
index bbd7d08..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Example of  client bundle of FrameworkAdmin
-Bundle-SymbolicName: org.eclipse.equinox.frameworkadmin.examples
-Bundle-Version: 1.3.1
-Bundle-Activator: org.eclipse.equinox.frameworkadmin.examples.Activator
-Bundle-Localization: plugin
-Import-Package: org.eclipse.equinox.configuratormanipulator,
- org.eclipse.equinox.frameworkadmin,
- org.eclipse.equinox.frameworkadmin.equinox.internal.utils,
- org.eclipse.equinox.internal.frameworkadmin.utils,
- org.osgi.framework;version="1.3.0",
- org.osgi.util.tracker;version="1.3.2"
-Bundle-Vendor: Eclipse.org
-Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
- J2SE-1.3

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/build.properties b/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/build.properties
deleted file mode 100644
index aaefddf..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               bin/

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/doc/readme.txt b/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/doc/readme.txt
deleted file mode 100644
index e841839..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/doc/readme.txt
+++ /dev/null

@@ -1,3 +0,0 @@
-This bundle shows how to use FrameworkAdmin service.
-To run it, "setting.properties" in the package "org.eclipse.equinox.frameworkadmin.examples"
-should be set properly in advance.
\ No newline at end of file

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/Activator.java b/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/Activator.java
deleted file mode 100644
index ba3a9ac..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/Activator.java
+++ /dev/null

@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.frameworkadmin.examples;
-
-import java.io.*;
-import java.net.URL;
-import java.util.Properties;
-
-import org.eclipse.equinox.frameworkadmin.*;
-import org.osgi.framework.*;
-
-/**
- * This bundle shows how to use @{link FrameworkAdmin}.
- * 
- * You should set proper values in setting.properties file in this bundle.
- */
-public class Activator implements BundleActivator {
-
-	static String jvmArgs;
-	static String jvm;
-
-	/**
-	 * Return value for the key.
-	 * If value for the key, throw IllegalStateException.
-	 * 	
-	 * @param key
-	 * @return value 
-	 */
-	static String getValue(Properties props, String key) {
-		String value = props.getProperty(key);
-		if (value == null)
-			throw new IllegalStateException("\"" + key + "\" should be set.");
-		return value;
-	}
-
-	EquinoxActivator equinox;
-
-	KfActivator knopflerfish;
-	FelixActivator felix;
-
-	private int mode;
-
-	private void convertConfigFromKfToEquinoxAndLaunch() throws IOException {
-		// 1. save config for Knopflerfish.
-		knopflerfish.save(knopflerfish.configLoc, KfActivator.bundleInfoListWoSimpleConfigurator, false);
-
-		// 2. load config from the config location.
-		Manipulator kfManipulator = knopflerfish.fwAdmin.getManipulator();
-		LauncherData kfLauncherData = kfManipulator.getLauncherData();
-		kfLauncherData.setFwConfigLocation(knopflerfish.configLoc);
-		kfManipulator.load();
-
-		// 3. create new instance of manipulator.
-		Manipulator eqManipulator = equinox.fwAdmin.getManipulator();
-		// 4. copy parameters from the one read from config files for knopflerfish.
-		eqManipulator.setConfigData(kfManipulator.getConfigData());
-		eqManipulator.setLauncherData(kfManipulator.getLauncherData());
-		ConfigData eqConfigData = eqManipulator.getConfigData();
-		LauncherData eqLauncherData = eqManipulator.getLauncherData();
-
-		// jvm and jvmargs must not be set for knopflerfish.
-		eqLauncherData.setJvm(new File(Activator.jvm));
-		String[] jvmArgs = {Activator.jvmArgs};
-		eqLauncherData.setJvmArgs(jvmArgs);
-
-		// Overwrite equinox and instance specific parameters.		
-		eqLauncherData.setFwJar(equinox.fwJar);
-		eqLauncherData.setFwPersistentDataLocation(equinox.configLoc, true);
-		eqLauncherData.setFwConfigLocation(equinox.configLoc);
-
-		// for debugging, set console port.
-		eqConfigData.setFwDependentProp(EquinoxActivator.PROPS_KEY_CONSOLE_PORT, equinox.propsValueConsolePort);
-
-		// 7. Expect bundles state
-		BundleInfo[] bInfos = eqManipulator.getExpectedState();
-		System.out.println("ExpectedState:");
-		for (int i = 0; i < bInfos.length; i++)
-			System.out.println(" " + bInfos[i]);
-
-		// 8 save config for equinox.
-		eqManipulator.save(true);
-
-		// 9. launch it.
-		equinox.launch(eqManipulator, equinox.cwd);
-	}
-
-	private Properties initialize(BundleContext context) throws InvalidSyntaxException, IOException {
-		Properties props = new Properties();
-		String path = this.getClass().getName();
-		path = path.replace('.', '/');
-		path = path.substring(0, path.lastIndexOf('/'));
-		path = path + "/" + "setting.properties";
-		URL url = context.getBundle().getResource(path);
-		if (url == null) {
-			RuntimeException ex = new IllegalStateException("Error!!:bundle.getEntry(" + "setting.properties" + ")==null. Check if \"" + "setting.properties" + " exists in the Bundle.\" ");
-			ex.printStackTrace();
-			throw ex;
-		}
-		InputStream inputStream = url.openStream();
-		props.load(inputStream);
-
-		this.readParameters(props);
-		return props;
-	}
-
-	private void printout() {
-		System.out.println("######################\nActivator");
-		System.out.println("mode:" + mode);
-		System.out.println("jvm:" + jvm);
-		System.out.println("jvmArgs:" + jvmArgs);
-		System.out.println("");
-	}
-
-	void readParameters(Properties props) {
-		String value = getValue(props, "mode");
-		try {
-			mode = Integer.parseInt(value);
-		} catch (NumberFormatException nfe) {
-			throw new IllegalStateException("\"mode\" should be set.", nfe);
-		}
-
-		value = props.getProperty("jvm.location");
-		jvm = value;
-		jvmArgs = props.getProperty("jvm.args");
-
-		printout();
-	}
-
-	public void start(BundleContext context) throws Exception {
-		try {
-			Properties props = initialize(context);
-			System.out.println("mode = " + mode);
-			equinox = new EquinoxActivator(context, props);
-			equinox.start();
-			switch (mode) {
-				case 0 :
-					equinox.equinoxSaveAndLaunch(equinox.bundleInfoListWoSimpleConfigurator, false);
-					break;
-				case 1 :
-					equinox.equinoxSaveAndLaunch(equinox.bundleInfoListWithSimpleConfigurator, false);
-					break;
-				case 2 :
-					equinox.eclipseSaveAndLaunch(equinox.bundleInfoListEclipse, false);
-					break;
-				case 3 :
-					knopflerfish = new KfActivator(context, props);
-					knopflerfish.start();
-					knopflerfish.kfSaveAndLaunch(KfActivator.bundleInfoListWoSimpleConfigurator, false);
-					break;
-				case 4 :
-					knopflerfish = new KfActivator(context, props);
-					knopflerfish.start();
-					knopflerfish.kfSaveAndLaunch(KfActivator.bundleInfoListWithSimpleConfigurator, false);
-					break;
-				case 5 :
-					knopflerfish = new KfActivator(context, props);
-					knopflerfish.start();
-					convertConfigFromKfToEquinoxAndLaunch();
-					break;
-				case 6 :
-					felix = new FelixActivator(context, props);
-					felix.start();
-					felix.felixSaveAndLaunch(FelixActivator.bundleInfoListWoSimpleConfigurator, false);
-					break;
-				case 7 :
-					equinox.equinoxSaveAndGetState(equinox.bundleInfoListWoSimpleConfigurator, false);
-					break;
-				case 8 :
-					equinox.equinoxSaveAndLaunch(equinox.bundleInfoListWithSimpleConfigurator, false);
-					equinox.equinoxGetState(true);
-					break;
-				case 9 :
-					equinox.equinoxSaveAndLaunch(equinox.bundleInfoListWithSimpleConfigurator, false);
-					equinox.stop();
-					Thread.sleep(1000);
-					equinox.start();
-					equinox.equinoxGetState(false);
-					break;
-				case 100 :
-					equinox.equinoxGetRunningState();
-					break;
-				case 101 :
-					Manipulator manipulator = equinox.equinoxSetAndSaveForRunningTest();
-					equinox.launch(manipulator, equinox.cwd);
-					break;
-				default :
-					break;
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		if (equinox != null)
-			equinox.stop();
-		if (knopflerfish != null)
-			knopflerfish.stop();
-		if (felix != null)
-			felix.stop();
-	}
-}

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/EquinoxActivator.java b/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/EquinoxActivator.java
deleted file mode 100644
index e43c40e..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/EquinoxActivator.java
+++ /dev/null

@@ -1,452 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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 http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.equinox.frameworkadmin.examples;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.equinox.frameworkadmin.*;
-import org.eclipse.equinox.frameworkadmin.equinox.internal.utils.FileUtils;
-import org.osgi.framework.*;
-import org.osgi.util.tracker.ServiceTracker;
-
-/**
- * It automatically find bundle jars in the plugins directory in Eclipse environment according to the values of 
- * equinox.home and equinox.bundlesDir. 
- */
-public class EquinoxActivator {
-	final static List bundleInfoListSimpleConfigurator = new LinkedList();
-
-	public static final String PROPS_KEY_CONSOLE_PORT = "osgi.console";
-	private final String FILTER_OBJECTCLASS = "(" + Constants.OBJECTCLASS + "=" + FrameworkAdmin.class.getName() + ")";
-	private String filterFwAdmin;
-	private String fwBundle;
-	private String equinoxCommonBundle;
-	private String coreRuntimeBundle;
-	private String updateConfiguratorBundle;
-	String frameworkAdminServiceBundle;
-	String simpleConfiguratorBundle;
-
-	private String jobsBundle;
-	private String registryBundle;
-	private String preferencesBundle;
-	private String contenttypeBundle;
-	private String applBundle;
-	private String osgiServicesBundle;
-	private String fwadminExamplesBundle;
-	private String fwadminEquinoxBundle;
-	//	private String fwadminKnopflerfishBundle;
-	//	private String fwadminFelixBundle;
-
-	public File fwHome;
-
-	public File eclipseExe;
-
-	public File cwd;
-
-	public String propsValueConsolePort;
-
-	public File bundlesDir;
-
-	public File fwJar;
-
-	public File configLoc;
-	public File configLocForRunningTest;
-	final List bundleInfoListEclipse = new LinkedList();
-	final List bundleInfoListWoSimpleConfigurator = new LinkedList();
-	final List bundleInfoListWithSimpleConfigurator = new LinkedList();
-	final List bundleInfoListForRunningTest = new LinkedList();
-
-	private BundleContext context;
-
-	private Process process = null;
-
-	private ServiceTracker fwAdminTracker;
-
-	FrameworkAdmin fwAdmin;
-
-	InputStreamMonitorThread threadStandardI = null;
-
-	InputStreamMonitorThread threadErrorI = null;
-
-	EquinoxActivator(Properties props) {
-		this(null, props);
-	}
-
-	EquinoxActivator(BundleContext context, Properties props) {
-		this.context = context;
-		readParameters(props);
-		initialieBundlesList();
-	}
-
-	void eclipseSaveAndLaunch(List bundleInfoList, boolean backup) throws IOException {
-		Manipulator manipulator = fwAdmin.getManipulator();
-		ConfigData configData = manipulator.getConfigData();
-		LauncherData launcherData = manipulator.getLauncherData();
-		// 1. Set Parameters.
-		launcherData.setLauncher(eclipseExe);
-
-		launcherData.setJvm(new File(Activator.jvm));
-		String[] jvmArgs = {Activator.jvmArgs};
-		launcherData.setJvmArgs(jvmArgs);
-		launcherData.setFwPersistentDataLocation(configLoc, true);
-		launcherData.setFwJar(fwJar);
-		launcherData.setFwConfigLocation(configLoc);
-		// 2. Set Parameters to ConfigData.
-		for (Iterator ite = bundleInfoList.iterator(); ite.hasNext();) {
-			BundleInfo bInfo = (BundleInfo) ite.next();
-			configData.addBundle(bInfo);
-		}
-		configData.setBeginningFwStartLevel(5);
-		configData.setInitialBundleStartLevel(5);
-		configData.setFwDependentProp(PROPS_KEY_CONSOLE_PORT, propsValueConsolePort);
-		// 3. Save them.
-		manipulator.save(backup);
-
-		// 4. Launch it.
-		process = fwAdmin.launch(manipulator, cwd);
-		InputStreamMonitorThread.monitorThreadStart(process, threadStandardI, threadErrorI);
-	}
-
-	void equinoxGetState(boolean clean) throws IOException {
-		System.out.println("equinoxGetState()");
-		Manipulator manipulator = fwAdmin.getManipulator();
-		//ConfigData configData = manipulator.getConfigData();
-		LauncherData launcherData = manipulator.getLauncherData();
-		// 1. getState from the persistently stored data.
-		// Set Parameters.
-		launcherData.setFwPersistentDataLocation(configLoc, clean);
-		launcherData.setFwJar(fwJar);
-		launcherData.setFwConfigLocation(configLoc);
-		manipulator.load();
-		BundleInfo[] bInfos = manipulator.getExpectedState();
-		System.out.println("ExpectedState:");
-		for (int i = 0; i < bInfos.length; i++)
-			System.out.println(" " + bInfos[i]);
-	}
-
-	/**
-	 * For equinox, set parameters and save into config files.
-	 * without launching,load config from saved files and
-	 * expect bundles state. 
-	 * 
-	 * @param bundleInfoList
-	 * @param backup
-	 * @throws IOException
-	 */
-	void equinoxSaveAndGetState(List bundleInfoList, boolean backup) throws IOException {
-		equinoxSetAndSave(bundleInfoList, backup);
-
-		// 4. getState from the persistently stored data.
-		Manipulator manipulator = fwAdmin.getManipulator();
-		//configData = manipulator.getConfigData();
-		LauncherData launcherData = manipulator.getLauncherData();
-		// Set Parameters.
-
-		launcherData.setFwPersistentDataLocation(configLoc, true);
-		launcherData.setFwJar(fwJar);
-		launcherData.setFwConfigLocation(configLoc);
-		manipulator.load();
-
-		BundleInfo[] bInfos = manipulator.getExpectedState();
-		System.out.println("ExpectedState:");
-		for (int i = 0; i < bInfos.length; i++)
-			System.out.println(" " + bInfos[i]);
-	}
-
-	/**
-	 * For equinox, set parameters and save into config files.
-	 * 
-	 * @param bundleInfoList
-	 * @param backup
-	 * @return Manipulator object used for saving.
-	 * @throws IOException
-	 */
-	Manipulator equinoxSetAndSave(List bundleInfoList, boolean backup) throws IOException {
-		if (configLoc.exists())
-			if (configLoc.isFile())
-				configLoc.delete();
-			else {
-				File[] lists = configLoc.listFiles();
-				if (lists != null)
-					for (int i = 0; i < lists.length; i++) {
-						lists[i].delete();
-					}
-			}
-		Manipulator manipulator = fwAdmin.getManipulator();
-		ConfigData configData = manipulator.getConfigData();
-		LauncherData launcherData = manipulator.getLauncherData();
-		// 1. Set Parameters to LaunchData.
-		launcherData.setJvm(new File(Activator.jvm));
-		String[] jvmArgs = {Activator.jvmArgs};
-		launcherData.setJvmArgs(jvmArgs);
-		launcherData.setFwPersistentDataLocation(configLoc, true);
-		launcherData.setFwJar(fwJar);
-		launcherData.setFwConfigLocation(configLoc);
-		// 2. Set Parameters to ConfigData.
-		for (Iterator ite = bundleInfoList.iterator(); ite.hasNext();) {
-			BundleInfo bInfo = (BundleInfo) ite.next();
-			configData.addBundle(bInfo);
-		}
-		configData.setBeginningFwStartLevel(5);
-		configData.setInitialBundleStartLevel(5);
-		configData.setFwDependentProp(PROPS_KEY_CONSOLE_PORT, propsValueConsolePort);
-
-		// 3. Expect bundles state.
-		BundleInfo[] bInfos = manipulator.getExpectedState();
-		System.out.println("Before Save, ExpectedState:");
-		for (int i = 0; i < bInfos.length; i++)
-			System.out.println(" " + bInfos[i]);
-
-		// 4. Save them.
-		manipulator.save(backup);
-		System.out.println("Saved");
-		return manipulator;
-	}
-
-	/**
-	 * For equinox, set parameters and save into config files.
-	 * nextly launch by the config. 
-	 
-	 * @param bundleInfoList
-	 * @param backup
-	 * @throws IOException
-	 */
-	Process equinoxSaveAndLaunch(List bundleInfoList, boolean backup) throws IOException {
-		Manipulator manipulator = equinoxSetAndSave(bundleInfoList, backup);
-		// 5. Launch it.
-		process = fwAdmin.launch(manipulator, cwd);
-		System.out.println("Launched");
-		InputStreamMonitorThread.monitorThreadStart(process, threadStandardI, threadErrorI);
-		return process;
-	}
-
-	/**
-	 * For equinox, set parameters and save into config files.
-	 * 
-	 * @param bundleInfoList
-	 * @param backup
-	 * @return Manipulator object used for saving.
-	 * @throws IOException
-	 */
-	Manipulator equinoxSetAndSaveForRunningTest() throws IOException {
-		Manipulator manipulator = fwAdmin.getManipulator();
-		ConfigData configData = manipulator.getConfigData();
-		LauncherData launcherData = manipulator.getLauncherData();
-		// 1. Set Parameters to LaunchData.
-		launcherData.setJvm(new File(Activator.jvm));
-		String[] jvmArgs = {Activator.jvmArgs};
-		launcherData.setJvmArgs(jvmArgs);
-		launcherData.setFwPersistentDataLocation(configLocForRunningTest, true);
-		launcherData.setFwJar(fwJar);
-		launcherData.setFwConfigLocation(configLocForRunningTest);
-		// 2. Set Parameters to ConfigData.
-		for (Iterator ite = bundleInfoListForRunningTest.iterator(); ite.hasNext();) {
-			BundleInfo bInfo = (BundleInfo) ite.next();
-			configData.addBundle(bInfo);
-		}
-		configData.setBeginningFwStartLevel(5);
-		configData.setInitialBundleStartLevel(5);
-		configData.setFwDependentProp(PROPS_KEY_CONSOLE_PORT, propsValueConsolePort);
-
-		// 3. Expect bundles state.
-		BundleInfo[] bInfos = manipulator.getExpectedState();
-		System.out.println("Before Save, ExpectedState:");
-		for (int i = 0; i < bInfos.length; i++)
-			System.out.println(" " + bInfos[i]);
-
-		// 4. Save them.
-		manipulator.save(false);
-		System.out.println("Saved");
-		return manipulator;
-	}
-
-	/**
-	 * 
-	 * 
-	 * @throws IOException
-	 */
-	void equinoxGetRunningState() throws IOException {
-		//1. get FrameworkAdmin for running system.
-		String filter = "(" + FrameworkAdmin.SERVICE_PROP_KEY_RUNNING_SYSTEM_FLAG + "=true)";
-		ServiceReference[] references = null;
-		try {
-			references = context.getServiceReferences(FrameworkAdmin.class.getName(), filter);
-		} catch (InvalidSyntaxException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		if (references == null)
-			throw new IllegalStateException("There is no available FrameworkAdmin for running system.");
-		FrameworkAdmin runningFwAdmin = (FrameworkAdmin) context.getService(references[0]);
-		Manipulator manipulator = runningFwAdmin.getRunningManipulator();
-
-		System.out.println(manipulator.toString());
-
-		// 3. Expect bundles state.
-		BundleInfo[] bInfos = manipulator.getExpectedState();
-		System.out.println("Running ExpectedState:");
-		for (int i = 0; i < bInfos.length; i++)
-			System.out.println(" " + bInfos[i]);
-
-	}
-
-	//	private String getFullyQualifiedLocation(String BundleJarName) {
-	//		try {
-	//			return (new File(bundlesDir, BundleJarName)).toURL().toExternalForm();
-	//		} catch (MalformedURLException e) {
-	//			// TODO Auto-generated catch block
-	//			e.printStackTrace();
-	//			return null;
-	//		}
-	//	}
-
-	private void initialieBundlesList() {
-		try {
-			bundleInfoListEclipse.add(new BundleInfo(fwJar.toURL().toExternalForm(), 0, true));
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		bundleInfoListEclipse.add(new BundleInfo(equinoxCommonBundle, 3, true));
-		bundleInfoListEclipse.add(new BundleInfo(updateConfiguratorBundle, 4, true));
-		bundleInfoListEclipse.add(new BundleInfo(coreRuntimeBundle, BundleInfo.NO_LEVEL, true));
-		try {
-			bundleInfoListWoSimpleConfigurator.add(new BundleInfo(fwJar.toURL().toExternalForm(), 0, true));
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		bundleInfoListWoSimpleConfigurator.add(new BundleInfo(equinoxCommonBundle, 3, true));
-		bundleInfoListWoSimpleConfigurator.add(new BundleInfo(updateConfiguratorBundle, 4, false));
-		bundleInfoListWoSimpleConfigurator.add(new BundleInfo(coreRuntimeBundle, BundleInfo.NO_LEVEL, false));
-
-		bundleInfoListSimpleConfigurator.add(new BundleInfo(frameworkAdminServiceBundle, BundleInfo.NO_LEVEL, false));
-		bundleInfoListSimpleConfigurator.add(new BundleInfo(simpleConfiguratorBundle, 2, true));
-
-		bundleInfoListWithSimpleConfigurator.addAll(bundleInfoListWoSimpleConfigurator);
-		bundleInfoListWithSimpleConfigurator.addAll(bundleInfoListSimpleConfigurator);
-
-		bundleInfoListForRunningTest.add(new BundleInfo(equinoxCommonBundle, 3, true));
-		bundleInfoListForRunningTest.add(new BundleInfo(applBundle, BundleInfo.NO_LEVEL, true));
-		bundleInfoListForRunningTest.add(new BundleInfo(coreRuntimeBundle, BundleInfo.NO_LEVEL, true));
-		bundleInfoListForRunningTest.add(new BundleInfo(jobsBundle, 1, true));
-		bundleInfoListForRunningTest.add(new BundleInfo(registryBundle, 1, true));
-		bundleInfoListForRunningTest.add(new BundleInfo(contenttypeBundle, 1, true));
-		bundleInfoListForRunningTest.add(new BundleInfo(preferencesBundle, 1, true));
-		bundleInfoListForRunningTest.add(new BundleInfo(osgiServicesBundle));
-		bundleInfoListForRunningTest.add(new BundleInfo(frameworkAdminServiceBundle));
-		bundleInfoListForRunningTest.add(new BundleInfo(fwadminEquinoxBundle, 1, true));
-		bundleInfoListForRunningTest.add(new BundleInfo(fwadminExamplesBundle, 4, true));
-	}
-
-	public void launch(Manipulator manipulator, File runtimeCwd) throws IOException {
-		process = fwAdmin.launch(manipulator, runtimeCwd);
-		InputStreamMonitorThread.monitorThreadStart(process, threadStandardI, threadErrorI);
-	}
-
-	private void printoutParameters() {
-		System.out.println("######################\nEquinoxActivator");
-		System.out.println("fwHome:" + fwHome);
-		System.out.println("cwd:" + cwd);
-		System.out.println("eclipseExe:" + eclipseExe);
-		System.out.println("bundlesDir:" + bundlesDir);
-		System.out.println("fwBundle:" + fwBundle);
-		System.out.println("fwJar:" + fwJar);
-		System.out.println("configLoc:" + configLoc);
-		System.out.println("simpleConfiguratorBundle:" + simpleConfiguratorBundle);
-		System.out.println("frameworkAdminServiceBundle:" + frameworkAdminServiceBundle);
-		System.out.println("coreRuntimeBundle:" + coreRuntimeBundle);
-		System.out.println("updateConfiguratorBundle:" + updateConfiguratorBundle);
-		System.out.println("configLocForRunningTest:" + configLocForRunningTest);
-		System.out.println("jobsBundle:" + jobsBundle);
-		System.out.println("preferencesBundle:" + preferencesBundle);
-		System.out.println("applBundle:" + applBundle);
-		System.out.println("fwadminEquinoxBundle:" + fwadminEquinoxBundle);
-		System.out.println("fwadminExamplesBundle:" + fwadminExamplesBundle);
-		System.out.println("osgiServicesBundle:" + osgiServicesBundle);
-		System.out.println("");
-	}
-
-	private void readParameters(Properties props) {
-		fwHome = new File(Activator.getValue(props, "equinox.home"));
-		cwd = new File(Activator.getValue(props, "equinox.cwd"));
-
-		eclipseExe = new File(Activator.getValue(props, "equinox.launcher"));
-
-		bundlesDir = new File(fwHome, Activator.getValue(props, "equinox.bundlesDir"));
-		fwBundle = FileUtils.getEclipsePluginFullLocation("org.eclipse.osgi", bundlesDir);
-		simpleConfiguratorBundle = FileUtils.getEclipsePluginFullLocation("org.eclipse.equinox.simpleconfigurator", bundlesDir);
-		frameworkAdminServiceBundle = FileUtils.getEclipsePluginFullLocation("org.eclipse.equinox.frameworkadmin", bundlesDir);
-		equinoxCommonBundle = FileUtils.getEclipsePluginFullLocation("org.eclipse.equinox.common", bundlesDir);
-		coreRuntimeBundle = FileUtils.getEclipsePluginFullLocation("org.eclipse.core.runtime", bundlesDir);
-		updateConfiguratorBundle = FileUtils.getEclipsePluginFullLocation("org.eclipse.update.configurator", bundlesDir);
-
-		jobsBundle = FileUtils.getEclipsePluginFullLocation("org.eclipse.core.jobs", bundlesDir);
-		registryBundle = FileUtils.getEclipsePluginFullLocation("org.eclipse.equinox.registry", bundlesDir);
-		preferencesBundle = FileUtils.getEclipsePluginFullLocation("org.eclipse.equinox.preferences", bundlesDir);
-		contenttypeBundle = FileUtils.getEclipsePluginFullLocation("org.eclipse.core.contenttype", bundlesDir);
-		osgiServicesBundle = FileUtils.getEclipsePluginFullLocation("org.eclipse.osgi.services", bundlesDir);
-		fwadminExamplesBundle = FileUtils.getEclipsePluginFullLocation("org.eclipse.equinox.frameworkadmin.examples", bundlesDir);
-		fwadminEquinoxBundle = FileUtils.getEclipsePluginFullLocation("org.eclipse.equinox.frameworkadmin.equinox", bundlesDir);
-		applBundle = FileUtils.getEclipsePluginFullLocation("org.eclipse.equinox.app", bundlesDir);
-
-		try {
-			fwJar = new File((new URL(fwBundle)).getFile());
-		} catch (MalformedURLException e) {
-			// never happen;
-			e.printStackTrace();
-		}
-		propsValueConsolePort = Activator.getValue(props, "equinox.console.port");
-		configLoc = new File(fwHome, Activator.getValue(props, "equinox.configLoc"));
-		configLocForRunningTest = new File(fwHome, Activator.getValue(props, "equinox.configLocForRunningTest"));
-
-		String filterFwName = "(" + FrameworkAdmin.SERVICE_PROP_KEY_FW_NAME + "=" + props.getProperty("equinox.fw.name") + ")";
-		String filterFwVersion = "(" + FrameworkAdmin.SERVICE_PROP_KEY_FW_VERSION + "=" + props.getProperty("equinox.fw.version") + ")";
-		String filterLauncherName = "(" + FrameworkAdmin.SERVICE_PROP_KEY_LAUNCHER_NAME + "=" + props.getProperty("equinox.launcher.name") + ")";
-		String filterLauncherVersion = "(" + FrameworkAdmin.SERVICE_PROP_KEY_LAUNCHER_VERSION + "=" + props.getProperty("equinox.launcher.version") + ")";
-		filterFwAdmin = "(&" + FILTER_OBJECTCLASS + filterFwName + filterFwVersion + filterLauncherName + filterLauncherVersion + ")";
-
-		printoutParameters();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start() throws InvalidSyntaxException {
-		if (context != null) {
-			Filter chFilter = context.createFilter(filterFwAdmin);
-			fwAdminTracker = new ServiceTracker(context, chFilter, null);
-			fwAdminTracker.open();
-			fwAdmin = (FrameworkAdmin) fwAdminTracker.getService();
-			return;
-		}
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop() throws Exception {
-		//context = null;
-		if (fwAdminTracker != null)
-			fwAdminTracker.close();
-		fwAdminTracker = null;
-		fwAdmin = null;
-		InputStreamMonitorThread.stopProcess(process, threadStandardI, threadErrorI);
-	}
-
-}

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/FelixActivator.java b/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/FelixActivator.java
deleted file mode 100644
index d3e492e..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/FelixActivator.java
+++ /dev/null

@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.frameworkadmin.examples;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.equinox.frameworkadmin.*;
-import org.osgi.framework.*;
-import org.osgi.util.tracker.ServiceTracker;
-
-public class FelixActivator {
-
-	private final static String FILTER_OBJECTCLASS = "(" + Constants.OBJECTCLASS + "=" + FrameworkAdmin.class.getName() + ")";
-	static List bundleInfoListWoSimpleConfigurator = new LinkedList();
-	List bundleInfoListWithSimpleConfigurator = new LinkedList();
-	private File fwHome;
-
-	File fwJar;
-	File configLoc;
-	File cwd;
-	private String bundlesDir;
-
-	File fwPersistentDataLoc;
-
-	private String filterFwAdmin;
-	private List bundlesList = new LinkedList();
-
-	private BundleContext context;
-	private Process process = null;
-	private ServiceTracker fwAdminTracker;
-	private FrameworkAdmin fwAdmin;
-
-	InputStreamMonitorThread threadStandardI = null;
-	InputStreamMonitorThread threadErrorI = null;
-	private final int initialBundleSl = 7;
-
-	private final int beginningFwSl = 7;
-
-	FelixActivator(Properties props) {
-		this(null, props);
-	}
-
-	FelixActivator(BundleContext context, Properties props) {
-		this.context = context;
-		this.context = context;
-		this.readParameters(props);
-		initializeBundlesList();
-	}
-
-	void felixSaveAndLaunch(List bundleList, boolean backup) throws InvalidSyntaxException, IOException {
-		Manipulator manipulator = fwAdmin.getManipulator();
-		ConfigData configData = manipulator.getConfigData();
-		LauncherData launcherData = manipulator.getLauncherData();
-
-		// 1. Set Parameters to LaunchData.
-		launcherData.setFwJar(fwJar);
-		launcherData.setFwConfigLocation(configLoc);
-		launcherData.setFwPersistentDataLocation(fwPersistentDataLoc, true);
-
-		// 2. Set Parameters to ConfigData.
-		configData.setBeginningFwStartLevel(this.beginningFwSl);
-		configData.setInitialBundleStartLevel(this.initialBundleSl);
-		for (Iterator ite = bundleList.iterator(); ite.hasNext();) {
-			BundleInfo bundleInfo = (BundleInfo) ite.next();
-			configData.addBundle(bundleInfo);
-		}
-		manipulator.save(backup);
-		launcherData.setJvm(new File(Activator.jvm));
-		String[] jvmArgs = {Activator.jvmArgs};
-		launcherData.setJvmArgs(jvmArgs);
-		launcherData.setFwPersistentDataLocation(fwPersistentDataLoc, true);
-		launcherData.setFwConfigLocation(configLoc);
-		process = fwAdmin.launch(manipulator, cwd);
-		InputStreamMonitorThread.monitorThreadStart(process, threadStandardI, threadErrorI);
-	}
-
-	private void initializeBundlesList() {
-
-		int sl = 0;
-		for (Iterator ite = bundlesList.iterator(); ite.hasNext();) {
-			sl++;
-			String[] bundles = (String[]) ite.next();
-			for (int i = 0; i < bundles.length; i++) {
-				URL url;
-				try {
-					url = new URL("file", null, (new File(fwHome, bundlesDir + "/" + bundles[i]).getAbsolutePath()));
-					bundleInfoListWoSimpleConfigurator.add(new BundleInfo(url.toExternalForm(), sl, true));
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-			}
-		}
-
-		bundleInfoListWithSimpleConfigurator.addAll(EquinoxActivator.bundleInfoListSimpleConfigurator);
-
-		bundleInfoListWithSimpleConfigurator.addAll(bundleInfoListWoSimpleConfigurator);
-		try {
-			bundleInfoListWithSimpleConfigurator.add(new BundleInfo(fwJar.toURL().toExternalForm(), 1, true, 0));
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	private void printoutParameters() {
-		System.out.println("######################\nFelixActivator");
-		System.out.println("fwHome:" + fwHome);
-		System.out.println("cwd:" + cwd);
-		System.out.println("bundlesDir:" + bundlesDir);
-		System.out.println("fwJar:" + fwJar);
-		System.out.println("configLoc:" + configLoc);
-		System.out.println("fwPersistentDataLoc:" + fwPersistentDataLoc);
-		System.out.println("");
-	}
-
-	private void readParameters(Properties props) {
-		fwHome = new File(Activator.getValue(props, "felix.home"));
-		cwd = fwHome;
-		String value = Activator.getValue(props, "felix.bundlesDir");
-		bundlesDir = value.endsWith(File.separator) ? value : value + File.separator;
-		configLoc = new File(fwHome, Activator.getValue(props, "felix.configLoc"));
-		fwPersistentDataLoc = new File(fwHome, Activator.getValue(props, "felix.fwPersistentDataLoc"));
-		fwJar = new File(fwHome, Activator.getValue(props, "felix.fw"));
-		for (int i = 1; i < 3; i++) {
-			try {
-				value = Activator.getValue(props, "felix.bundles." + String.valueOf(i) + ".start");
-				bundlesList.add(KfActivator.getStringArray(value));
-			} catch (IllegalStateException e) {
-				e.printStackTrace();
-			}
-		}
-		String filterFwName = "(" + FrameworkAdmin.SERVICE_PROP_KEY_FW_NAME + "=" + props.getProperty("felix.fw.name") + ")";
-		String filterFwVersion = "(" + FrameworkAdmin.SERVICE_PROP_KEY_FW_VERSION + "=" + props.getProperty("felix.fw.version") + ")";
-		String filterLauncherName = "(" + FrameworkAdmin.SERVICE_PROP_KEY_LAUNCHER_NAME + "=" + props.getProperty("felix.launcher.name") + ")";
-		String filterLauncherVersion = "(" + FrameworkAdmin.SERVICE_PROP_KEY_LAUNCHER_VERSION + "=" + props.getProperty("felix.launcher.version") + ")";
-		filterFwAdmin = "(&" + FILTER_OBJECTCLASS + filterFwName + filterFwVersion + filterLauncherName + filterLauncherVersion + ")";
-
-		printoutParameters();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start() throws InvalidSyntaxException {
-		Filter chFilter = context.createFilter(filterFwAdmin);
-		fwAdminTracker = new ServiceTracker(this.context, chFilter, null);
-		fwAdminTracker.open();
-		fwAdmin = (FrameworkAdmin) this.fwAdminTracker.getService();
-	}
-
-	public void stop() throws Exception {
-		this.context = null;
-		if (fwAdminTracker != null)
-			fwAdminTracker.close();
-		fwAdminTracker = null;
-		this.fwAdmin = null;
-		InputStreamMonitorThread.stopProcess(process, threadStandardI, threadErrorI);
-	}
-}

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/InputStreamMonitorThread.java b/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/InputStreamMonitorThread.java
deleted file mode 100644
index 75c8ff3..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/InputStreamMonitorThread.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.frameworkadmin.examples;
-
-import java.io.*;
-
-public class InputStreamMonitorThread extends Thread {
-	static void monitorThreadStart(Process process, InputStreamMonitorThread threadStandard, InputStreamMonitorThread threadError) {
-		threadStandard = new InputStreamMonitorThread("S", process.getInputStream());
-		threadError = new InputStreamMonitorThread("E", process.getErrorStream());
-		threadStandard.start();
-		threadError.start();
-	}
-
-	static void stopProcess(Process process, InputStreamMonitorThread threadStandard, InputStreamMonitorThread threadError) {
-		if (process != null) {
-			try {
-				process.exitValue();
-			} catch (IllegalThreadStateException e) {
-				process.destroy();
-				System.out.println("process is stopped.");
-				process = null;
-			}
-		}
-
-		if (threadStandard != null)
-			threadStandard.inactivate();
-		if (threadError != null)
-			threadError.inactivate();
-	}
-
-	private final String name;
-	private BufferedReader br;
-
-	private boolean active = false;
-
-	InputStreamMonitorThread(String name, InputStream is) {
-		this.name = name;
-		br = new BufferedReader(new InputStreamReader(is));
-	}
-
-	public void inactivate() {
-		active = false;
-	}
-
-	public void run() {
-		String line = null;
-		try {
-			active = true;
-			while (active == true && (line = br.readLine()) != null) {
-				System.out.println("[" + name + "]" + line);
-			}
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-}
\ No newline at end of file

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/KfActivator.java b/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/KfActivator.java
deleted file mode 100644
index 0da9b90..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/KfActivator.java
+++ /dev/null

@@ -1,240 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.frameworkadmin.examples;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.equinox.frameworkadmin.*;
-import org.eclipse.equinox.internal.frameworkadmin.utils.Utils;
-import org.osgi.framework.*;
-import org.osgi.util.tracker.ServiceTracker;
-
-public class KfActivator {
-
-	private final static String FILTER_OBJECTCLASS = "(" + Constants.OBJECTCLASS + "=" + FrameworkAdmin.class.getName() + ")";
-	static List bundleInfoListWoSimpleConfigurator = new LinkedList();
-	static List bundleInfoListWithSimpleConfigurator = new LinkedList();
-
-	static String[] getStringArray(String value) {
-		StringTokenizer tokenizer = new StringTokenizer(value, ",");
-		List list = new ArrayList(tokenizer.countTokens());
-		while (tokenizer.hasMoreTokens()) {
-			list.add(tokenizer.nextToken());
-		}
-		String[] ret = new String[list.size()];
-		list.toArray(ret);
-		return ret;
-	}
-
-	File configLoc;
-
-	private File fwHome;
-	File fwJar;
-	File cwd;
-	private String bundlesDir;
-	File fwPersistentDataLoc;
-
-	private String filterFwAdmin;
-
-	private BundleContext context;
-	private Process process = null;
-	private ServiceTracker fwAdminTracker;
-
-	FrameworkAdmin fwAdmin;
-	InputStreamMonitorThread threadStandardI = null;
-	InputStreamMonitorThread threadErrorI = null;
-
-	private List bundlesList = new LinkedList();
-	private final int initialBundleSl = 7;
-
-	private final int beginningFwSl = 7;
-
-	KfActivator(Properties props) {
-		this(null, props);
-	}
-
-	KfActivator(BundleContext context, Properties props) {
-		this.context = context;
-		this.readParameters(props);
-		initializeBundlesList();
-	}
-
-	private void initializeBundlesList() {
-
-		int sl = 0;
-		for (Iterator ite = bundlesList.iterator(); ite.hasNext();) {
-			sl++;
-			String[] bundles = (String[]) ite.next();
-			for (int i = 0; i < bundles.length; i++) {
-				try {
-					URL url = Utils.getUrl("file", null, (new File(fwHome, bundlesDir + "/" + bundles[i]).getAbsolutePath()));
-					bundleInfoListWoSimpleConfigurator.add(new BundleInfo(url.toExternalForm(), sl, true));
-				} catch (MalformedURLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-			}
-		}
-
-		bundleInfoListWithSimpleConfigurator.addAll(EquinoxActivator.bundleInfoListSimpleConfigurator);
-
-		bundleInfoListWithSimpleConfigurator.addAll(bundleInfoListWoSimpleConfigurator);
-		try {
-			bundleInfoListWithSimpleConfigurator.add(new BundleInfo(fwJar.toURL().toExternalForm(), 0, true, 0));
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	void kfSaveAndLaunch(List bundleList, boolean backup) throws IOException {
-		Manipulator manipulator = fwAdmin.getManipulator();
-		ConfigData configData = manipulator.getConfigData();
-		LauncherData launcherData = manipulator.getLauncherData();
-
-		// 1. Set Parameters to LaunchData.
-		launcherData.setJvm(new File(Activator.jvm));
-		String[] jvmArgs = {Activator.jvmArgs};
-		launcherData.setJvmArgs(jvmArgs);
-		launcherData.setFwJar(fwJar);
-		launcherData.setFwPersistentDataLocation(fwPersistentDataLoc, true);
-		launcherData.setFwConfigLocation(configLoc);
-
-		// 2. Set Parameters to ConfigData.
-		configData.setBeginningFwStartLevel(this.beginningFwSl);
-		configData.setInitialBundleStartLevel(this.initialBundleSl);
-		for (Iterator ite = bundleList.iterator(); ite.hasNext();) {
-			BundleInfo bundleInfo = (BundleInfo) ite.next();
-			configData.addBundle(bundleInfo);
-			//	System.out.println(bundleInfo);
-		}
-		//	System.out.println("configFile=" + configFile);
-		// 4. Save them.
-		manipulator.save(backup);
-
-		// 5. Launch it.
-		process = fwAdmin.launch(manipulator, cwd);
-		InputStreamMonitorThread.monitorThreadStart(process, threadStandardI, threadErrorI);
-	}
-
-	public void load(File configFile) {
-		Manipulator manipulator = fwAdmin.getManipulator();
-		//ConfigData configData = manipulator.getConfigData();
-		LauncherData launcherData = manipulator.getLauncherData();
-		// 1. set required parameters to load.
-		launcherData.setFwConfigLocation(configFile);
-		try {
-			manipulator.load();
-		} catch (IllegalStateException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (FrameworkAdminRuntimeException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	private void printoutParameters() {
-		System.out.println("######################\nFelixActivator");
-		System.out.println("fwHome:" + fwHome);
-		System.out.println("cwd:" + cwd);
-		System.out.println("bundlesDir:" + bundlesDir);
-		System.out.println("fwJar:" + fwJar);
-		System.out.println("configLoc:" + configLoc);
-		System.out.println("fwPersistentDataLoc:" + fwPersistentDataLoc);
-		System.out.println("");
-
-	}
-
-	private void readParameters(Properties props) {
-		fwHome = new File(Activator.getValue(props, "knopflerfish.home"));
-		cwd = new File(Activator.getValue(props, "knopflerfish.cwd"));
-		String value = Activator.getValue(props, "knopflerfish.bundlesDir");
-		bundlesDir = value.endsWith(File.separator) ? value : value + File.separator;
-		configLoc = new File(fwHome, Activator.getValue(props, "knopflerfish.configLoc"));
-		fwPersistentDataLoc = new File(fwHome, Activator.getValue(props, "knopflerfish.fwPersistentDataLoc"));
-		fwJar = new File(fwHome, Activator.getValue(props, "knopflerfish.fw"));
-		for (int i = 1; i < 7; i++) {
-			try {
-				value = Activator.getValue(props, "knopflerfish.bundles." + String.valueOf(i) + ".start");
-				bundlesList.add(getStringArray(value));
-			} catch (IllegalStateException e) {
-				e.printStackTrace();
-			}
-		}
-		String filterFwName = "(" + FrameworkAdmin.SERVICE_PROP_KEY_FW_NAME + "=" + props.getProperty("knopflerfish.fw.name") + ")";
-		String filterFwVersion = "(" + FrameworkAdmin.SERVICE_PROP_KEY_FW_VERSION + "=" + props.getProperty("knopflerfish.fw.version") + ")";
-		String filterLauncherName = "(" + FrameworkAdmin.SERVICE_PROP_KEY_LAUNCHER_NAME + "=" + props.getProperty("knopflerfish.launcher.name") + ")";
-		String filterLauncherVersion = "(" + FrameworkAdmin.SERVICE_PROP_KEY_LAUNCHER_VERSION + "=" + props.getProperty("knopflerfish.launcher.version") + ")";
-		filterFwAdmin = "(&" + FILTER_OBJECTCLASS + filterFwName + filterFwVersion + filterLauncherName + filterLauncherVersion + ")";
-
-		printoutParameters();
-	}
-
-	public void save(File configFile, List bundleList, boolean backup) throws IOException {
-		Manipulator manipulator = fwAdmin.getManipulator();
-		ConfigData configData = manipulator.getConfigData();
-		LauncherData launcherData = manipulator.getLauncherData();
-
-		// 1. Set Parameters to LaunchData.
-		launcherData.setJvm(new File(Activator.jvm));
-		String[] jvmArgs = {Activator.jvmArgs};
-		launcherData.setJvmArgs(jvmArgs);
-		launcherData.setFwJar(fwJar);
-		launcherData.setFwPersistentDataLocation(fwPersistentDataLoc, true);
-		launcherData.setFwConfigLocation(configFile);
-
-		// 2. Set Parameters to ConfigData.
-		configData.setBeginningFwStartLevel(this.beginningFwSl);
-		configData.setInitialBundleStartLevel(this.initialBundleSl);
-		for (Iterator ite = bundleList.iterator(); ite.hasNext();) {
-			BundleInfo bundleInfo = (BundleInfo) ite.next();
-			configData.addBundle(bundleInfo);
-			//	System.out.println(bundleInfo);
-		}
-		//	System.out.println("configFile=" + configFile);
-		// 4. Save them.
-		manipulator.save(backup);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start() throws InvalidSyntaxException {
-		Filter chFilter = context.createFilter(filterFwAdmin);
-		fwAdminTracker = new ServiceTracker(this.context, chFilter, null);
-		fwAdminTracker.open();
-		fwAdmin = (FrameworkAdmin) this.fwAdminTracker.getService();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop() throws Exception {
-		this.context = null;
-		if (fwAdminTracker != null)
-			fwAdminTracker.close();
-		fwAdminTracker = null;
-		this.fwAdmin = null;
-		InputStreamMonitorThread.stopProcess(process, threadStandardI, threadErrorI);
-	}
-}

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/Main.java b/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/Main.java
deleted file mode 100644
index 21e701b..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/Main.java
+++ /dev/null

@@ -1,347 +0,0 @@
-package org.eclipse.equinox.frameworkadmin.examples;
-
-import java.io.*;
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.equinox.frameworkadmin.*;
-import org.eclipse.equinox.configuratormanipulator.ConfiguratorManipulatorFactory;
-
-/**
- * This is an example how a Java application configure an framework with bundles and launch it. 
- * 
- * Usage: just 
- *
- */
-public class Main {
-	private static EquinoxActivator equinox = null;
-	private static FelixActivator felix = null;
-	private static KfActivator knopflerfish = null;
-	private static Properties props = new Properties();
-	private static final boolean differentThread = true;
-	private static Process process = null;
-	private static int mode;
-
-	/**
-	 * @param args
-	 */
-	public static void main(String[] args) {
-		initialize();
-		mode = Integer.parseInt(props.getProperty("main.mode"));
-
-		switch (mode) {
-			case 0 :
-				launchEquinox();
-				break;
-			case 1 :
-				launchKnopflerfish();
-				break;
-			case 2 :
-				launchFelix();
-				break;
-			default :
-				break;
-		}
-	}
-
-	private static void launchEquinox() {
-		FrameworkAdmin fwAdmin = null;
-		String configuratorManipulatorFactoryClassName = props.getProperty("main.configuratorManipulatorFactoryClassName");
-		String frameworkAdminFactoryClassName = props.getProperty("main.equinox.frameworkAdminFactoryClassName");
-
-		try {
-
-			//			// Method 1: set both implementation class names into arguments.
-			//			fwAdmin = FrameworkAdminFactory.getInstance(frameworkAdminFactoryClassName, configuratorManipulatorFactoryClassName);
-
-			//			// Method 2:	set both magic system properties in advance.	
-			//			System.setProperty("org.eclipse.equinox.frameworkadmin.frameworkAdminFactory", frameworkAdminFactoryClassName);
-			//			System.setProperty("org.eclipse.equinox.frameworkadmin.configuratorManipulatorFactory", configuratorManipulatorFactoryClassName);//		FrameworkAdmin fwAdmin = FrameworkAdminFactory.getInstance(className);
-			//			fwAdmin = FrameworkAdminFactory.getInstance();
-
-			// Method 3: set ConfiguratorManipulatorFactory magic system property in advance.
-			//           and specify FrameworkAdminFactoryImplementation as an argument.
-			System.setProperty(ConfiguratorManipulatorFactory.SYSTEM_PROPERTY_KEY, configuratorManipulatorFactoryClassName);//		FrameworkAdmin fwAdmin = FrameworkAdminFactory.getInstance(className);
-			fwAdmin = FrameworkAdminFactory.getInstance(frameworkAdminFactoryClassName);
-		} catch (InstantiationException e) {
-			System.err.println("frameworkAdminFactoryClassName=" + frameworkAdminFactoryClassName);
-			System.err.println("configuratorManipulatorFactoryClassName=" + configuratorManipulatorFactoryClassName);
-			e.printStackTrace();
-		} catch (IllegalAccessException e) {
-			System.err.println("frameworkAdminFactoryClassName=" + frameworkAdminFactoryClassName);
-			System.err.println("configuratorManipulatorFactoryClassName=" + configuratorManipulatorFactoryClassName);
-			e.printStackTrace();
-		} catch (ClassNotFoundException e) {
-			System.err.println("frameworkAdminFactoryClassName=" + frameworkAdminFactoryClassName);
-			System.err.println("configuratorManipulatorFactoryClassName=" + configuratorManipulatorFactoryClassName);
-			e.printStackTrace();
-		}
-
-		if (fwAdmin == null)
-			return;
-
-		// After instanciating FrameworkAdmin object, completely same code can be used
-		// as the case that you get the object from a service registry on OSGi framework.
-
-		List bundleInfoList = equinox.bundleInfoListWithSimpleConfigurator;
-		Manipulator manipulator = fwAdmin.getManipulator();
-
-		ConfigData configData = manipulator.getConfigData();
-		LauncherData launcherData = manipulator.getLauncherData();
-
-		// 1. Set Parameters to LaunchData.
-		launcherData.setJvm(new File(Activator.jvm));
-		launcherData.setJvmArgs(new String[] {Activator.jvmArgs});
-		launcherData.setFwPersistentDataLocation(equinox.configLoc, true);
-		launcherData.setFwJar(equinox.fwJar);
-		launcherData.setFwConfigLocation(equinox.configLoc);
-
-		// 2. Set Parameters to ConfigData.
-		for (Iterator ite = bundleInfoList.iterator(); ite.hasNext();) {
-			BundleInfo bInfo = (BundleInfo) ite.next();
-			configData.addBundle(bInfo);
-		}
-		configData.setBeginningFwStartLevel(6);
-		configData.setInitialBundleStartLevel(5);
-		configData.setFwDependentProp(EquinoxActivator.PROPS_KEY_CONSOLE_PORT, equinox.propsValueConsolePort);
-
-		try {
-			// 3. Save them.
-			manipulator.save(false);
-			System.out.println("Saved");
-			// 4. Launch it.
-			//if (differentThread)
-			//	process = launchThread(fwAdmin, manipulator, equinox.cwd);
-			//else
-			process = fwAdmin.launch(manipulator, equinox.cwd);
-			System.out.println("Launched");
-			InputStreamMonitorThread.monitorThreadStart(process, equinox.threadStandardI, equinox.threadErrorI);
-			System.out.println("Monitors Started");
-			Runtime.getRuntime().addShutdownHook(new ShutdownHookForEquinox(Integer.parseInt(equinox.propsValueConsolePort)));
-			System.out.println("ShutdownHookForEquinox Added");
-
-			// Remark: How to communicate with launched framework is out of scope of FrameworkAdmin, so far.
-		} catch (FrameworkAdminRuntimeException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	static void stop() {
-		InputStreamMonitorThread threadStandardI = null;
-		InputStreamMonitorThread threadErrorI = null;
-		switch (mode) {
-			case 0 :
-				threadStandardI = equinox.threadStandardI;
-				threadErrorI = equinox.threadErrorI;
-				break;
-			case 1 :
-				threadStandardI = knopflerfish.threadStandardI;
-				threadErrorI = knopflerfish.threadErrorI;
-				break;
-			case 2 :
-				threadStandardI = felix.threadStandardI;
-				threadErrorI = felix.threadErrorI;
-				break;
-			default :
-				break;
-		}
-		if (threadStandardI != null)
-			threadStandardI.inactivate();
-		if (threadErrorI != null)
-			threadErrorI.inactivate();
-	}
-
-	private static void launchKnopflerfish() {
-		FrameworkAdmin fwAdmin = null;
-		String configuratorManipulatorFactoryClassName = props.getProperty("main.configuratorManipulatorFactoryClassName");
-		String frameworkAdminFactoryClassName = props.getProperty("main.knopflerfish.frameworkAdminFactoryClassName");
-
-		try {
-
-			//			// Method 1: set both implementation class names into arguments.
-			//			fwAdmin = FrameworkAdminFactory.getInstance(frameworkAdminFactoryClassName, configuratorManipulatorFactoryClassName);
-
-			//			// Method 2:	set both magic system properties in advance.	
-			//			System.setProperty("org.eclipse.equinox.frameworkadmin.frameworkAdminFactory", frameworkAdminFactoryClassName);
-			//			System.setProperty("org.eclipse.equinox.frameworkadmin.configuratorManipulatorFactory", configuratorManipulatorFactoryClassName);//		FrameworkAdmin fwAdmin = FrameworkAdminFactory.getInstance(className);
-			//			fwAdmin = FrameworkAdminFactory.getInstance();
-
-			// Method 3: set ConfiguratorManipulatorFactory magic system property in advance.
-			//           and specify FrameworkAdminFactoryImplementation as an argument.
-			System.setProperty(ConfiguratorManipulatorFactory.SYSTEM_PROPERTY_KEY, configuratorManipulatorFactoryClassName);//		FrameworkAdmin fwAdmin = FrameworkAdminFactory.getInstance(className);
-			fwAdmin = FrameworkAdminFactory.getInstance(frameworkAdminFactoryClassName);
-		} catch (InstantiationException e) {
-			System.err.println("frameworkAdminFactoryClassName=" + frameworkAdminFactoryClassName);
-			System.err.println("configuratorManipulatorFactoryClassName=" + configuratorManipulatorFactoryClassName);
-			e.printStackTrace();
-		} catch (IllegalAccessException e) {
-			System.err.println("frameworkAdminFactoryClassName=" + frameworkAdminFactoryClassName);
-			System.err.println("configuratorManipulatorFactoryClassName=" + configuratorManipulatorFactoryClassName);
-			e.printStackTrace();
-		} catch (ClassNotFoundException e) {
-			System.err.println("frameworkAdminFactoryClassName=" + frameworkAdminFactoryClassName);
-			System.err.println("configuratorManipulatorFactoryClassName=" + configuratorManipulatorFactoryClassName);
-			e.printStackTrace();
-		}
-
-		if (fwAdmin == null)
-			return;
-
-		// After instanciating FrameworkAdmin object, completely same code can be used
-		// as the case that you get the object from a service registry on OSGi framework.
-
-		//List bundleInfoList = felix.bundleInfoListWithSimpleConfigurator;
-		List bundleInfoList = KfActivator.bundleInfoListWithSimpleConfigurator;
-		Manipulator manipulator = fwAdmin.getManipulator();
-
-		ConfigData configData = manipulator.getConfigData();
-		LauncherData launcherData = manipulator.getLauncherData();
-
-		// 1. Set Parameters to LaunchData.
-		launcherData.setJvm(new File(Activator.jvm));
-		launcherData.setJvmArgs(new String[] {Activator.jvmArgs});
-		launcherData.setFwPersistentDataLocation(knopflerfish.fwPersistentDataLoc, true);
-		launcherData.setFwJar(knopflerfish.fwJar);
-		launcherData.setFwConfigLocation(knopflerfish.configLoc);
-
-		// 2. Set Parameters to ConfigData.
-		for (Iterator ite = bundleInfoList.iterator(); ite.hasNext();) {
-			BundleInfo bInfo = (BundleInfo) ite.next();
-			configData.addBundle(bInfo);
-		}
-		configData.setBeginningFwStartLevel(7);
-		configData.setInitialBundleStartLevel(7);
-		//		configData.setFwDependentProp(EquinoxActivator.PROPS_KEY_CONSOLE_PORT, equinox.propsValueConsolePort);
-
-		try {
-			// 3. Save them.
-			manipulator.save(false);
-			System.out.println("Saved");
-			// 4. Launch it.
-			Process process = fwAdmin.launch(manipulator, knopflerfish.cwd);
-			System.out.println("Launched");
-			InputStreamMonitorThread.monitorThreadStart(process, knopflerfish.threadStandardI, knopflerfish.threadErrorI);
-			// Remark: How to communicate with launched framework is out of scope of FrameworkAdmin, so far.
-		} catch (FrameworkAdminRuntimeException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	private static void launchFelix() {
-		FrameworkAdmin fwAdmin = null;
-		String configuratorManipulatorFactoryClassName = props.getProperty("main.configuratorManipulatorFactoryClassName");
-		String frameworkAdminFactoryClassName = props.getProperty("main.felix.frameworkAdminFactoryClassName");
-
-		try {
-
-			//			// Method 1: set both implementation class names into arguments.
-			//			fwAdmin = FrameworkAdminFactory.getInstance(frameworkAdminFactoryClassName, configuratorManipulatorFactoryClassName);
-
-			//			// Method 2:	set both magic system properties in advance.	
-			//			System.setProperty("org.eclipse.equinox.frameworkadmin.frameworkAdminFactory", frameworkAdminFactoryClassName);
-			//			System.setProperty("org.eclipse.equinox.frameworkadmin.configuratorManipulatorFactory", configuratorManipulatorFactoryClassName);//		FrameworkAdmin fwAdmin = FrameworkAdminFactory.getInstance(className);
-			//			fwAdmin = FrameworkAdminFactory.getInstance();
-
-			// Method 3: set ConfiguratorManipulatorFactory magic system property in advance.
-			//           and specify FrameworkAdminFactoryImplementation as an argument.
-			System.setProperty(ConfiguratorManipulatorFactory.SYSTEM_PROPERTY_KEY, configuratorManipulatorFactoryClassName);//		FrameworkAdmin fwAdmin = FrameworkAdminFactory.getInstance(className);
-			fwAdmin = FrameworkAdminFactory.getInstance(frameworkAdminFactoryClassName);
-		} catch (InstantiationException e) {
-			System.err.println("frameworkAdminFactoryClassName=" + frameworkAdminFactoryClassName);
-			System.err.println("configuratorManipulatorFactoryClassName=" + configuratorManipulatorFactoryClassName);
-			e.printStackTrace();
-		} catch (IllegalAccessException e) {
-			System.err.println("frameworkAdminFactoryClassName=" + frameworkAdminFactoryClassName);
-			System.err.println("configuratorManipulatorFactoryClassName=" + configuratorManipulatorFactoryClassName);
-			e.printStackTrace();
-		} catch (ClassNotFoundException e) {
-			System.err.println("frameworkAdminFactoryClassName=" + frameworkAdminFactoryClassName);
-			System.err.println("configuratorManipulatorFactoryClassName=" + configuratorManipulatorFactoryClassName);
-			e.printStackTrace();
-		}
-
-		if (fwAdmin == null)
-			return;
-
-		// After instanciating FrameworkAdmin object, completely same code can be used
-		// as the case that you get the object from a service registry on OSGi framework.
-
-		//List bundleInfoList = felix.bundleInfoListWithSimpleConfigurator;
-		List bundleInfoList = FelixActivator.bundleInfoListWoSimpleConfigurator;
-		Manipulator manipulator = fwAdmin.getManipulator();
-
-		ConfigData configData = manipulator.getConfigData();
-		LauncherData launcherData = manipulator.getLauncherData();
-
-		// 1. Set Parameters to LaunchData.
-		launcherData.setJvm(new File(Activator.jvm));
-		launcherData.setJvmArgs(new String[] {Activator.jvmArgs});
-		launcherData.setFwPersistentDataLocation(felix.fwPersistentDataLoc, true);
-		launcherData.setFwJar(felix.fwJar);
-		launcherData.setFwConfigLocation(felix.configLoc);
-
-		// 2. Set Parameters to ConfigData.
-		for (Iterator ite = bundleInfoList.iterator(); ite.hasNext();) {
-			BundleInfo bInfo = (BundleInfo) ite.next();
-			configData.addBundle(bInfo);
-		}
-		configData.setBeginningFwStartLevel(8);
-		configData.setInitialBundleStartLevel(7);
-		//		configData.setFwDependentProp(EquinoxActivator.PROPS_KEY_CONSOLE_PORT, equinox.propsValueConsolePort);
-
-		try {
-			// 3. Save them.
-			manipulator.save(false);
-			System.out.println("Saved");
-			// 4. Launch it.
-			Process process = fwAdmin.launch(manipulator, felix.cwd);
-			System.out.println("Launched");
-			InputStreamMonitorThread.monitorThreadStart(process, felix.threadStandardI, felix.threadErrorI);
-			// Remark: How to communicate with launched framework is out of scope of FrameworkAdmin, so far.
-		} catch (FrameworkAdminRuntimeException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Read properties from "setting.properties" file.
-	 * They will be 
-	 * 
-	 * 
-	 */
-	private static void initialize() {
-		Activator activator = new Activator();
-
-		try {
-			String path = Main.class.getName();
-			path = (path.replace('.', '/'));
-			path = path.substring(0, path.lastIndexOf('/'));
-			path = path + "/" + "setting.properties";
-			URL url = Main.class.getClassLoader().getResource(path);
-			props.load(url.openStream());
-			activator.readParameters(props);
-		} catch (FileNotFoundException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-		equinox = new EquinoxActivator(props);
-		felix = new FelixActivator(props);
-		knopflerfish = new KfActivator(props);
-	}
-}

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/ShutdownHookForEquinox.java b/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/ShutdownHookForEquinox.java
deleted file mode 100644
index 412d6ab..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/ShutdownHookForEquinox.java
+++ /dev/null

@@ -1,81 +0,0 @@
-package org.eclipse.equinox.frameworkadmin.examples;
-
-import java.io.*;
-import java.net.*;
-
-/**
- * Tentative implementation.
- * 
- * Current FrameworkAdmin doesn't support in-process launching frameworks.
- * In addition, it doesn't provide a way to control the launched framework.
- * In this implementation, the launched framework is shutdown by using equinox telnet console.
- * If telnet connection is used by other stuff, it cannot be realized.
- * 
- */
-public class ShutdownHookForEquinox extends Thread {
-	int port;
-
-	ShutdownHookForEquinox(int port) {
-		this.port = port;
-	}
-
-	public void run() {
-		System.out.println("ShutdownHookForEquinox started.");
-		Socket mySocket = null;
-		PrintWriter out = null;
-		BufferedReader in = null;
-
-		try {
-
-			InetAddress address = InetAddress.getByName("localhost");
-			System.out.println("trying to connect .....");
-			mySocket = new Socket(address, port);
-			System.out.println("connected .... ");
-			out = new PrintWriter(mySocket.getOutputStream(), true);
-			in = new BufferedReader(new InputStreamReader(mySocket.getInputStream()));
-
-			out.println("shutdown");
-			while (true) {
-				String line = in.readLine();
-				if (line != null)
-					System.out.println("line:" + line);
-				if (line.startsWith("osgi>")) {
-					out.println("close");
-					break;
-				}
-			}
-
-		} catch (UnknownHostException e) {
-			System.err.println("Don't know about host: ");
-
-			//		System.exit(1);
-
-		} catch (IOException e) {
-			System.err.println("Couldn't get I/O for " + "the connection to: ");
-			//		System.exit(1);
-		} finally {
-			if (in != null)
-				try {
-					in.close();
-
-				} catch (IOException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				} finally {
-					in = null;
-				}
-
-			if (out != null) {
-				out.close();
-				out = null;
-			}
-		}
-		try {
-			Main.stop();
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		System.out.println("ShutdownHookForEquinox ended.");
-	}
-}

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/setting.properties b/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/setting.properties
deleted file mode 100644
index 73ce451..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.examples/src/org/eclipse/equinox/frameworkadmin/examples/setting.properties
+++ /dev/null

@@ -1,119 +0,0 @@
-#########################################################
-# setting for running this examples bundle.
-#########################################################
-#
-# This bundle contains two kinds of examples using FrameworkAdmin.
-# 1. examples showing how a Java program can configure and launch a framework by using FrameworkAdmin API. 
-# 2. examples showing how a bundle running on a framework can configure and launch a framework (Equinox) by using FrameworkAdmin API. 
-
-##################################################################
-# 1. examples showing how a Java program can configure and launch a framework by using FrameworkAdmin API. 
-#     (Main.class)
-# main.mode=0: equinox with SimpleConfigurator.
-# main.mode=1: knopflerfish with SimpleConfigurator.
-# main.mode=2: felix without SimpleConfigurator.
-#
-# You can run them as a Java application from PDE(IDE). For it,
-# required plugins need to be included in its classpath.
-
-main.mode=0
-
-main.equinox.frameworkAdminFactoryClassName=org.eclipse.equinox.frameworkadmin.equinox.internal.EquinoxFrameworkAdminFactoryImpl
-main.knopflerfish.frameworkAdminFactoryClassName=org.eclipse.equinox.frameworkadmin.knopflerfish.internal.KfFrameworkAdminFactoryImpl
-main.felix.frameworkAdminFactoryClassName=org.eclipse.equinox.frameworkadmin.felix.internal.FelixFrameworkAdminFactoryImpl
-main.configuratorManipulatorFactoryClassName=org.eclipse.equinox.simpleconfigurator.manipulator.internal.SimpleConfiguratorManipulatorFactoryImpl
-
-##################################################################
-# 2. examples showing how a bundle running on a framework can configure and launch a framework (Equinox) by using FrameworkAdmin API. 
-# 
-# mode 0: without simpleconfigurator, config and launch Equinox.
-# mode 1: with simpleconfigurator, config and launch Equinox.
-# mode 2: without simpleconfigurator, config and launch Equinox by Eclipse.exe.
-# mode 3: without simpleconfigurator, config and launch Knopflerfish.
-#          telnet console is available on port 23 (userid admin, pwd admin)
-#
-# mode 4: with simpleconfigurator, config and launch Knopflerfish.
-# mode 5: First, config for Knopflerfish and save them.
-#         Then load them and convert loaded config to the one for Equinox.
-#         Finally, launch Equinox.
-# mode 6: without simpleconfigurator, config and launch Felix.
-#         But telnet bundles doesn't seem to work properly...
-# mode 7: without simpleconfigurator, config and save for Equinox.
-#		  Then load them and expect BundlesState. 
-# mode 8: with simpleconfigurator, config and launch Equinox.
-# 		  Then load them with clean = true and expect BundlesState.  
-# mode 9: with simpleconfigurator, config and launch Equinox and stop it.
-# 		  Then load them with clean = false and expect BundlesState.  
-#
-#--------------------------------------------------------
-# mode 100 & 101: get Manipulator representing the running framework
-#		  and expect BundlesState of it. 
-
-# To run this modes, you need to be careful extremely.
-# First, set mode to 100 and export all bundle as an deployment plugins to the proper directory.
-# Second, set mode to 101 and run from PDE.
-#
-# [CAUTION] If you export it with mode = 101 and run with mode 101, you might be in trouble.
-#-------------------------------------------------------
-mode=0
-# you should export plugins and the following properties properly in advance.
-#--------------------------------------------------------
-jvm.location=C\:\\Java\\jre1.5.0_07\\bin\\java.exe
-jvm.args=-Dms40
-#--------------------------------------------------------
-#For Equinox
-equinox.fw.name=Equinox
-equinox.fw.version=3.3
-equinox.launcher.name=Eclipse.exe
-equinox.launcher.version=3.2
-# absolute path
-equinox.launcher=C\:\\eclipse\\targetFwAdmin\\eclipse\\eclipse.exe
-equinox.home=C\:\\eclipse\\targetFwAdmin\\eclipse
-equinox.cwd=C\:\\eclipse\\targetFwAdmin\\eclipse
-# relative path from home
-#equinox.fw=plugins\\org.eclipse.osgi_3.3.0.v20070208.jar
-equinox.configLoc=configuration2
-equinox.bundlesDir=plugins
-
-equinox.console.port=9000
-equinox.configLocForRunningTest=configuration3
-
-#--------------------------------------------------------
-# For Knopflerfish
-knopflerfish.fw.name=Knopflerfish
-knopflerfish.fw.version=2.0
-knopflerfish.launcher.name=java -jar
-knopflerfish.launcher.version=2.0
-# absolute path
-knopflerfish.home=C\:\\KF\\knopflerfish_osgi_2.0.0\\knopflerfish.org\\osgi
-knopflerfish.cwd=C\:\\KF\\knopflerfish_osgi_2.0.0\\knopflerfish.org\\osgi
-# relative path from home
-knopflerfish.fw=framework.jar
-knopflerfish.configLoc=tmp\\init.xargs
-knopflerfish.fwPersistentDataLoc=fwdir
-knopflerfish.bundlesDir=jars
-# relative path from bundleDir
-knopflerfish.bundles.1.start=log/log_all-2.0.0.jar,cm/cm_all-2.0.0.jar,console/console_all-2.0.0.jar,component/component_all-2.0.0.jar,event/event_all-2.0.0.jar
-knopflerfish.bundles.2.start=util/util-2.0.0.jar,crimson/crimson-2.0.0.jar,jsdk/jsdk-2.2.jar,bundlerepository/bundlerepository_all-2.0.0.jar
-knopflerfish.bundles.3.start=device/device_all-2.0.0.jar,useradmin/useradmin_all-2.0.0.jar
-knopflerfish.bundles.4.start=http/http_all-2.0.0.jar
-knopflerfish.bundles.5.start=frameworkcommands/frameworkcommands-2.0.0.jar,logcommands/logcommands-2.0.0.jar,cm_cmd/cm_cmd-2.0.0.jar,consoletty/consoletty-2.0.0.jar,consoletelnet/consoletelnet-2.0.0.jar
-knopflerfish.bundles.6.start=httproot/httproot-2.0.0.jar
-
-#--------------------------------------------------------
-# For Felix
-felix.fw.name=Felix
-felix.fw.version=0.8.0.SNAPSHOT
-felix.launcher.name=java -jar
-felix.launcher.version=0.8.0.SNAPSHOT
-# absolute path
-felix.home=C\:\\FelixWorkspace\\trunk\\main
-felix.cwd=C\:\\FelixWorkspace\\trunk\\main
-# relative path from home
-felix.fw=bin\\felix.jar
-felix.configLoc=conf2
-felix.fwPersistentDataLoc=fwdir
-felix.bundlesDir=bundle
-# relative path from bundleDir
-felix.bundles.1.start=org.apache.felix.shell-0.8.0-SNAPSHOT.jar,org.apache.felix.shell.tui-0.8.0-SNAPSHOT.jar
-felix.bundles.2.start=org.apache.felix.bundlerepository-0.8.0-SNAPSHOT.jar,telnetd.jar

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/.classpath b/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/.project b/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/.project
deleted file mode 100644
index 8c3a8a0..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.frameworkadmin.felix</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/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/.settings/org.eclipse.jdt.core.prefs b/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index a838985..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,12 +0,0 @@
-#Fri Jan 26 18:26:51 EST 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.3
-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.problem.assertIdentifier=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=ignore
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/.settings/org.eclipse.pde.core.prefs b/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 4010afc..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/.settings/org.eclipse.pde.core.prefs
+++ /dev/null

@@ -1,4 +0,0 @@
-#Tue Nov 21 17:23:21 EST 2006
-eclipse.preferences.version=1
-pluginProject.equinox=false
-pluginProject.extensions=false

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/META-INF/MANIFEST.MF b/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/META-INF/MANIFEST.MF
deleted file mode 100644
index 69648f9..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: FrameworkAdmin Service for Felix
-Bundle-SymbolicName: org.eclipse.equinox.frameworkadmin.felix
-Bundle-Version: 1.3.0
-Bundle-Activator: org.eclipse.equinox.frameworkadmin.felix.internal.Activator
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Import-Package: org.eclipse.equinox.configuratormanipulator,
- org.eclipse.equinox.frameworkadmin,
- org.eclipse.equinox.internal.frameworkadmin.utils,
- org.osgi.framework;version="1.3.0",
- org.osgi.service.log;version="1.3.0",
- org.osgi.util.tracker;version="1.3.2"

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/build.properties b/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/build.properties
deleted file mode 100644
index 34d2e4d..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/build.properties
+++ /dev/null

@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/Activator.java b/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/Activator.java
deleted file mode 100644
index 04bfd4b..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/Activator.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.frameworkadmin.felix.internal;
-
-import java.util.Dictionary;
-import java.util.Hashtable;
-
-import org.eclipse.equinox.frameworkadmin.FrameworkAdmin;
-import org.osgi.framework.*;
-
-/**
- * This bundle provides the tentative {@link FrameworkAdmin} implementation for Felix.
- * Essintially the bundle providing the {@link FrameworkAdmin} implementation for Felix
- * should be implemented by the implementator of Felix.
- * Therefore, this bundle is tantative.
- *
- */
-public class Activator implements BundleActivator {
-	static BundleContext context;
-
-	private ServiceRegistration registrationFh;
-
-	FelixFwAdminImpl fwAdmin = null;
-
-	private void registerFrameworkAdmin() {
-		Dictionary props = new Hashtable();
-		props.put(Constants.SERVICE_VENDOR, "Eclipse.org");
-		props.put(FrameworkAdmin.SERVICE_PROP_KEY_FW_NAME, FelixConstants.FW_NAME);
-		props.put(FrameworkAdmin.SERVICE_PROP_KEY_FW_VERSION, FelixConstants.FW_VERSION);
-		props.put(FrameworkAdmin.SERVICE_PROP_KEY_LAUNCHER_NAME, FelixConstants.LAUNCHER_NAME);
-		props.put(FrameworkAdmin.SERVICE_PROP_KEY_LAUNCHER_VERSION, FelixConstants.LAUNCHER_VERSION);
-
-		if (FelixFwAdminImpl.isRunningFw(context)) {
-			props.put(FrameworkAdmin.SERVICE_PROP_KEY_RUNNING_SYSTEM_FLAG, "true");
-			fwAdmin = new FelixFwAdminImpl(context, true);
-		} else
-			fwAdmin = new FelixFwAdminImpl(context);
-
-		fwAdmin = new FelixFwAdminImpl(context);
-		registrationFh = context.registerService(FrameworkAdmin.class.getName(), fwAdmin, props);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		Activator.context = context;
-		Log.init(context);
-		registerFrameworkAdmin();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		Activator.context = null;
-		if (registrationFh != null)
-			registrationFh.unregister();
-		if (fwAdmin != null)
-			fwAdmin.deactivate();
-	}
-
-}

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/FelixConstants.java b/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/FelixConstants.java
deleted file mode 100644
index 32f538c..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/FelixConstants.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.frameworkadmin.felix.internal;
-
-public class FelixConstants {
-	public final static String PROP_FELIX_DEPENDENT_PREFIX = "felix.";
-	//	public final static String PROP_FELIX_BUNDLEBASE_DIR = "org.knopflerfish.gosg.jars";
-	public final static String PROP_FELIX_FWPRIVATE_DIR = "felix.cache.profiledir";
-
-	public final static String PROP_BUNDLES_STARTLEVEL = "felix.startlevel.bundle";
-	public final static String PROP_INITIAL_STARTLEVEL = "felix.startlevel.framework";
-	public final static String PROP_BUNDLE_INSTALL_PREFIX = "felix.auto.install.";
-	public final static String PROP_BUNDLE_START_PREFIX = "felix.auto.start.";
-	public final static String JVMPROP_FWCONFIGFILE_URL = "felix.config.properties";
-	public final static String JVMPROP_SYSTEMPROPS_CONFIGFILE_URL = "felix.system.properties";
-
-	//	private final static String DEFAULT_BUNDLE_SEARCH_DIR = "jars";
-	public static final String FW_VERSION = "0.8.0.SNAPSHOT";
-	public static final String FW_NAME = "Felix";
-	public static final String LAUNCHER_NAME = "java -jar";
-	public static final String LAUNCHER_VERSION = FW_VERSION;
-
-	public static final String VMARGS_COMMAND = "-vmargs";
-	public static final String VM_COMMAND = "-vm";
-	public static final String XARGS_INIT = "-init";
-	public static final String XARGS_OPTION = "-xargs";
-	public static final String DEFAULT_FW_PRIVATE_AREA = ".felix";
-	public static final String DEFAULT_FW_CONFIGLOCATION = "conf";
-	public static final String DEFAULT_FW_CONFIGFILE = "config.properties";
-	public static final String DEFAULT_SYSTEMPROP_CONFIGFILE = "system.properties";
-	public static final int DEFAULT_INITIAL_BUNDLE_SL = 1;
-	public static final String FELIX_BASIC_PROPERTIES_FILE = "felixBasic.properties";
-
-}

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/FelixFrameworkAdminFactoryImpl.java b/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/FelixFrameworkAdminFactoryImpl.java
deleted file mode 100644
index 5d2c4dc..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/FelixFrameworkAdminFactoryImpl.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.frameworkadmin.felix.internal;
-
-import org.eclipse.equinox.configuratormanipulator.ConfiguratorManipulatorFactory;
-import org.eclipse.equinox.frameworkadmin.FrameworkAdmin;
-import org.eclipse.equinox.frameworkadmin.FrameworkAdminFactory;
-
-public class FelixFrameworkAdminFactoryImpl extends FrameworkAdminFactory {
-	public FrameworkAdmin createFrameworkAdmin() throws InstantiationException, IllegalAccessException, ClassNotFoundException {
-		String className = System.getProperty(ConfiguratorManipulatorFactory.SYSTEM_PROPERTY_KEY);
-		if (className == null)
-			return new FelixFwAdminImpl();;
-		return new FelixFwAdminImpl(className);
-	}
-
-	//	public FrameworkAdmin createFrameworkAdmin() throws InstantiationException, IllegalAccessException, ClassNotFoundException {
-	//		return new felixFwAdminImpl();;
-	//		
-	//	}
-
-	//	public FrameworkAdmin createFrameworkAdmin(String className) throws InstantiationException, IllegalAccessException, ClassNotFoundException {
-	//		return new FelixFwAdminImpl(className);
-	//	}
-}

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/FelixFwAdminImpl.java b/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/FelixFwAdminImpl.java
deleted file mode 100644
index 6d43ea1..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/FelixFwAdminImpl.java
+++ /dev/null

@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.frameworkadmin.felix.internal;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.eclipse.equinox.configuratormanipulator.ConfiguratorManipulator;
-import org.eclipse.equinox.configuratormanipulator.ConfiguratorManipulatorFactory;
-import org.eclipse.equinox.frameworkadmin.*;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-
-public class FelixFwAdminImpl implements FrameworkAdmin {
-
-	/**
-	 * If the currently running fw launch is the one that the FrameworkAdmin object can handle,
-	 * return true.
-	 *  
-	 * @return flag true if the fwAdmin object can handle currently running fw launch. 
-	 */
-	static boolean isRunningFw(BundleContext context) {
-		//TODO implementation for Eclipse.exe and for Equinox
-		if (!context.getProperty(Constants.FRAMEWORK_VENDOR).equals("Eclipse.org"))
-			return false;
-		//TODO decide if this version can be supported by this bundle.
-		//Dictionary header = context.getBundle(0).getHeaders();
-		//String versionSt = (String) header.get("Bundle-Version");
-
-		// TODO need to identify the version of eclipse.exe used for this launch, if used. 
-		//		String eclipseCommandsSt = context.getProperty(EquinoxConstants.PROP_ECLIPSE_COMMANDS);
-		//	StringTokenizer tokenizer = new StringTokenizer(eclipseCommandsSt,"\n");
-
-		return false;
-	}
-
-	BundleContext context = null;
-
-	boolean active = false;
-
-	private boolean runningFw = false;
-	private ConfiguratorManipulator configuratorManipulator = null;
-
-	FelixFwAdminImpl() {
-		this(null, false);
-	}
-
-	FelixFwAdminImpl(BundleContext context) {
-		this(context, false);
-
-	}
-
-	FelixFwAdminImpl(BundleContext context, boolean runningFw) {
-		this.context = context;
-		this.active = true;
-		this.runningFw = runningFw;
-	}
-
-	FelixFwAdminImpl(String configuratorManipulatorFactoryName) throws InstantiationException, IllegalAccessException, ClassNotFoundException {
-		this.context = null;
-		this.active = true;
-		this.runningFw = false;
-		//		this.configuratorManipulatorFactoryName = configuratorManipulatorFactoryName;
-		loadConfiguratorManipulator(configuratorManipulatorFactoryName);
-	}
-
-	private void loadConfiguratorManipulator(String configuratorManipulatorFactoryName) throws InstantiationException, IllegalAccessException, ClassNotFoundException {
-		if (configuratorManipulatorFactoryName == null)
-			this.configuratorManipulator = null;
-		else
-			this.configuratorManipulator = ConfiguratorManipulatorFactory.getInstance(configuratorManipulatorFactoryName);
-		return;
-	}
-
-	void deactivate() {
-		active = false;
-	}
-
-	public Manipulator getManipulator() {
-		return new FelixManipulatorImpl(context, this);
-	}
-
-	public Manipulator getRunningManipulator() {
-		if (this.runningFw) {
-			//KfManipulatorImpl manipulator = new KfManipulatorImpl(context, this);
-			//TODO using some MAGIC dependent on Kf implementation, set parameters according to the current running fw.
-			return null;
-		}
-		return null;
-	}
-
-	public boolean isActive() {
-		return active;
-	}
-
-	public Process launch(Manipulator manipulator, File cwd) throws IllegalArgumentException, FrameworkAdminRuntimeException, IOException {
-		return new FelixLauncherImpl(context, this).launch(manipulator, cwd);
-	}
-
-	public ConfiguratorManipulator getConfiguratorManipulator() {
-		return configuratorManipulator;
-	}
-}

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/FelixFwConfigFileParser.java b/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/FelixFwConfigFileParser.java
deleted file mode 100644
index de4cf77..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/FelixFwConfigFileParser.java
+++ /dev/null

@@ -1,305 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.frameworkadmin.felix.internal;
-
-import java.io.*;
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.equinox.frameworkadmin.*;
-import org.eclipse.equinox.internal.frameworkadmin.utils.Utils;
-import org.osgi.service.log.LogService;
-
-public class FelixFwConfigFileParser {
-	private static boolean DEBUG = false;
-
-	private Properties getBasicProperties() throws IOException {
-		Properties props = new Properties();
-		InputStream is = null;
-
-		String entry = Utils.replaceAll(this.getClass().getPackage().getName(), ".", "/") + "/" + FelixConstants.FELIX_BASIC_PROPERTIES_FILE;
-		//		String entry = Utils.replaceAll(this.getClass().getName(), ".", "/") + ".class";
-
-		URL url = null;
-		if (Activator.context == null)
-			url = this.getClass().getClassLoader().getResource(entry);
-		else
-			url = Activator.context.getBundle().getResource(entry);
-
-		try {
-			is = url.openStream();
-			props.load(is);
-			//	} catch (IOException e) {
-			//		throw new ManipulatorException("Fail to read file(URL=" + url + ")", e, ManipulatorException.OTHERS);
-		} finally {
-			//		try {
-			is.close();
-			//	} catch (IOException e) {
-			//		e.printStackTrace();
-			//	}
-			is = null;
-		}
-		return props;
-	}
-
-	private Properties getConfigProps(BundleInfo[] bInfos, Manipulator manipulator, boolean relative) throws IOException {
-		ConfigData configData = manipulator.getConfigData();
-		LauncherData launcherData = manipulator.getLauncherData();
-
-		// validate must be called. therefore, baseLocation must start with "file:"
-		// and has absolute file path.
-
-		Properties props = getBasicProperties();
-
-		//		URL baseUrl = null;
-		//		if (fwConfigInfo.baseLocation != null) {
-		//			try {
-		//				baseUrl = new URL(fwConfigInfo.baseLocation);
-		//			} catch (MalformedURLException e) {
-		//				//Never happen. ignore.
-		//				e.printStackTrace();
-		//			}
-		//			if (baseUrl.getProtocol().equals("file")) {
-		//				String urlFileSt = baseUrl.getFile();
-		//				if (relative) {
-		//					if (fwConfigInfo.fwJar == null || !fwConfigInfo.fwJar.getParentFile().equals(new File(urlFileSt)))
-		//						props.setProperty(EquinoxConstants.PROP_SYSPATH, urlFileSt);
-		//					else
-		//						props.setProperty(EquinoxFwConfigInfo.PROP_ASSUMED_BASE_DIR, urlFileSt);
-		//				} else {
-		//					props.setProperty(EquinoxConstants.PROP_SYSPATH, urlFileSt);
-		//				}
-		//			}
-		//		}
-		props.setProperty(FelixConstants.PROP_BUNDLES_STARTLEVEL, Integer.toString(configData.getInitialBundleStartLevel()));
-		props.setProperty(FelixConstants.PROP_INITIAL_STARTLEVEL, Integer.toString(configData.getBeginingFwStartLevel()));
-		if (launcherData.getFwPersistentDataLocation() != null)
-			props.setProperty(FelixConstants.PROP_FELIX_FWPRIVATE_DIR, launcherData.getFwPersistentDataLocation().getAbsolutePath());
-
-		// Sort by startlevel for each bunldes to be installed and started.
-		SortedMap installList = new TreeMap();
-		SortedMap startList = new TreeMap();
-		for (int i = 0; i < bInfos.length; i++) {
-			Integer sL = Integer.valueOf(bInfos[i].getStartLevel());
-			if (sL.intValue() == BundleInfo.NO_LEVEL)
-				sL = new Integer(configData.getInitialBundleStartLevel());
-			if (bInfos[i].isMarkedAsStarted()) {
-				List list = (List) startList.get(sL);
-				if (list == null) {
-					list = new LinkedList();
-					startList.put(sL, list);
-				}
-				list.add(bInfos[i]);
-			} else {
-				List list = (List) installList.get(sL);
-				if (list == null) {
-					list = new LinkedList();
-					installList.put(sL, list);
-				}
-				list.add(bInfos[i]);
-			}
-		}
-		//installList and startList are sorted by the key (StartLevel).
-
-		setInstallingBundles(props, installList, FelixConstants.PROP_BUNDLE_INSTALL_PREFIX);
-		setInstallingBundles(props, startList, FelixConstants.PROP_BUNDLE_START_PREFIX);
-
-		props = Utils.appendProperties(props, configData.getFwDependentProps());
-
-		//props.setProperty(EquinoxConstants.AOL, EquinoxConstants.AOL);
-		return props;
-	}
-
-	private boolean isFwDependent(String key) {
-		// TODO This algorithm is temporal. 
-		if (key.startsWith(FelixConstants.PROP_FELIX_DEPENDENT_PREFIX))
-			return true;
-		return false;
-	}
-
-	void readFwConfigFile(Manipulator manipulator, File configDir) throws IOException {
-		ConfigData configData = manipulator.getConfigData();
-		LauncherData launcherData = manipulator.getLauncherData();
-		File configFile = new File(configDir, FelixConstants.DEFAULT_FW_CONFIGFILE);
-		File systemPropsFile = new File(configDir, FelixConstants.DEFAULT_SYSTEMPROP_CONFIGFILE);
-
-		Properties props = new Properties();
-		InputStream is = null;
-		try {
-			is = new FileInputStream(configFile);
-			props.load(is);
-		} finally {
-			//		try {
-			if (is != null)
-				is.close();
-			//	} catch (IOException e) {
-			//e.printStackTrace();
-			//}
-			is = null;
-		}
-
-		if (DEBUG)
-			Utils.printoutProperties(System.out, "props", props);
-
-		// this.initialize();
-		//		if (fwConfigInfo.fwJar == null)
-		//			throw new ConfigManipulatorException("fwJar must be set in advance", ConfigManipulatorException.UNSATISFIED_CONDITION);
-		for (Enumeration enumeration = props.keys(); enumeration.hasMoreElements();) {
-			String key = (String) enumeration.nextElement();
-			String value = props.getProperty(key);
-			if (key.equals(FelixConstants.PROP_BUNDLES_STARTLEVEL))
-				configData.setInitialBundleStartLevel(Integer.parseInt(value));
-			else if (key.equals(FelixConstants.PROP_INITIAL_STARTLEVEL))
-				configData.setBeginningFwStartLevel(Integer.parseInt(value));
-			else if (key.startsWith(FelixConstants.PROP_BUNDLE_INSTALL_PREFIX) || key.startsWith(FelixConstants.PROP_BUNDLE_START_PREFIX)) {
-				setInstallingBundles(configData, key, value);
-			} else if (key.equals(FelixConstants.PROP_FELIX_FWPRIVATE_DIR))
-				launcherData.setFwPersistentDataLocation(new File(value), false);
-			else {
-				//if (this.isFwDependent(key))
-				configData.setFwDependentProp(key, value);
-				//else
-				//	configData.setFwIndependentProp(key, value);
-			}
-		}
-		Log.log(LogService.LOG_INFO, "Config file(" + configFile.getAbsolutePath() + ") is read successfully.");
-
-		// next System Properties
-		props.clear();
-		is = null;
-		try {
-			is = new FileInputStream(systemPropsFile);
-			props.load(is);
-		} finally {
-			if (is != null)
-				is.close();
-			is = null;
-		}
-
-		if (DEBUG)
-			Utils.printoutProperties(System.out, "props", props);
-		configData.setFwIndependentProps(props);
-
-		Log.log(LogService.LOG_INFO, "System Props file(" + systemPropsFile.getAbsolutePath() + ") is read successfully.");
-
-	}
-
-	void saveConfigs(BundleInfo[] bInfos, Manipulator manipulator, File configDir, boolean backup, boolean relative) throws IOException {
-		String header = "This properties were written by " + this.getClass().getName();
-
-		Properties configProps = this.getConfigProps(bInfos, manipulator, relative);
-		if (configProps == null || configProps.size() == 0) {
-			Log.log(LogService.LOG_WARNING, this, "saveConfigs(File) ", "configProps is empty");
-			return;
-		}
-		Utils.createParentDir(configDir);
-
-		if (DEBUG)
-			Utils.printoutProperties(System.out, "configProps", configProps);
-		// Properties newProps = reverseProps(configProps);
-
-		File configFile = new File(configDir, FelixConstants.DEFAULT_FW_CONFIGFILE);
-		File systemPropsFile = new File(configDir, FelixConstants.DEFAULT_SYSTEMPROP_CONFIGFILE);
-
-		// for config file.
-		if (backup)
-			if (configFile.exists()) {
-				File dest = Utils.getSimpleDataFormattedFile(configFile);
-				if (!configFile.renameTo(dest))
-					throw new IOException("Fail to rename from (" + configFile + ") to (" + dest + ")");
-				Log.log(LogService.LOG_INFO, this, "saveConfigs()", "Succeed to rename from (" + configFile + ") to (" + dest + ")");
-			}
-
-		FileOutputStream out = null;
-		try {
-			out = new FileOutputStream(configFile);
-			configProps.store(out, header);
-			Log.log(LogService.LOG_INFO, "configProps is stored successfully.");
-			//} catch (SecurityException se) {
-			//	throw new ManipulatorException("File " + outputFile + " cannot be created because of lack of permission", se, ManipulatorException.OTHERS);
-			//} catch (FileNotFoundException fnfe) {
-			//	throw new ManipulatorException("File " + outputFile + " cannot be found", fnfe, ManipulatorException.OTHERS);
-			//} catch (IOException ioe) {
-			//	throw new ManipulatorException("Error occured during writing File " + outputFile, ioe, ManipulatorException.OTHERS);
-		} finally {
-			//	try {
-			out.flush();
-			out.close();
-			Log.log(LogService.LOG_INFO, "out is closed successfully.");
-			//	} catch (IOException e) {
-			//		e.printStackTrace();
-			//	}
-			out = null;
-		}
-		// for system props file.
-		if (backup)
-			if (systemPropsFile.exists()) {
-				File dest = Utils.getSimpleDataFormattedFile(systemPropsFile);
-				if (!systemPropsFile.renameTo(dest))
-					throw new IOException("Fail to rename from (" + configFile + ") to (" + dest + ")");
-				Log.log(LogService.LOG_INFO, this, "saveConfigs()", "Succeed to rename from (" + configFile + ") to (" + dest + ")");
-			}
-
-		out = null;
-		try {
-			out = new FileOutputStream(systemPropsFile);
-			ConfigData configData = manipulator.getConfigData();
-			configData.getFwIndependentProps().store(out, header);
-			Log.log(LogService.LOG_INFO, "system props are stored successfully.");
-		} finally {
-			out.flush();
-			out.close();
-			Log.log(LogService.LOG_INFO, "out is closed successfully.");
-			out = null;
-		}
-	}
-
-	private void setInstallingBundles(ConfigData configData, String key, String value) throws IOException {
-		int sl = BundleInfo.NO_LEVEL;
-		boolean toBeStarted = false;
-		//String location = null;
-		try {
-			if (key.startsWith(FelixConstants.PROP_BUNDLE_INSTALL_PREFIX)) {
-				sl = Integer.parseInt(key.substring(FelixConstants.PROP_BUNDLE_INSTALL_PREFIX.length()));
-			} else if (key.startsWith(FelixConstants.PROP_BUNDLE_START_PREFIX)) {
-				sl = Integer.parseInt(key.substring(FelixConstants.PROP_BUNDLE_START_PREFIX.length()));
-				toBeStarted = true;
-			} else
-				return;
-		} catch (NumberFormatException e) {
-			throw new IllegalArgumentException("Invalid Format of ServiceLevel:key=" + key + " value=" + value, e);
-		}
-
-		if (value == null)
-			throw new IllegalArgumentException("Invalid Format of ServiceLevel:key=" + key + " value=" + value);
-		String[] locations = Utils.getTokens(value, " ");
-
-		for (int i = 0; i < locations.length; i++)
-			configData.addBundle((new BundleInfo(locations[i], sl, toBeStarted)));
-	}
-
-	private void setInstallingBundles(Properties props, SortedMap bundleList, String keyPrefix) {
-		for (Iterator ite = bundleList.keySet().iterator(); ite.hasNext();) {
-			Integer sl = (Integer) ite.next();
-			List list = (List) bundleList.get(sl);
-			String key = keyPrefix + sl.toString();
-			StringBuffer sb = new StringBuffer();
-			for (Iterator ite2 = list.iterator(); ite2.hasNext();) {
-				BundleInfo bInfo = (BundleInfo) ite2.next();
-				sb.append(bInfo.getLocation());
-				if (ite2.hasNext())
-					sb.append(" ");
-			}
-			props.setProperty(key, sb.toString());
-		}
-	}
-
-}

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/FelixLauncherImpl.java b/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/FelixLauncherImpl.java
deleted file mode 100644
index ab66c87..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/FelixLauncherImpl.java
+++ /dev/null

@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.frameworkadmin.felix.internal;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.equinox.frameworkadmin.*;
-import org.eclipse.equinox.internal.frameworkadmin.utils.SimpleBundlesState;
-import org.eclipse.equinox.internal.frameworkadmin.utils.Utils;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.log.LogService;
-
-public class FelixLauncherImpl {
-	static String getStringOfCmd(String[] cmdarray) {
-		StringBuffer sb = new StringBuffer();
-		for (int i = 0; i < cmdarray.length; i++) {
-			sb.append(cmdarray[i]);
-			sb.append(" ");
-		}
-		return sb.toString();
-	}
-
-	BundleContext context = null;
-
-	FelixFwAdminImpl fwAdmin = null;
-
-	FelixLauncherImpl(BundleContext context, FelixFwAdminImpl fwAdmin) {
-		this.context = context;
-		this.fwAdmin = fwAdmin;
-	}
-
-	public Process launch(Manipulator manipulator, File cwd) throws IllegalArgumentException, IOException, FrameworkAdminRuntimeException {
-		Log.log(LogService.LOG_DEBUG, this, "launch(Manipulator manipulator, File cwd)", "");
-		LauncherData launcherData = manipulator.getLauncherData();
-		if (launcherData.getLauncher() == null)
-			return launchInMemory(manipulator, cwd);
-		return launchByLauncher(manipulator, cwd);
-	}
-
-	private Process launchByLauncher(Manipulator manipulator, File cwd) throws IOException {
-		// XXX not supported
-		return null;
-	}
-
-	private Process launchInMemory(Manipulator manipulator, File cwd) throws IOException {
-		SimpleBundlesState.checkAvailability(fwAdmin);
-		LauncherData launcherData = manipulator.getLauncherData();
-		Utils.checkAbsoluteFile(launcherData.getFwJar(), "fwJar");
-		Utils.checkAbsoluteDir(cwd, "cwd");
-		//		prepareSuitableConfigFile(manipulator, cwd);
-
-		List cmdList = new LinkedList();
-		if (launcherData.getJvm() != null)
-			cmdList.add(launcherData.getJvm().getAbsolutePath());
-		else
-			cmdList.add("java");
-
-		//		if (this.fwConfigInfo.getConfiguratorConfigUrl() != null)
-		//			this.manipulator.addLauncherJvmArgs(new String[] {"-D" + BundleStateConfigurator.PROP_KEY_CONFIGURL + "=" + this.fwConfigInfo.getConfiguratorConfigUrl()});
-
-		File fwConfigDir = launcherData.getFwConfigLocation();
-		if (fwConfigDir == null)
-			fwConfigDir = new File(cwd, FelixConstants.DEFAULT_FW_CONFIGLOCATION);
-		File fwConfigFile = new File(fwConfigDir, FelixConstants.DEFAULT_FW_CONFIGFILE);
-		File systemPropsFile = new File(fwConfigDir, FelixConstants.DEFAULT_SYSTEMPROP_CONFIGFILE);
-
-		String[] jvmArgs = launcherData.getJvmArgs();
-		if (jvmArgs != null)
-			for (int i = 0; i < jvmArgs.length; i++) {
-				//				String prefix = "-D" + FelixConstants.PROP_FELIX_FWPRIVATE_DIR + "=";
-				//				if (launcherData.jvmArgs[i].startsWith(prefix)) {
-				//					String value = launcherData.jvmArgs[i].substring(prefix.length());
-				//					File file = new File(value);
-				//					if (launcherData.fwInstancePrivateArea != null) {
-				//						if (!file.isAbsolute())
-				//							file = new File(cwd, value);
-				//						if (!launcherData.fwInstancePrivateArea.equals(file)) {
-				//							Log.log(LogService.LOG_WARNING, "fwInstancePrivateArea doesn't match jvmArgs[" + i + "]\n" + "\tfwInstancePrivateArea will be used.\n" + "\tfwInstancePrivateArea=" + launcherData.fwInstancePrivateArea + "\n\tjvmArgs[" + i + "]=" + launcherData.jvmArgs[i] + " ");
-				//							continue;
-				//						}
-				//					}
-				//				}
-				cmdList.add(jvmArgs[i]);
-			}
-
-		if (launcherData.isClean()) {
-			Manipulator tmpHandler = fwAdmin.getManipulator();
-			tmpHandler.setConfigData(manipulator.getConfigData());
-			tmpHandler.setLauncherData(launcherData);
-			boolean fail = false;
-			try {
-				tmpHandler.load();
-			} catch (IOException ioex) {
-				fail = true;
-			}
-
-			if (!fail) {
-				LauncherData tmpLauncherData = tmpHandler.getLauncherData();
-				File fwPersistentDataLocation = tmpLauncherData.getFwPersistentDataLocation();
-				if (fwPersistentDataLocation != null) {
-					if (fwPersistentDataLocation.exists())
-						Utils.deleteDir(fwPersistentDataLocation);
-					//			fwPrivateArea = fwPrivateArea == null ? new File(cwd, FelixConstants.DEFAULT_FW_PRIVATE_AREA) : fwPrivateArea;
-					//			if (fwPrivateArea.exists())
-					//				Utils.deleteDir(fwPrivateArea);
-				}
-			}
-		}
-		//}
-
-		cmdList.add("-D" + FelixConstants.JVMPROP_FWCONFIGFILE_URL + "=file:" + fwConfigFile);
-		cmdList.add("-D" + FelixConstants.JVMPROP_SYSTEMPROPS_CONFIGFILE_URL + "=file:" + systemPropsFile);
-
-		cmdList.add("-jar");
-		cmdList.add(Utils.getRelativePath(launcherData.getFwJar(), cwd));
-
-		// cmdList.add(CONSOLE_COMMAND);
-		// cmdList.add("9000");
-		// cmdList.add(INSTANCE_COMMAND);
-		// cmdList.add("C:\\ws");
-
-		String[] cmdarray = new String[cmdList.size()];
-		cmdList.toArray(cmdarray);
-		Log.log(LogService.LOG_DEBUG, "In CWD = " + cwd + "\n\t" + getStringOfCmd(cmdarray));
-
-		return Runtime.getRuntime().exec(cmdarray, null, cwd);
-	}
-
-}

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/FelixManipulatorImpl.java b/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/FelixManipulatorImpl.java
deleted file mode 100644
index 35cd60b..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/FelixManipulatorImpl.java
+++ /dev/null

@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.frameworkadmin.felix.internal;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.eclipse.equinox.configuratormanipulator.ConfiguratorManipulator;
-import org.eclipse.equinox.frameworkadmin.*;
-import org.eclipse.equinox.internal.frameworkadmin.utils.SimpleBundlesState;
-import org.eclipse.equinox.internal.frameworkadmin.utils.Utils;
-import org.osgi.framework.*;
-import org.osgi.service.log.LogService;
-import org.osgi.util.tracker.ServiceTracker;
-
-public class FelixManipulatorImpl implements Manipulator {
-	private static final String SYSTEMBUNDLE_SYMBOLICNAME = "org.apache.felix.org.apache.felix.main";
-	ConfigData configData = new ConfigData(FelixConstants.FW_NAME, FelixConstants.FW_VERSION, null, null);
-	LauncherData launcherData = new LauncherData(FelixConstants.FW_NAME, FelixConstants.FW_VERSION, null, null);
-
-	BundleContext context = null;
-	BundlesState bundleState = null;
-
-	ServiceTracker cmTracker;
-	int trackingCount = -1;
-
-	ConfiguratorManipulator configuratorManipulator;
-
-	FelixFwAdminImpl fwAdmin = null;
-
-	FelixManipulatorImpl(BundleContext context, FelixFwAdminImpl fwAdmin) {
-		this.context = context;
-		this.fwAdmin = fwAdmin;
-		if (context != null) {
-			cmTracker = new ServiceTracker(context, ConfiguratorManipulator.class.getName(), null);
-			cmTracker.open();
-		}
-	}
-
-	public BundlesState getBundlesState() throws FrameworkAdminRuntimeException {
-		return new SimpleBundlesState(fwAdmin, this, SYSTEMBUNDLE_SYMBOLICNAME);
-	}
-
-	public ConfigData getConfigData() throws FrameworkAdminRuntimeException {
-		return configData;
-	}
-
-	public BundleInfo[] getExpectedState() throws IllegalArgumentException, IOException, FrameworkAdminRuntimeException {
-		Log.log(LogService.LOG_DEBUG, this, "getExpectedState()", "BEGIN");
-		SimpleBundlesState.checkAvailability(fwAdmin);
-
-		BundlesState bundleState = this.getBundlesState();
-		bundleState.resolve(true);
-		return bundleState.getExpectedState();
-	}
-
-	public LauncherData getLauncherData() throws FrameworkAdminRuntimeException {
-		return launcherData;
-	}
-
-	public void initialize() {
-		Log.log(LogService.LOG_DEBUG, this, "initialize()", "BEGIN");
-		configData.initialize();
-		launcherData.initialize();
-	}
-
-	// Load parameters from LauncherConfigFile, FwConfigFile, and ConfiguratorConfigFile if required.
-	// The parameter has been set will be updated.
-	public void load() throws IOException, FrameworkAdminRuntimeException {
-		Log.log(LogService.LOG_DEBUG, this, "load()", "BEGIN");
-		SimpleBundlesState.checkAvailability(fwAdmin);
-
-		// current implementation for KF doesn't support launcher.
-
-		File fwConfigDir = launcherData.getFwConfigLocation();
-		if (fwConfigDir == null) {
-			//TODO refine this algorithm according to the Felix behaivior.
-			File home = launcherData.getHome();
-			fwConfigDir = new File(home, FelixConstants.DEFAULT_FW_CONFIGLOCATION);
-		}
-		FelixFwConfigFileParser parser = new FelixFwConfigFileParser();
-		parser.readFwConfigFile(this, fwConfigDir);
-
-		// TODO current impl doesn't support it.
-		//		BundlesState bundleState = this.getBundlesState();
-		//		BundleInfo[] newBundleInfos = bundleState.getExpectedState();
-		//		configData.setBundles(newBundleInfos);
-		setConfiguratorManipulator();
-		if (this.configuratorManipulator == null)
-			return;
-		configuratorManipulator.updateBundles(this);
-		return;
-	}
-
-	// Save all parameter in memory into proper config files.
-	public void save(boolean backup) throws IOException, FrameworkAdminRuntimeException {
-		Log.log(LogService.LOG_DEBUG, this, "save()", "BEGIN");
-		SimpleBundlesState.checkAvailability(fwAdmin);
-
-		// current implementation for KF doesn't support launcher.
-
-		File fwConfigDir = launcherData.getFwConfigLocation();
-		if (fwConfigDir == null)
-			throw new IllegalStateException("FwConfigLocation is not set.");
-
-		setConfiguratorManipulator();
-
-		BundleInfo[] newBInfos = null;
-		if (configuratorManipulator != null) // Optimize BundleInfo[] 
-			newBInfos = configuratorManipulator.save(this, backup);
-		else
-			newBInfos = configData.getBundles();
-		// Save FwConfigFile
-		FelixFwConfigFileParser parser = new FelixFwConfigFileParser();
-		parser.saveConfigs(newBInfos, this, fwConfigDir, backup, false);
-	}
-
-	public void setConfigData(ConfigData configData) {
-		this.configData.initialize();
-		this.configData.setInitialBundleStartLevel(configData.getInitialBundleStartLevel());
-		this.configData.setBeginningFwStartLevel(configData.getBeginingFwStartLevel());
-		BundleInfo[] bInfos = configData.getBundles();
-		for (int i = 0; i < bInfos.length; i++)
-			this.configData.addBundle(bInfos[i]);
-		this.configData.setFwIndependentProps(configData.getFwIndependentProps());
-		if (this.configData.getFwName().equals(configData.getFwName()))
-			if (this.configData.getFwVersion().equals(configData.getFwVersion())) {
-				// TODO refine the algorithm to copying fw dependent props.
-				//  configData.getFwName()/getFwVersion()/
-				//	getLauncherName()/getLauncherVersion() might be taken into consideration. 
-				this.configData.setFwDependentProps(configData.getFwDependentProps());
-			}
-	}
-
-	/**
-	 * 1. get all ServiceReferences of ConfiguratorManipulator.   
-	 * 2. Check if there any ConfiguratorBundle in the Bundles list that can be manipulated by 
-	 * 	the available ConfiguratorManipulators.
-	 * 3. Choose the one that will be firstly started among them.
-	 * 4. set the object that corresponds to the chosen ConfiguratorBundle.  
-	 * 
-	 */
-	private void setConfiguratorManipulator() {
-		if (context == null) {
-			this.configuratorManipulator = this.fwAdmin.getConfiguratorManipulator();
-			return;
-		}
-
-		ServiceReference[] references = cmTracker.getServiceReferences();
-		int count = cmTracker.getTrackingCount();
-		if (count == this.trackingCount)
-			return;
-		this.trackingCount = count;
-
-		BundleInfo[] bInfos = configData.getBundles();
-		int initialBSL = configData.getInitialBundleStartLevel();
-		bInfos = Utils.sortBundleInfos(bInfos, initialBSL);
-		//int index = -1;	
-		configuratorManipulator = null;
-		for (int i = 0; i < bInfos.length; i++) {
-			//String location = bInfos[i].getLocation();
-			if (!bInfos[i].isMarkedAsStarted())
-				continue;
-			for (int j = 0; j < references.length; j++)
-				if (references[j].getProperty(ConfiguratorManipulator.SERVICE_PROP_KEY_CONFIGURATOR_BUNDLESYMBOLICNAME).equals(Utils.getManifestMainAttributes(bInfos[i].getLocation(), Constants.BUNDLE_SYMBOLICNAME))) {
-					configuratorManipulator = (ConfiguratorManipulator) cmTracker.getService(references[j]);
-					break;
-				}
-			if (configuratorManipulator != null)
-				break;
-		}
-	}
-
-	public void setLauncherData(LauncherData launcherData) {
-		this.launcherData.initialize();
-		this.launcherData.setFwConfigLocation(launcherData.getFwConfigLocation());
-		this.launcherData.setFwPersistentDataLocation(launcherData.getFwPersistentDataLocation(), launcherData.isClean());
-		this.launcherData.setJvm(launcherData.getJvm());
-		this.launcherData.setJvmArgs(launcherData.getJvmArgs());
-		if (this.launcherData.getFwName().equals(launcherData.getFwName()))
-			if (this.launcherData.getFwVersion().equals(launcherData.getFwVersion())) {
-				// TODO launcherData.getFwName()/getFwVersion()/
-				//	getLauncherName()/getLauncherVersion() might be taken into consideration
-				//  for copying . 
-				this.launcherData.setFwJar(launcherData.getFwJar());
-			}
-	}
-
-	public long getTimeStamp() {
-		throw new FrameworkAdminRuntimeException(FrameworkAdminRuntimeException.UNSUPPORTED_OPERATION, "getTimeStamp() is not supported by FelixManipulator.");
-	}
-}

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/Log.java b/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/Log.java
deleted file mode 100644
index 6af3898..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/Log.java
+++ /dev/null

@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.equinox.frameworkadmin.felix.internal;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.service.log.LogService;
-import org.osgi.util.tracker.ServiceTracker;
-
-/**
- * Utility class with static methods for logging to LogService, if available 
- */
-public class Log {
-	static private ServiceTracker logTracker;
-
-	static void dispose() {
-		if (logTracker != null) {
-			logTracker.close();
-		}
-		logTracker = null;
-	};
-
-	public static void init(BundleContext bc) {
-		logTracker = new ServiceTracker(bc, LogService.class.getName(), null);
-		logTracker.open();
-	}
-
-	public static void log(int level, Object obj, String method, String message) {
-		log(level, obj, method, message, null);
-	}
-
-	public static void log(int level, Object obj, String method, String message, Throwable e) {
-		LogService logService = null;
-		String msg = "";
-		if (method == null) {
-			if (obj != null)
-				msg = "(" + obj.getClass().getName() + ")";
-		} else if (obj == null)
-			msg = "[" + method + "]" + message;
-		else
-			msg = "[" + method + "](" + obj.getClass().getName() + ")";
-		msg += message;
-		if (logTracker != null)
-			logService = (LogService) logTracker.getService();
-
-		if (logService != null) {
-			logService.log(level, msg, e);
-		} else {
-			String levelSt = null;
-			if (level == LogService.LOG_DEBUG)
-				levelSt = "DEBUG";
-			else if (level == LogService.LOG_INFO)
-				levelSt = "INFO";
-			else if (level == LogService.LOG_WARNING)
-				levelSt = "WARNING";
-			else if (level == LogService.LOG_ERROR)
-				levelSt = "ERROR";
-
-			System.err.println("[" + levelSt + "]" + msg);
-			if (e != null)
-				e.printStackTrace();
-		}
-	}
-
-	public static void log(int level, Object obj, String method, Throwable e) {
-		log(level, obj, method, null, e);
-	}
-
-	public static void log(int level, String message) {
-		log(level, null, null, message, null);
-	}
-
-	public static void log(int level, String method, String message) {
-		log(level, null, method, message, null);
-	}
-
-	public static void log(int level, String message, Throwable e) {
-		log(level, null, null, message, e);
-	}
-
-	private Log() {
-	}
-
-}
\ No newline at end of file

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/felixBasic.properties b/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/felixBasic.properties
deleted file mode 100644
index ede16ab..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.felix/src/org/eclipse/equinox/frameworkadmin/felix/internal/felixBasic.properties
+++ /dev/null

@@ -1,264 +0,0 @@
-org.osgi.framework.system.packages=org.osgi.framework; version=1.3.0, \
- org.osgi.service.packageadmin; version=1.2.0, \
- org.osgi.service.startlevel; version=1.0.0, \
- org.osgi.service.url; version=1.0.0, \
- ${jre-${java.specification.version}}
-jre-1.3= \
- javax.accessibility; \
- javax.accessibility.resources; \
- javax.naming; \
- javax.naming.directory; \
- javax.naming.event; \
- javax.naming.ldap; \
- javax.naming.spi; \
- javax.rmi; \
- javax.rmi.CORBA; \
- javax.sound.midi; \
- javax.sound.midi.spi; \
- javax.sound.sampled; \
- javax.sound.sampled.spi; \
- javax.swing; \
- javax.swing.border; \
- javax.swing.colorchooser; \
- javax.swing.event; \
- javax.swing.filechooser; \
- javax.swing.plaf; \
- javax.swing.plaf.basic; \
- javax.swing.plaf.basic.resources; \
- javax.swing.plaf.metal; \
- javax.swing.plaf.metal.resources; \
- javax.swing.plaf.multi; \
- javax.swing.table; \
- javax.swing.text; \
- javax.swing.text.html; \
- javax.swing.text.html.parser; \
- javax.swing.text.rtf; \
- javax.swing.tree; \
- javax.swing.undo; \
- javax.transaction; \
- org.omg.CORBA; \
- org.omg.CORBA_2_3; \
- org.omg.CORBA_2_3.portable; \
- org.omg.CORBA.DynAnyPackage; \
- org.omg.CORBA.ORBPackage; \
- org.omg.CORBA.portable; \
- org.omg.CORBA.TypeCodePackage; \
- org.omg.CosNaming; \
- org.omg.CosNaming.NamingContextPackage; \
- org.omg.SendingContext; \
- org.omg.stub.java.rmi; \
- version="1.3.0"
-
-jre-1.4= \
- javax.accessibility; \
- javax.imageio; \
- javax.imageio.event; \
- javax.imageio.metadata; \
- javax.imageio.plugins.jpeg; \
- javax.imageio.spi; \
- javax.imageio.stream; \
- javax.naming; \
- javax.naming.directory; \
- javax.naming.event; \
- javax.naming.ldap; \
- javax.naming.spi; \
- javax.print; \
- javax.print.attribute; \
- javax.print.attribute.standard; \
- javax.print.event; \
- javax.rmi; \
- javax.rmi.CORBA; \
- javax.security.auth; \
- javax.security.auth.callback; \
- javax.security.auth.kerberos; \
- javax.security.auth.login; \
- javax.security.auth.spi; \
- javax.security.auth.x500; \
- javax.sound.midi; \
- javax.sound.midi.spi; \
- javax.sound.sampled; \
- javax.sound.sampled.spi; \
- javax.sql; \
- javax.swing; \
- javax.swing.border; \
- javax.swing.colorchooser; \
- javax.swing.event; \
- javax.swing.filechooser; \
- javax.swing.plaf; \
- javax.swing.plaf.basic; \
- javax.swing.plaf.metal; \
- javax.swing.plaf.multi; \
- javax.swing.table; \
- javax.swing.text; \
- javax.swing.text.html; \
- javax.swing.text.html.parser; \
- javax.swing.text.rtf; \
- javax.swing.tree; \
- javax.swing.undo; \
- javax.transaction; \
- javax.transaction.xa; \
- javax.xml.parsers; \
- javax.xml.transform; \
- javax.xml.transform.dom; \
- javax.xml.transform.sax; \
- javax.xml.transform.stream; \
- org.ietf.jgss; \
- org.omg.CORBA; \
- org.omg.CORBA_2_3; \
- org.omg.CORBA_2_3.portable; \
- org.omg.CORBA.DynAnyPackage; \
- org.omg.CORBA.ORBPackage; \
- org.omg.CORBA.portable; \
- org.omg.CORBA.TypeCodePackage; \
- org.omg.CosNaming; \
- org.omg.CosNaming.NamingContextExtPackage; \
- org.omg.CosNaming.NamingContextPackage; \
- org.omg.Dynamic; \
- org.omg.DynamicAny; \
- org.omg.DynamicAny.DynAnyFactoryPackage; \
- org.omg.DynamicAny.DynAnyPackage; \
- org.omg.IOP; \
- org.omg.IOP.CodecFactoryPackage; \
- org.omg.IOP.CodecPackage; \
- org.omg.Messaging; \
- org.omg.PortableInterceptor; \
- org.omg.PortableInterceptor.ORBInitInfoPackage; \
- org.omg.PortableServer; \
- org.omg.PortableServer.CurrentPackage; \
- org.omg.PortableServer.POAManagerPackage; \
- org.omg.PortableServer.POAPackage; \
- org.omg.PortableServer.portable; \
- org.omg.PortableServer.ServantLocatorPackage; \
- org.omg.SendingContext; \
- org.omg.stub.java.rmi; \
- org.w3c.dom; \
- org.w3c.dom.css; \
- org.w3c.dom.events; \
- org.w3c.dom.html; \
- org.w3c.dom.stylesheets; \
- org.w3c.dom.traversal; \
- org.w3c.dom.views; \
- org.xml.sax; \
- org.xml.sax.ext; \
- org.xml.sax.helpers; \
- version="1.4.0"
-
-jre-1.5= \
- javax.accessibility; \
- javax.activity; \
- javax.imageio; \
- javax.imageio.event; \
- javax.imageio.metadata; \
- javax.imageio.plugins.bmp; \
- javax.imageio.plugins.jpeg; \
- javax.imageio.spi; \
- javax.imageio.stream; \
- javax.management; \
- javax.management.loading; \
- javax.management.modelmbean; \
- javax.management.monitor; \
- javax.management.openmbean; \
- javax.management.relation; \
- javax.management.remote; \
- javax.management.remote.rmi; \
- javax.management.timer; \
- javax.naming; \
- javax.naming.directory; \
- javax.naming.event; \
- javax.naming.ldap; \
- javax.naming.spi; \
- javax.print; \
- javax.print.attribute; \
- javax.print.attribute.standard; \
- javax.print.event; \
- javax.rmi; \
- javax.rmi.CORBA; \
- javax.rmi.ssl; \
- javax.security.auth; \
- javax.security.auth.callback; \
- javax.security.auth.kerberos; \
- javax.security.auth.login; \
- javax.security.auth.spi; \
- javax.security.auth.x500; \
- javax.security.sasl; \
- javax.sound.midi; \
- javax.sound.midi.spi; \
- javax.sound.sampled; \
- javax.sound.sampled.spi; \
- javax.sql; \
- javax.sql.rowset; \
- javax.sql.rowset.serial; \
- javax.sql.rowset.spi; \
- javax.swing; \
- javax.swing.border; \
- javax.swing.colorchooser; \
- javax.swing.event; \
- javax.swing.filechooser; \
- javax.swing.plaf; \
- javax.swing.plaf.basic; \
- javax.swing.plaf.metal; \
- javax.swing.plaf.multi; \
- javax.swing.plaf.synth; \
- javax.swing.table; \
- javax.swing.text; \
- javax.swing.text.html; \
- javax.swing.text.html.parser; \
- javax.swing.text.rtf; \
- javax.swing.tree; \
- javax.swing.undo; \
- javax.transaction; \
- javax.transaction.xa; \
- javax.xml; \
- javax.xml.datatype; \
- javax.xml.namespace; \
- javax.xml.parsers; \
- javax.xml.transform; \
- javax.xml.transform.dom; \
- javax.xml.transform.sax; \
- javax.xml.transform.stream; \
- javax.xml.validation; \
- javax.xml.xpath; \
- org.ietf.jgss; \
- org.omg.CORBA; \
- org.omg.CORBA_2_3; \
- org.omg.CORBA_2_3.portable; \
- org.omg.CORBA.DynAnyPackage; \
- org.omg.CORBA.ORBPackage; \
- org.omg.CORBA.portable; \
- org.omg.CORBA.TypeCodePackage; \
- org.omg.CosNaming; \
- org.omg.CosNaming.NamingContextExtPackage; \
- org.omg.CosNaming.NamingContextPackage; \
- org.omg.Dynamic; \
- org.omg.DynamicAny; \
- org.omg.DynamicAny.DynAnyFactoryPackage; \
- org.omg.DynamicAny.DynAnyPackage; \
- org.omg.IOP; \
- org.omg.IOP.CodecFactoryPackage; \
- org.omg.IOP.CodecPackage; \
- org.omg.Messaging; \
- org.omg.PortableInterceptor; \
- org.omg.PortableInterceptor.ORBInitInfoPackage; \
- org.omg.PortableServer; \
- org.omg.PortableServer.CurrentPackage; \
- org.omg.PortableServer.POAManagerPackage; \
- org.omg.PortableServer.POAPackage; \
- org.omg.PortableServer.portable; \
- org.omg.PortableServer.ServantLocatorPackage; \
- org.omg.SendingContext; \
- org.omg.stub.java.rmi; \
- org.omg.stub.javax.management.remote.rmi; \
- org.w3c.dom; \
- org.w3c.dom.bootstrap; \
- org.w3c.dom.css; \
- org.w3c.dom.events; \
- org.w3c.dom.html; \
- org.w3c.dom.ls; \
- org.w3c.dom.ranges; \
- org.w3c.dom.stylesheets; \
- org.w3c.dom.traversal; \
- org.w3c.dom.views; \
- org.xml.sax; \
- org.xml.sax.ext; \
- org.xml.sax.helpers; \
- version="1.5.0"

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/.classpath b/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/.project b/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/.project
deleted file mode 100644
index ff97f62..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.frameworkadmin.knopflerfish</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/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/.settings/org.eclipse.jdt.core.prefs b/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d97fe99..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,12 +0,0 @@
-#Fri Jan 26 18:26:55 EST 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.3
-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.problem.assertIdentifier=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=ignore
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/.settings/org.eclipse.pde.core.prefs b/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 4010afc..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/.settings/org.eclipse.pde.core.prefs
+++ /dev/null

@@ -1,4 +0,0 @@
-#Tue Nov 21 17:23:21 EST 2006
-eclipse.preferences.version=1
-pluginProject.equinox=false
-pluginProject.extensions=false

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/META-INF/MANIFEST.MF b/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/META-INF/MANIFEST.MF
deleted file mode 100644
index 5693401..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: FrameworkAdmin Service for Knopflerfish
-Bundle-SymbolicName: org.eclipse.equinox.frameworkadmin.knopflerfish
-Bundle-Version: 1.3.0
-Bundle-Activator: org.eclipse.equinox.frameworkadmin.knopflerfish.internal.Activator
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Import-Package: org.eclipse.equinox.configuratormanipulator,
- org.eclipse.equinox.frameworkadmin,
- org.eclipse.equinox.internal.frameworkadmin.utils,
- org.osgi.framework;version="1.3.0",
- org.osgi.service.log;version="1.3.0",
- org.osgi.util.tracker;version="1.3.2"
-Export-Package: org.eclipse.equinox.frameworkadmin.knopflerfish

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/build.properties b/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/build.properties
deleted file mode 100644
index 34d2e4d..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/build.properties
+++ /dev/null

@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/KfConfigData.java b/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/KfConfigData.java
deleted file mode 100644
index a7d17b7..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/KfConfigData.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.frameworkadmin.knopflerfish;
-
-import java.io.File;
-
-import org.eclipse.equinox.frameworkadmin.ConfigData;
-
-
-public class KfConfigData extends ConfigData {
-
-	File xargsFile = null;
-
-	public KfConfigData(String fwName, String fwVersion, String launcherName, String launcherVersion) {
-		super(fwName, fwVersion, launcherName, launcherVersion);
-	}
-
-	public File getXargsFile() {
-		return xargsFile;
-	}
-
-	public void setXargsFile(File file) {
-		this.xargsFile = file;
-	}
-}

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/Activator.java b/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/Activator.java
deleted file mode 100644
index 1e879a2..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/Activator.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.frameworkadmin.knopflerfish.internal;
-
-import java.util.Dictionary;
-import java.util.Hashtable;
-
-import org.eclipse.equinox.frameworkadmin.FrameworkAdmin;
-import org.osgi.framework.*;
-
-/**
- * This bundle provides the tentative {@link FrameworkAdmin} implementation for Knopflerfish.
- * Essintially the bundle providing the {@link FrameworkAdmin} implementation for Knopflerfish
- * should be implemented by the implementator of Knopflerfish.
- * Therefore, this bundle is tantative.
- *
- */
-public class Activator implements BundleActivator {
-	private BundleContext context;
-
-	private ServiceRegistration registrationFh;
-
-	KfFwAdminImpl fwAdmin = null;
-
-	private void registerFrameworkAdmin() {
-		Dictionary props = new Hashtable();
-		props.put(Constants.SERVICE_VENDOR, "Eclipse.org");
-		props.put(FrameworkAdmin.SERVICE_PROP_KEY_FW_NAME, KfConstants.FW_NAME);
-		props.put(FrameworkAdmin.SERVICE_PROP_KEY_FW_VERSION, KfConstants.FW_VERSION);
-		props.put(FrameworkAdmin.SERVICE_PROP_KEY_LAUNCHER_NAME, KfConstants.LAUNCHER_NAME);
-		props.put(FrameworkAdmin.SERVICE_PROP_KEY_LAUNCHER_VERSION, KfConstants.LAUNCHER_VERSION);
-
-		if (KfFwAdminImpl.isRunningFw(context)) {
-			props.put(FrameworkAdmin.SERVICE_PROP_KEY_RUNNING_SYSTEM_FLAG, "true");
-			fwAdmin = new KfFwAdminImpl(context, true);
-		} else
-			fwAdmin = new KfFwAdminImpl(context);
-
-		fwAdmin = new KfFwAdminImpl(context);
-		registrationFh = context.registerService(FrameworkAdmin.class.getName(), fwAdmin, props);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		this.context = context;
-		Log.init(context);
-		registerFrameworkAdmin();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		this.context = null;
-		if (registrationFh != null)
-			registrationFh.unregister();
-		if (fwAdmin != null)
-			fwAdmin.deactivate();
-	}
-
-}

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/KfConstants.java b/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/KfConstants.java
deleted file mode 100644
index 8ffcecf..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/KfConstants.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.frameworkadmin.knopflerfish.internal;
-
-public class KfConstants {
-	public final static String PROP_KF_DEPENDENT_PREFIX = "org.knopflerfish.";
-	public final static String PROP_KF_BUNDLEBASE_DIR = "org.knopflerfish.gosg.jars";
-	public final static String PROP_KF_FW_PERSISTENT_DATA_LOC = "org.osgi.framework.dir";
-	//	private final static String DEFAULT_BUNDLE_SEARCH_DIR = "jars";
-
-	public final static String FW_NAME = "Knopflerfish";
-	public final static String FW_VERSION = "2.0";
-	public static final String LAUNCHER_NAME = "java -jar";
-	public static final String LAUNCHER_VERSION = FW_VERSION;
-
-	public static final String VMARGS_COMMAND = "-vmargs";
-	public static final String VM_COMMAND = "-vm";
-	public static final String XARGS_INIT = "-init";
-	public static final String XARGS_OPTION = "-xargs";
-	public static final String DEFAULT_FW_PRIVATE_AREA = "fwdir";
-	public static final int DEFAULT_INITIAL_BUNDLE_SL = 1;
-}

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/KfFrameworkAdminFactoryImpl.java b/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/KfFrameworkAdminFactoryImpl.java
deleted file mode 100644
index f8065a9..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/KfFrameworkAdminFactoryImpl.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.frameworkadmin.knopflerfish.internal;
-
-import org.eclipse.equinox.configuratormanipulator.ConfiguratorManipulatorFactory;
-import org.eclipse.equinox.frameworkadmin.FrameworkAdmin;
-import org.eclipse.equinox.frameworkadmin.FrameworkAdminFactory;
-
-public class KfFrameworkAdminFactoryImpl extends FrameworkAdminFactory {
-	public FrameworkAdmin createFrameworkAdmin() throws InstantiationException, IllegalAccessException, ClassNotFoundException {
-		String className = System.getProperty(ConfiguratorManipulatorFactory.SYSTEM_PROPERTY_KEY);
-		if (className == null)
-			return new KfFwAdminImpl();;
-		return new KfFwAdminImpl(className);
-	}
-
-	//	public FrameworkAdmin createFrameworkAdmin() throws InstantiationException, IllegalAccessException, ClassNotFoundException {
-	//		return new EquinoxFwAdminImpl();;
-	//		
-	//	}
-
-	//	public FrameworkAdmin createFrameworkAdmin(String className) throws InstantiationException, IllegalAccessException, ClassNotFoundException {
-	//		return new EquinoxFwAdminImpl(className);
-	//	}
-}

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/KfFwAdminImpl.java b/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/KfFwAdminImpl.java
deleted file mode 100644
index 0ec6b97..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/KfFwAdminImpl.java
+++ /dev/null

@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.frameworkadmin.knopflerfish.internal;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.eclipse.equinox.configuratormanipulator.ConfiguratorManipulator;
-import org.eclipse.equinox.configuratormanipulator.ConfiguratorManipulatorFactory;
-import org.eclipse.equinox.frameworkadmin.*;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-
-public class KfFwAdminImpl implements FrameworkAdmin {
-
-	/**
-	 * If the currently running fw launch is the one that the FrameworkAdmin object can handle,
-	 * return true.
-	 *  
-	 * @return flag true if the ManipulatorAdmin object can handle currently running fw launch. 
-	 */
-	static boolean isRunningFw(BundleContext context) {
-		//TODO implementation for Eclipse.exe and for Equinox
-		if (!context.getProperty(Constants.FRAMEWORK_VENDOR).equals("Eclipse.org"))
-			return false;
-		//TODO decide if this version can be supported by this bundle.
-		//Dictionary header = context.getBundle(0).getHeaders();
-		//String versionSt = (String) header.get("Bundle-Version");
-
-		// TODO need to identify the version of eclipse.exe used for this launch, if used. 
-		//		String eclipseCommandsSt = context.getProperty(EquinoxConstants.PROP_ECLIPSE_COMMANDS);
-		//	StringTokenizer tokenizer = new StringTokenizer(eclipseCommandsSt,"\n");
-
-		return false;
-	}
-
-	BundleContext context = null;
-
-	boolean active = false;
-
-	private boolean runningFw = false;
-	private ConfiguratorManipulator configuratorManipulator = null;
-
-	KfFwAdminImpl() {
-		this(null, false);
-	}
-
-	KfFwAdminImpl(BundleContext context) {
-		this(context, false);
-
-	}
-
-	KfFwAdminImpl(BundleContext context, boolean runningFw) {
-		this.context = context;
-		this.active = true;
-		this.runningFw = runningFw;
-	}
-
-	KfFwAdminImpl(String configuratorManipulatorFactoryName) throws InstantiationException, IllegalAccessException, ClassNotFoundException {
-		this.context = null;
-		this.active = true;
-		this.runningFw = false;
-		//		this.configuratorManipulatorFactoryName = configuratorManipulatorFactoryName;
-		loadConfiguratorManipulator(configuratorManipulatorFactoryName);
-	}
-
-	private void loadConfiguratorManipulator(String configuratorManipulatorFactoryName) throws InstantiationException, IllegalAccessException, ClassNotFoundException {
-		if (configuratorManipulatorFactoryName == null)
-			this.configuratorManipulator = null;
-		else
-			this.configuratorManipulator = ConfiguratorManipulatorFactory.getInstance(configuratorManipulatorFactoryName);
-		return;
-	}
-
-	void deactivate() {
-		active = false;
-	}
-
-	public Manipulator getManipulator() {
-		return new KfManipulatorImpl(context, this);
-	}
-
-	public Manipulator getRunningManipulator() {
-		if (this.runningFw) {
-			//KfManipulatorImpl Manipulator = new KfManipulatorImpl(context, this);
-			//TODO using some MAGIC dependent on Kf implementation, set parameters according to the current running fw.
-			return null;
-		}
-		return null;
-	}
-
-	public boolean isActive() {
-		return active;
-	}
-
-	public Process launch(Manipulator Manipulator, File cwd) throws IllegalArgumentException, FrameworkAdminRuntimeException, IOException {
-		return new KfLauncherImpl(context, this).launch(Manipulator, cwd);
-	}
-
-	public ConfiguratorManipulator getConfiguratorManipulator() {
-		return configuratorManipulator;
-	}
-
-}

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/KfFwConfigFileParser.java b/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/KfFwConfigFileParser.java
deleted file mode 100644
index d324eb4..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/KfFwConfigFileParser.java
+++ /dev/null

@@ -1,306 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.frameworkadmin.knopflerfish.internal;
-
-import java.io.*;
-import java.net.URL;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-import org.eclipse.equinox.frameworkadmin.BundleInfo;
-import org.eclipse.equinox.frameworkadmin.knopflerfish.KfConfigData;
-import org.eclipse.equinox.internal.frameworkadmin.utils.Utils;
-import org.osgi.service.log.LogService;
-
-public class KfFwConfigFileParser {
-	private final static String HEADER = "# This file was written by ConfigSetter for Knopflerfish.";
-	private final static String D = "-D";
-	private final static String PROPFILE_PREFIX = "prop.";
-
-	private void addInstallingBundlesList(BundleInfo[] bInfos, KfConfigData configData, List lines) {
-		if (bInfos.length == 0)
-			return;
-		int initialBSL = configData.getInitialBundleStartLevel() == BundleInfo.NO_LEVEL ? 1 : configData.getInitialBundleStartLevel();
-
-		SortedMap bslToList = new TreeMap();
-		for (int i = 0; i < bInfos.length; i++) {
-			Integer sL = Integer.valueOf(bInfos[i].getStartLevel());
-			if (sL.intValue() == BundleInfo.NO_LEVEL)
-				sL = new Integer(initialBSL);
-			List list = (List) bslToList.get(sL);
-			if (list == null) {
-				list = new LinkedList();
-				bslToList.put(sL, list);
-			}
-			list.add(bInfos[i]);
-		}
-		// bslToList is sorted by the key (StartLevel).
-		for (Iterator ite = bslToList.keySet().iterator(); ite.hasNext();) {
-			Integer sl = (Integer) ite.next();
-			lines.add("-initlevel " + sl.toString());
-			List list = (List) bslToList.get(sl);
-			for (Iterator ite2 = list.iterator(); ite2.hasNext();) {
-				BundleInfo bInfo = (BundleInfo) ite2.next();
-				try {
-					//					String cmd = Utils.getRelativePath(new URL(bInfo.getLocation()), new URL(cInfo.getBaseLocation()));
-					//					//KF doesn't support "../".
-					//					if (cmd.startsWith("../"))
-					//						cmd = bInfo.getLocation();
-					String cmd = bInfo.getLocation();
-
-					if (bInfo.isMarkedAsStarted())
-						lines.add("-istart " + cmd);
-					else
-						lines.add("-install " + cmd);
-				} catch (IllegalArgumentException e) {
-					// Never happen
-					e.printStackTrace();
-				}
-			}
-			lines.add("");
-		}
-		return;
-	}
-
-	private String[] getConfigFileLines(BundleInfo[] bInfos, KfConfigData configData, File outputFile) throws IOException {
-		//		if (cInfo.getFwJar() == null)
-		//			new FwLauncherException("fwHomeDirUrl == null", FwLauncherException.OTHERS);
-
-		List lines = new LinkedList();
-		lines.add(HEADER);
-		SimpleDateFormat df = new SimpleDateFormat("yyyy/MM/dd/HH:mm:ss");
-		String date = df.format(new Date());
-		lines.add("# " + date);
-		//if (absolute)
-		//		lines.add(D + KfConstants.PROP_ASSUMED_CWD + "=" + Utils.replaceAll(cInfo.getAssumedCwd().getAbsolutePath(), File.separator, "/"));
-
-		handleProperties(configData, outputFile, lines);
-
-		//	KfConfigHandler ch = (KfConfigHandler) cf;
-		//-Dorg.knopflerfish.gosg.jars=file:jars/
-		// value of org.knopflerfish.gosg.jars must endwith "/".
-
-		//		if (relative) {
-		//			String baseUrlSt = cInfo.getBaseLocation();
-		//			baseUrlSt = baseUrlSt.endsWith("/") ? baseUrlSt : baseUrlSt + "/";
-		//			URL baseUrl = new URL(baseUrlSt);
-		//			String assumedCwd = ((KfConfiguratorFwConfigInfo) cInfo).getAssumedCwd().getAbsolutePath();
-		//			URL assumedCwdUrl = Utils.getUrl("file", null, assumedCwd);
-		//			if (baseUrl.getProtocol().endsWith("file")) {
-		//				lines.add(D + "org.knopflerfish.gosg.jars=" + "file:" + Utils.getRelativePath(baseUrl, assumedCwdUrl) + "/");
-		//				lines.add(D + KfConfiguratorFwConfigHandler.PROP_ASSUMED_CWD + "=" + assumedCwd + File.separator);
-		//			} else
-		//				lines.add(D + "org.knopflerfish.gosg.jars=" + baseUrl.toExternalForm());
-		//		} else {
-		//			URL baseUrl = new URL(cInfo.getBaseLocation());
-		//			lines.add(D + "org.knopflerfish.gosg.jars=" + baseUrl.toExternalForm());
-		//		}
-
-		//		if (cInfo.isInitial())
-		//			lines.add("-init");
-
-		addInstallingBundlesList(bInfos, configData, lines);
-
-		if (configData.getInitialBundleStartLevel() != BundleInfo.NO_LEVEL)
-			lines.add("-initlevel " + configData.getInitialBundleStartLevel());
-		if (configData.getBeginingFwStartLevel() != BundleInfo.NO_LEVEL)
-			lines.add("-startlevel " + configData.getBeginingFwStartLevel());
-		String[] ret = new String[lines.size()];
-		lines.toArray(ret);
-		return ret;
-	}
-
-	private void handleProperties(KfConfigData configData, File outputFile, List lines) throws IOException {
-
-		//	File assumedCwd = fwConfigHandler.fwConfigInfo.assumedCwd;
-		//if (assumedCwd == null)
-		//	throw new FwLauncherException("assumedCwd must be set in advance", FwLauncherException.UNSATISFIED_PREREQUISTE);
-		Properties fwIndependentProps = configData.getFwIndependentProps();
-		Properties fwDependentProps = configData.getFwDependentProps();
-		if (fwDependentProps.size() == 0 && fwIndependentProps.size() == 0)
-			return;
-
-		if (configData.getXargsFile() == null)
-			// init2.xargs --> PROPFILE_PREFIX +init2.xargs
-			configData.setXargsFile(new File(outputFile.getParentFile(), PROPFILE_PREFIX + outputFile.getName()));
-
-		BufferedWriter bw = null;
-		try {
-			bw = new BufferedWriter(new FileWriter(configData.getXargsFile()));
-			writeCmdLineForProps(fwIndependentProps, bw);
-			writeCmdLineForProps(fwDependentProps, bw);
-			bw.flush();
-			bw.close();
-		} finally {
-			if (bw != null)
-				bw.close();
-		}
-		Log.log(LogService.LOG_INFO, "Prop Config are stored in file(" + configData.getXargsFile().getAbsolutePath() + ") successfully.");
-
-		// Assume that -xargs will use cwd as base dir.
-		try {
-			URL targetUrl = Utils.getUrl("file", null, configData.getXargsFile().getAbsolutePath());
-			//			URL url = Utils.getUrl("file", null, assumedCwd.getAbsolutePath());
-			//			String relativePropXargs = Utils.getRelativePath(targetUrl, url);
-			//			lines.add("-xargs " + relativePropXargs);
-			lines.add("-xargs " + targetUrl.toExternalForm());
-		} catch (IllegalArgumentException e) {
-			e.printStackTrace();
-		}
-
-	}
-
-	private boolean isFwDependent(String key) {
-		// TODO This algorithm is temporal. 
-		if (key.startsWith(KfConstants.PROP_KF_DEPENDENT_PREFIX))
-			return true;
-		return false;
-	}
-
-	private boolean isIncludedInInstallingBundles(KfConfigData configData, String location) {
-		BundleInfo[] bInfo = configData.getBundles();
-		for (int i = 0; i < bInfo.length; i++) {
-			if (bInfo[i].getLocation().equals(location))
-				return true;
-		}
-		return false;
-	}
-
-	private void parseCmdLine(KfConfigData configData, String[] lines, File inputFile) throws IOException {
-		Log.log(LogService.LOG_DEBUG, this, "parseCmdLine(FwConfigData configData,String[] lines, File inputFile)", "inputFile=" + inputFile.getAbsolutePath());
-
-		int startlevel = KfConstants.DEFAULT_INITIAL_BUNDLE_SL;
-
-		for (int i = 0; i < lines.length; i++) {
-			final String line = lines[i].trim();
-			StringTokenizer tokenizer = new StringTokenizer(line, " ");
-			if (line.startsWith("#"))
-				continue;
-			if (line.length() == 0)
-				continue;
-			//			if (line.equals("-init")) {
-			//				handler.setInitial(true);
-			//			} else 
-			if (line.startsWith("-xargs")) {
-				if (tokenizer.countTokens() != 2) {
-					Log.log(LogService.LOG_WARNING, "Illegal Format:line=" + line + "tokenizer.countTokens()=" + tokenizer.countTokens());
-					//	throw new ManipulatorException("Illegal Format:line=" + line + "tokenizer.countTokens()=" + tokenizer.countTokens(), ManipulatorException.FILE_FORMAT_ERROR);
-				}
-				tokenizer.nextToken();
-				String value = tokenizer.nextToken();
-				URL url = Utils.formatUrl(value, Utils.getUrl("file", null, inputFile.getAbsolutePath()));
-				File file = new File(url.getFile());
-				configData.setXargsFile(file);
-				this.readFwConfigFile(configData, file);
-			} else if (line.startsWith("-initlevel")) {
-				if (tokenizer.countTokens() != 2) {
-					Log.log(LogService.LOG_WARNING, "Illegal Format:line=" + line);
-				}
-				tokenizer.nextToken();
-				startlevel = Integer.parseInt(tokenizer.nextToken());
-			} else if (line.startsWith("-startlevel")) {
-				if (tokenizer.countTokens() != 2)
-					Log.log(LogService.LOG_WARNING, "Illegal Format:line=" + line);
-				tokenizer.nextToken();
-				configData.setBeginningFwStartLevel(Integer.parseInt(tokenizer.nextToken()));
-			} else if (line.startsWith("-install")) {
-				if (tokenizer.countTokens() != 2)
-					Log.log(LogService.LOG_WARNING, "Illegal Format:line=" + line);
-				tokenizer.nextToken();
-				String value = tokenizer.nextToken();
-				configData.addBundle(new BundleInfo(value, startlevel, false));
-			} else if (line.startsWith("-istart")) {
-				if (tokenizer.countTokens() != 2)
-					Log.log(LogService.LOG_WARNING, "Illegal Format:line=" + line);
-				tokenizer.nextToken();
-				String value = tokenizer.nextToken();
-				configData.addBundle(new BundleInfo(value, startlevel, true));
-			} else if (line.startsWith("-start")) {
-				if (tokenizer.countTokens() != 2)
-					Log.log(LogService.LOG_WARNING, "Illegal Format:line=" + line);
-				tokenizer.nextToken();
-				String value = tokenizer.nextToken();
-				if (this.isIncludedInInstallingBundles(configData, value))
-					configData.addBundle(new BundleInfo(value, startlevel, false));
-				else
-					Log.log(LogService.LOG_WARNING, "location(" + value + ") is NOT included in InstallingBundles.");
-			} else if (line.startsWith("-D")) {
-				String tmp = line.substring("-D".length());
-				StringTokenizer tok = new StringTokenizer(tmp, "=");
-				if (tok.countTokens() != 2)
-					Log.log(LogService.LOG_WARNING, "Illegal Format:line=" + line);
-				String key = tok.nextToken();
-				String value = tok.nextToken();
-				if (isFwDependent(key))
-					configData.setFwDependentProp(key, value);
-				else
-					configData.setFwIndependentProp(key, value);
-			} else
-				Log.log(LogService.LOG_WARNING, "Unsupported Format:line=" + line);
-		}
-
-		configData.setInitialBundleStartLevel(startlevel);
-	}
-
-	void readFwConfigFile(KfConfigData configData, File inputFile) throws IOException {
-		BufferedReader br = null;
-		try {
-			br = new BufferedReader(new FileReader(inputFile));
-			String line;
-			List list = new LinkedList();
-			while ((line = br.readLine()) != null) {
-				list.add(line);
-			}
-			String[] lines = new String[list.size()];
-			list.toArray(lines);
-			this.parseCmdLine(configData, lines, inputFile);
-		} finally {
-			if (br != null)
-				br.close();
-		}
-	}
-
-	void saveConfigs(BundleInfo[] bInfos, KfConfigData configData, File outputFile, boolean backup) throws IOException {
-		if (backup)
-			if (outputFile.exists()) {
-				File dest = Utils.getSimpleDataFormattedFile(outputFile);
-				if (!outputFile.renameTo(dest))
-					throw new IOException("Fail to rename from (" + outputFile + ") to (" + dest + ")");
-			}
-		Utils.createParentDir(outputFile);
-
-		//void saveConfigs(File outputFile, File assumedCwd) throws ConfigManipulatorException {
-		//handler.setAssumedCwd(assumedCwd);
-		BufferedWriter bw = null;
-		try {
-			bw = new BufferedWriter(new FileWriter(outputFile));
-			String[] lines = this.getConfigFileLines(bInfos, configData, outputFile);
-			for (int i = 0; i < lines.length; i++) {
-				bw.write(lines[i]);
-				bw.newLine();
-			}
-			bw.flush();
-			Log.log(LogService.LOG_INFO, "Config are stored in file(" + outputFile.getAbsolutePath() + ") successfully.");
-		} finally {
-			if (bw != null)
-				bw.close();
-		}
-	}
-
-	private void writeCmdLineForProps(Properties props, BufferedWriter bw) throws IOException {
-		for (Enumeration enumeration = props.keys(); enumeration.hasMoreElements();) {
-			String key = (String) enumeration.nextElement();
-			String value = props.getProperty(key);
-			bw.write(D + key + "=" + value);
-			bw.newLine();
-		}
-	}
-}

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/KfLauncherImpl.java b/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/KfLauncherImpl.java
deleted file mode 100644
index 6e8739c..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/KfLauncherImpl.java
+++ /dev/null

@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.frameworkadmin.knopflerfish.internal;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.equinox.frameworkadmin.*;
-import org.eclipse.equinox.internal.frameworkadmin.utils.SimpleBundlesState;
-import org.eclipse.equinox.internal.frameworkadmin.utils.Utils;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.log.LogService;
-
-public class KfLauncherImpl {
-	static String getStringOfCmd(String[] cmdarray) {
-		StringBuffer sb = new StringBuffer();
-		for (int i = 0; i < cmdarray.length; i++) {
-			sb.append(cmdarray[i]);
-			sb.append(" ");
-		}
-		return sb.toString();
-	}
-
-	BundleContext context = null;
-
-	KfFwAdminImpl fwAdmin = null;
-
-	KfLauncherImpl(BundleContext context, KfFwAdminImpl fwAdmin) {
-		this.context = context;
-		this.fwAdmin = fwAdmin;
-	}
-
-	public Process launch(Manipulator Manipulator, File cwd) throws IllegalArgumentException, IOException, FrameworkAdminRuntimeException {
-		Log.log(LogService.LOG_DEBUG, this, "launch(Manipulator Manipulator, File cwd)", "");
-		LauncherData launcherData = Manipulator.getLauncherData();
-		if (launcherData.getLauncher() == null)
-			return launchInMemory(Manipulator, cwd);
-		return launchByLauncher(Manipulator, cwd);
-	}
-
-	private Process launchByLauncher(Manipulator Manipulator, File cwd) throws IOException {
-		// XXX not supported
-		return null;
-	}
-
-	private Process launchInMemory(Manipulator Manipulator, File cwd) throws IOException {
-		SimpleBundlesState.checkAvailability(fwAdmin);
-		LauncherData launcherData = Manipulator.getLauncherData();
-		Utils.checkAbsoluteFile(launcherData.getFwJar(), "fwJar");
-		Utils.checkAbsoluteDir(cwd, "cwd");
-		//		prepareSuitableConfigFile(Manipulator, cwd);
-
-		List cmdList = new LinkedList();
-		if (launcherData.getJvm() != null)
-			cmdList.add(launcherData.getJvm().getAbsolutePath());
-		else
-			cmdList.add("java");
-
-		//		if (this.fwConfigInfo.getConfiguratorConfigUrl() != null)
-		//			this.Manipulator.addLauncherJvmArgs(new String[] {"-D" + BundleStateConfigurator.PROP_KEY_CONFIGURL + "=" + this.fwConfigInfo.getConfiguratorConfigUrl()});
-
-		String[] jvmArgs = launcherData.getJvmArgs();
-		if (jvmArgs != null)
-			for (int i = 0; i < jvmArgs.length; i++) {
-				String prefix = "-D" + KfConstants.PROP_KF_FW_PERSISTENT_DATA_LOC + "=";
-				if (jvmArgs[i].startsWith(prefix)) {
-					String value = jvmArgs[i].substring(prefix.length());
-					File file = new File(value);
-					if (launcherData.getFwPersistentDataLocation() != null) {
-						if (!file.isAbsolute())
-							file = new File(cwd, value);
-						if (!launcherData.getFwPersistentDataLocation().equals(file)) {
-							Log.log(LogService.LOG_WARNING, "fwPersistentDataLocation doesn't match jvmArgs[" + i + "]\n" + "\tfwPersistentDataLocation will be used.\n" + "\tfwInstancePrivateArea=" + launcherData.getFwPersistentDataLocation() + "\n\tjvmArgs[" + i + "]=" + jvmArgs[i] + " ");
-							continue;
-						}
-					}
-				}
-				cmdList.add(jvmArgs[i]);
-			}
-
-		if (launcherData.getFwPersistentDataLocation() != null) {
-			cmdList.add("-D" + KfConstants.PROP_KF_FW_PERSISTENT_DATA_LOC + "=" + Utils.getRelativePath(launcherData.getFwPersistentDataLocation(), cwd));
-		}
-
-		cmdList.add("-jar");
-		cmdList.add(Utils.getRelativePath(launcherData.getFwJar(), cwd));
-
-		// -init must be present prior to "-xargs", if required.
-		if (launcherData.isClean())
-			cmdList.add(KfConstants.XARGS_INIT);
-
-		if (launcherData.getFwConfigLocation() != null) {
-			cmdList.add(KfConstants.XARGS_OPTION);
-			cmdList.add(Utils.getRelativePath(launcherData.getFwConfigLocation(), cwd));
-		}
-
-		String[] cmdarray = new String[cmdList.size()];
-		cmdList.toArray(cmdarray);
-		Log.log(LogService.LOG_DEBUG, "In CWD = " + cwd + "\n\t" + getStringOfCmd(cmdarray));
-		return Runtime.getRuntime().exec(cmdarray, null, cwd);
-	}
-
-}

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/KfManipulatorImpl.java b/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/KfManipulatorImpl.java
deleted file mode 100644
index ae82b9a..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/KfManipulatorImpl.java
+++ /dev/null

@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.frameworkadmin.knopflerfish.internal;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.eclipse.equinox.configuratormanipulator.ConfiguratorManipulator;
-import org.eclipse.equinox.frameworkadmin.*;
-import org.eclipse.equinox.frameworkadmin.knopflerfish.KfConfigData;
-import org.eclipse.equinox.internal.frameworkadmin.utils.SimpleBundlesState;
-import org.eclipse.equinox.internal.frameworkadmin.utils.Utils;
-import org.osgi.framework.*;
-import org.osgi.service.log.LogService;
-import org.osgi.util.tracker.ServiceTracker;
-
-public class KfManipulatorImpl implements Manipulator {
-	private static final String SYSTEMBUNDLE_VENDOR = "Knopflerfish";
-	private static final String SYSTEMBUNDLE_NAME = "frameworkbundle";
-	KfConfigData configData = new KfConfigData(KfConstants.FW_NAME, KfConstants.FW_VERSION, null, null);
-	LauncherData launcherData = new LauncherData(KfConstants.FW_NAME, KfConstants.FW_VERSION, null, null);
-
-	BundleContext context = null;
-	BundlesState bundleState = null;
-
-	ServiceTracker cmTracker;
-	int trackingCount = -1;
-
-	ConfiguratorManipulator configuratorManipulator;
-
-	KfFwAdminImpl fwAdmin = null;
-
-	KfManipulatorImpl(BundleContext context, KfFwAdminImpl ManipulatorAdmin) {
-		this.context = context;
-		this.fwAdmin = ManipulatorAdmin;
-		if (context != null) {
-			cmTracker = new ServiceTracker(context, ConfiguratorManipulator.class.getName(), null);
-			cmTracker.open();
-		}
-	}
-
-	public BundlesState getBundlesState() throws FrameworkAdminRuntimeException {
-		return new SimpleBundlesState(fwAdmin, this, SYSTEMBUNDLE_NAME, SYSTEMBUNDLE_VENDOR);
-		//		return new KfBundlesState(context, ManipulatorAdmin, this);
-	}
-
-	public ConfigData getConfigData() throws FrameworkAdminRuntimeException {
-		return configData;
-	}
-
-	public BundleInfo[] getExpectedState() throws IllegalArgumentException, IOException, FrameworkAdminRuntimeException {
-		Log.log(LogService.LOG_DEBUG, this, "getExpectedState()", "BEGIN");
-		SimpleBundlesState.checkAvailability(fwAdmin);
-
-		BundlesState bundleState = this.getBundlesState();
-		bundleState.resolve(true);
-		return bundleState.getExpectedState();
-	}
-
-	public LauncherData getLauncherData() throws FrameworkAdminRuntimeException {
-		return launcherData;
-	}
-
-	public void initialize() {
-		Log.log(LogService.LOG_DEBUG, this, "initialize()", "BEGIN");
-		configData.initialize();
-		launcherData.initialize();
-	}
-
-	// Load parameters from LauncherConfigFile, FwConfigFile, and ConfiguratorConfigFile if required.
-	// The parameter has been set will be updated.
-	public void load() throws IOException, FrameworkAdminRuntimeException {
-		Log.log(LogService.LOG_DEBUG, this, "load()", "BEGIN");
-		SimpleBundlesState.checkAvailability(fwAdmin);
-
-		// current implementation for KF doesn't support launcher.
-
-		File fwConfigFile = launcherData.getFwConfigLocation();
-		if (fwConfigFile == null) {
-			//TODO refine this algorithm according to the KF behaivior.
-			// Default fwConfigFile for Eclipse.exe
-			File home = launcherData.getHome();
-			fwConfigFile = new File(home, "init.xargs");
-		}
-		KfFwConfigFileParser parser = new KfFwConfigFileParser();
-		parser.readFwConfigFile(configData, fwConfigFile);
-
-		// TODO current impl doesn't support it.
-		//		BundlesState bundleState = this.getBundlesState();
-		//		BundleInfo[] newBundleInfos = bundleState.getExpectedState();
-		//		configData.setBundles(newBundleInfos);
-		setConfiguratorManipulator();
-		if (this.configuratorManipulator == null)
-			return;
-		configuratorManipulator.updateBundles(this);
-		return;
-	}
-
-	// Save all parameter in memory into proper config files.
-	public void save(boolean backup) throws IOException, FrameworkAdminRuntimeException {
-		Log.log(LogService.LOG_DEBUG, this, "save()", "BEGIN");
-		SimpleBundlesState.checkAvailability(fwAdmin);
-
-		// current implementation for KF doesn't support launcher.
-
-		File fwConfigFile = launcherData.getFwConfigLocation();
-		if (fwConfigFile == null)
-			throw new IllegalStateException("fwConfigFile is not set.");
-
-		setConfiguratorManipulator();
-
-		BundleInfo[] newBInfo = null;
-		if (configuratorManipulator != null) // Optimize BundleInfo[] 
-			newBInfo = configuratorManipulator.save(this, backup);
-		else
-			newBInfo = configData.getBundles();
-		// Save FwConfigFile
-		KfFwConfigFileParser parser = new KfFwConfigFileParser();
-		parser.saveConfigs(newBInfo, configData, fwConfigFile, backup);
-	}
-
-	public void setConfigData(ConfigData configData) {
-		this.configData.initialize();
-		this.configData.setInitialBundleStartLevel(configData.getInitialBundleStartLevel());
-		this.configData.setBeginningFwStartLevel(configData.getBeginingFwStartLevel());
-		BundleInfo[] bInfos = configData.getBundles();
-		for (int i = 0; i < bInfos.length; i++)
-			this.configData.addBundle(bInfos[i]);
-		this.configData.setFwIndependentProps(configData.getFwIndependentProps());
-		if (this.configData.getFwName().equals(configData.getFwName()))
-			if (this.configData.getFwVersion().equals(configData.getFwVersion())) {
-				// TODO refine the algorithm to copying fw dependent props.
-				//  configData.getFwName()/getFwVersion()/
-				//	getLauncherName()/getLauncherVersion() might be taken into consideration. 
-				this.configData.setFwDependentProps(configData.getFwDependentProps());
-			}
-	}
-
-	/**
-	 * 1. get all ServiceReferences of ConfiguratorManipulator.   
-	 * 2. Check if there any ConfiguratorBundle in the Bundles list that can be manipulated by 
-	 * 	the available ConfiguratorManipulators.
-	 * 3. Choose the one that will be firstly started among them.
-	 * 4. set the object that corresponds to the chosen ConfiguratorBundle.  
-	 * 
-	 */
-	private void setConfiguratorManipulator() {
-		if (context == null) {
-			this.configuratorManipulator = this.fwAdmin.getConfiguratorManipulator();
-			return;
-		}
-
-		ServiceReference[] references = cmTracker.getServiceReferences();
-		int count = cmTracker.getTrackingCount();
-		if (count == this.trackingCount)
-			return;
-		this.trackingCount = count;
-
-		BundleInfo[] bInfos = configData.getBundles();
-		int initialBSL = configData.getInitialBundleStartLevel();
-		bInfos = Utils.sortBundleInfos(bInfos, initialBSL);
-		//int index = -1;	
-		configuratorManipulator = null;
-		for (int i = 0; i < bInfos.length; i++) {
-			//String location = bInfos[i].getLocation();
-			if (!bInfos[i].isMarkedAsStarted())
-				continue;
-			for (int j = 0; j < references.length; j++)
-				if (references[j].getProperty(ConfiguratorManipulator.SERVICE_PROP_KEY_CONFIGURATOR_BUNDLESYMBOLICNAME).equals(Utils.getManifestMainAttributes(bInfos[i].getLocation(), Constants.BUNDLE_SYMBOLICNAME))) {
-					configuratorManipulator = (ConfiguratorManipulator) cmTracker.getService(references[j]);
-					break;
-				}
-			if (configuratorManipulator != null)
-				break;
-		}
-	}
-
-	public void setLauncherData(LauncherData launcherData) {
-		this.launcherData.initialize();
-		this.launcherData.setFwConfigLocation(launcherData.getFwConfigLocation());
-		this.launcherData.setFwPersistentDataLocation(launcherData.getFwPersistentDataLocation(), launcherData.isClean());
-		this.launcherData.setJvm(launcherData.getJvm());
-		this.launcherData.setJvmArgs(launcherData.getJvmArgs());
-		if (this.launcherData.getFwName().equals(launcherData.getFwName()))
-			if (this.launcherData.getFwVersion().equals(launcherData.getFwVersion())) {
-				// TODO launcherData.getFwName()/getFwVersion()/
-				//	getLauncherName()/getLauncherVersion() might be taken into consideration
-				//  for copying . 
-				this.launcherData.setFwJar(launcherData.getFwJar());
-			}
-	}
-
-	public long getTimeStamp() {
-		throw new FrameworkAdminRuntimeException(FrameworkAdminRuntimeException.UNSUPPORTED_OPERATION, "getTimeStamp() is not supported by KfManipulator.");
-	}
-
-}

diff --git a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/Log.java b/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/Log.java
deleted file mode 100644
index 88e329f..0000000
--- a/p2/bundles/org.eclipse.equinox.frameworkadmin.knopflerfish/src/org/eclipse/equinox/frameworkadmin/knopflerfish/internal/Log.java
+++ /dev/null

@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.equinox.frameworkadmin.knopflerfish.internal;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.service.log.LogService;
-import org.osgi.util.tracker.ServiceTracker;
-
-/**
- * Utility class with static methods for logging to LogService, if available 
- */
-public class Log {
-	static private ServiceTracker logTracker;
-
-	static void dispose() {
-		if (logTracker != null) {
-			logTracker.close();
-		}
-		logTracker = null;
-	};
-
-	public static void init(BundleContext bc) {
-		logTracker = new ServiceTracker(bc, LogService.class.getName(), null);
-		logTracker.open();
-	}
-
-	public static void log(int level, Object obj, String method, String message) {
-		log(level, obj, method, message, null);
-	}
-
-	public static void log(int level, Object obj, String method, String message, Throwable e) {
-		LogService logService = null;
-		String msg = "";
-		if (method == null) {
-			if (obj != null)
-				msg = "(" + obj.getClass().getName() + ")";
-		} else if (obj == null)
-			msg = "[" + method + "]" + message;
-		else
-			msg = "[" + method + "](" + obj.getClass().getName() + ")";
-		msg += message;
-		if (logTracker != null)
-			logService = (LogService) logTracker.getService();
-
-		if (logService != null) {
-			logService.log(level, msg, e);
-		} else {
-			String levelSt = null;
-			if (level == LogService.LOG_DEBUG)
-				levelSt = "DEBUG";
-			else if (level == LogService.LOG_INFO)
-				levelSt = "INFO";
-			else if (level == LogService.LOG_WARNING)
-				levelSt = "WARNING";
-			else if (level == LogService.LOG_ERROR)
-				levelSt = "ERROR";
-
-			System.err.println("[" + levelSt + "]" + msg);
-			if (e != null)
-				e.printStackTrace();
-		}
-	}
-
-	public static void log(int level, Object obj, String method, Throwable e) {
-		log(level, obj, method, null, e);
-	}
-
-	public static void log(int level, String message) {
-		log(level, null, null, message, null);
-	}
-
-	public static void log(int level, String method, String message) {
-		log(level, null, method, message, null);
-	}
-
-	public static void log(int level, String message, Throwable e) {
-		log(level, null, null, message, e);
-	}
-
-	private Log() {
-	}
-
-}
\ No newline at end of file

diff --git a/server-side/bundles/org.eclipse.equinox.http.helper/.classpath b/server-side/bundles/org.eclipse.equinox.http.helper/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/server-side/bundles/org.eclipse.equinox.http.helper/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/server-side/bundles/org.eclipse.equinox.http.helper/.cvsignore b/server-side/bundles/org.eclipse.equinox.http.helper/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/server-side/bundles/org.eclipse.equinox.http.helper/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/server-side/bundles/org.eclipse.equinox.http.helper/.project b/server-side/bundles/org.eclipse.equinox.http.helper/.project
deleted file mode 100644
index e40d3de..0000000
--- a/server-side/bundles/org.eclipse.equinox.http.helper/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.http.helper</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/server-side/bundles/org.eclipse.equinox.http.helper/.settings/org.eclipse.jdt.core.prefs b/server-side/bundles/org.eclipse.equinox.http.helper/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f72f4bc..0000000
--- a/server-side/bundles/org.eclipse.equinox.http.helper/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,253 +0,0 @@
-#Thu Sep 28 11:26:23 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1
-org.eclipse.jdt.core.compiler.compliance=1.3
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=ignore
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
-org.eclipse.jdt.core.formatter.comment.format_comments=false
-org.eclipse.jdt.core.formatter.comment.format_header=true
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=800
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

diff --git a/server-side/bundles/org.eclipse.equinox.http.helper/.settings/org.eclipse.jdt.ui.prefs b/server-side/bundles/org.eclipse.equinox.http.helper/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 8729242..0000000
--- a/server-side/bundles/org.eclipse.equinox.http.helper/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,8 +0,0 @@
-#Thu Sep 28 11:26:55 EDT 2006
-eclipse.preferences.version=1
-formatter_profile=_core
-formatter_settings_version=10
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.staticondemandthreshold=3

diff --git a/server-side/bundles/org.eclipse.equinox.http.helper/.settings/org.eclipse.pde.core.prefs b/server-side/bundles/org.eclipse.equinox.http.helper/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index c10ef5f..0000000
--- a/server-side/bundles/org.eclipse.equinox.http.helper/.settings/org.eclipse.pde.core.prefs
+++ /dev/null

@@ -1,4 +0,0 @@
-#Wed Feb 07 17:46:38 EST 2007
-eclipse.preferences.version=1
-pluginProject.extensions=false
-resolve.requirebundle=false

diff --git a/server-side/bundles/org.eclipse.equinox.http.helper/META-INF/MANIFEST.MF b/server-side/bundles/org.eclipse.equinox.http.helper/META-INF/MANIFEST.MF
deleted file mode 100644
index 4e0d7dd..0000000
--- a/server-side/bundles/org.eclipse.equinox.http.helper/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %bundleName
-Bundle-Vendor: %bundleProvider
-Bundle-Localization: plugin
-Bundle-SymbolicName: org.eclipse.equinox.http.helper
-Bundle-Version: 1.0.0.qualifier
-Import-Package: javax.servlet;version="2.3",
- javax.servlet.http;version="2.3",
- org.osgi.framework;version="1.3.0",
- org.osgi.service.http;version="1.2.0"
-Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
- J2SE-1.3
-Export-Package: org.eclipse.equinox.http.helper

diff --git a/server-side/bundles/org.eclipse.equinox.http.helper/build.properties b/server-side/bundles/org.eclipse.equinox.http.helper/build.properties
deleted file mode 100644
index aa1a008..0000000
--- a/server-side/bundles/org.eclipse.equinox.http.helper/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.properties

diff --git a/server-side/bundles/org.eclipse.equinox.http.helper/plugin.properties b/server-side/bundles/org.eclipse.equinox.http.helper/plugin.properties
deleted file mode 100644
index 97c08c0..0000000
--- a/server-side/bundles/org.eclipse.equinox.http.helper/plugin.properties
+++ /dev/null

@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-###############################################################################
-bundleName = Http Service Helper Bundle
-providerName = Eclipse.org

diff --git a/server-side/bundles/org.eclipse.equinox.http.helper/src/org/eclipse/equinox/http/helper/BundleEntryHttpContext.java b/server-side/bundles/org.eclipse.equinox.http.helper/src/org/eclipse/equinox/http/helper/BundleEntryHttpContext.java
deleted file mode 100644
index 93c8532..0000000
--- a/server-side/bundles/org.eclipse.equinox.http.helper/src/org/eclipse/equinox/http/helper/BundleEntryHttpContext.java
+++ /dev/null

@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation, Cognos Incorporated 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
- *******************************************************************************/
-package org.eclipse.equinox.http.helper;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.osgi.framework.Bundle;
-import org.osgi.service.http.HttpContext;
-
-public class BundleEntryHttpContext implements HttpContext {
-	private Bundle bundle;
-	private String bundlePath;
-
-	public BundleEntryHttpContext(Bundle bundle) {
-		this.bundle = bundle;
-	}
-
-	public BundleEntryHttpContext(Bundle b, String bundlePath) {
-		this(b);
-		if (bundlePath != null) {
-			if (bundlePath.endsWith("/")) //$NON-NLS-1$
-				bundlePath = bundlePath.substring(0, bundlePath.length() - 1);
-
-			if (bundlePath.length() == 0)
-				bundlePath = null;
-		}
-		this.bundlePath = bundlePath;
-	}
-
-	public String getMimeType(String arg0) {
-		return null;
-	}
-
-	public boolean handleSecurity(HttpServletRequest arg0, HttpServletResponse arg1) throws IOException {
-		return true;
-	}
-
-	public URL getResource(String resourceName) {
-		if (bundlePath != null)
-			resourceName = bundlePath + resourceName;
-		
-		int lastSlash = resourceName.lastIndexOf('/');
-		if (lastSlash == -1)
-			return null;
-		
-		String path = resourceName.substring(0, lastSlash);
-		if (path.length() == 0)
-			path = "/"; //$NON-NLS-1$
-		String file = resourceName.substring(lastSlash + 1);
-		Enumeration entryPaths = bundle.findEntries(path, file, false);
-		
-		if (entryPaths != null && entryPaths.hasMoreElements())
-			return (URL) entryPaths.nextElement();
-		
-		return null;
-	}
-
-	public Set getResourcePaths(String path) {
-		if (bundlePath != null)
-			path = bundlePath + path;
-		
-		Enumeration entryPaths = bundle.findEntries(path, null, false);
-		if (entryPaths == null)
-			return null;
-
-		Set result = new HashSet();
-		while (entryPaths.hasMoreElements()) {
-			URL entryURL = (URL) entryPaths.nextElement();
-			String entryPath = entryURL.getFile();
-
-			if (bundlePath == null)	
-				result.add(entryPath);
-			else
-				result.add(entryPath.substring(bundlePath.length()));
-		}
-		return result;
-	}
-}
\ No newline at end of file

diff --git a/server-side/bundles/org.eclipse.equinox.http.helper/src/org/eclipse/equinox/http/helper/ContextInitParametersServletAdaptor.java b/server-side/bundles/org.eclipse.equinox.http.helper/src/org/eclipse/equinox/http/helper/ContextInitParametersServletAdaptor.java
deleted file mode 100644
index 9da5282..0000000
--- a/server-side/bundles/org.eclipse.equinox.http.helper/src/org/eclipse/equinox/http/helper/ContextInitParametersServletAdaptor.java
+++ /dev/null

@@ -1,194 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation
- * 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
- *******************************************************************************/
-package org.eclipse.equinox.http.helper;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-
-import javax.servlet.*;
-
-public class ContextInitParametersServletAdaptor implements Servlet {
-
-	private Servlet delegate;
-	Properties initParameters;
-
-	public ContextInitParametersServletAdaptor(Servlet delegate, Properties initParameters) {
-		this.delegate = delegate;
-		this.initParameters = initParameters;
-	}
-
-	public void init(ServletConfig config) throws ServletException {
-		delegate.init(new ServletConfigAdaptor(config));
-	}
-
-	public void service(ServletRequest request, ServletResponse response) throws ServletException, IOException {
-		delegate.service(request, response);
-	}
-
-	public void destroy() {
-		delegate.destroy();
-	}
-
-	public ServletConfig getServletConfig() {
-		return delegate.getServletConfig();
-	}
-
-	public String getServletInfo() {
-		return delegate.getServletInfo();
-	}
-
-	private class ServletConfigAdaptor implements ServletConfig {
-		private ServletConfig config;
-		private ServletContext context;
-
-		public ServletConfigAdaptor(ServletConfig config) {
-			this.config = config;
-			this.context = new ServletContextAdaptor(config.getServletContext());
-		}
-
-		public String getInitParameter(String arg0) {
-			return config.getInitParameter(arg0);
-		}
-
-		public Enumeration getInitParameterNames() {
-			return config.getInitParameterNames();
-		}
-
-		public ServletContext getServletContext() {
-			return context;
-		}
-
-		public String getServletName() {
-			return config.getServletName();
-		}
-	}
-
-	private class ServletContextAdaptor implements ServletContext {
-
-		private ServletContext delegate;
-
-		public ServletContextAdaptor(ServletContext delegate) {
-			this.delegate = delegate;
-		}
-
-		public RequestDispatcher getRequestDispatcher(String path) {
-			return delegate.getRequestDispatcher(path);
-		}
-
-		public URL getResource(String name) throws MalformedURLException {
-			return delegate.getResource(name);
-		}
-
-		public InputStream getResourceAsStream(String name) {
-			return delegate.getResourceAsStream(name);
-		}
-
-		public Set getResourcePaths(String name) {
-			return delegate.getResourcePaths(name);
-		}
-
-		public Object getAttribute(String arg0) {
-			return delegate.getAttribute(arg0);
-		}
-
-		public Enumeration getAttributeNames() {
-			return delegate.getAttributeNames();
-		}
-
-		public ServletContext getContext(String arg0) {
-			return delegate.getContext(arg0);
-		}
-
-		public String getInitParameter(String arg0) {
-			return initParameters.getProperty(arg0);
-		}
-
-		public Enumeration getInitParameterNames() {
-			return initParameters.propertyNames();
-		}
-
-		public int getMajorVersion() {
-			return delegate.getMajorVersion();
-		}
-
-		public String getMimeType(String arg0) {
-			return delegate.getMimeType(arg0);
-		}
-
-		public int getMinorVersion() {
-			return delegate.getMinorVersion();
-		}
-
-		public RequestDispatcher getNamedDispatcher(String arg0) {
-			return delegate.getNamedDispatcher(arg0);
-		}
-
-		public String getRealPath(String arg0) {
-			return delegate.getRealPath(arg0);
-		}
-
-		public String getServerInfo() {
-			return delegate.getServerInfo();
-		}
-
-		/** @deprecated **/
-		public Servlet getServlet(String arg0) throws ServletException {
-			return delegate.getServlet(arg0);
-		}
-
-		public String getServletContextName() {
-			return delegate.getServletContextName();
-		}
-
-		/** @deprecated **/
-		public Enumeration getServletNames() {
-			return delegate.getServletNames();
-		}
-
-		/** @deprecated **/
-		public Enumeration getServlets() {
-			return delegate.getServlets();
-		}
-
-		/** @deprecated **/
-		public void log(Exception arg0, String arg1) {
-			delegate.log(arg0, arg1);
-		}
-
-		public void log(String arg0, Throwable arg1) {
-			delegate.log(arg0, arg1);
-		}
-
-		public void log(String arg0) {
-			delegate.log(arg0);
-		}
-
-		public void removeAttribute(String arg0) {
-			delegate.removeAttribute(arg0);
-		}
-
-		public void setAttribute(String arg0, Object arg1) {
-			delegate.setAttribute(arg0, arg1);
-		}
-		
-		// Added in Servlet 2.5
-		public String getContextPath() {
-			try {
-				Method getContextPathMethod = delegate.getClass().getMethod("getContextPath", null); //$NON-NLS-1$
-				return (String) getContextPathMethod.invoke(delegate, null);
-			} catch (Exception e) {
-				// ignore
-			}
-			return null;
-		}
-	}
-}

diff --git a/server-side/bundles/org.eclipse.equinox.http.helper/src/org/eclipse/equinox/http/helper/ContextListenerServletAdaptor.java b/server-side/bundles/org.eclipse.equinox.http.helper/src/org/eclipse/equinox/http/helper/ContextListenerServletAdaptor.java
deleted file mode 100644
index f5f310f..0000000
--- a/server-side/bundles/org.eclipse.equinox.http.helper/src/org/eclipse/equinox/http/helper/ContextListenerServletAdaptor.java
+++ /dev/null

@@ -1,39 +0,0 @@
-package org.eclipse.equinox.http.helper;
-
-import java.io.IOException;
-import javax.servlet.*;
-
-public class ContextListenerServletAdaptor implements Servlet {
-	private ServletConfig config;
-	private ServletContextListener listener;
-	private Servlet delegate;
-
-	public ContextListenerServletAdaptor(ServletContextListener listener, Servlet delegate) {
-		this.listener = listener;
-		this.delegate = delegate;
-	}
-
-	public void init(ServletConfig config) throws ServletException {
-		this.config = config;
-		listener.contextInitialized(new ServletContextEvent(config.getServletContext()));
-		delegate.init(config);
-	}
-
-	public void service(ServletRequest req, ServletResponse resp) throws ServletException, IOException {
-		delegate.service(req, resp);
-	}
-
-	public void destroy() {
-		delegate.destroy();
-		listener.contextDestroyed(new ServletContextEvent(config.getServletContext()));
-		config = null;
-	}
-
-	public ServletConfig getServletConfig() {
-		return config;
-	}
-
-	public String getServletInfo() {
-		return ""; //$NON-NLS-1$
-	}
-}

diff --git a/server-side/bundles/org.eclipse.equinox.http.helper/src/org/eclipse/equinox/http/helper/ContextPathServletAdaptor.java b/server-side/bundles/org.eclipse.equinox.http.helper/src/org/eclipse/equinox/http/helper/ContextPathServletAdaptor.java
deleted file mode 100644
index 6bdf67d..0000000
--- a/server-side/bundles/org.eclipse.equinox.http.helper/src/org/eclipse/equinox/http/helper/ContextPathServletAdaptor.java
+++ /dev/null

@@ -1,256 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Cognos Incorporated, 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
- *******************************************************************************/
-package org.eclipse.equinox.http.helper;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-
-public class ContextPathServletAdaptor implements Servlet {
-
-	private Servlet delegate;
-	String contextPath;
-
-	public ContextPathServletAdaptor(Servlet delegate, String contextPath) {
-		this.delegate = delegate;
-		this.contextPath = (contextPath == null || contextPath.equals("/")) ? "" : contextPath; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void init(ServletConfig config) throws ServletException {
-		delegate.init(new ServletConfigAdaptor(config));
-	}
-
-	public void service(ServletRequest request, ServletResponse response) throws ServletException, IOException {
-		delegate.service(new HttpServletRequestAdaptor((HttpServletRequest) request), response);
-	}
-
-	public void destroy() {
-		delegate.destroy();
-	}
-
-	public ServletConfig getServletConfig() {
-		return delegate.getServletConfig();
-	}
-
-	public String getServletInfo() {
-		return delegate.getServletInfo();
-	}
-
-	private class ServletConfigAdaptor implements ServletConfig {
-		private ServletConfig config;
-		private ServletContext context;
-
-		public ServletConfigAdaptor(ServletConfig config) {
-			this.config = config;
-			this.context = new ServletContextAdaptor(config.getServletContext());
-		}
-
-		public String getInitParameter(String arg0) {
-			return config.getInitParameter(arg0);
-		}
-
-		public Enumeration getInitParameterNames() {
-			return config.getInitParameterNames();
-		}
-
-		public ServletContext getServletContext() {
-			return context;
-		}
-
-		public String getServletName() {
-			return config.getServletName();
-		}
-	}
-
-	private class ServletContextAdaptor implements ServletContext {
-
-		private ServletContext delegate;
-
-		public ServletContextAdaptor(ServletContext delegate) {
-			this.delegate = delegate;
-		}
-
-		public RequestDispatcher getRequestDispatcher(String path) {
-			if (contextPath.equals("/")) //$NON-NLS-1$
-				return new RequestDispatcherAdaptor(delegate.getRequestDispatcher(path));
-			return new RequestDispatcherAdaptor(delegate.getRequestDispatcher(contextPath + path));
-		}
-
-		public URL getResource(String name) throws MalformedURLException {
-			return delegate.getResource(name);
-		}
-
-		public InputStream getResourceAsStream(String name) {
-			return delegate.getResourceAsStream(name);
-		}
-
-		public Set getResourcePaths(String name) {
-			return delegate.getResourcePaths(name);
-		}
-
-		public Object getAttribute(String arg0) {
-			return delegate.getAttribute(arg0);
-		}
-
-		public Enumeration getAttributeNames() {
-			return delegate.getAttributeNames();
-		}
-
-		public ServletContext getContext(String arg0) {
-			return delegate.getContext(arg0);
-		}
-
-		public String getInitParameter(String arg0) {
-			return delegate.getInitParameter(arg0);
-		}
-
-		public Enumeration getInitParameterNames() {
-			return delegate.getInitParameterNames();
-		}
-
-		public int getMajorVersion() {
-			return delegate.getMajorVersion();
-		}
-
-		public String getMimeType(String arg0) {
-			return delegate.getMimeType(arg0);
-		}
-
-		public int getMinorVersion() {
-			return delegate.getMinorVersion();
-		}
-
-		public RequestDispatcher getNamedDispatcher(String arg0) {
-			return new RequestDispatcherAdaptor(delegate.getNamedDispatcher(arg0));
-		}
-
-		public String getRealPath(String arg0) {
-			return delegate.getRealPath(arg0);
-		}
-
-		public String getServerInfo() {
-			return delegate.getServerInfo();
-		}
-
-		/** @deprecated **/
-		public Servlet getServlet(String arg0) throws ServletException {
-			return delegate.getServlet(arg0);
-		}
-
-		public String getServletContextName() {
-			return delegate.getServletContextName();
-		}
-
-		/** @deprecated **/
-		public Enumeration getServletNames() {
-			return delegate.getServletNames();
-		}
-
-		/** @deprecated **/
-		public Enumeration getServlets() {
-			return delegate.getServlets();
-		}
-
-		/** @deprecated **/
-		public void log(Exception arg0, String arg1) {
-			delegate.log(arg0, arg1);
-		}
-
-		public void log(String arg0, Throwable arg1) {
-			delegate.log(arg0, arg1);
-		}
-
-		public void log(String arg0) {
-			delegate.log(arg0);
-		}
-
-		public void removeAttribute(String arg0) {
-			delegate.removeAttribute(arg0);
-		}
-
-		public void setAttribute(String arg0, Object arg1) {
-			delegate.setAttribute(arg0, arg1);
-		}
-	}
-
-	private class HttpServletRequestAdaptor extends HttpServletRequestWrapper {
-		static final String INCLUDE_REQUEST_URI_ATTRIBUTE = "javax.servlet.include.request_uri"; //$NON-NLS-1$
-		static final String INCLUDE_CONTEXT_PATH_ATTRIBUTE = "javax.servlet.include.context_path"; //$NON-NLS-1$
-		static final String INCLUDE_SERVLET_PATH_ATTRIBUTE = "javax.servlet.include.servlet_path"; //$NON-NLS-1$
-		static final String INCLUDE_PATH_INFO_ATTRIBUTE = "javax.servlet.include.path_info"; //$NON-NLS-1$
-		private boolean isRequestDispatcherInclude;
-
-		public HttpServletRequestAdaptor(HttpServletRequest req) {
-			super(req);
-			isRequestDispatcherInclude = req.getAttribute(HttpServletRequestAdaptor.INCLUDE_REQUEST_URI_ATTRIBUTE) != null;
-		}
-
-		public String getServletPath() {
-			if (isRequestDispatcherInclude)
-				return super.getServletPath();
-
-			String fullPath = super.getServletPath();
-			return fullPath.substring(contextPath.length());
-		}
-
-		public String getContextPath() {
-			if (isRequestDispatcherInclude)
-				return super.getContextPath();
-
-			return super.getContextPath() + contextPath;
-		}
-
-		public Object getAttribute(String attributeName) {
-			if (isRequestDispatcherInclude) {
-				if (attributeName.equals(HttpServletRequestAdaptor.INCLUDE_CONTEXT_PATH_ATTRIBUTE)) {
-					String contextPathAttribute = (String) super.getAttribute(HttpServletRequestAdaptor.INCLUDE_CONTEXT_PATH_ATTRIBUTE);
-					if (contextPathAttribute == null || contextPathAttribute.equals("/")) //$NON-NLS-1$
-						return contextPath;
-
-					return contextPathAttribute + contextPath;
-				} else if (attributeName.equals(HttpServletRequestAdaptor.INCLUDE_SERVLET_PATH_ATTRIBUTE)) {
-					String servletPath = (String) super.getAttribute(HttpServletRequestAdaptor.INCLUDE_SERVLET_PATH_ATTRIBUTE);
-					return servletPath.substring(contextPath.length());
-				}
-			}
-			return super.getAttribute(attributeName);
-		}
-
-		public RequestDispatcher getRequestDispatcher(String arg0) {
-			return new RequestDispatcherAdaptor(super.getRequestDispatcher(contextPath + arg0));
-		}
-	}
-	
-	private class RequestDispatcherAdaptor implements RequestDispatcher {
-
-		private RequestDispatcher requestDispatcher;
-		public RequestDispatcherAdaptor(RequestDispatcher requestDispatcher) {
-			this.requestDispatcher = requestDispatcher;
-		}
-
-		public void forward(ServletRequest req, ServletResponse resp) throws ServletException, IOException {
-			if (req instanceof HttpServletRequestAdaptor)
-				req = ((HttpServletRequestAdaptor) req).getRequest();
-			
-			requestDispatcher.forward(req, resp);
-		}
-
-		public void include(ServletRequest req, ServletResponse resp) throws ServletException, IOException {
-			if (req instanceof HttpServletRequestAdaptor)
-				req = ((HttpServletRequestAdaptor) req).getRequest();
-			
-			requestDispatcher.include(req, resp);
-		}
-	}
-}

diff --git a/server-side/bundles/org.eclipse.equinox.http.helper/src/org/eclipse/equinox/http/helper/FilterServletAdaptor.java b/server-side/bundles/org.eclipse.equinox.http.helper/src/org/eclipse/equinox/http/helper/FilterServletAdaptor.java
deleted file mode 100644
index bafff51..0000000
--- a/server-side/bundles/org.eclipse.equinox.http.helper/src/org/eclipse/equinox/http/helper/FilterServletAdaptor.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation
- * 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
- *******************************************************************************/
-package org.eclipse.equinox.http.helper;
-
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.Properties;
-import javax.servlet.*;
-
-public class FilterServletAdaptor implements Servlet {
-
-	ServletConfig config;
-	Servlet delegate;
-	Filter filter;
-	Properties filterInitParameters;
-	private FilterChain filterChain;
-
-	public FilterServletAdaptor(Filter filter, Properties filterInitParameters, Servlet delegate) {
-		this.delegate = delegate;
-		this.filter = filter;
-		this.filterInitParameters = (filterInitParameters == null) ? new Properties(): filterInitParameters;
-		this.filterChain = new FilterChainImpl();
-	}
-
-	public void init(ServletConfig config) throws ServletException {
-		this.config = config;
-		filter.init(new FilterConfigImpl());
-		delegate.init(config);
-	}
-
-	public void service(ServletRequest request, ServletResponse response) throws ServletException, IOException {
-		filter.doFilter(request, response, filterChain);
-	}
-
-	public void destroy() {
-		delegate.destroy();
-		filter.destroy();
-		config = null;
-	}
-
-	public ServletConfig getServletConfig() {
-		return config;
-	}
-
-	public String getServletInfo() {
-		return ""; //$NON-NLS-1$
-	}
-	public class FilterChainImpl implements FilterChain {
-
-		public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException {
-			delegate.service(request, response);
-		}
-
-	}
-	
-	class FilterConfigImpl implements FilterConfig {
-
-		public String getFilterName() {
-			String filterName = filterInitParameters.getProperty("filter-name"); //$NON-NLS-1$
-			if(filterName == null)
-				filterName = filter.getClass().getName();
-			
-			return filterName;
-		}
-
-		public String getInitParameter(String name) {
-			return filterInitParameters.getProperty(name);
-		}
-
-		public Enumeration getInitParameterNames() {
-			return filterInitParameters.propertyNames();
-		}
-
-		public ServletContext getServletContext() {
-			return config.getServletContext();
-		}
-	}
-}

diff --git a/server-side/bundles/org.eclipse.equinox.http.helper/src/org/eclipse/equinox/http/helper/ResourceServlet.java b/server-side/bundles/org.eclipse.equinox.http.helper/src/org/eclipse/equinox/http/helper/ResourceServlet.java
deleted file mode 100644
index cda3665..0000000
--- a/server-side/bundles/org.eclipse.equinox.http.helper/src/org/eclipse/equinox/http/helper/ResourceServlet.java
+++ /dev/null

@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Cognos Incorporated, 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
- *******************************************************************************/
-package org.eclipse.equinox.http.helper;
-
-import java.io.*;
-import java.net.URL;
-import java.net.URLConnection;
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class ResourceServlet implements Servlet {
-
-	private static final String LAST_MODIFIED = "Last-Modified"; //$NON-NLS-1$
-	private static final String IF_MODIFIED_SINCE = "If-Modified-Since"; //$NON-NLS-1$
-	private static final String IF_NONE_MATCH = "If-None-Match"; //$NON-NLS-1$
-	private static final String ETAG = "ETag"; //$NON-NLS-1$
-
-	private String internalName;
-	private ServletConfig config;
-
-	public ResourceServlet() {
-		this.internalName = ""; //$NON-NLS-1$
-	}
-	
-	public ResourceServlet(String internalName) {
-		this.internalName = internalName;
-		if (internalName == null || internalName.equals("/")) { //$NON-NLS-1$
-			this.internalName = ""; //$NON-NLS-1$
-		}
-	}
-
-	public void init(ServletConfig config) throws ServletException {
-		this.config = config;
-		String baseName = config.getInitParameter("base-name"); //$NON-NLS-1$
-		if (baseName != null) {
-			if (baseName.equals("/")) //$NON-NLS-1$
-				internalName = ""; //$NON-NLS-1$
-			else
-				internalName = baseName;
-		}		
-	}
-
-	public void service(ServletRequest req, ServletResponse resp) throws ServletException, IOException {
-		HttpServletRequest httpRequest = (HttpServletRequest) req;
-		HttpServletResponse httpResponse = (HttpServletResponse) resp;
-	
-		String method = httpRequest.getMethod();
-		if (method.equals("GET") || method.equals("POST") || method.equals("HEAD")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
-			String resourcePath = internalName + httpRequest.getPathInfo();
-			if (!writeResource(httpRequest, httpResponse, resourcePath)) {
-				httpResponse.setStatus(HttpServletResponse.SC_NOT_FOUND);
-			}
-		} else
-			httpResponse.setStatus(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
-	}
-
-	public void destroy() {
-		config = null;
-	}
-
-	public ServletConfig getServletConfig() {
-		return config;
-	}
-
-	public String getServletInfo() {
-		return ""; //$NON-NLS-1$
-	}
-	
-	private boolean writeResource(final HttpServletRequest req, final HttpServletResponse resp, final String resourcePath) throws IOException {
-		ServletContext servletContext = config.getServletContext();
-		URL url = servletContext.getResource(resourcePath);
-		if (url == null)
-			return false;
-
-		URLConnection connection = url.openConnection();
-		long lastModified = connection.getLastModified();
-		int contentLength = connection.getContentLength();
-
-		String etag = null;
-		if (lastModified != -1 && contentLength != -1)
-			etag = "W/\"" + contentLength + "-" + lastModified + "\""; //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
-
-		// Check for cache revalidation.
-		// We should prefer ETag validation as the guarantees are stronger and all HTTP 1.1 clients should be using it
-		String ifNoneMatch = req.getHeader(IF_NONE_MATCH);
-		if (ifNoneMatch != null && etag != null && ifNoneMatch.indexOf(etag) != -1) {
-			resp.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
-			return true;
-		} else {
-			long ifModifiedSince = req.getDateHeader(IF_MODIFIED_SINCE);
-			// for purposes of comparison we add 999 to ifModifiedSince since the fidelity
-			// of the IMS header generally doesn't include milli-seconds
-			if (ifModifiedSince > -1 && lastModified > 0 && lastModified <= (ifModifiedSince + 999)) {
-				resp.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
-				return true;
-			}
-		}
-
-		// return the full contents regularly
-		if (contentLength != -1)
-			resp.setContentLength(contentLength);
-
-		String contentType = servletContext.getMimeType(resourcePath);
-		if (contentType == null)
-			contentType = servletContext.getMimeType(resourcePath);
-
-		if (contentType != null)
-			resp.setContentType(contentType);
-
-		if (lastModified > 0)
-			resp.setDateHeader(LAST_MODIFIED, lastModified);
-
-		if (etag != null)
-			resp.setHeader(ETAG, etag);
-
-		InputStream is = null;
-		try {
-			is = connection.getInputStream();
-			OutputStream os = resp.getOutputStream();
-			byte[] buffer = new byte[8192];
-			int bytesRead = is.read(buffer);
-			int writtenContentLength = 0;
-			while (bytesRead != -1) {
-				os.write(buffer, 0, bytesRead);
-				writtenContentLength += bytesRead;
-				bytesRead = is.read(buffer);
-			}
-			if (contentLength == -1 || contentLength != writtenContentLength)
-				resp.setContentLength(writtenContentLength);
-		} finally {
-			if (is != null)
-				is.close();
-		}
-		return true;
-	}
-}

diff --git a/server-side/bundles/org.eclipse.equinox.servletbridge.feature/.project b/server-side/bundles/org.eclipse.equinox.servletbridge.feature/.project
deleted file mode 100644
index ac0da0c..0000000
--- a/server-side/bundles/org.eclipse.equinox.servletbridge.feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.equinox.servletbridge.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/server-side/bundles/org.eclipse.equinox.servletbridge.feature/build.properties b/server-side/bundles/org.eclipse.equinox.servletbridge.feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/server-side/bundles/org.eclipse.equinox.servletbridge.feature/build.properties
+++ /dev/null

@@ -1 +0,0 @@
-bin.includes = feature.xml

diff --git a/server-side/bundles/org.eclipse.equinox.servletbridge.feature/feature.xml b/server-side/bundles/org.eclipse.equinox.servletbridge.feature/feature.xml
deleted file mode 100644
index 5cc8599..0000000
--- a/server-side/bundles/org.eclipse.equinox.servletbridge.feature/feature.xml
+++ /dev/null

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.equinox.servletbridge.feature"
-      label="Servletbridge Feature"
-      version="1.0.0"
-      provider-name="eclipse.org">
-
-   <description>
-      The Servletbridge feature is used to hold the default plugins and dependencies used to build the bridge WebARchive.
-   </description>
-
-   <copyright>
-      2006 Cognos Inc.
-   </copyright>
-
-   <license url="http://www.eclipse.org/legal/epl-v10.html">
-      ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT
-   </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.registry"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.update.configurator"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.http.registry"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.http.servlet"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.http.servletbridge"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
commit	28de4dbf1688394ba8531e5bc6273f26b730ee7f	[log] [tgz]
author	cvs2svn <platform-releng-dev@eclipse.org>	Thu May 10 18:07:52 2007 +0000
committer	cvs2svn <platform-releng-dev@eclipse.org>	Thu May 10 18:07:52 2007 +0000
tree	66b33edbaf8ccf42e77f6169a3ec2a3bf570f25f
parent	30a2d515484339d3bae287917fe24be251006dc3 [diff]