diff -ruN netbeans-7.0.1-pristine/nbbuild/build.properties netbeans-7.0.1-patched/nbbuild/build.properties
--- netbeans-7.0.1-pristine/nbbuild/build.properties	2011-07-28 20:46:12.000000000 -0400
+++ netbeans-7.0.1-patched/nbbuild/build.properties	2011-11-07 11:30:09.882000039 -0500
@@ -153,7 +153,6 @@
     lexer,\
     api.xml,\
     o.apache.tools.ant.module,\
-    db,\
     spi.quicksearch,\
     print,\
     extexecution
diff -ruN netbeans-7.0.1-pristine/nbbuild/cluster.properties netbeans-7.0.1-patched/nbbuild/cluster.properties
--- netbeans-7.0.1-pristine/nbbuild/cluster.properties	2011-07-28 20:46:12.000000000 -0400
+++ netbeans-7.0.1-patched/nbbuild/cluster.properties	2011-11-07 19:48:50.970999121 -0500
@@ -71,7 +71,6 @@
         ${clusters.config.platform.list},\
         nb.cluster.ide,\
         nb.cluster.php,\
-        nb.cluster.websvccommon,\
         nb.cluster.nb
 
 clusters.config.groovy.list=\
@@ -95,7 +94,6 @@
 clusters.config.java.list=\
         ${clusters.config.platform.list},\
         nb.cluster.ide,\
-        nb.cluster.websvccommon,\
         nb.cluster.java,\
         nb.cluster.profiler,\
         nb.cluster.nb
@@ -224,21 +222,8 @@
         csl.api,\
         css.editor,\
         css.visual,\
-        db,\
-        db.core,\
-        db.dataview,\
-        db.drivers,\
-        db.kit,\
-        db.metadata.model,\
-        db.mysql,\
-        db.sql.editor,\
-        db.sql.visualeditor,\
-        dbapi,\
         defaults,\
-        derby,\
         diff,\
-        dlight.nativeexecution,\
-        dlight.terminal,\
         editor,\
         editor.actions,\
         editor.bookmarks,\
@@ -264,8 +249,6 @@
         editor.util,\
         extbrowser,\
         extexecution,\
-        extexecution.destroy,\
-        glassfish.common,\
         gototest,\
         gsf.codecoverage,\
         gsf.testrunner,\
@@ -273,18 +256,8 @@
         html.editor,\
         html.editor.lib,\
         html.lexer,\
-        html.parser,\
-        html.validation,\
-        httpserver,\
-        hudson,\
-        hudson.mercurial,\
-        hudson.subversion,\
         ide.kit,\
         image,\
-        javascript.editing,\
-        javascript.hints,\
-        javascript.kit,\
-        javascript.refactoring,\
         jellytools.ide,\
         jumpto,\
         languages,\
@@ -305,21 +278,17 @@
         libs.freemarker,\
         libs.ini4j,\
         libs.jakarta_oro,\
-        libs.jaxb,\
         libs.jsch,\
         libs.jvyamlb,\
         libs.jzlib,\
         libs.lucene,\
         libs.smack,\
         libs.svnClientAdapter,\
-        libs.svnClientAdapter.javahl,\
-        libs.svnClientAdapter.svnkit,\
         libs.swingx,\
         libs.xerces,\
         localhistory,\
         mercurial,\
         o.apache.xml.resolver,\
-        o.mozilla.rhino.patched,\
         o.n.swing.dirchooser,\
         o.openidex.util,\
         options.editor,\
@@ -342,7 +311,6 @@
         spellchecker.apimodule,\
         spellchecker.bindings.htmlxml,\
         spellchecker.bindings.properties,\
-        spellchecker.dictionary_en,\
         spellchecker.kit,\
         spi.debugger.ui,\
         spi.editor.hints,\
@@ -371,7 +339,6 @@
         xml.axi,\
         xml.catalog,\
         xml.core,\
-        xml.jaxb.api,\
         xml.lexer,\
         xml.multiview,\
         xml.retriever,\
@@ -382,8 +349,8 @@
         xml.tools,\
         xml.wsdl.model,\
         xml.xam,\
-        xml.xdm,\
-        xsl
+        xml.xdm
+
 validation.nb.cluster.ide=\
         ide.kit
 
@@ -391,7 +358,6 @@
 nb.cluster.java.depends=\
         nb.cluster.ide,\
         nb.cluster.platform,\
-        nb.cluster.websvccommon,\
         nb.cluster.harness
 nb.cluster.java=\
         ant.browsetask,\
@@ -403,31 +369,18 @@
         api.java,\
         beans,\
         classfile,\
-        dbschema,\
         debugger.jpda,\
         debugger.jpda.ant,\
         debugger.jpda.projects,\
         debugger.jpda.ui,\
         form,\
-        form.j2ee,\
         form.kit,\
-        hibernate,\
-        hibernatelib,\
-        hudson.ant,\
-        hudson.maven,\
         i18n,\
         i18n.form,\
         j2ee.core.utilities,\
-        j2ee.eclipselink,\
-        j2ee.eclipselinkmodelgen,\
-        j2ee.jpa.refactoring,\
-        j2ee.jpa.verification,\
         j2ee.metadata,\
         j2ee.metadata.model.support,\
-        j2ee.persistence,\
-        j2ee.persistence.kit,\
         j2ee.persistenceapi,\
-        j2ee.toplinklib,\
         java.api.common,\
         java.debug,\
         java.editor,\
@@ -457,34 +410,13 @@
         libs.cglib,\
         libs.javacapi,\
         libs.javacimpl,\
-        libs.springframework,\
-        maven,\
-        maven.coverage,\
-        maven.embedder,\
-        maven.grammar,\
-        maven.graph,\
-        maven.hints,\
-        maven.indexer,\
-        maven.junit,\
-        maven.kit,\
-        maven.model,\
-        maven.osgi,\
-        maven.persistence,\
-        maven.repository,\
-        maven.search,\
-        maven.spring,\
         o.apache.tools.ant.module,\
         o.jdesktop.beansbinding,\
         projectimport.eclipse.core,\
         projectimport.eclipse.j2se,\
         refactoring.java,\
         spellchecker.bindings.java,\
-        spring.beans,\
         swingapp,\
-        websvc.jaxws21,\
-        websvc.jaxws21api,\
-        websvc.saas.codegen.java,\
-        xml.jaxb,\
         xml.tools.java
 validation.nb.cluster.java=\
         java.kit
@@ -497,75 +429,34 @@
         nb.cluster.harness
 nb.cluster.apisupport=\
         apisupport.ant,\
-        apisupport.crudsample,\
-        apisupport.feedreader,\
-        apisupport.installer,\
-        apisupport.installer.maven,\
         apisupport.kit,\
         apisupport.osgidemo,\
         apisupport.paintapp,\
         apisupport.project,\
-        apisupport.refactoring,\
-        maven.apisupport
+        apisupport.refactoring
 
 nb.cluster.enterprise.dir=enterprise
 nb.cluster.enterprise.depends=\
         nb.cluster.java,\
         nb.cluster.ide,\
         nb.cluster.profiler,\
-        nb.cluster.websvccommon,\
         nb.cluster.platform,\
         nb.cluster.harness
 nb.cluster.enterprise=\
         api.web.webmodule,\
-        apisupport.facebooksample,\
-        apisupport.restsample,\
         el.lexer,\
-        glassfish.eecommon,\
-        glassfish.javaee,\
         hibernateweb,\
-        j2ee.ant,\
-        j2ee.api.ejbmodule,\
-        j2ee.archive,\
-        j2ee.clientproject,\
-        j2ee.common,\
-        j2ee.core,\
-        j2ee.dd,\
-        j2ee.dd.webservice,\
-        j2ee.ddloaders,\
-        j2ee.earproject,\
-        j2ee.ejbcore,\
-        j2ee.ejbjarproject,\
-        j2ee.ejbrefactoring,\
-        j2ee.ejbverification,\
-        j2ee.genericserver,\
-        j2ee.jboss4,\
-        j2ee.kit,\
-        j2ee.platform,\
-        j2ee.samples,\
-        j2ee.sun.appsrv,\
-        j2ee.sun.dd,\
-        j2ee.sun.ddui,\
-        j2ee.weblogic9,\
-        j2eeapis,\
-        j2eeserver,\
         javaee.api,\
         javaee.beanvalidation,\
         jellytools.enterprise,\
         jsp.lexer,\
         libs.commons_fileupload,\
         libs.elimpl,\
-        libs.glassfish_logging,\
-        maven.j2ee,\
-        maven.jaxws,\
-        maven.samples,\
-        profiler.j2ee,\
         projectimport.eclipse.web,\
         servletjspapi,\
         spring.webmvc,\
         tomcat5,\
         web.beans,\
-        web.client.javascript.debugger.ant,\
         web.core,\
         web.core.syntax,\
         web.debug,\
@@ -588,33 +480,7 @@
         web.primefaces,\
         web.project,\
         web.refactoring,\
-        web.struts,\
-        websvc.clientapi,\
-        websvc.core,\
-        websvc.customization,\
-        websvc.design,\
-        websvc.editor.hints,\
-        websvc.jaxws.lightapi,\
-        websvc.jaxwsapi,\
-        websvc.jaxwsmodel,\
-        websvc.kit,\
-        websvc.manager,\
-        websvc.metro.lib,\
-        websvc.metro.model,\
-        websvc.metro.samples,\
-        websvc.projectapi,\
-        websvc.rest,\
-        websvc.rest.samples,\
-        websvc.restapi,\
-        websvc.restkit,\
-        websvc.restlib,\
-        websvc.saas.codegen.j2ee,\
-        websvc.utilities,\
-        websvc.websvcapi,\
-        websvc.wsitconf,\
-        websvc.wsitmodelext,\
-        websvc.wsstack.jaxws,\
-        websvc.wsstackapi
+        web.struts
 
 nb.cluster.ergonomics.dir=ergonomics
 nb.cluster.ergonomics.depends=nb.cluster.ide,nb.cluster.platform
@@ -646,8 +512,6 @@
         apisupport.harness,\
         jellytools.platform,\
         jemmy,\
-        libs.nbi.ant,\
-        libs.nbi.engine,\
         nbjunit,\
         o.n.insane
 
@@ -662,16 +526,10 @@
         lib.profiler.charts,\
         lib.profiler.common,\
         lib.profiler.ui,\
-        maven.profiler,\
         profiler,\
         profiler.attach,\
         profiler.attach.impl,\
         profiler.freeform,\
-        profiler.j2ee.generic,\
-        profiler.j2ee.jboss,\
-        profiler.j2ee.sunas,\
-        profiler.j2ee.tomcat,\
-        profiler.j2ee.weblogic,\
         profiler.j2se,\
         profiler.nbmodule,\
         profiler.oql,\
@@ -688,13 +546,11 @@
 nb.cluster.php.dir=php
 nb.cluster.php.depends=\
         nb.cluster.platform,\
-        nb.cluster.ide,\
-        nb.cluster.websvccommon
+        nb.cluster.ide
 nb.cluster.php=\
         languages.ini,\
         libs.javacup,\
         php.api.phpmodule,\
-        php.dbgp,\
         php.editor,\
         php.help,\
         php.kit,\
@@ -704,8 +560,7 @@
         php.refactoring,\
         php.samples,\
         php.symfony,\
-        php.zend,\
-        websvc.saas.codegen.php
+        php.zend
 validation.nb.cluster.php=\
         php.editor
 
@@ -728,7 +583,6 @@
 nb.cluster.mobility.depends=\
         nb.cluster.platform,\
         nb.cluster.java,\
-        nb.cluster.websvccommon,\
         nb.cluster.apisupport,\
         nb.cluster.ide,\
         nb.cluster.enterprise
@@ -886,7 +740,6 @@
         dlight.core.stack,\
         dlight.core.ui,\
         dlight.cpu,\
-        dlight.db.h2,\
         dlight.dtrace,\
         dlight.extras,\
         dlight.fops,\
@@ -917,17 +770,11 @@
 nb.cluster.stableuc=\
         apisupport.apidocs,\
         apisupport.tc.cobertura,\
-        bugtracking.kenai,\
-        db.mysql.sakila,\
-        j2ee.sun.appsrv81,\
         jconsole,\
         jira,\
         jmx,\
         jmx.common,\
         junitlib,\
-        kenai,\
-        kenai.maven,\
-        kenai.ui,\
         libs.jira,\
         libs.junit4,\
         libs.svnjavahlwin32,\
@@ -937,9 +784,7 @@
         o.apache.jmeter.module,\
         o.apache.tools.ant.module.docs,\
         profiler.loadgen,\
-        projectimport.jbuilder,\
-        team.kit,\
-        versioning.kenai
+        projectimport.jbuilder
 
 nb.cluster.experimental.dir=extra
 nb.cluster.experimental.depends=${clusters.config.full.list}
@@ -992,14 +837,8 @@
         contrib/gsfpath.api,\
         contrib/hexeditor,\
         contrib/htmlprojects,\
-        contrib/hudsonfindbugs,\
         contrib/imagepaste,\
         contrib/insertunicode,\
-        contrib/j2ee.blueprints,\
-        contrib/j2ee.geronimo2,\
-        contrib/j2ee.jetty,\
-        contrib/j2ee.oc4j,\
-        contrib/j2ee.sun.ws7,\
         contrib/java.ext.editor,\
         contrib/javahints,\
         contrib/jemmysupport,\
@@ -1040,7 +879,6 @@
         contrib/quickfilechooser,\
         contrib/scanondemand,\
         contrib/selenium,\
-        contrib/selenium.maven,\
         contrib/selenium.php,\
         contrib/selenium.server,\
         contrib/showtodos,\
@@ -1058,7 +896,6 @@
         contrib/tasklist.usertasks,\
         contrib/testng,\
         contrib/testng.ant,\
-        contrib/testng.maven,\
         contrib/web.flyingsaucer,\
         contrib/websvc.saas.services.rtm,\
         contrib/whichproject,\
@@ -1068,13 +905,8 @@
         core.browser.xulrunner.solaris,\
         core.browser.xulrunner.win,\
         git,\
-        j2ee.websphere6,\
         j2me.cdc.platform.bdj,\
         j2me.cdc.project.bdj,\
-        javascript.libraries,\
-        javascript.libraries.jquery,\
-        javascript.libraries.prototype,\
-        javascript.libraries.scriptaculous,\
         languages.refactoring,\
         libs.git,\
         libs.xmlbeans,\
@@ -1083,14 +915,7 @@
         uihandler.interactive,\
         web.facelets010114,\
         web.jsf.extensions,\
-        webpreview,\
-        websvc.axis2,\
-        websvc.jaxrpc,\
-        websvc.jaxrpc16,\
-        websvc.jaxrpckit,\
-        websvc.registry,\
-        websvc.rest.wadl.design,\
-        websvc.rest.wadl.model
+        webpreview
 # XXX broken after javascript.editing changes: contrib/languages.ejs
 # Started to fail with: contrib/scala.editor/scala-build.xml:83: Compilation failed because of an internal compiler error; see the error output for details.
         # contrib/libs.scala,\
@@ -1121,28 +946,6 @@
         web.client.tools.internetexplorer,\
         web.client.tools.kit
 
-nb.cluster.websvccommon.dir=websvccommon
-nb.cluster.websvccommon.depends=\
-        nb.cluster.ide,\
-        nb.cluster.platform
-nb.cluster.websvccommon=\
-        websvc.jaxwsmodelapi,\
-        websvc.saas.api,\
-        websvc.saas.codegen,\
-        websvc.saas.kit,\
-        websvc.saas.services.amazon,\
-        websvc.saas.services.delicious,\
-        websvc.saas.services.facebook,\
-        websvc.saas.services.flickr,\
-        websvc.saas.services.google,\
-        websvc.saas.services.strikeiron,\
-        websvc.saas.services.twitter,\
-        websvc.saas.services.weatherbug,\
-        websvc.saas.services.yahoo,\
-        websvc.saas.services.zillow,\
-        websvc.saas.services.zvents,\
-        websvc.saas.ui
-
 nb.cluster.javacard.dir=javacard
 nb.cluster.javacard.depends=\
         nb.cluster.ide,\