diff --git a/ide/allmodules/nbproject/project.xml b/ide/allmodules/nbproject/project.xml
--- a/ide/allmodules/nbproject/project.xml
+++ b/ide/allmodules/nbproject/project.xml
@@ -164,6 +164,8 @@
../../editor.bracesmatching
../../editor.codetemplates
../../editor.completion
+ ../../editor.deprecated.pre61completion
+ ../../editor.deprecated.pre61settings
../../editor.errorstripe
../../editor.errorstripe.api
../../editor.fold
@@ -189,6 +191,9 @@
../../form
../../form.j2ee
../../form.kit
+ ../../glassfish.common
+ ../../glassfish.javaee
+ ../../glassfish.jruby
../../gototest
../../groovy.editor
../../groovy.grails
@@ -199,6 +204,9 @@
../../gsf
../../gsf.api
../../gsfpath.api
+ ../../hibernate
+ ../../hibernatelib
+ ../../hibernateweb
../../html
../../html.editor
../../html.editor.lib
@@ -293,10 +301,15 @@
../../javascript.hints
../../javascript.kit
../../javascript.libraries
- ../../javascript.libraries.woodstock
- ../../javascript.libraries.yahooui
+ ../../javascript.libraries.dojo
+ ../../javascript.libraries.jquery
+ ../../javascript.libraries.kit
+ ../../javascript.libraries.prototype
+ ../../javascript.libraries.scriptaculous
../../javascript.refactoring
../../javawebstart
+ ../../jellytools
+ ../../jemmy
../../jsp.lexer
../../jumpto
../../junit
@@ -329,6 +342,7 @@
../../libs.jna
../../libs.jsch
../../libs.jsr223
+ ../../libs.junit4
../../libs.jxpath
../../libs.lucene
../../libs.ppawtlayout
@@ -365,6 +379,7 @@
../../mobility.snippets
../../mobility.svgcore
../../mvd
+ ../../nbjunit
../../o.apache.tools.ant.module
../../o.apache.xml.resolver
../../o.jdesktop.beansbinding
@@ -701,6 +716,7 @@
../../xsl
../../xslt.core
../../xslt.help
+ ../../xslt.kit
../../xslt.mapper
../../xslt.model
../../xslt.project
diff --git a/javascript.libraries.kit/nbproject/project.xml b/javascript.libraries.kit/nbproject/project.xml
--- a/javascript.libraries.kit/nbproject/project.xml
+++ b/javascript.libraries.kit/nbproject/project.xml
@@ -53,6 +53,34 @@
+ org.netbeans.modules.javascript.libraries.dojo
+
+ 1
+ 1.0
+
+
+
+ org.netbeans.modules.javascript.libraries.jquery
+
+ 1
+ 1.0
+
+
+
+ org.netbeans.modules.javascript.libraries.prototype
+
+ 1
+ 1.0
+
+
+
+ org.netbeans.modules.javascript.libraries.scriptaculous
+
+ 1
+ 1.0
+
+
+
org.netbeans.modules.javascript.libraries.woodstock
1
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -61,7 +61,8 @@
nb.cluster.profiler,\
nb.cluster.mobility,\
nb.cluster.visualweb,\
- nb.cluster.identity
+ nb.cluster.identity,\
+ nb.cluster.webcommon
clusters.config.full.list=\
${clusters.config.standard.list},\
@@ -78,7 +79,8 @@
nb.cluster.harness,\
nb.cluster.ide,\
nb.cluster.gsf,\
- nb.cluster.php
+ nb.cluster.php,\
+ nb.cluster.webcommon
clusters.config.groovy.list=\
nb.cluster.nb,\
@@ -95,7 +97,9 @@
nb.cluster.harness,\
nb.cluster.ide,\
nb.cluster.gsf,\
- nb.cluster.ruby
+ nb.cluster.ruby,\
+ nb.cluster.webcommon
+
clusters.config.cnd.list=\
nb.cluster.nb,\
@@ -117,7 +121,8 @@
${clusters.config.java.list},\
nb.cluster.j2ee,\
nb.cluster.gsf,\
- nb.cluster.profiler
+ nb.cluster.profiler,\
+ nb.cluster.webcommon
clusters.config.soa.list=\
${clusters.config.java.list},\
@@ -1128,14 +1133,7 @@
contrib/tasklist.usertasks,\
contrib/visualweb.samples.postrel,\
contrib/whichproject,\
- contrib/xtc,\
- javascript.libraries,\
- javascript.libraries.dojo,\
- javascript.libraries.jquery,\
- javascript.libraries.prototype,\
- javascript.libraries.scriptaculous,\
- javascript.libraries.woodstock,\
- javascript.libraries.yahooui
+ contrib/xtc
nb.cluster.javafx.dir=javafx
nb.cluster.javafx.depends=${clusters.config.full.list}
@@ -1165,6 +1163,20 @@
nb.cluster.javafx
# need to build j2ee and gsf to build profiler
+# webcommon cluster
+nb.cluster.webcommon.dir=webcommon1
+nb.cluster.webcommon.depends=\
+ nb.cluster.platform,\
+ nb.cluster.ide
+nb.cluster.webcommon=\
+ javascript.libraries,\
+ javascript.libraries.dojo,\
+ javascript.libraries.jquery,\
+ javascript.libraries.kit,\
+ javascript.libraries.prototype,\
+ javascript.libraries.scriptaculous
+ javascript.libraries.woodstock,\
+ javascript.libraries.yahooui
# Unbuildable against new java/source:
# contrib/importcruncher,\