diff -Nur -x '*.orig' -x '*~' netbeans-6.1/form.kit/nbproject/project.xml netbeans-6.1.new/form.kit/nbproject/project.xml --- netbeans-6.1/form.kit/nbproject/project.xml 2008-06-16 17:33:03.000000000 +0400 +++ netbeans-6.1.new/form.kit/nbproject/project.xml 2008-06-16 17:36:44.000000000 +0400 @@ -12,13 +12,13 @@ <specification-version>1.22</specification-version> </run-dependency> </dependency> - <dependency> + <!--dependency> <code-name-base>org.netbeans.modules.form.j2ee</code-name-base> <run-dependency> <release-version>0</release-version> <specification-version>0.1</specification-version> </run-dependency> - </dependency> + </dependency--> <dependency> <code-name-base>org.netbeans.modules.i18n.form</code-name-base> <run-dependency> @@ -26,12 +26,12 @@ <specification-version>1.21</specification-version> </run-dependency> </dependency> - <dependency> + <!--dependency> <code-name-base>org.netbeans.modules.j2ee.persistence.kit</code-name-base> <run-dependency> <specification-version>1.0</specification-version> </run-dependency> - </dependency> + </dependency--> <dependency> <code-name-base>org.netbeans.modules.java.kit</code-name-base> <run-dependency> diff -Nur -x '*.orig' -x '*~' netbeans-6.1/ide.kit/nbproject/project.xml netbeans-6.1.new/ide.kit/nbproject/project.xml --- netbeans-6.1/ide.kit/nbproject/project.xml 2008-06-16 17:33:03.000000000 +0400 +++ netbeans-6.1.new/ide.kit/nbproject/project.xml 2008-06-16 17:36:44.000000000 +0400 @@ -130,13 +130,13 @@ <specification-version>1.11</specification-version> </run-dependency> </dependency> - <dependency> + <!--dependency> <code-name-base>org.netbeans.modules.httpserver</code-name-base> <run-dependency> <release-version>2</release-version> <specification-version>2.7</specification-version> </run-dependency> - </dependency> + </dependency--> <dependency> <code-name-base>org.netbeans.modules.ide.branding</code-name-base> <run-dependency> diff -Nur -x '*.orig' -x '*~' netbeans-6.1/java.kit/nbproject/project.xml netbeans-6.1.new/java.kit/nbproject/project.xml --- netbeans-6.1/java.kit/nbproject/project.xml 2008-06-16 17:33:03.000000000 +0400 +++ netbeans-6.1.new/java.kit/nbproject/project.xml 2008-06-16 17:37:41.000000000 +0400 @@ -66,13 +66,13 @@ <specification-version>1.6</specification-version> </run-dependency> </dependency> - <dependency> + <!--dependency> <code-name-base>org.netbeans.modules.java.examples</code-name-base> <run-dependency> <release-version>1</release-version> <specification-version>1.6</specification-version> </run-dependency> - </dependency> + </dependency--> <dependency> <code-name-base>org.netbeans.modules.java.freeform</code-name-base> <run-dependency> @@ -169,7 +169,7 @@ <specification-version>1.1</specification-version> </run-dependency> </dependency> - <dependency> + <!--dependency> <code-name-base>org.netbeans.modules.websvc.jaxws21</code-name-base> <run-dependency> <release-version>1</release-version> @@ -187,7 +187,7 @@ <run-dependency> <specification-version>1.0</specification-version> </run-dependency> - </dependency> + </dependency--> </module-dependencies> <public-packages/> </data> diff -Nur -x '*.orig' -x '*~' netbeans-6.1/nbbuild/cluster.properties netbeans-6.1.new/nbbuild/cluster.properties --- netbeans-6.1/nbbuild/cluster.properties 2008-06-16 17:33:03.000000000 +0400 +++ netbeans-6.1.new/nbbuild/cluster.properties 2008-06-16 17:36:44.000000000 +0400 @@ -231,14 +231,6 @@ api.xml,\ classfile,\ core.ide,\ - db,\ - db.core,\ - db.drivers,\ - db.kit, \ - db.mysql, \ - db.sql.editor,\ - db.sql.visualeditor,\ - dbapi,\ defaults,\ diff,\ editor,\ @@ -263,7 +255,6 @@ editor.util,\ extbrowser,\ gototest,\ - httpserver,\ ide.kit,\ image,\ jumpto,\ @@ -300,7 +291,6 @@ refactoring.api,\ schema2beans,\ server,\ - servletapi,\ spi.debugger.ui,\ spi.editor.hints,\ spi.navigator,\ @@ -319,7 +309,6 @@ versioning,\ versioning.system.cvss,\ versioning.util,\ - web.flyingsaucer,\ xml,\ xml.axi,\ xml.catalog,\ @@ -334,8 +323,7 @@ xml.tools,\ xml.wsdl.model,\ xml.xam,\ - xml.xdm,\ - xsl + xml.xdm nb.cluster.java.dir=java2 nb.cluster.java.depends=\ @@ -349,27 +337,19 @@ ant.kit,\ api.debugger.jpda,\ api.java,\ - beans,\ - dbschema,\ + beans,\ debugger.jpda,\ debugger.jpda.ant,\ debugger.jpda.projects,\ debugger.jpda.ui,\ - derby,\ form,\ - form.j2ee,\ form.kit,\ i18n,\ i18n.form,\ j2ee.core.utilities,\ - 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,\ @@ -395,16 +375,10 @@ junit,\ libs.javacapi,\ libs.javacimpl,\ - libs.springframework,\ o.apache.tools.ant.module,\ o.jdesktop.beansbinding,\ refactoring.java,\ - spring.beans,\ swingapp,\ - websvc.jaxws21,\ - websvc.jaxws21api,\ - websvc.serviceapi,\ - xml.jaxb, \ xml.tools.java nb.cluster.xml.dir=xml2