moceap pushed to netbeans (master). "Revert "Retire netbeans due to lack of a maintainer." (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Apr 14 01:52:26 UTC 2015
>From 001c6564f56d997a8ccd33425816a11b9ad3ce30 Mon Sep 17 00:00:00 2001
From: Mosaab Alzoubi <moceap at hotmail.com>
Date: Tue, 14 Apr 2015 04:51:37 +0300
Subject: Revert "Retire netbeans due to lack of a maintainer."
This reverts commit 2b556bac97bb65b1305c2aab4eb2917f894e74c1.
diff --git a/add-xml-commons-apis-to-classpath.patch b/add-xml-commons-apis-to-classpath.patch
new file mode 100644
index 0000000..877fab1
--- /dev/null
+++ b/add-xml-commons-apis-to-classpath.patch
@@ -0,0 +1,10 @@
+--- netbeans-7.0.1/ide/launcher/unix/netbeans 2011-09-22 11:54:57.500999423 -0400
++++ netbeans-7.0.1/ide/launcher/unix/netbeans 2011-09-22 12:05:11.329999884 -0400
+@@ -211,6 +211,7 @@
+ --branding nb \
+ --clusters '"$netbeans_clusters"' \
+ -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \
++ -cp:a /usr/share/java/xml-commons-apis.jar \
+ ${netbeans_default_options} \
+ '"$@"'
+ ;;
diff --git a/db-jdk7-compat.patch b/db-jdk7-compat.patch
new file mode 100644
index 0000000..8450553
--- /dev/null
+++ b/db-jdk7-compat.patch
@@ -0,0 +1,17 @@
+--- netbeans-7.0.1/db/libsrc/org/netbeans/lib/ddl/adaptors/DefaultAdaptor.java 2011-07-28 20:45:16.000000000 -0400
++++ netbeans-7.0.1/db/libsrc/org/netbeans/lib/ddl/adaptors/DefaultAdaptor.java 2011-10-27 23:10:08.158038407 -0400
+@@ -4089,4 +4089,14 @@
+ public boolean autoCommitFailureClosesAllResultSets() throws SQLException {
+ return false;
+ }
++
++ //JDK 1.7 / JDBC 4.1
++
++ public ResultSet getPseudoColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) throws SQLException {
++ return null;
++ }
++
++ public boolean generatedKeyAlwaysReturned() throws SQLException {
++ return false;
++ }
+ }
diff --git a/dead.package b/dead.package
deleted file mode 100644
index b8c7442..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-This package was retired on 2012-02-06 due to lack of a maintainer.
diff --git a/do-not-copy-windows-launcher.patch b/do-not-copy-windows-launcher.patch
new file mode 100644
index 0000000..8f6f14f
--- /dev/null
+++ b/do-not-copy-windows-launcher.patch
@@ -0,0 +1,12 @@
+diff -Nur netbeans-7.0.1/apisupport.harness/release/suite.xml netbeans-7.0.1/apisupport.harness/release/suite.xml
+--- netbeans-7.0.1/apisupport.harness/release/suite.xml 2010-06-10 15:17:40.000000000 +0400
++++ netbeans-7.0.1/apisupport.harness/release/suite.xml 2010-09-01 22:01:46.397920988 +0400
+@@ -313,7 +313,7 @@
+ <condition property="app.exe.prefix" value="" else="pre7_">
+ <isset property="nbexec.dll.found"/>
+ </condition>
+- <copy file="${harness.dir}/launchers/${app.exe.prefix}app.exe" tofile="${build.launcher.dir}/bin/${app.name}.exe" overwrite="true"/>
++ <copy file="${harness.dir}/launchers/${app.exe.prefix}app.exe" tofile="${build.launcher.dir}/bin/${app.name}.exe" failonerror="false" overwrite="true"/>
+ <copy file="${harness.dir}/launchers/${app.exe.prefix}app_w.exe" tofile="${build.launcher.dir}/bin/${app.name}_w.exe" failonerror="false" overwrite="true"/>
+
+ <copy file="${harness.dir}/launchers/app.sh" tofile="${build.launcher.dir}/bin/${app.name}"/>
diff --git a/do-not-release-external-jars.patch b/do-not-release-external-jars.patch
new file mode 100644
index 0000000..e767e43
--- /dev/null
+++ b/do-not-release-external-jars.patch
@@ -0,0 +1,1097 @@
+diff -ruN netbeans-7.0.1/apisupport.harness/nbproject/project.properties netbeans-7.0.1/apisupport.harness/nbproject/project.properties
+--- netbeans-7.0.1/apisupport.harness/nbproject/project.properties 2011-10-27 14:26:33.129000002 -0400
++++ netbeans-7.0.1/apisupport.harness/nbproject/project.properties 2011-10-27 14:33:56.752000001 -0400
+@@ -51,8 +51,6 @@
+ release.../nbbuild/templates/common.xml=common.xml
+ release.../nbbuild/templates/no-testcoverage.xml=no-testcoverage.xml
+ release.../nbbuild/jdk.xml=jdk.xml
+-release.external/jsearch-2.0_05.jar=antlib/jsearch-2.0_05.jar
+-release.external/bindex-2.2.jar=antlib/bindex-2.2.jar
+ nbm.executable.files=launchers/app.sh
+ extra.module.files=\
+ jnlp/jnlp-launcher.jar,\
+diff -ruN netbeans-7.0.1/cnd.discovery/nbproject/project.properties netbeans-7.0.1.my/cnd.discovery/nbproject/project.properties
+--- netbeans-7.0.1/cnd.discovery/nbproject/project.properties 2011-10-27 14:26:01.871000001 -0400
++++ netbeans-7.0.1/cnd.discovery/nbproject/project.properties 2011-10-27 14:33:56.493999997 -0400
+@@ -1,10 +1,4 @@
+ javac.compilerargs=-Xlint -Xlint:-serial
+ javac.source=1.6
+ spec.version.base=1.14.2
+-release.external/cnd-build-trace-1.0.zip!/SunOS-x86/libBuildTrace.so = bin/SunOS-x86/libBuildTrace.so
+-release.external/cnd-build-trace-1.0.zip!/SunOS-x86_64/libBuildTrace.so = bin/SunOS-x86_64/libBuildTrace.so
+-release.external/cnd-build-trace-1.0.zip!/SunOS-sparc/libBuildTrace.so = bin/SunOS-sparc/libBuildTrace.so
+-release.external/cnd-build-trace-1.0.zip!/SunOS-sparc_64/libBuildTrace.so = bin/SunOS-sparc_64/libBuildTrace.so
+-release.external/cnd-build-trace-1.0.zip!/Linux-x86/libBuildTrace.so = bin/Linux-x86/libBuildTrace.so
+-release.external/cnd-build-trace-1.0.zip!/Linux-x86_64/libBuildTrace.so = bin/Linux-x86_64/libBuildTrace.so
+ nbm.executable.files=bin/**
+diff -ruN netbeans-7.0.1/cnd.remote/nbproject/project.properties netbeans-7.0.1.my/cnd.remote/nbproject/project.properties
+--- netbeans-7.0.1/cnd.remote/nbproject/project.properties 2011-10-27 14:25:42.787999999 -0400
++++ netbeans-7.0.1/cnd.remote/nbproject/project.properties 2011-10-27 14:33:56.162000007 -0400
+@@ -2,21 +2,3 @@
+ javac.source=1.6
+ javac.compilerargs=-Xlint -Xlint:-serial
+ spec.version.base=1.9.3
+-release.external/cnd-rfs-1.0.zip!/Linux-x86/rfs_preload.so = bin/Linux-x86/rfs_preload.so
+-release.external/cnd-rfs-1.0.zip!/Linux-x86/rfs_controller = bin/Linux-x86/rfs_controller
+-release.external/cnd-rfs-1.0.zip!/Linux-x86/rfs_test_env = bin/Linux-x86/rfs_test_env
+-release.external/cnd-rfs-1.0.zip!/Linux-x86_64/rfs_preload.so = bin/Linux-x86_64/rfs_preload.so
+-release.external/cnd-rfs-1.0.zip!/Linux-x86_64/rfs_controller = bin/Linux-x86_64/rfs_controller
+-release.external/cnd-rfs-1.0.zip!/Linux-x86_64/rfs_test_env = bin/Linux-x86_64/rfs_test_env
+-release.external/cnd-rfs-1.0.zip!/SunOS-sparc/rfs_preload.so = bin/SunOS-sparc/rfs_preload.so
+-release.external/cnd-rfs-1.0.zip!/SunOS-sparc/rfs_controller = bin/SunOS-sparc/rfs_controller
+-release.external/cnd-rfs-1.0.zip!/SunOS-sparc/rfs_test_env = bin/SunOS-sparc/rfs_test_env
+-release.external/cnd-rfs-1.0.zip!/SunOS-sparc_64/rfs_preload.so = bin/SunOS-sparc_64/rfs_preload.so
+-release.external/cnd-rfs-1.0.zip!/SunOS-sparc_64/rfs_controller = bin/SunOS-sparc_64/rfs_controller
+-release.external/cnd-rfs-1.0.zip!/SunOS-sparc_64/rfs_test_env = bin/SunOS-sparc_64/rfs_test_env
+-release.external/cnd-rfs-1.0.zip!/SunOS-x86/rfs_preload.so = bin/SunOS-x86/rfs_preload.so
+-release.external/cnd-rfs-1.0.zip!/SunOS-x86/rfs_controller = bin/SunOS-x86/rfs_controller
+-release.external/cnd-rfs-1.0.zip!/SunOS-x86/rfs_test_env = bin/SunOS-x86/rfs_test_env
+-release.external/cnd-rfs-1.0.zip!/SunOS-x86_64/rfs_preload.so = bin/SunOS-x86_64/rfs_preload.so
+-release.external/cnd-rfs-1.0.zip!/SunOS-x86_64/rfs_controller = bin/SunOS-x86_64/rfs_controller
+-release.external/cnd-rfs-1.0.zip!/SunOS-x86_64/rfs_test_env = bin/SunOS-x86_64/rfs_test_env
+diff -ruN netbeans-7.0.1.my.orig/core.nativeaccess/nbproject/project.properties netbeans-7.0.1.my/core.nativeaccess/nbproject/project.properties
+--- netbeans-7.0.1/core.nativeaccess/nbproject/project.properties 2011-10-27 14:27:58.978000000 -0400
++++ netbeans-7.0.1/core.nativeaccess/nbproject/project.properties 2011-10-27 14:33:57.135000001 -0400
+@@ -1,4 +1,3 @@
+ is.eager=true
+ javac.compilerargs=-Xlint -Xlint:-serial
+ javac.source=1.6
+-release.external/platform-3.2.7.jar=modules/ext/platform-3.2.7.jar
+diff -ruN netbeans-7.0.1.my.orig/css.editor/nbproject/project.properties netbeans-7.0.1.my/css.editor/nbproject/project.properties
+--- netbeans-7.0.1/css.editor/nbproject/project.properties 2011-10-27 14:28:04.783000001 -0400
++++ netbeans-7.0.1/css.editor/nbproject/project.properties 2011-10-27 14:33:57.251000002 -0400
+@@ -40,7 +40,6 @@
+ # Version 2 license, then the option applies only if the new code is
+ # made subject to such option by the copyright holder.
+
+-release.external/css21-spec.zip=docs/css21-spec.zip
+ jnlp.indirect.jars=docs/css21-spec.zip
+
+ javac.compilerargs=-Xlint -Xlint:-serial
+diff -ruN netbeans-7.0.1.my.orig/css.visual/nbproject/project.properties netbeans-7.0.1.my/css.visual/nbproject/project.properties
+--- netbeans-7.0.1/css.visual/nbproject/project.properties 2011-10-27 14:27:41.208000001 -0400
++++ netbeans-7.0.1/css.visual/nbproject/project.properties 2011-10-27 14:33:57.057000001 -0400
+@@ -44,8 +44,6 @@
+ javac.compilerargs=\ -Xlint:unchecked -Xlint -Xlint:-serial
+ javac.source=1.6
+
+-release.external/sac-1.3.jar=modules/ext/sac-1.3.jar
+-release.external/flute-1.3.jar=modules/ext/flute-1.3.jar
+
+ test.config.stable.includes=\
+ **/CSSTest.class
+diff -ruN netbeans-7.0.1.my.orig/db.drivers/nbproject/project.properties netbeans-7.0.1.my/db.drivers/nbproject/project.properties
+--- netbeans-7.0.1/db.drivers/nbproject/project.properties 2011-10-27 14:28:58.415000008 -0400
++++ netbeans-7.0.1/db.drivers/nbproject/project.properties 2011-10-27 14:33:57.370000002 -0400
+@@ -40,8 +40,6 @@
+ # Version 2 license, then the option applies only if the new code is
+ # made subject to such option by the copyright holder.
+
+-release.external/mysql-connector-java-5.1.13-bin.jar=modules/ext/mysql-connector-java-5.1.13-bin.jar
+-release.external/postgresql-8.3-603.jdbc3.jar=modules/ext/postgresql-8.3-603.jdbc3.jar
+ jnlp.indirect.jars=\
+ modules/ext/mysql-connector-java-5.1.13-bin.jar,\
+ modules/ext/postgresql-8.3-603.jdbc3.jar
+diff -ruN netbeans-7.0.1.my.orig/derby/nbproject/project.properties netbeans-7.0.1.my/derby/nbproject/project.properties
+--- netbeans-7.0.1/derby/nbproject/project.properties 2011-10-27 14:26:22.357999988 -0400
++++ netbeans-7.0.1/derby/nbproject/project.properties 2011-10-27 14:33:56.623999999 -0400
+@@ -43,6 +43,5 @@
+ javac.source=1.6
+ javac.compilerargs=-Xlint:unchecked
+
+-release.external/derbysampledb.zip=modules/ext/derbysampledb.zip
+ jnlp.indirect.jars=\
+ modules/ext/derbysampledb.zip
+diff -ruN netbeans-7.0.1.my.orig/dlight.dtrace/nbproject/project.properties netbeans-7.0.1.my/dlight.dtrace/nbproject/project.properties
+--- netbeans-7.0.1/dlight.dtrace/nbproject/project.properties 2011-10-27 14:26:22.974999996 -0400
++++ netbeans-7.0.1/dlight.dtrace/nbproject/project.properties 2011-10-27 14:33:56.636000002 -0400
+@@ -4,7 +4,5 @@
+ project.license=cddl-netbeans-sun
+ javadoc.arch=${basedir}/arch.xml
+ spec.version.base=1.9.1
+-release.external/dtracectrl-0.1.zip!/SunOS-x86/dtracectrl=bin/SunOS-x86/dtracectrl
+-release.external/dtracectrl-0.1.zip!/SunOS-sparc/dtracectrl=bin/SunOS-sparc/dtracectrl
+ nbm.executable.files=bin/**
+ jnlp.indirect.files=bin/**
+diff -ruN netbeans-7.0.1.my.orig/dlight.libs.h2/nbproject/project.properties netbeans-7.0.1.my/dlight.libs.h2/nbproject/project.properties
+--- netbeans-7.0.1/dlight.libs.h2/nbproject/project.properties 2011-10-27 14:27:56.192000001 -0400
++++ netbeans-7.0.1/dlight.libs.h2/nbproject/project.properties 2011-10-27 14:33:57.113000001 -0400
+@@ -2,5 +2,4 @@
+ javac.source=1.6
+ javac.compilerargs=-Xlint -Xlint:-serial
+ project.license=cddl-netbeans-sun
+-release.external/h2-1.0.79.jar=modules/ext/h2-1.0.79.jar
+ spec.version.base=1.5.1
+diff -ruN netbeans-7.0.1.my.orig/extexecution.destroy/nbproject/project.properties netbeans-7.0.1.my/extexecution.destroy/nbproject/project.properties
+--- netbeans-7.0.1/extexecution.destroy/nbproject/project.properties 2011-10-27 14:25:56.241000001 -0400
++++ netbeans-7.0.1/extexecution.destroy/nbproject/project.properties 2011-10-27 14:33:56.401000001 -0400
+@@ -1,7 +1,3 @@
+ is.eager=true
+ javac.source=1.6
+ javac.compilerargs=-Xlint -Xlint:-serial
+-release.external/winp-1.14-patched.jar=modules/ext/winp-1.14-patched.jar
+-release.external/libpam4j-1.1.jar=modules/ext/libpam4j-1.1.jar
+-release.external/processtreekiller-1.0.1.jar=modules/ext/processtreekiller-1.0.1.jar
+-release.external/commons-io-1.4.jar=modules/ext/commons-io-1.4.jar
+diff -ruN netbeans-7.0.1.my.orig/groovy.editor/nbproject/project.properties netbeans-7.0.1.my/groovy.editor/nbproject/project.properties
+--- netbeans-7.0.1/groovy.editor/nbproject/project.properties 2011-10-27 14:27:06.117000002 -0400
++++ netbeans-7.0.1/groovy.editor/nbproject/project.properties 2011-10-27 14:33:56.863000002 -0400
+@@ -5,5 +5,4 @@
+ nbm.homepage=http://wiki.netbeans.org/groovy
+ nbm.module.author=Martin Adamek, Petr Hejl, Matthias Schmidt
+ nbm.needs.restart=true
+-release.external/groovy-all-1.6.4.jar=modules/ext/groovy-all.jar
+
+diff -ruN netbeans-7.0.1.my.orig/hibernatelib/nbproject/project.properties netbeans-7.0.1.my/hibernatelib/nbproject/project.properties
+--- netbeans-7.0.1/hibernatelib/nbproject/project.properties 2011-10-27 14:27:58.989000002 -0400
++++ netbeans-7.0.1/hibernatelib/nbproject/project.properties 2011-10-27 14:33:57.147000001 -0400
+@@ -45,23 +45,6 @@
+
+ is.autoload=true
+
+-release.external/hibernate-3.2.5-lib.zip!/hibernate-3.2.5-lib/antlr-2.7.6.jar=modules/ext/hibernate/antlr-2.7.6.jar
+-release.external/hibernate-3.2.5-lib.zip!/hibernate-3.2.5-lib/asm.jar=modules/ext/hibernate/asm.jar
+-release.external/hibernate-3.2.5-lib.zip!/hibernate-3.2.5-lib/asm-attrs.jar=modules/ext/hibernate/asm-attrs.jar
+-release.external/hibernate-3.2.5-lib.zip!/hibernate-3.2.5-lib/cglib-2.1.3.jar=modules/ext/hibernate/cglib-2.1.3.jar
+-release.external/hibernate-3.2.5-lib.zip!/hibernate-3.2.5-lib/commons-collections-2.1.1.jar=modules/ext/hibernate/commons-collections-2.1.1.jar
+-release.external/hibernate-3.2.5-lib.zip!/hibernate-3.2.5-lib/dom4j-1.6.1.jar=modules/ext/hibernate/dom4j-1.6.1.jar
+-release.external/hibernate-3.2.5-lib.zip!/hibernate-3.2.5-lib/ehcache-1.2.3.jar=modules/ext/hibernate/ehcache-1.2.3.jar
+-release.external/hibernate-3.2.5-lib.zip!/hibernate-3.2.5-lib/jdbc2_0-stdext.jar=modules/ext/hibernate/jdbc2_0-stdext.jar
+-release.external/hibernate-3.2.5-lib.zip!/hibernate-3.2.5-lib/jta.jar=modules/ext/hibernate/jta.jar
+-release.external/hibernate-3.2.5-lib.zip!/hibernate-3.2.5-lib/hibernate3.jar=modules/ext/hibernate/hibernate3.jar
+-release.external/hibernate-3.2.5-lib.zip!/hibernate-3.2.5-lib/hibernate-tools.jar=modules/ext/hibernate/hibernate-tools.jar
+-release.external/hibernate-3.2.5-lib.zip!/hibernate-3.2.5-lib/hibernate-annotations.jar=modules/ext/hibernate/hibernate-annotations.jar
+-release.external/hibernate-3.2.5-lib.zip!/hibernate-3.2.5-lib/hibernate-commons-annotations.jar=modules/ext/hibernate/hibernate-commons-annotations.jar
+-release.external/hibernate-3.2.5-lib.zip!/hibernate-3.2.5-lib/ejb3-persistence.jar=modules/ext/hibernate/ejb3-persistence.jar
+-release.external/hibernate-3.2.5-lib.zip!/hibernate-3.2.5-lib/hibernate-entitymanager.jar=modules/ext/hibernate/hibernate-entitymanager.jar
+-release.external/hibernate-3.2.5-lib.zip!/hibernate-3.2.5-lib/javassist.jar=modules/ext/hibernate/javassist.jar
+-release.external/hibernate-3.2.5-lib.zip!/hibernate-3.2.5-lib/jtidy-r8-20060801.jar=modules/ext/hibernate/jtidy-r8-20060801.jar
+
+ jnlp.indirect.jars=\
+ modules/ext/hibernate/hibernate-entitymanager.jar,\
+diff -ruN netbeans-7.0.1.my.orig/html.editor/nbproject/project.properties netbeans-7.0.1.my/html.editor/nbproject/project.properties
+--- netbeans-7.0.1/html.editor/nbproject/project.properties 2011-10-27 14:25:32.846999999 -0400
++++ netbeans-7.0.1/html.editor/nbproject/project.properties 2011-10-27 14:33:56.018000002 -0400
+@@ -40,7 +40,6 @@
+ # Version 2 license, then the option applies only if the new code is
+ # made subject to such option by the copyright holder.
+
+-release.external/html-4.01.zip=docs/html-4.01.zip
+
+ javac.compilerargs=-Xlint:unchecked
+ javac.source=1.6
+diff -ruN netbeans-7.0.1.my.orig/html.parser/nbproject/project.properties netbeans-7.0.1.my/html.parser/nbproject/project.properties
+--- netbeans-7.0.1/html.parser/nbproject/project.properties 2011-10-27 14:28:20.648000039 -0400
++++ netbeans-7.0.1/html.parser/nbproject/project.properties 2011-10-27 14:33:57.307000002 -0400
+@@ -43,9 +43,6 @@
+ javac.compilerargs=-Xlint -Xlint:-serial
+ javac.source=1.5
+
+-release.external/htmlparser-1.2.1.jar=modules/ext/html5-parser.jar
+-release.external/html5doc.zip=docs/html5doc.zip
+-release.external/icu4j-4_0.jar=modules/ext/icu4j-4_0.jar
+
+ jnlp.indirect.jars=docs/html5doc.zip
+
+diff -ruN netbeans-7.0.1.my.orig/html.validation/nbproject/project.properties netbeans-7.0.1.my/html.validation/nbproject/project.properties
+--- netbeans-7.0.1/html.validation/nbproject/project.properties 2011-10-27 14:27:44.508000001 -0400
++++ netbeans-7.0.1/html.validation/nbproject/project.properties 2011-10-27 14:33:57.069000001 -0400
+@@ -52,18 +52,6 @@
+ file.reference.validator.jar=external/validator.jar
+ file.reference.saxon9B.jar=external/saxon9B.jar
+ file.reference.isorelax20041111.jar=external/isorelax20041111.jar
+-release.external/commons-logging-1.1.1.jar=modules/ext/commons-logging-1.1.1.jar
+-release.external/commons-logging-api-1.1.1.jar=modules/ext/commons-logging-api-1.1.1.jar
+-release.external/html5-datatypes.jar=modules/ext/html5-datatypes.jar
+-release.external/io-xml-util.jar=modules/ext/io-xml-util.jar
+-release.external/iri.jar=modules/ext/iri.jar
+-release.external/jing.jar=modules/ext/jing.jar
+-release.external/js.jar=modules/ext/js.jar
+-release.external/log4j-1.2.15.jar=modules/ext/log4j-1.2.15.jar
+-release.external/non-schema.jar=modules/ext/non-schema.jar
+-release.external/validator.jar=modules/ext/validator.jar
+-release.external/saxon9B.jar=modules/ext/saxon9B.jar
+-release.external/isorelax20041111.jar=modules/ext/isorelax20041111.jar
+
+ javac.source=1.5
+ javac.compilerargs=-Xlint -Xlint:-serial
+diff -ruN netbeans-7.0.1.my.orig/httpserver/nbproject/project.properties netbeans-7.0.1.my/httpserver/nbproject/project.properties
+--- netbeans-7.0.1/httpserver/nbproject/project.properties 2011-10-27 14:26:24.801000001 -0400
++++ netbeans-7.0.1/httpserver/nbproject/project.properties 2011-10-27 14:33:56.688000002 -0400
+@@ -43,7 +43,6 @@
+ javac.compilerargs=-Xlint:unchecked
+ javac.source=1.6
+ spec.version.base=2.19.1
+-release.external/tomcat-webserver-3.2.jar=modules/ext/webserver.jar
+ test-unit-sys-prop.xtest.data=${nb_all}/httpserver/test/unit/testfs
+ test.unit.data.dir=${nb_all}/httpserver/test/unit/testfs
+ disable.qa-functional.tests=true
+diff -ruN netbeans-7.0.1.my.orig/j2eeapis/nbproject/project.properties netbeans-7.0.1.my/j2eeapis/nbproject/project.properties
+--- netbeans-7.0.1/j2eeapis/nbproject/project.properties 2011-10-27 14:28:02.778000001 -0400
++++ netbeans-7.0.1/j2eeapis/nbproject/project.properties 2011-10-27 14:33:57.204000002 -0400
+@@ -41,4 +41,3 @@
+ # made subject to such option by the copyright holder.
+
+ is.autoload=true
+-release.external/jsr88javax.jar=modules/ext/jsr88javax.jar
+diff -ruN netbeans-7.0.1.my.orig/j2ee.eclipselink/nbproject/project.properties netbeans-7.0.1.my/j2ee.eclipselink/nbproject/project.properties
+--- netbeans-7.0.1/j2ee.eclipselink/nbproject/project.properties 2011-10-27 14:28:01.379000001 -0400
++++ netbeans-7.0.1/j2ee.eclipselink/nbproject/project.properties 2011-10-27 14:33:57.182000002 -0400
+@@ -44,5 +44,3 @@
+ modules/ext/eclipselink/eclipselink-2.2.0.jar,\
+ modules/ext/eclipselink/eclipselink-javax.persistence-2.0.jar
+
+-release.external/eclipselink-2.2.0.jar=modules/ext/eclipselink/eclipselink-2.2.0.jar
+-release.external/eclipselink-javax.persistence-2.0.jar=modules/ext/eclipselink/eclipselink-javax.persistence-2.0.jar
+diff -ruN netbeans-7.0.1.my.orig/j2ee.eclipselinkmodelgen/nbproject/project.properties netbeans-7.0.1.my/j2ee.eclipselinkmodelgen/nbproject/project.properties
+--- netbeans-7.0.1/j2ee.eclipselinkmodelgen/nbproject/project.properties 2011-10-27 14:25:56.352000001 -0400
++++ netbeans-7.0.1/j2ee.eclipselinkmodelgen/nbproject/project.properties 2011-10-27 14:33:56.429000008 -0400
+@@ -43,4 +43,3 @@
+ jnlp.indirect.jars=\
+ modules/ext/eclipselink/eclipselink-jpa-modelgen-2.2.0.jar
+
+-release.external/eclipselink-jpa-modelgen-2.2.0.jar=modules/ext/eclipselink/eclipselink-jpa-modelgen-2.2.0.jar
+diff -ruN netbeans-7.0.1.my.orig/j2ee.platform/nbproject/project.properties netbeans-7.0.1.my/j2ee.platform/nbproject/project.properties
+--- netbeans-7.0.1/j2ee.platform/nbproject/project.properties 2011-10-27 14:27:17.398000001 -0400
++++ netbeans-7.0.1/j2ee.platform/nbproject/project.properties 2011-10-27 14:33:56.893000001 -0400
+@@ -40,7 +40,6 @@
+ # Version 2 license, then the option applies only if the new code is
+ # made subject to such option by the copyright holder.
+
+-release.external/javaee6-doc-api.zip=docs/javaee6-doc-api.zip
+
+ javadoc.arch=${basedir}/arch.xml
+ javahelp.base=org/netbeans/modules/j2ee/platform/docs
+diff -ruN netbeans-7.0.1.my.orig/j2ee.toplinklib/nbproject/project.properties netbeans-7.0.1.my/j2ee.toplinklib/nbproject/project.properties
+--- netbeans-7.0.1/j2ee.toplinklib/nbproject/project.properties 2011-10-27 14:27:56.232000003 -0400
++++ netbeans-7.0.1/j2ee.toplinklib/nbproject/project.properties 2011-10-27 14:53:31.646002813 -0400
+@@ -40,17 +40,6 @@
+ # Version 2 license, then the option applies only if the new code is
+ # made subject to such option by the copyright holder.
+
+-release.external/glassfish-persistence-v2ur1-build-09d.jar!/toplink-essentials.jar=\
+- modules/ext/toplink/toplink-essentials.jar
+-release.external/glassfish-persistence-v2ur1-build-09d.jar!/toplink-essentials-agent.jar=\
+- modules/ext/toplink/toplink-essentials-agent.jar
+-release.external/glassfish-persistence-v2ur1-build-09d.jar!/3RD-PARTY-LICENSE.txt=\
+- modules/ext/toplink/3RD-PARTY-LICENSE.txt
+-release.external/glassfish-persistence-v2ur1-build-09d.jar!/README=\
+- modules/ext/toplink/README
+-release.external/glassfish-persistence-v2ur1-build-09d.jar!/LICENSE.txt=\
+- modules/ext/toplink/LICENSE.txt
+-
+ jnlp.indirect.jars=\
+ modules/ext/toplink/toplink-essentials.jar,\
+ modules/ext/toplink/toplink-essentials-agent.jar
+diff -ruN netbeans-7.0.1.my.orig/j2me.cdc.project.ricoh/nbproject/project.properties netbeans-7.0.1.my/j2me.cdc.project.ricoh/nbproject/project.properties
+--- netbeans-7.0.1/j2me.cdc.project.ricoh/nbproject/project.properties 2011-10-27 14:27:25.098999991 -0400
++++ netbeans-7.0.1/j2me.cdc.project.ricoh/nbproject/project.properties 2011-10-27 14:33:56.963000001 -0400
+@@ -45,6 +45,3 @@
+ javac.compilerargs=-Xlint:unchecked
+ javac.source=1.6
+ extra.module.files=modules/ext/org-netbeans-modules-j2me-cdc-project-ricoh.jar
+-release.external/commons-codec-1.3.jar=modules/ext/commons-codec-1.3.jar
+-release.external/commons-httpclient-3.0.jar=modules/ext/commons-httpclient-3.0.jar
+-release.external/RicohAntTasks-2.0.jar=modules/ext/RicohAntTasks-2.0.jar
+diff -ruN netbeans-7.0.1.my.orig/javacard.apdu.io/nbproject/project.properties netbeans-7.0.1.my/javacard.apdu.io/nbproject/project.properties
+--- netbeans-7.0.1/javacard.apdu.io/nbproject/project.properties 2011-10-27 14:25:41.212004696 -0400
++++ netbeans-7.0.1/javacard.apdu.io/nbproject/project.properties 2011-10-27 14:33:56.113000023 -0400
+@@ -2,4 +2,3 @@
+ javac.source=1.6
+ javac.compilerargs=-Xlint -Xlint:-serial
+ javadoc.arch=${basedir}/arch.xml
+-release.external/apduio.jar=modules/ext/apduio.jar
+diff -ruN netbeans-7.0.1.my.orig/javacard.ri.platform/nbproject/project.properties netbeans-7.0.1.my/javacard.ri.platform/nbproject/project.properties
+--- netbeans-7.0.1/javacard.ri.platform/nbproject/project.properties 2011-10-27 14:27:35.654000002 -0400
++++ netbeans-7.0.1/javacard.ri.platform/nbproject/project.properties 2011-10-27 14:33:57.006000001 -0400
+@@ -1,6 +1,5 @@
+ extra.license.files=../javacard.ri.bundle/external/javacard_ri-license.txt
+ extra.module.files=javacard302/anttasks.jar
+ javac.source=1.6
+-release.external/anttasks.jar=javacard302/anttasks.jar
+ javac.compilerargs=-Xlint -Xlint:-serial
+ nbm.module.author=Tim Boudreau
+diff -ruN netbeans-7.0.1.my.orig/javaee.api/nbproject/project.properties netbeans-7.0.1.my/javaee.api/nbproject/project.properties
+--- netbeans-7.0.1/javaee.api/nbproject/project.properties 2011-10-27 14:27:09.085000000 -0400
++++ netbeans-7.0.1/javaee.api/nbproject/project.properties 2011-10-27 14:33:56.883000000 -0400
+@@ -41,13 +41,3 @@
+ # made subject to such option by the copyright holder.
+
+ javac.source=1.6
+-release.external/javaee-api-6.0.jar=modules/ext/javaee-api-6.0.jar
+-release.external/javaee-api-6.0-license.txt=modules/ext/javaee-api-6.0-license.txt
+-release.external/javaee-web-api-6.0.jar=modules/ext/javaee-web-api-6.0.jar
+-release.external/javaee-web-api-6.0-license.txt=modules/ext/javaee-web-api-6.0-license.txt
+-release.external/javax.annotation.jar=modules/ext/javaee6-endorsed/javax.annotation.jar
+-release.external/javax.annotation-license.txt=modules/ext/javaee6-endorsed/javax.annotation-license.txt
+-release.external/jaxb-api-osgi.jar=modules/ext/javaee6-endorsed/jaxb-api-osgi.jar
+-release.external/jaxb-api-osgi-license.txt=modules/ext/javaee6-endorsed/jaxb-api-osgi-license.txt
+-release.external/webservices-api-osgi.jar=modules/ext/javaee6-endorsed/webservices-api-osgi.jar
+-release.external/webservices-api-osgi-license.txt=modules/ext/javaee6-endorsed/webservices-api-osgi-license.txt
+diff -ruN netbeans-7.0.1.my.orig/javahelp/nbproject/project.properties netbeans-7.0.1.my/javahelp/nbproject/project.properties
+--- netbeans-7.0.1/javahelp/nbproject/project.properties 2011-10-27 14:25:49.575000001 -0400
++++ netbeans-7.0.1/javahelp/nbproject/project.properties 2011-10-27 14:33:56.261000000 -0400
+@@ -41,7 +41,6 @@
+ # made subject to such option by the copyright holder.
+
+ is.autoload=true
+-release.external/jhall-2.0_05.jar=modules/ext/jhall-2.0_05.jar
+
+ javac.compilerargs=-Xlint:unchecked
+ javac.source=1.6
+diff -ruN netbeans-7.0.1.my.orig/javascript.editing/nbproject/project.properties netbeans-7.0.1.my/javascript.editing/nbproject/project.properties
+--- netbeans-7.0.1/javascript.editing/nbproject/project.properties 2011-10-27 14:28:55.461000001 -0400
++++ netbeans-7.0.1/javascript.editing/nbproject/project.properties 2011-10-27 14:33:57.349000002 -0400
+@@ -8,4 +8,3 @@
+ jsstubs/netbeans-index-*-javascript-*.zip,\
+ jsstubs/allstubs.zip
+ jnlp.indirect.jars=jsstubs/*.zip
+-release.external/sdocs.zip=jsstubs/sdocs.zip
+diff -ruN netbeans-7.0.1.my.orig/jemmy/nbproject/project.properties netbeans-7.0.1.my/jemmy/nbproject/project.properties
+--- netbeans-7.0.1/jemmy/nbproject/project.properties 2011-10-27 14:28:17.693000003 -0400
++++ netbeans-7.0.1/jemmy/nbproject/project.properties 2011-10-27 14:33:57.285000002 -0400
+@@ -42,6 +42,5 @@
+ is.autoload=true
+ javac.compilerargs=-Xlint -Xlint:-serial
+ javac.source=1.6
+-release.external/jemmy-2.3.0.0.jar=modules/ext/jemmy-2.3.0.0.jar
+ sigtest.gen.fail.on.error=false
+
+diff -ruN netbeans-7.0.1.my.orig/libs.antlr3.devel/nbproject/project.properties netbeans-7.0.1.my/libs.antlr3.devel/nbproject/project.properties
+--- netbeans-7.0.1/libs.antlr3.devel/nbproject/project.properties 2011-10-27 14:25:54.563999989 -0400
++++ netbeans-7.0.1/libs.antlr3.devel/nbproject/project.properties 2011-10-27 14:33:56.389999993 -0400
+@@ -43,8 +43,6 @@
+
+ is.autoload=true
+ javac.source=1.6
+-release.external/antlr-3.1.3.jar=modules/ext/antlr-3.1.3.jar
+-release.external/stringtemplate-3.2.jar=modules/ext/stringtemplate-3.2.jar
+
+ license.file=../external/antlr-3.1.3-license.txt
+ nbm.homepage=http://www.antlr.org/
+diff -ruN netbeans-7.0.1.my.orig/libs.antlr3.runtime/nbproject/project.properties netbeans-7.0.1.my/libs.antlr3.runtime/nbproject/project.properties
+--- netbeans-7.0.1/libs.antlr3.runtime/nbproject/project.properties 2011-10-27 14:27:25.233000001 -0400
++++ netbeans-7.0.1/libs.antlr3.runtime/nbproject/project.properties 2011-10-27 14:33:56.985000001 -0400
+@@ -43,7 +43,6 @@
+
+ is.autoload=true
+ javac.source=1.6
+-release.external/antlr-runtime-3.1.3.jar=modules/ext/antlr-runtime-3.1.3.jar
+
+ license.file=../external/antlr-3.1.3-license.txt
+ nbm.homepage=http://www.antlr.org/
+diff -ruN netbeans-7.0.1.my.orig/libs.bugtracking/nbproject/project.properties netbeans-7.0.1.my/libs.bugtracking/nbproject/project.properties
+--- netbeans-7.0.1/libs.bugtracking/nbproject/project.properties 2011-10-27 14:28:00.090000002 -0400
++++ netbeans-7.0.1/libs.bugtracking/nbproject/project.properties 2011-10-27 14:33:57.171999999 -0400
+@@ -46,8 +46,3 @@
+ sigtest.gen.fail.on.error=false
+
+ javac.source=1.6
+-release.external/org.eclipse.mylyn.commons.core_3.3.1.jar=modules/ext/org.eclipse.mylyn.commons.core_3.3.1.jar
+-release.external/org.eclipse.mylyn.commons.net_3.3.0.jar=modules/ext/org.eclipse.mylyn.commons.net_3.3.0.jar
+-release.external/org.eclipse.mylyn.tasks.core_3.3.1.jar=modules/ext/org.eclipse.mylyn.tasks.core_3.3.1.jar
+-release.external/commons-httpclient-3.1.jar=modules/ext/commons-httpclient-3.1.jar
+-release.external/commons-lang-2.3.jar=modules/ext/commons-lang-2.3.jar
+diff -ruN netbeans-7.0.1.my.orig/libs.bugzilla/nbproject/project.properties netbeans-7.0.1.my/libs.bugzilla/nbproject/project.properties
+--- netbeans-7.0.1/libs.bugzilla/nbproject/project.properties 2011-10-27 14:27:54.909999998 -0400
++++ netbeans-7.0.1/libs.bugzilla/nbproject/project.properties 2011-10-27 14:33:57.103000001 -0400
+@@ -43,4 +43,3 @@
+
+ javac.compilerargs=-Xlint -Xlint:-serial
+ javac.source=1.6
+-release.external/org.eclipse.mylyn.bugzilla.core_3.3.1.jar=modules/ext/org.eclipse.mylyn.bugzilla.core_3.3.1.jar
+diff -ruN netbeans-7.0.1.my.orig/libs.bytelist/nbproject/project.properties netbeans-7.0.1.my/libs.bytelist/nbproject/project.properties
+--- netbeans-7.0.1/libs.bytelist/nbproject/project.properties 2011-10-27 14:26:56.573000001 -0400
++++ netbeans-7.0.1/libs.bytelist/nbproject/project.properties 2011-10-27 14:33:56.839000001 -0400
+@@ -41,5 +41,4 @@
+ # made subject to such option by the copyright holder.
+
+ is.autoload=true
+-release.external/bytelist-0.1.jar=modules/ext/bytelist-0.1.jar
+ spec.version.base=0.11.1
+diff -ruN netbeans-7.0.1.my.orig/libs.cglib/nbproject/project.properties netbeans-7.0.1.my/libs.cglib/nbproject/project.properties
+--- netbeans-7.0.1/libs.cglib/nbproject/project.properties 2011-10-27 14:27:24.105000001 -0400
++++ netbeans-7.0.1/libs.cglib/nbproject/project.properties 2011-10-27 14:33:56.952000001 -0400
+@@ -42,7 +42,6 @@
+
+ is.autoload=true
+
+-release.external/cglib-2.2.jar=modules/ext/cglib-2.2.jar
+
+ sigtest.gen.fail.on.error=false
+
+diff -ruN netbeans-7.0.1.my.orig/libs.commons_codec/nbproject/project.properties netbeans-7.0.1.my/libs.commons_codec/nbproject/project.properties
+--- netbeans-7.0.1/libs.commons_codec/nbproject/project.properties 2011-10-27 14:26:37.881000001 -0400
++++ netbeans-7.0.1/libs.commons_codec/nbproject/project.properties 2011-10-27 14:33:56.773000000 -0400
+@@ -43,4 +43,3 @@
+ is.autoload=true
+ javac.compilerargs=-Xlint -Xlint:-serial
+ javac.source=1.6
+-release.external/apache-commons-codec-1.3.jar=modules/ext/apache-commons-codec-1.3.jar
+diff -ruN netbeans-7.0.1.my.orig/libs.commons_fileupload/nbproject/project.properties netbeans-7.0.1.my/libs.commons_fileupload/nbproject/project.properties
+--- netbeans-7.0.1/libs.commons_fileupload/nbproject/project.properties 2011-10-27 14:27:47.124000002 -0400
++++ netbeans-7.0.1/libs.commons_fileupload/nbproject/project.properties 2011-10-27 14:33:57.092000001 -0400
+@@ -42,6 +42,5 @@
+
+ is.autoload=true
+
+-release.external/commons-fileupload-1.0.jar=modules/ext/commons-fileupload-1.0.jar
+ jnlp.indirect.jars=\
+ modules/ext/commons-fileupload-1.0.jar
+diff -ruN netbeans-7.0.1.my.orig/libs.commons_logging/nbproject/project.properties netbeans-7.0.1.my/libs.commons_logging/nbproject/project.properties
+--- netbeans-7.0.1/libs.commons_logging/nbproject/project.properties 2011-10-27 14:26:24.108000002 -0400
++++ netbeans-7.0.1/libs.commons_logging/nbproject/project.properties 2011-10-27 14:33:56.673000002 -0400
+@@ -41,5 +41,4 @@
+ # made subject to such option by the copyright holder.
+
+ is.autoload=true
+-release.external/commons-logging-1.1.jar=modules/ext/commons-logging-1.1.jar
+ spec.version.base=1.17.1
+diff -ruN netbeans-7.0.1.my.orig/libs.commons_net/nbproject/project.properties netbeans-7.0.1.my/libs.commons_net/nbproject/project.properties
+--- netbeans-7.0.1/libs.commons_net/nbproject/project.properties 2011-10-27 14:28:58.349000003 -0400
++++ netbeans-7.0.1/libs.commons_net/nbproject/project.properties 2011-10-27 14:33:57.359000002 -0400
+@@ -41,5 +41,4 @@
+ # made subject to such option by the copyright holder.
+
+ is.autoload=true
+-release.external/commons-net-1.4.1.jar=modules/ext/commons-net-1.4.1.jar
+ spec.version.base=1.12.1
+diff -ruN netbeans-7.0.1.my.orig/libs.elimpl/nbproject/project.properties netbeans-7.0.1.my/libs.elimpl/nbproject/project.properties
+--- netbeans-7.0.1/libs.elimpl/nbproject/project.properties 2011-10-27 14:25:45.488000001 -0400
++++ netbeans-7.0.1/libs.elimpl/nbproject/project.properties 2011-10-27 14:33:56.195000002 -0400
+@@ -44,5 +44,4 @@
+ javac.compilerargs=-Xlint -Xlint:-serial
+ javac.source=1.6
+ javadoc.arch=${basedir}/arch.xml
+-release.external/el-impl.jar=modules/ext/el-impl.jar
+ spec.version.base=1.3.1
+diff -ruN netbeans-7.0.1.my.orig/libs.felix/nbproject/project.properties netbeans-7.0.1.my/libs.felix/nbproject/project.properties
+--- netbeans-7.0.1/libs.felix/nbproject/project.properties 2011-10-27 14:27:34.014000000 -0400
++++ netbeans-7.0.1/libs.felix/nbproject/project.properties 2011-10-27 14:33:56.997000001 -0400
+@@ -40,8 +40,6 @@
+ # Version 2 license, then the option applies only if the new code is
+ # made subject to such option by the copyright holder.
+
+-release.external/felix-2.0.3.jar=modules/ext/felix-2.0.3.jar
+-release.external/felix-main-2.0.2.jar=modules/ext/felix-main-2.0.2.jar
+ jnlp.verify.excludes=modules/ext/felix-main-2.0.2.jar
+ javac.source=1.6
+ javac.compilerargs=-Xlint -Xlint:-serial
+diff -ruN netbeans-7.0.1.my.orig/libs.freemarker/nbproject/project.properties netbeans-7.0.1.my/libs.freemarker/nbproject/project.properties
+--- netbeans-7.0.1/libs.freemarker/nbproject/project.properties 2011-10-27 14:25:29.230000002 -0400
++++ netbeans-7.0.1/libs.freemarker/nbproject/project.properties 2011-10-27 14:33:55.953000002 -0400
+@@ -44,6 +44,5 @@
+
+ javac.compilerargs=-Xlint:unchecked
+ javac.source=1.6
+-release.external/freemarker-2.3.8.jar=modules/ext/freemarker-2.3.8.jar
+ module.jar.verifylinkageignores=freemarker.((ext.ant.FreemarkerXmlTask)|(template.DefaultObjectWrapper))
+ spec.version.base=2.15.1
+diff -ruN netbeans-7.0.1.my.orig/libs.glassfish_logging/nbproject/project.properties netbeans-7.0.1.my/libs.glassfish_logging/nbproject/project.properties
+--- netbeans-7.0.1/libs.glassfish_logging/nbproject/project.properties 2011-10-27 14:28:04.745000001 -0400
++++ netbeans-7.0.1/libs.glassfish_logging/nbproject/project.properties 2011-10-27 14:33:57.239000002 -0400
+@@ -42,6 +42,5 @@
+
+ is.autoload=true
+ javac.source=1.6
+-release.external/glassfish-logging-2.0.jar=modules/ext/glassfish-logging-2.0.jar
+
+ spec.version.base=1.12.1
+diff -ruN netbeans-7.0.1.my.orig/libs.ini4j/nbproject/project.properties netbeans-7.0.1.my/libs.ini4j/nbproject/project.properties
+--- netbeans-7.0.1/libs.ini4j/nbproject/project.properties 2011-10-27 14:25:45.693000001 -0400
++++ netbeans-7.0.1/libs.ini4j/nbproject/project.properties 2011-10-27 14:33:56.224000002 -0400
+@@ -41,7 +41,6 @@
+ # made subject to such option by the copyright holder.
+
+ is.autoload=true
+-release.external/ini4j-0.5.1.jar=modules/ext/ini4j-0.5.1.jar
+ module.jar.verifylinkageignores=org.ini4j.IniPreferencesFactoryListener
+
+ # Fatal error: class javax.servlet.ServletContextListener not found
+diff -ruN netbeans-7.0.1.my.orig/libs.jakarta_oro/nbproject/project.properties netbeans-7.0.1.my/libs.jakarta_oro/nbproject/project.properties
+--- netbeans-7.0.1/libs.jakarta_oro/nbproject/project.properties 2011-10-27 14:25:43.734000001 -0400
++++ netbeans-7.0.1/libs.jakarta_oro/nbproject/project.properties 2011-10-27 14:33:56.174000002 -0400
+@@ -41,5 +41,4 @@
+ # made subject to such option by the copyright holder.
+
+ is.autoload=true
+-release.external/jakarta-oro-2.0.8.jar=modules/ext/jakarta-oro-2.0.8.jar
+ spec.version.base=1.11.1
+diff -ruN netbeans-7.0.1.my.orig/libs.javacapi/nbproject/project.properties netbeans-7.0.1.my/libs.javacapi/nbproject/project.properties
+--- netbeans-7.0.1/libs.javacapi/nbproject/project.properties 2011-10-27 14:28:15.877002052 -0400
++++ netbeans-7.0.1/libs.javacapi/nbproject/project.properties 2011-10-27 14:33:57.274000002 -0400
+@@ -47,6 +47,5 @@
+ nbm.homepage=http://jackpot.netbeans.org/
+ nbm.module.author=Petr Hrebejk, Sun Microsystems, Inc.
+ spec.version.base=7.6.1
+-release.external/javac-api-nb-7.0-b07.jar=modules/ext/javac-api-nb-7.0-b07.jar
+ javadoc.arch=${basedir}/arch.xml
+ module.javadoc.packages=com.sun.source.tree,com.sun.source.util
+diff -ruN netbeans-7.0.1.my.orig/libs.javacimpl/nbproject/project.properties netbeans-7.0.1.my/libs.javacimpl/nbproject/project.properties
+--- netbeans-7.0.1/libs.javacimpl/nbproject/project.properties 2011-10-27 14:26:24.083000002 -0400
++++ netbeans-7.0.1/libs.javacimpl/nbproject/project.properties 2011-10-27 14:33:56.659999999 -0400
+@@ -44,7 +44,6 @@
+ nbm.homepage=http://jackpot.netbeans.org/
+ nbm.module.author=Petr Hrebejk, Sun Microsystems, Inc.
+ spec.version.base=0.22.1
+-release.external/javac-impl-nb-7.0-b07.jar=modules/ext/javac-impl-nb-7.0-b07.jar
+ javadoc.arch=${basedir}/arch.xml
+
+
+diff -ruN netbeans-7.0.1.my.orig/libs.javacup/nbproject/project.properties netbeans-7.0.1.my/libs.javacup/nbproject/project.properties
+--- netbeans-7.0.1/libs.javacup/nbproject/project.properties 2011-10-27 14:26:59.745998327 -0400
++++ netbeans-7.0.1/libs.javacup/nbproject/project.properties 2011-10-27 14:33:56.850000002 -0400
+@@ -41,5 +41,4 @@
+ # made subject to such option by the copyright holder.
+
+ is.autoload=true
+-release.external/java-cup-11a.jar=modules/ext/java-cup-11a.jar
+ spec.version.base=1.10.1
+diff -ruN netbeans-7.0.1.my.orig/libs.jaxb/nbproject/project.properties netbeans-7.0.1.my/libs.jaxb/nbproject/project.properties
+--- netbeans-7.0.1/libs.jaxb/nbproject/project.properties 2011-10-27 14:25:29.322000001 -0400
++++ netbeans-7.0.1/libs.jaxb/nbproject/project.properties 2011-10-27 14:33:55.976000001 -0400
+@@ -48,11 +48,7 @@
+ modules/ext/jaxb/jaxb-xjc.jar,\
+ docs/jaxb-api-doc.zip
+
+-release.external/jaxb-impl.jar=modules/ext/jaxb/jaxb-impl.jar
+-release.external/jaxb1-impl.jar=modules/ext/jaxb/jaxb1-impl.jar
+-release.external/jaxb-xjc.jar=modules/ext/jaxb/jaxb-xjc.jar
+
+ # JAXB Javadoc
+-release.external/jaxb-api-doc.zip=docs/jaxb-api-doc.zip
+
+ sigtest.gen.fail.on.error=false
+diff -ruN netbeans-7.0.1.my.orig/libs.jna/nbproject/project.properties netbeans-7.0.1.my/libs.jna/nbproject/project.properties
+--- netbeans-7.0.1/libs.jna/nbproject/project.properties 2011-10-27 14:27:23.611000001 -0400
++++ netbeans-7.0.1/libs.jna/nbproject/project.properties 2011-10-27 14:33:56.941000001 -0400
+@@ -40,10 +40,4 @@
+ # Version 2 license, then the option applies only if the new code is
+ # made subject to such option by the copyright holder.
+
+-release.external/jna-3.2.7.jar=modules/ext/jna-3.2.7.jar
+-release.external/jna-3.2.7.jar!/com/sun/jna/darwin/libjnidispatch.jnilib=modules/lib/libjnidispatch.jnilib
+-release.external/jna-3.2.7.jar!/com/sun/jna/linux-amd64/libjnidispatch.so=modules/lib/amd64/Linux/libjnidispatch.so
+-release.external/jna-3.2.7.jar!/com/sun/jna/linux-i386/libjnidispatch.so=modules/lib/i386/Linux/libjnidispatch.so
+-release.external/jna-3.2.7.jar!/com/sun/jna/win32-amd64/jnidispatch.dll=modules/lib/amd64/jnidispatch.dll
+-release.external/jna-3.2.7.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch.dll
+ jnlp.indirect.files=modules/lib/**/*jnidispatch*
+diff -ruN netbeans-7.0.1.my.orig/libs.jsch/nbproject/project.properties netbeans-7.0.1.my/libs.jsch/nbproject/project.properties
+--- netbeans-7.0.1/libs.jsch/nbproject/project.properties 2011-10-27 14:25:28.360000002 -0400
++++ netbeans-7.0.1/libs.jsch/nbproject/project.properties 2011-10-27 14:33:55.920000151 -0400
+@@ -41,6 +41,5 @@
+ # made subject to such option by the copyright holder.
+
+ is.autoload=true
+-release.external/jsch-0.1.44.jar=modules/ext/jsch-0.1.44.jar
+ sigtest.gen.fail.on.error=false
+
+diff -ruN netbeans-7.0.1.my.orig/libs.junit4/nbproject/project.properties netbeans-7.0.1.my/libs.junit4/nbproject/project.properties
+--- netbeans-7.0.1/libs.junit4/nbproject/project.properties 2011-10-27 14:25:57.639000001 -0400
++++ netbeans-7.0.1/libs.junit4/nbproject/project.properties 2011-10-27 14:33:56.460000001 -0400
+@@ -41,7 +41,6 @@
+ # made subject to such option by the copyright holder.
+
+ is.autoload=true
+-release.external/junit-4.8.2.jar=modules/ext/junit-4.8.2.jar
+ nbm.target.cluster=platform
+ sigtest.skip.check=true
+
+diff -ruN netbeans-7.0.1.my.orig/libs.jvyamlb/nbproject/project.properties netbeans-7.0.1.my/libs.jvyamlb/nbproject/project.properties
+--- netbeans-7.0.1/libs.jvyamlb/nbproject/project.properties 2011-10-27 14:28:21.771000001 -0400
++++ netbeans-7.0.1/libs.jvyamlb/nbproject/project.properties 2011-10-27 14:33:57.318000002 -0400
+@@ -41,6 +41,5 @@
+ # made subject to such option by the copyright holder.
+
+ is.autoload=true
+-release.external/jvyamlb-0.2.3.jar=modules/ext/jvyamlb-0.2.3.jar
+
+ sigtest.gen.fail.on.error=false
+diff -ruN netbeans-7.0.1.my.orig/libs.jzlib/nbproject/project.properties netbeans-7.0.1.my/libs.jzlib/nbproject/project.properties
+--- netbeans-7.0.1/libs.jzlib/nbproject/project.properties 2011-10-27 14:26:16.557000001 -0400
++++ netbeans-7.0.1/libs.jzlib/nbproject/project.properties 2011-10-27 14:33:56.591000000 -0400
+@@ -41,6 +41,5 @@
+ # made subject to such option by the copyright holder.
+
+ is.autoload=true
+-release.external/jzlib-1.0.7.jar=modules/ext/jzlib-1.0.7.jar
+ spec.version.base=1.8.1
+ sigtest.gen.fail.on.error=false
+diff -ruN netbeans-7.0.1.my.orig/libs.lucene/nbproject/project.properties netbeans-7.0.1.my/libs.lucene/nbproject/project.properties
+--- netbeans-7.0.1/libs.lucene/nbproject/project.properties 2011-10-27 14:25:45.684000001 -0400
++++ netbeans-7.0.1/libs.lucene/nbproject/project.properties 2011-10-27 14:33:56.212000002 -0400
+@@ -41,5 +41,4 @@
+ # made subject to such option by the copyright holder.
+
+ is.autoload=true
+-release.external/lucene-core-3.0.3.jar=modules/ext/lucene-core-3.0.3.jar
+
+diff -ruN netbeans-7.0.1.my.orig/libs.osgi/nbproject/project.properties netbeans-7.0.1.my/libs.osgi/nbproject/project.properties
+--- netbeans-7.0.1/libs.osgi/nbproject/project.properties 2011-10-27 14:26:30.688000001 -0400
++++ netbeans-7.0.1/libs.osgi/nbproject/project.properties 2011-10-27 14:33:56.720000001 -0400
+@@ -2,5 +2,3 @@
+ javac.source=1.6
+ javac.compilerargs=-Xlint -Xlint:-serial
+
+-release.external/osgi.core-4.2.jar=modules/ext/osgi.core-4.2.jar
+-release.external/osgi.cmpn-4.2.jar=modules/ext/osgi.cmpn-4.2.jar
+diff -ruN netbeans-7.0.1.my.orig/libs.smack/nbproject/project.properties netbeans-7.0.1.my/libs.smack/nbproject/project.properties
+--- netbeans-7.0.1/libs.smack/nbproject/project.properties 2011-10-27 14:25:34.785000001 -0400
++++ netbeans-7.0.1/libs.smack/nbproject/project.properties 2011-10-27 14:33:56.073000001 -0400
+@@ -5,5 +5,3 @@
+ sigtest.gen.fail.on.error=false
+
+ license.file=${basedir}/README.html
+-release.external/smack.jar=modules/ext/smack.jar
+-release.external/smackx.jar=modules/ext/smackx.jar
+diff -ruN netbeans-7.0.1.my.orig/libs.springframework/nbproject/project.properties netbeans-7.0.1.my/libs.springframework/nbproject/project.properties
+--- netbeans-7.0.1/libs.springframework/nbproject/project.properties 2011-10-27 14:27:47.008000002 -0400
++++ netbeans-7.0.1/libs.springframework/nbproject/project.properties 2011-10-27 14:33:57.081000001 -0400
+@@ -43,31 +43,9 @@
+
+ is.autoload=true
+
+-release.external/spring-2.5.6.SEC01.jar=modules/ext/spring/spring-2.5.6.SEC01.jar
+
+ module.jar.verifylinkageignores=org((\.apache\.commons\.logging\.impl)|(\.springframework)).*
+
+-release.external/spring-framework-3.0.2.RELEASE.zip!/spring-framework-3.0.2.RELEASE/org.springframework.aop-3.0.2.RELEASE.jar=modules/ext/spring-3.0/spring-aop-3.0.2.RELEASE.jar
+-release.external/spring-framework-3.0.2.RELEASE.zip!/spring-framework-3.0.2.RELEASE/org.springframework.asm-3.0.2.RELEASE.jar=modules/ext/spring-3.0/spring-asm-3.0.2.RELEASE.jar
+-release.external/spring-framework-3.0.2.RELEASE.zip!/spring-framework-3.0.2.RELEASE/org.springframework.aspects-3.0.2.RELEASE.jar=modules/ext/spring-3.0/spring-aspects-3.0.2.RELEASE.jar
+-release.external/spring-framework-3.0.2.RELEASE.zip!/spring-framework-3.0.2.RELEASE/org.springframework.beans-3.0.2.RELEASE.jar=modules/ext/spring-3.0/spring-beans-3.0.2.RELEASE.jar
+-release.external/spring-framework-3.0.2.RELEASE.zip!/spring-framework-3.0.2.RELEASE/org.springframework.context-3.0.2.RELEASE.jar=modules/ext/spring-3.0/spring-context-3.0.2.RELEASE.jar
+-release.external/spring-framework-3.0.2.RELEASE.zip!/spring-framework-3.0.2.RELEASE/org.springframework.context.support-3.0.2.RELEASE.jar=modules/ext/spring-3.0/spring-context-support-3.0.2.RELEASE.jar
+-release.external/spring-framework-3.0.2.RELEASE.zip!/spring-framework-3.0.2.RELEASE/org.springframework.core-3.0.2.RELEASE.jar=modules/ext/spring-3.0/spring-core-3.0.2.RELEASE.jar
+-release.external/spring-framework-3.0.2.RELEASE.zip!/spring-framework-3.0.2.RELEASE/org.springframework.expression-3.0.2.RELEASE.jar=modules/ext/spring-3.0/spring-expression-3.0.2.RELEASE.jar
+-release.external/spring-framework-3.0.2.RELEASE.zip!/spring-framework-3.0.2.RELEASE/org.springframework.instrument-3.0.2.RELEASE.jar=modules/ext/spring-3.0/spring-instrument-3.0.2.RELEASE.jar
+-release.external/spring-framework-3.0.2.RELEASE.zip!/spring-framework-3.0.2.RELEASE/org.springframework.instrument.tomcat-3.0.2.RELEASE.jar=modules/ext/spring-3.0/spring-instrument-tomcat-3.0.2.RELEASE.jar
+-release.external/spring-framework-3.0.2.RELEASE.zip!/spring-framework-3.0.2.RELEASE/org.springframework.jdbc-3.0.2.RELEASE.jar=modules/ext/spring-3.0/spring-jdbc-3.0.2.RELEASE.jar
+-release.external/spring-framework-3.0.2.RELEASE.zip!/spring-framework-3.0.2.RELEASE/org.springframework.jms-3.0.2.RELEASE.jar=modules/ext/spring-3.0/spring-jms-3.0.2.RELEASE.jar
+-release.external/spring-framework-3.0.2.RELEASE.zip!/spring-framework-3.0.2.RELEASE/org.springframework.orm-3.0.2.RELEASE.jar=modules/ext/spring-3.0/spring-orm-3.0.2.RELEASE.jar
+-release.external/spring-framework-3.0.2.RELEASE.zip!/spring-framework-3.0.2.RELEASE/org.springframework.oxm-3.0.2.RELEASE.jar=modules/ext/spring-3.0/spring-oxm-3.0.2.RELEASE.jar
+-release.external/spring-framework-3.0.2.RELEASE.zip!/spring-framework-3.0.2.RELEASE/org.springframework.test-3.0.2.RELEASE.jar=modules/ext/spring-3.0/spring-test-3.0.2.RELEASE.jar
+-release.external/spring-framework-3.0.2.RELEASE.zip!/spring-framework-3.0.2.RELEASE/org.springframework.transaction-3.0.2.RELEASE.jar=modules/ext/spring-3.0/spring-tx-3.0.2.RELEASE.jar
+-release.external/spring-framework-3.0.2.RELEASE.zip!/spring-framework-3.0.2.RELEASE/org.springframework.web-3.0.2.RELEASE.jar=modules/ext/spring-3.0/spring-web-3.0.2.RELEASE.jar
+-release.external/spring-framework-3.0.2.RELEASE.zip!/spring-framework-3.0.2.RELEASE/org.springframework.web.portlet-3.0.2.RELEASE.jar=modules/ext/spring-3.0/spring-webmvc-portlet-3.0.2.RELEASE.jar
+-release.external/spring-framework-3.0.2.RELEASE.zip!/spring-framework-3.0.2.RELEASE/org.springframework.web.servlet-3.0.2.RELEASE.jar=modules/ext/spring-3.0/spring-webmvc-3.0.2.RELEASE.jar
+-release.external/spring-framework-3.0.2.RELEASE.zip!/spring-framework-3.0.2.RELEASE/org.springframework.web.struts-3.0.2.RELEASE.jar=modules/ext/spring-3.0/spring-struts-3.0.2.RELEASE.jar
+-release.external/spring-framework-3.0.2.RELEASE.zip!/spring-framework-3.0.2.RELEASE/license.txt=modules/ext/spring-3.0/license.txt
+
+ jnlp.indirect.jars=\
+ modules/ext/spring-3.0/spring-aop-3.0.2.RELEASE.jar,\
+diff -ruN netbeans-7.0.1.my.orig/libs.svnClientAdapter.javahl/nbproject/project.properties netbeans-7.0.1.my/libs.svnClientAdapter.javahl/nbproject/project.properties
+--- netbeans-7.0.1/libs.svnClientAdapter.javahl/nbproject/project.properties 2011-10-27 14:28:08.284000002 -0400
++++ netbeans-7.0.1/libs.svnClientAdapter.javahl/nbproject/project.properties 2011-10-27 14:33:57.262000002 -0400
+@@ -43,8 +43,6 @@
+
+ is.eager=true
+ javac.source=1.6
+-release.external/svnClientAdapter-javahl-1.6.13.jar=modules/ext/svnClientAdapter-javahl-1.6.13.jar
+-release.external/svnjavahl-1.6.0.jar=modules/ext/svnjavahl-1.6.0.jar
+
+ # Hidden class found: org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments in method protected byte[] org.tigris.subversion.svnclientadapter.commandline.SvnCommandLine.execBytes(org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments,boolean) throws java.lang.Exception in class org.tigris.subversion.svnclientadapter.commandline.SvnCommandLine
+ # Hidden class found: org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments in method protected java.lang.String org.tigris.subversion.svnclientadapter.commandline.SvnAdminCommandLine.execString(org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments,boolean) throws java.lang.Exception in class org.tigris.subversion.svnclientadapter.commandline.SvnAdminCommandLine
+diff -ruN netbeans-7.0.1.my.orig/libs.svnClientAdapter.svnkit/nbproject/project.properties netbeans-7.0.1.my/libs.svnClientAdapter.svnkit/nbproject/project.properties
+--- netbeans-7.0.1/libs.svnClientAdapter.svnkit/nbproject/project.properties 2011-10-27 14:25:56.383000001 -0400
++++ netbeans-7.0.1/libs.svnClientAdapter.svnkit/nbproject/project.properties 2011-10-27 14:33:56.443000001 -0400
+@@ -43,11 +43,6 @@
+
+ is.eager=true
+ javac.source=1.6
+-release.external/svnClientAdapter-svnkit-1.6.13.jar=modules/ext/svnClientAdapter-svnkit-1.6.13.jar
+-release.external/svnkit-javahl.jar=modules/ext/svnkit-javahl.jar
+-release.external/svnkit-1.3.4.jar=modules/ext/svnkit-1.3.4.jar
+-release.external/sqljet-1.0.3.jar=modules/ext/sqljet-1.0.3.jar
+-release.external/trilead.jar=modules/ext/trilead.jar
+
+ sigtest.gen.fail.on.error=false
+
+diff -ruN netbeans-7.0.1.my.orig/libs.swingx/nbproject/project.properties netbeans-7.0.1.my/libs.swingx/nbproject/project.properties
+--- netbeans-7.0.1/libs.swingx/nbproject/project.properties 2011-10-27 14:25:41.233002643 -0400
++++ netbeans-7.0.1/libs.swingx/nbproject/project.properties 2011-10-27 14:33:56.125000001 -0400
+@@ -40,6 +40,5 @@
+ # Version 2 license, then the option applies only if the new code is
+ # made subject to such option by the copyright holder.
+
+-release.external/swingx-0.9.5.jar=modules/ext/swingx-0.9.5.jar
+ sigtest.gen.fail.on.error=false
+
+diff -ruN netbeans-7.0.1.my.orig/libs.xerces/nbproject/project.properties netbeans-7.0.1.my/libs.xerces/nbproject/project.properties
+--- netbeans-7.0.1/libs.xerces/nbproject/project.properties 2011-10-27 14:26:14.251000001 -0400
++++ netbeans-7.0.1/libs.xerces/nbproject/project.properties 2011-10-27 14:33:56.571000002 -0400
+@@ -41,6 +41,5 @@
+ # made subject to such option by the copyright holder.
+
+ is.autoload=true
+-release.external/xerces-2.8.0.jar=modules/ext/xerces-2.8.0.jar
+ module.jar.verifylinkageignores=org.apache.xerces.util.XMLCatalogResolver
+ spec.version.base=1.22.1
+diff -ruN netbeans-7.0.1.my.orig/maven.embedder/nbproject/project.properties netbeans-7.0.1.my/maven.embedder/nbproject/project.properties
+--- netbeans-7.0.1/maven.embedder/nbproject/project.properties 2011-10-27 14:28:02.874000001 -0400
++++ netbeans-7.0.1/maven.embedder/nbproject/project.properties 2011-10-27 14:33:57.216000002 -0400
+@@ -41,8 +41,6 @@
+ is.autoload=true
+ javac.source=1.6
+ javac.compilerargs=-Xlint -Xlint:-serial
+-release.external/jdom-1.0.jar=modules/ext/maven/jdom-1.0.jar
+-release.external/maven-dependency-tree-1.2.jar=modules/ext/maven/maven-dependency-tree-1.2.jar
+ bundled.maven=apache-maven-3.0.3
+ extra.module.files=maven/
+ nbm.executable.files=maven/bin/mvn,maven/bin/mvnDebug,maven/bin/mvnyjp
+diff -ruN netbeans-7.0.1.my.orig/maven.indexer/nbproject/project.properties netbeans-7.0.1.my/maven.indexer/nbproject/project.properties
+--- netbeans-7.0.1/maven.indexer/nbproject/project.properties 2011-10-27 14:28:19.080000004 -0400
++++ netbeans-7.0.1/maven.indexer/nbproject/project.properties 2011-10-27 14:33:57.296000002 -0400
+@@ -41,6 +41,4 @@
+ is.autoload=true
+ javac.source=1.6
+ javac.compilerargs=-Xlint -Xlint:-serial
+-release.external/indexer-core-4.1.0.jar=modules/ext/maven/indexer-core-4.1.0.jar
+-release.external/indexer-artifact-4.1.0.jar=modules/ext/maven/indexer-artifact-4.1.0.jar
+
+diff -ruN netbeans-7.0.1.my.orig/mobility.antext/nbproject/project.properties netbeans-7.0.1.my/mobility.antext/nbproject/project.properties
+--- netbeans-7.0.1/mobility.antext/nbproject/project.properties 2011-10-27 14:26:50.477000002 -0400
++++ netbeans-7.0.1/mobility.antext/nbproject/project.properties 2011-10-27 14:33:56.822000001 -0400
+@@ -49,5 +49,4 @@
+ ${netbeans.dest.dir}/extra/modules/org-netbeans-modules-mobility-antext.jar:\
+ ${netbeans.dest.dir}/mobility/modules/org-netbeans-modules-mobility-antext.jar
+
+-release.external/ant-contrib-1.0b3.jar=modules/ext/ant-contrib-1.0b3.jar
+
+diff -ruN netbeans-7.0.1.my.orig/mobility.deployment.webdav/nbproject/project.properties netbeans-7.0.1.my/mobility.deployment.webdav/nbproject/project.properties
+--- netbeans-7.0.1/mobility.deployment.webdav/nbproject/project.properties 2011-10-27 14:26:32.848000001 -0400
++++ netbeans-7.0.1/mobility.deployment.webdav/nbproject/project.properties 2011-10-27 14:33:56.740000000 -0400
+@@ -42,9 +42,5 @@
+
+ javac.source=1.6
+
+-release.external/commons-httpclient-3.0.1.jar=modules/ext/commons-httpclient-3.0.1.jar
+-release.external/jdom-1.0.jar=modules/ext/jdom-1.0.jar
+-release.external/jakarta-slide-webdavlib-2.1.jar=modules/ext/jakarta-slide-webdavlib-2.1.jar
+-release.external/jakarta-slide-ant-webdav-2.1.jar=modules/ext/jakarta-slide-ant-webdav-2.1.jar
+ release.scripts/deploy-webdav-impl.xml=modules/scr/deploy-webdav-impl.xml
+
+diff -ruN netbeans-7.0.1.my.orig/mobility.j2meunit/nbproject/project.properties netbeans-7.0.1.my/mobility.j2meunit/nbproject/project.properties
+--- netbeans-7.0.1/mobility.j2meunit/nbproject/project.properties 2011-10-27 14:28:01.435000001 -0400
++++ netbeans-7.0.1/mobility.j2meunit/nbproject/project.properties 2011-10-27 14:33:57.193000002 -0400
+@@ -46,7 +46,4 @@
+ modules/ext/jmunit4cldc10-1.2.1.jar
+ javac.source=1.6
+
+-release.external/jmunit4cldc10-1.2.1.jar=modules/ext/jmunit4cldc10-1.2.1.jar
+-release.external/jmunit4cldc11-1.2.1.jar=modules/ext/jmunit4cldc11-1.2.1.jar
+-release.external/jmunit-1.2.1-api.zip=modules/docs/jmunit-1.2.1-api.zip
+
+diff -ruN netbeans-7.0.1.my.orig/o.apache.xml.resolver/nbproject/project.properties netbeans-7.0.1.my/o.apache.xml.resolver/nbproject/project.properties
+--- netbeans-7.0.1/o.apache.xml.resolver/nbproject/project.properties 2011-10-27 14:25:46.375000001 -0400
++++ netbeans-7.0.1/o.apache.xml.resolver/nbproject/project.properties 2011-10-27 14:33:56.238000002 -0400
+@@ -41,5 +41,4 @@
+ # made subject to such option by the copyright holder.
+
+ is.autoload=true
+-release.external/resolver-1.2.jar=modules/ext/resolver-1.2.jar
+ spec.version.base=1.15.1
+diff -ruN netbeans-7.0.1.my.orig/o.jdesktop.beansbinding/nbproject/project.properties netbeans-7.0.1.my/o.jdesktop.beansbinding/nbproject/project.properties
+--- netbeans-7.0.1/o.jdesktop.beansbinding/nbproject/project.properties 2011-10-27 14:26:10.376000003 -0400
++++ netbeans-7.0.1/o.jdesktop.beansbinding/nbproject/project.properties 2011-10-27 14:33:56.543000001 -0400
+@@ -41,7 +41,5 @@
+ # made subject to such option by the copyright holder.
+
+ is.autoload=true
+-release.external/beansbinding-1.2.1.jar=modules/ext/beansbinding-1.2.1.jar
+-release.external/beansbinding-1.2.1-doc.zip=docs/beansbinding-1.2.1-doc.zip
+ jnlp.indirect.jars=docs/beansbinding-1.2.1-doc.zip
+ spec.version.base=1.11.1
+diff -ruN netbeans-7.0.1.my.orig/o.jdesktop.layout/nbproject/project.properties netbeans-7.0.1.my/o.jdesktop.layout/nbproject/project.properties
+--- netbeans-7.0.1/o.jdesktop.layout/nbproject/project.properties 2011-10-27 14:25:29.758000002 -0400
++++ netbeans-7.0.1/o.jdesktop.layout/nbproject/project.properties 2011-10-27 14:33:55.988000001 -0400
+@@ -41,7 +41,4 @@
+ # made subject to such option by the copyright holder.
+
+ is.autoload=true
+-release.external/swing-layout-1.0.4.jar=modules/ext/swing-layout-1.0.4.jar
+-release.external/swing-layout-1.0.4-doc.zip=docs/swing-layout-1.0.4-doc.zip
+-release.external/swing-layout-1.0.4-src.zip=docs/swing-layout-1.0.4-src.zip
+ jnlp.indirect.jars=docs/swing-layout-1.0.4-doc.zip, docs/swing-layout-1.0.4-src.zip
+diff -ruN netbeans-7.0.1.my.orig/o.n.core/nbproject/project.properties netbeans-7.0.1.my/o.n.core/nbproject/project.properties
+--- netbeans-7.0.1/o.n.core/nbproject/project.properties 2011-10-27 14:25:28.007000001 -0400
++++ netbeans-7.0.1/o.n.core/nbproject/project.properties 2011-10-27 14:33:55.839999976 -0400
+@@ -45,7 +45,6 @@
+
+ javadoc.arch=${basedir}/arch.xml
+
+-release.external/nsProxyAutoConfig.js=modules/ext/nsProxyAutoConfig.js
+ jnlp.indirect.files=modules/ext/nsProxyAutoConfig.js
+ jnlp.verify.excludes=config/ModuleAutoDeps/org-netbeans-core.xml, LICENSE.txt, DISTRIBUTION.txt, THIRDPARTYLICENSEREADME.txt
+
+diff -ruN netbeans-7.0.1.my.orig/o.n.mobility.lib.activesync/nbproject/project.properties netbeans-7.0.1.my/o.n.mobility.lib.activesync/nbproject/project.properties
+--- netbeans-7.0.1/o.n.mobility.lib.activesync/nbproject/project.properties 2011-10-27 14:26:39.386999847 -0400
++++ netbeans-7.0.1/o.n.mobility.lib.activesync/nbproject/project.properties 2011-10-27 14:33:56.789000002 -0400
+@@ -43,6 +43,4 @@
+ is.autoload=true
+ javac.compilerargs=-Xlint:unchecked
+ javac.source=1.6
+-release.external/nbactivesync.dll=modules/lib/nbactivesync.dll
+-release.external/nbactivesync-5.0.jar=modules/ext/nbactivesync-5.0.jar
+
+diff -ruN netbeans-7.0.1.my.orig/php.editor/nbproject/project.properties netbeans-7.0.1.my/php.editor/nbproject/project.properties
+--- netbeans-7.0.1/php.editor/nbproject/project.properties 2011-10-27 14:28:35.828999990 -0400
++++ netbeans-7.0.1/php.editor/nbproject/project.properties 2011-10-27 14:33:57.339000002 -0400
+@@ -4,7 +4,6 @@
+ javac.compilerargs=-J-Xmx512m
+ nbm.needs.restart=true
+ spec.version.base=1.17.1
+-release.external/predefined_vars.zip=docs/predefined_vars.zip
+ sigtest.gen.fail.on.error=false
+
+ test-unit-sys-prop.xtest.php.home=${netbeans.dest.dir}/php
+diff -ruN netbeans-7.0.1.my.orig/php.phpdoc.documentation/nbproject/project.properties netbeans-7.0.1.my/php.phpdoc.documentation/nbproject/project.properties
+--- netbeans-7.0.1/php.phpdoc.documentation/nbproject/project.properties 2011-10-27 14:28:03.539000001 -0400
++++ netbeans-7.0.1/php.phpdoc.documentation/nbproject/project.properties 2011-10-27 14:33:57.225000002 -0400
+@@ -1 +0,0 @@
+-release.external/phpdocdesc.zip=docs/phpdocdesc.zip
+diff -ruN netbeans-7.0.1.my.orig/servletapi/nbproject/project.properties netbeans-7.0.1.my/servletapi/nbproject/project.properties
+--- netbeans-7.0.1/servletapi/nbproject/project.properties 2011-10-27 14:27:22.541000001 -0400
++++ netbeans-7.0.1/servletapi/nbproject/project.properties 2011-10-27 14:33:56.930000001 -0400
+@@ -41,4 +41,3 @@
+ # made subject to such option by the copyright holder.
+
+ is.autoload=true
+-release.external/servlet-2.2.jar=modules/ext/servlet-2.2.jar
+diff -ruN netbeans-7.0.1.my.orig/servletjspapi/nbproject/project.properties netbeans-7.0.1.my/servletjspapi/nbproject/project.properties
+--- netbeans-7.0.1/servletjspapi/nbproject/project.properties 2011-10-27 14:26:12.369000001 -0400
++++ netbeans-7.0.1/servletjspapi/nbproject/project.properties 2011-10-27 14:33:56.560000001 -0400
+@@ -41,7 +41,6 @@
+ # made subject to such option by the copyright holder.
+
+ is.autoload=true
+-release.external/servlet3.0-jsp2.2-api.jar=modules/ext/servlet3.0-jsp2.2-api.jar
+ javac.compilerargs=-Xlint:unchecked
+ javac.source=1.6
+ spec.version.base=1.12.1
+diff -ruN netbeans-7.0.1.my.orig/spellchecker.dictionary_en/nbproject/project.properties netbeans-7.0.1.my/spellchecker.dictionary_en/nbproject/project.properties
+--- netbeans-7.0.1/spellchecker.dictionary_en/nbproject/project.properties 2011-10-27 14:29:01.304000006 -0400
++++ netbeans-7.0.1/spellchecker.dictionary_en/nbproject/project.properties 2011-10-27 14:33:57.380000002 -0400
+@@ -1,3 +1,2 @@
+ javac.source=1.5
+-release.external/ispell-enwl-3.1.20.zip=modules/dict/ispell-enwl-3.1.20.zip
+ jnlp.indirect.files=modules/dict/dictionary_en_US.description,modules/dict/dictionary_en_GB.description,modules/dict/ispell-enwl-3.1.20.zip,modules/dict/dictionary_en.description
+diff -ruN netbeans-7.0.1.my.orig/spring.webmvc/nbproject/project.properties netbeans-7.0.1.my/spring.webmvc/nbproject/project.properties
+--- netbeans-7.0.1/spring.webmvc/nbproject/project.properties 2011-10-27 14:27:35.859000001 -0400
++++ netbeans-7.0.1/spring.webmvc/nbproject/project.properties 2011-10-27 14:33:57.018000001 -0400
+@@ -43,7 +43,6 @@
+ javac.source=1.6
+ javac.compilerargs=-Xlint -Xlint:-serial
+
+-release.external/spring-webmvc-2.5.6.SEC01.jar=modules/ext/spring/spring-webmvc-2.5.6.SEC01.jar
+ #release.external/spring-webmvc-3.0.2.RELEASE.jar=modules/ext/spring/spring-webmvc-3.0.2.RELEASE.jar
+
+ jnlp.indirect.jars=modules/ext/spring/spring-webmvc-2.5.6.SEC01.jar
+diff -ruN netbeans-7.0.1.my.orig/svg.perseus/nbproject/project.properties netbeans-7.0.1.my/svg.perseus/nbproject/project.properties
+--- netbeans-7.0.1/svg.perseus/nbproject/project.properties 2011-10-27 14:25:30.104000001 -0400
++++ netbeans-7.0.1/svg.perseus/nbproject/project.properties 2011-10-27 14:33:56.005999999 -0400
+@@ -1,5 +1,4 @@
+ is.autoload=true
+-release.external/perseus-nb-1.0.jar=modules/ext/perseus-nb-1.0.jar
+
+
+ # Fatal error: class javax.media.ControllerListener not found
+diff -ruN netbeans-7.0.1.my.orig/swing.validation/nbproject/project.properties netbeans-7.0.1.my/swing.validation/nbproject/project.properties
+--- netbeans-7.0.1/swing.validation/nbproject/project.properties 2011-10-27 14:28:21.935000001 -0400
++++ netbeans-7.0.1/swing.validation/nbproject/project.properties 2011-10-27 14:33:57.328000002 -0400
+@@ -4,4 +4,3 @@
+ javadoc.arch=${basedir}/arch.xml
+ nbm.homepage=http://kenai.com/projects/simplevalidation/pages/Home
+ nbm.module.author=Tim Boudreau
+-release.external/ValidationAPI.jar=modules/ext/ValidationAPI.jar
+diff -ruN netbeans-7.0.1.my.orig/web.core.syntax/nbproject/project.properties netbeans-7.0.1.my/web.core.syntax/nbproject/project.properties
+--- netbeans-7.0.1/web.core.syntax/nbproject/project.properties 2011-10-27 14:27:36.019000001 -0400
++++ netbeans-7.0.1/web.core.syntax/nbproject/project.properties 2011-10-27 14:33:57.034000001 -0400
+@@ -41,7 +41,6 @@
+ # made subject to such option by the copyright holder.
+
+ javac.compilerargs=-Xlint:unchecked
+-release.external/syntaxref20.zip=docs/syntaxref20.zip
+ release.tlddoc/doc/jstl11-doc.zip=docs/jstl11-doc.zip
+ release.tlddoc/doc/jsf12-tlddoc.zip=docs/jsf12-tlddoc.zip
+ release.tlddoc/doc/struts-tags.zip=docs/struts-tags.zip
+diff -ruN netbeans-7.0.1.my.orig/web.jsf12/nbproject/project.properties netbeans-7.0.1.my/web.jsf12/nbproject/project.properties
+--- netbeans-7.0.1/web.jsf12/nbproject/project.properties 2011-10-27 14:26:29.974000003 -0400
++++ netbeans-7.0.1/web.jsf12/nbproject/project.properties 2011-10-27 14:33:56.710000000 -0400
+@@ -44,9 +44,5 @@
+ # release.external/jsf-1.2.zip!/jsf-1.2/commons-collections.jar=modules/ext/jsf-1_2/commons-collections.jar
+ # release.external/jsf-1.2.zip!/jsf-1.2/commons-digester.jar=modules/ext/jsf-1_2/commons-digester.jar
+ # release.external/jsf-1.2.zip!/jsf-1.2/commons-logging.jar=modules/ext/jsf-1_2/commons-logging.jar
+-release.external/jsf-1.2.zip!/jsf-1.2/jsf-api.jar=modules/ext/jsf-1_2/jsf-api.jar
+ # release.external/jsf-1.2.zip!/jsf-1.2/jsf-impl.jar=modules/ext/jsf-1_2/jsf-impl.jar
+-release.external/jsf-1.2.zip!/jsf-1.2/LICENSE-APACHE.txt=modules/ext/jsf-1_2/LICENSE-APACHE.txt
+-release.external/jsf-1.2.zip!/jsf-1.2/LICENSE.TXT=modules/ext/jsf-1_2/LICENSE.TXT
+-release.external/jsf-1.2.zip!/jsf-1.2/THIRDPARTYLICENSEREADME.txt=modules/ext/jsf-1_2/THIRDPARTYLICENSEREADME.txt
+ spec.version.base=1.11.1
+diff -ruN netbeans-7.0.1.my.orig/web.jsf20/nbproject/project.properties netbeans-7.0.1.my/web.jsf20/nbproject/project.properties
+--- netbeans-7.0.1/web.jsf20/nbproject/project.properties 2011-10-27 14:25:29.112000001 -0400
++++ netbeans-7.0.1/web.jsf20/nbproject/project.properties 2011-10-27 14:33:55.937999979 -0400
+@@ -40,9 +40,4 @@
+ # Version 2 license, then the option applies only if the new code is
+ # made subject to such option by the copyright holder.
+
+-release.external/jsf-2.1.zip!/jsf-2.1/jsf-api.jar=modules/ext/jsf-2_1/jsf-api.jar
+-release.external/jsf-2.1.zip!/jsf-2.1/jsf-impl.jar=modules/ext/jsf-2_1/jsf-impl.jar
+-release.external/jsf-2.1.zip!/jsf-2.1/LICENSE-APACHE.txt=modules/ext/jsf-2_1/LICENSE-APACHE.txt
+-release.external/jsf-2.1.zip!/jsf-2.1/LICENSE.TXT=modules/ext/jsf-2_1/LICENSE.TXT
+-release.external/jsf-2.1.zip!/jsf-2.1/THIRDPARTYLICENSEREADME.txt=modules/ext/jsf-2_1/THIRDPARTYLICENSEREADME.txt
+ spec.version.base=1.8.1
+diff -ruN netbeans-7.0.1.my.orig/web.jsf.editor/nbproject/project.properties netbeans-7.0.1.my/web.jsf.editor/nbproject/project.properties
+--- netbeans-7.0.1/web.jsf.editor/nbproject/project.properties 2011-10-27 14:25:59.525000096 -0400
++++ netbeans-7.0.1/web.jsf.editor/nbproject/project.properties 2011-10-27 14:33:56.475000001 -0400
+@@ -55,6 +55,5 @@
+
+ requires.nb.javac=true
+
+-release.external/jsf-api-docs.zip=docs/jsf-api-docs.zip
+
+ test-unit-sys-prop.netbeans.dirs=${netbeans.dest.dir}/${nb.cluster.enterprise.dir}
+diff -ruN netbeans-7.0.1.my.orig/web.jspparser/nbproject/project.properties netbeans-7.0.1.my/web.jspparser/nbproject/project.properties
+--- netbeans-7.0.1/web.jspparser/nbproject/project.properties 2011-10-27 14:27:40.587000002 -0400
++++ netbeans-7.0.1/web.jspparser/nbproject/project.properties 2011-10-27 14:33:57.046000001 -0400
+@@ -48,7 +48,6 @@
+
+ extra.module.files=modules/ext/jsp-parser-ext.jar
+
+-release.external/glassfish-jspparser-3.0.jar=modules/ext/glassfish-jspparser-3.0.jar
+
+ javadoc.arch=${basedir}/arch.xml
+
+diff -ruN netbeans-7.0.1.my.orig/web.jstl11/nbproject/project.properties netbeans-7.0.1.my/web.jstl11/nbproject/project.properties
+--- netbeans-7.0.1/web.jstl11/nbproject/project.properties 2011-10-27 14:25:54.373000001 -0400
++++ netbeans-7.0.1/web.jstl11/nbproject/project.properties 2011-10-27 14:33:56.358999977 -0400
+@@ -40,8 +40,6 @@
+ # Version 2 license, then the option applies only if the new code is
+ # made subject to such option by the copyright holder.
+
+-release.external/jstl-1.1.2.jar=modules/ext/jstl.jar
+-release.external/standard-1.1.2.jar=modules/ext/standard.jar
+
+
+ spec.version.base=2.19.1
+diff -ruN netbeans-7.0.1.my.orig/web.primefaces/nbproject/project.properties netbeans-7.0.1.my/web.primefaces/nbproject/project.properties
+--- netbeans-7.0.1/web.primefaces/nbproject/project.properties 2011-10-27 14:27:20.966000001 -0400
++++ netbeans-7.0.1/web.primefaces/nbproject/project.properties 2011-10-27 14:33:56.919000001 -0400
+@@ -1,4 +1,3 @@
+ javac.source=1.6
+ javac.compilerargs=-Xlint -Xlint:-serial
+
+-release.external/primefaces-2.2.1.jar=modules/ext/primefaces/primefaces-2.2.1.jar
+\ No newline at end of file
+diff -ruN netbeans-7.0.1.my.orig/web.struts/nbproject/project.properties netbeans-7.0.1.my/web.struts/nbproject/project.properties
+--- netbeans-7.0.1/web.struts/nbproject/project.properties 2011-10-27 14:26:04.024000001 -0400
++++ netbeans-7.0.1/web.struts/nbproject/project.properties 2011-10-27 14:33:56.511000002 -0400
+@@ -65,7 +65,6 @@
+ modules/ext/struts/struts-scripting-1.3.8.jar,\
+ modules/ext/struts/struts-taglib-1.3.8.jar,\
+ modules/ext/struts/struts-tiles-1.3.8.jar
+-release.external/struts-1.3.8-javadoc.zip=docs/struts-1.3.8-javadoc.zip
+
+ test.unit.cp.extra=\
+ ${xml.text.dir}/modules/org-netbeans-modules-xml-text.jar
+diff -ruN netbeans-7.0.1.my.orig/websvc.jaxws21/nbproject/project.properties netbeans-7.0.1.my/websvc.jaxws21/nbproject/project.properties
+--- netbeans-7.0.1/websvc.jaxws21/nbproject/project.properties 2011-10-27 14:25:54.364000001 -0400
++++ netbeans-7.0.1/websvc.jaxws21/nbproject/project.properties 2011-10-27 14:33:56.300000002 -0400
+@@ -59,21 +59,8 @@
+ modules/ext/jaxws22/woodstox.jar,\
+ docs/jaxws-api-doc.zip
+
+-release.external/jaxws-2.2.zip!/FastInfoset.jar=modules/ext/jaxws22/FastInfoset.jar
+-release.external/jaxws-2.2.zip!/gmbal-api-only.jar=modules/ext/jaxws22/gmbal-api-only.jar
+-release.external/jaxws-2.2.zip!/http.jar=modules/ext/jaxws22/http.jar
+-release.external/jaxws-2.2.zip!/jaxws-rt.jar=modules/ext/jaxws22/jaxws-rt.jar
+-release.external/jaxws-2.2.zip!/jaxws-tools.jar=modules/ext/jaxws22/jaxws-tools.jar
+-release.external/jaxws-2.2.zip!/management-api.jar=modules/ext/jaxws22/management-api.jar
+-release.external/jaxws-2.2.zip!/mimepull.jar=modules/ext/jaxws22/mimepull.jar
+-release.external/jaxws-2.2.zip!/policy.jar=modules/ext/jaxws22/policy.jar
+-release.external/jaxws-2.2.zip!/saaj-impl.jar=modules/ext/jaxws22/saaj-impl.jar
+-release.external/jaxws-2.2.zip!/stax-ex.jar=modules/ext/jaxws22/stax-ex.jar
+-release.external/jaxws-2.2.zip!/streambuffer.jar=modules/ext/jaxws22/streambuffer.jar
+-release.external/jaxws-2.2.zip!/woodstox.jar=modules/ext/jaxws22/woodstox.jar
+
+ # JAX-WS 2.1 Javadoc
+-release.external/jaxws-api-doc.zip=docs/jaxws-api-doc.zip
+
+ # throws NPE for some reason
+ sigtest.gen.fail.on.error=false
+diff -ruN netbeans-7.0.1.my.orig/websvc.jaxws21api/nbproject/project.properties netbeans-7.0.1.my/websvc.jaxws21api/nbproject/project.properties
+--- netbeans-7.0.1/websvc.jaxws21api/nbproject/project.properties 2011-10-27 14:25:50.551000001 -0400
++++ netbeans-7.0.1/websvc.jaxws21api/nbproject/project.properties 2011-10-27 14:33:56.281000001 -0400
+@@ -50,9 +50,5 @@
+ modules/ext/jaxws22/api/jsr250-api.jar,\
+ modules/ext/jaxws22/api/saaj-api.jar
+
+-release.external/jaxws-2.2-api.zip!/jaxws-api.jar=modules/ext/jaxws22/api/jaxws-api.jar
+-release.external/jaxws-2.2-api.zip!/jsr181-api.jar=modules/ext/jaxws22/api/jsr181-api.jar
+-release.external/jaxws-2.2-api.zip!/jsr250-api.jar=modules/ext/jaxws22/api/jsr250-api.jar
+-release.external/jaxws-2.2-api.zip!/saaj-api.jar=modules/ext/jaxws22/api/saaj-api.jar
+
+ javadoc.arch=${basedir}/arch.xml
+diff -ruN netbeans-7.0.1.my.orig/websvc.metro.lib/nbproject/project.properties netbeans-7.0.1.my/websvc.metro.lib/nbproject/project.properties
+--- netbeans-7.0.1/websvc.metro.lib/nbproject/project.properties 2011-10-27 14:26:46.550000169 -0400
++++ netbeans-7.0.1/websvc.metro.lib/nbproject/project.properties 2011-10-27 14:33:56.807000000 -0400
+@@ -47,14 +47,8 @@
+ modules/ext/metro/webservices-extra-api.jar,\
+ modules/ext/metro/webservices-rt.jar
+
+-release.external/metro-2.0.zip!/webservices-api.jar=modules/ext/metro/webservices-api.jar
+-release.external/metro-2.0.zip!/webservices-extra.jar=modules/ext/metro/webservices-extra.jar
+-release.external/metro-2.0.zip!/webservices-tools.jar=modules/ext/metro/webservices-tools.jar
+-release.external/metro-2.0.zip!/webservices-extra-api.jar=modules/ext/metro/webservices-extra-api.jar
+-release.external/metro-2.0.zip!/webservices-rt.jar=modules/ext/metro/webservices-rt.jar
+
+ # Metro Javadoc
+-release.external/metro-1.4-doc.zip=docs/metro-1.4-doc.zip
+
+ # throws NPE for some reason
+ #sigtest.gen.fail.on.error=false
+diff -ruN netbeans-7.0.1.my.orig/websvc.restlib/nbproject/project.properties netbeans-7.0.1.my/websvc.restlib/nbproject/project.properties
+--- netbeans-7.0.1/websvc.restlib/nbproject/project.properties 2011-10-27 14:26:18.138000001 -0400
++++ netbeans-7.0.1/websvc.restlib/nbproject/project.properties 2011-10-27 14:33:56.603000001 -0400
+@@ -67,30 +67,9 @@
+
+ javac.source=1.6
+
+-release.external/jersey-1.3.zip!/jsr311-api-1.1.1.jar=modules/ext/rest/jsr311-api-1.1.1.jar
+-release.external/jersey-1.3.zip!/asm-3.1.jar=modules/ext/rest/asm-3.1.jar
+-release.external/jersey-1.3.zip!/jackson-core-asl-1.1.1.jar=modules/ext/rest/jackson-core-asl-1.1.1.jar
+-release.external/jersey-1.3.zip!/jersey-client-1.3.jar=modules/ext/rest/jersey-client-1.3.jar
+-release.external/jersey-1.3.zip!/jersey-core-1.3.jar=modules/ext/rest/jersey-core-1.3.jar
+-release.external/jersey-1.3.zip!/jersey-json-1.3.jar=modules/ext/rest/jersey-json-1.3.jar
+-release.external/jersey-1.3.zip!/jersey-multipart-1.3.jar=modules/ext/rest/jersey-multipart-1.3.jar
+-release.external/jersey-1.3.zip!/jersey-server-1.3.jar=modules/ext/rest/jersey-server-1.3.jar
+-release.external/jersey-1.3.zip!/jersey-spring-1.3.jar=modules/ext/rest/jersey-spring-1.3.jar
+-release.external/jersey-1.3.zip!/jettison-1.1.jar=modules/ext/rest/jettison-1.1.jar
+-release.external/jersey-1.3.zip!/mimepull-1.4.jar=modules/ext/rest/mimepull-1.4.jar
+-release.external/jersey-1.3.zip!/oauth-client-1.3.jar=modules/ext/rest/oauth-client-1.3.jar
+-release.external/jersey-1.3.zip!/oauth-signature-1.3.jar=modules/ext/rest/oauth-signature-1.3.jar
+
+ # JSR-311 Javadoc
+-release.external/jsr311-api-1.1.1-javadoc.jar=docs/jsr311-api-1.1.1-javadoc.zip
+ # Jersey Javadoc
+-release.external/jersey-client-1.3-javadoc.jar=docs/jersey-client-1.3-javadoc.zip
+-release.external/jersey-core-1.1.5.1-javadoc.jar=docs/jersey-core-1.1.5.1-javadoc.zip
+-release.external/jersey-json-1.3-javadoc.jar=docs/jersey-json-1.3-javadoc.zip
+-release.external/jersey-multipart-1.3-javadoc.jar=docs/jersey-multipart-1.3-javadoc.zip
+-release.external/jersey-spring-1.3-javadoc.jar=docs/jersey-spring-1.3-javadoc.zip
+-release.external/oauth-client-1.3-javadoc.jar=docs/oauth-client-1.3-javadoc.zip
+-release.external/oauth-signature-1.3-javadoc.jar=docs/oauth-signature-1.3-javadoc.zip
+
+ javadoc.arch=${basedir}/arch.xml
+
+diff -ruN netbeans-7.0.1.my.orig/xml.jaxb.api/nbproject/project.properties netbeans-7.0.1.my/xml.jaxb.api/nbproject/project.properties
+--- netbeans-7.0.1/xml.jaxb.api/nbproject/project.properties 2011-10-27 14:26:05.234000001 -0400
++++ netbeans-7.0.1/xml.jaxb.api/nbproject/project.properties 2011-10-27 14:33:56.531000000 -0400
+@@ -47,8 +47,5 @@
+ modules/ext/jaxb/api/jaxb-api.jar,\
+ modules/ext/jaxb/api/jsr173_api.jar
+
+-release.external/activation.jar=modules/ext/jaxb/activation.jar
+-release.external/jaxb-api.jar=modules/ext/jaxb/api/jaxb-api.jar
+-release.external/jsr173_api.jar=modules/ext/jaxb/api/jsr173_api.jar
+
+ sigtest.gen.fail.on.error=false
diff --git a/ide-launcher.patch b/ide-launcher.patch
new file mode 100644
index 0000000..a7500ab
--- /dev/null
+++ b/ide-launcher.patch
@@ -0,0 +1,52 @@
+diff -Nur netbeans-7.0/ide/launcher/unix/netbeans netbeans-6.9.new/ide/launcher/unix/netbeans
+--- netbeans-7.0.1/ide/launcher/unix/netbeans 2010-06-10 15:19:10.000000000 +0400
++++ netbeans-7.0.1/ide/launcher/unix/netbeans 2010-07-22 04:03:54.905999281 +0400
+@@ -41,6 +41,17 @@
+ # Version 2 license, then the option applies only if the new code is
+ # made subject to such option by the copyright holder.
+
++# The Startup Notification Protocol Specification established by freedesktop.org
++# recommends to unset the DESKTOP_STARTUP_ID environment variable to avoid
++# possible reuse by some process started later by this process, e.g. when a browser
++# will be started after clicking a hyperlink in the NetBeans.
++if [ ! -z $DESKTOP_STARTUP_ID ] ; then
++ # Save a value for later using in the NB_DESKTOP_STARTUP_ID
++ NB_DESKTOP_STARTUP_ID=$DESKTOP_STARTUP_ID; export NB_DESKTOP_STARTUP_ID
++
++ unset DESKTOP_STARTUP_ID
++fi
++
+ #
+ # resolve symlinks
+ #
+@@ -57,16 +68,18 @@
+ fi
+ done
+
+-progdir=`dirname "$PRG"`
++#progdir=`dirname "$PRG"`
++# Patch for Debian/Ubuntu/Fedora where launcher is in /usr/bin
++progdir=/usr/share/netbeans/7.0/bin
+
+ if [ -f "$progdir"/../etc/netbeans.conf ] ; then
+ . "$progdir"/../etc/netbeans.conf
+ fi
+
+ # following should be done just in RPM or Solaris Launcher
+-# if [ -f /etc/netbeans.conf ] ; then
+-# . /etc/netbeans.conf
+-# fi
++if [ -f /etc/netbeans.conf ] ; then
++ . /etc/netbeans.conf
++fi
+
+
+ # #68373: look for userdir, but do not modify "$@"
+@@ -198,7 +211,6 @@
+ --branding nb \
+ --clusters '"$netbeans_clusters"' \
+ -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \
+- -J-Dnetbeans.accept_license_class=org.netbeans.license.AcceptLicense \
+ ${netbeans_default_options} \
+ '"$@"'
+ ;;
diff --git a/mylyn-internal-api-changes.patch b/mylyn-internal-api-changes.patch
new file mode 100644
index 0000000..dbf46fd
--- /dev/null
+++ b/mylyn-internal-api-changes.patch
@@ -0,0 +1,47 @@
+diff -ruN netbeans/libs.bugtracking/src/org/netbeans/libs/bugtracking/BugtrackingRuntime.java netbeans/libs.bugtracking/src/org/netbeans/libs/bugtracking/BugtrackingRuntime.java
+--- netbeans/libs.bugtracking/src/org/netbeans/libs/bugtracking/BugtrackingRuntime.java 2011-06-07 10:00:02.591195343 -0400
++++ netbeans/libs.bugtracking/src/org/netbeans/libs/bugtracking/BugtrackingRuntime.java 2011-06-13 10:17:30.140842508 -0400
+@@ -47,9 +47,11 @@
+ import javax.swing.SwingUtilities;
+ import org.eclipse.mylyn.commons.net.WebUtil;
+ import org.eclipse.mylyn.internal.tasks.core.RepositoryExternalizationParticipant;
++import org.eclipse.mylyn.internal.tasks.core.RepositoryModel;
+ import org.eclipse.mylyn.internal.tasks.core.TaskActivityManager;
+ import org.eclipse.mylyn.internal.tasks.core.TaskList;
+ import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryManager;
++import org.eclipse.mylyn.internal.tasks.core.data.SynchronizationManger;
+ import org.eclipse.mylyn.internal.tasks.core.data.TaskDataManager;
+ import org.eclipse.mylyn.internal.tasks.core.data.TaskDataStore;
+ import org.eclipse.mylyn.internal.tasks.core.externalization.ExternalizationManager;
+@@ -88,8 +90,10 @@
+
+ taskDataStore = new TaskDataStore(taskRepositoryManager);
+ TaskList tl = new TaskList();
++ RepositoryModel repositoryModel = new RepositoryModel(tl, taskRepositoryManager);
++ SynchronizationManger synchronizationManager = new SynchronizationManger(repositoryModel);
+ TaskActivityManager tam = new TaskActivityManager(taskRepositoryManager, tl);
+- taskDataManager = new TaskDataManager(taskDataStore, taskRepositoryManager, tl, tam);
++ taskDataManager = new TaskDataManager(taskDataStore, taskRepositoryManager, tl, tam, synchronizationManager);
+ taskDataManager.setDataPath(getCacheStore().getAbsolutePath());
+ synchronizationSession = new SynchronizationSession(taskDataManager);
+
+--- netbeans/bugzilla/src/org/netbeans/modules/bugzilla/issue/BugzillaIssue.java 2011-06-07 09:57:29.375195856 -0400
++++ netbeans/bugzilla/src/org/netbeans/modules/bugzilla/issue/BugzillaIssue.java 2011-06-13 18:06:09.913842768 -0400
+@@ -757,7 +757,7 @@
+ private void setOperation(BugzillaOperation operation) {
+ TaskAttribute rta = data.getRoot();
+ TaskAttribute ta = rta.getMappedAttribute(TaskAttribute.OPERATION);
+- ta.setValue(operation.name());
++ ta.setValue(operation.toString());
+ }
+
+ List<Attachment> getAttachments() {
+@@ -999,7 +999,7 @@
+
+ boolean isResolveAvailable () {
+ Map<String, TaskOperation> operations = getAvailableOperations();
+- return operations.containsKey(BugzillaOperation.resolve.name());
++ return operations.containsKey(BugzillaOperation.resolve.toString());
+ }
+
+ private Map<String, String> getSeenAttributes() {
diff --git a/netbeans-ide.desktop-template b/netbeans-ide.desktop-template
new file mode 100644
index 0000000..8d540c4
--- /dev/null
+++ b/netbeans-ide.desktop-template
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=NetBeans IDE <nb_ver>
+GenericName=Integrated Development Environment (IDE)
+Comment=The only IDE you need!
+Icon=netbeans
+TryExec=<nb_launcher>
+Exec=<nb_launcher>
+Terminal=false
+Categories=Development;Java;IDE;
+StartupNotify=true
+
+
diff --git a/netbeans-javaparser-7.0.1-compat.patch b/netbeans-javaparser-7.0.1-compat.patch
new file mode 100644
index 0000000..7686d54
--- /dev/null
+++ b/netbeans-javaparser-7.0.1-compat.patch
@@ -0,0 +1,30 @@
+# HG changeset patch
+# User Dusan Balek <dbalek at netbeans.org>
+# Date 1317308207 -7200
+# Node ID 876515037127ca6e8a6ecd7b392f530a5325167e
+# Parent 5e5f42aa720fe9a4635d46e251e9e01a5cf3b593
+Modified to follow recent changes in nb-javac.
+
+diff -r 5e5f42aa720f -r 876515037127 debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/WatchPanel.java
+--- netbeans-7.0.1/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/WatchPanel.java Thu Sep 29 16:28:10 2011 +02
++++ netbeans-7.0.1/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/WatchPanel.java Thu Sep 29 16:56:47 2011 +02
+@@ -100,6 +100,8 @@
+ import javax.swing.border.Border;
+ import javax.swing.text.Document;
+ import javax.swing.text.StyledDocument;
++
++import com.sun.source.tree.*;
+ import org.netbeans.api.debugger.Session;
+ import org.netbeans.api.debugger.jpda.ObjectVariable;
+ import org.netbeans.api.java.source.CancellableTask;
+@@ -716,6 +718,10 @@
+ return trees.getDocComment(path);
+ }
+
++ @Override
++ public TypeMirror getLub(CatchTree tree) {
++ return trees.getLub(tree);
++ }
+ }
+
+ public static final class DelegatingBorder implements Border {
diff --git a/netbeans.spec b/netbeans.spec
new file mode 100644
index 0000000..42ae069
--- /dev/null
+++ b/netbeans.spec
@@ -0,0 +1,679 @@
+# Prevent brp-java-repack-jars from being run.
+%define __jar_repack %{nil}
+
+%define __alternatives %{_sbindir}/alternatives
+
+%define nb_ netbeans
+%define nb_org %{nb_}.org
+%define nb_ver_major 7.0
+%define nb_ver_minor 1
+%define nb_ver %{nb_ver_major}.%{nb_ver_minor}
+%define nb_alt_priority 701
+%define nb_release_time 201107282000
+%define nb_home %{_datadir}/%{nb_}
+%define nb_dir %{nb_home}/%{nb_ver_major}
+%define nb_legaldoc_dir ide.branding/release-toplevel
+%define nb_license %{nb_legaldoc_dir}/LICENSE.txt
+
+%define nb_platform_ver 13
+%define nb_platform platform
+%define nb_platform_dir %{nb_home}/%{nb_platform}%{nb_platform_ver}
+%define nb_platform_pkg %{nb_}-platform
+%define nb_platform_vpkg %{nb_}-%{nb_platform}%{nb_platform_ver}
+
+%define nb_harness harness
+%define nb_harness_dir %{nb_home}/%{nb_harness}
+%define nb_harness_vpkg %{nb_platform_pkg}-%{nb_harness}
+
+%define nb_ide_ver 14
+%define nb_ide ide
+%define nb_ide_dir %{nb_home}/%{nb_ide}%{nb_ide_ver}
+%define nb_ide_pkg %{nb_}-%{nb_ide}
+%define nb_ide_vpkg %{nb_}-%{nb_ide}%{nb_ide_ver}
+
+%define nb_java_ver 5
+%define nb_java java
+%define nb_java_dir %{nb_home}/%{nb_java}%{nb_java_ver}
+%define nb_java_pkg %{nb_}-%{nb_java}
+%define nb_java_vpkg %{nb_}-%{nb_java}%{nb_java_ver}
+
+%define nb_apisupport_ver 3
+%define nb_apisupport apisupport
+%define nb_apisupport_dir %{nb_home}/%{nb_apisupport}%{nb_apisupport_ver}
+%define nb_apisupport_pkg %{nb_}-%{nb_apisupport}
+%define nb_apisupport_vpkg %{nb_}-%{nb_apisupport}%{nb_apisupport_ver}
+
+%define nb_nb nb
+%define nb_nb_dir %{nb_dir}/%{nb_nb}
+%define nb_bin_dir %{nb_dir}/bin
+%define nb_etc_dir %{nb_dir}/etc
+%define nb_nb_config_dir %{nb_nb_dir}/config
+
+%define nb_cvsclient cvsclient
+%define nb_cvsclient_pkg %{nb_}-%{nb_cvsclient}
+%define nb_cvsclient_jar org-netbeans-lib-cvsclient.jar
+%define nb_cvsclient_dir %{nb_ide_dir}/modules
+%define nb_cvsclient_sysjar netbeans-cvsclient-6.9.jar
+%define nb_cvsclient_sysln netbeans-cvsclient.jar
+
+# See http://wiki.netbeans.org/NBDistroIDs
+%define nb_distro_id NBFC
+
+%define nb_javadoc_site http://bits.netbeans.org/%{nb_ver}/javadoc
+
+%define cluster base
+
+%define nb_launcher %{nb_bin_dir}/netbeans
+%define nb_desktop %{name}-ide-%{version}.desktop
+
+%define compiler_opt -Dbuild.compiler.deprecation=false -Dbuild.compiler.debug=false
+%define jdk_opt -Dpermit.jdk6.builds=true -Dpermit.jdk7.builds=true
+%define verify_opt -Dverify.checkout=false
+# Note: use the Ant option -v to get build log with details
+%define ant_nb_opt %{ant} %{jdk_opt} %{compiler_opt} %{verify_opt}
+%define build_nb_dir nbbuild/netbeans
+
+# Layout defined by the ant package
+%define ant_bin_dir /usr/bin
+%define ant_etc_dir %{_datadir}/ant/etc
+%define ant_lib_dir %{_datadir}/java
+%define ant_lib_dir2 %{_datadir}/java/ant
+
+# Used xml resolver
+%define xml_resolver netbeans-resolver
+%define xml_resolver_ver 6.7.1
+%define xml_resolver_jar %{xml_resolver}-%{xml_resolver_ver}.jar
+
+# Used svn client adapter
+%define svnclientadapter netbeans-svnclientadapter
+%define svnclientadapter_ver 6.7.1
+%define svnclientadapter_jar %{svnclientadapter}.jar
+
+# existing commons-logging-1.0.4.jar instead of required commons-logging-1.1.jar
+%define commons_logging_ver 1.1
+
+%define svnjavahl_ver 1.6.0
+
+# Prevents use of autoupdate on the specified directory.
+# %%{1} the directory being prevented for autoupdate.
+%define noautoupdate() echo > %{1}/.noautoupdate
+
+# Creates the time stamp of the last modification for the NetBeans cluster.
+# See:
+# %%{nb_javadoc_site}/org-netbeans-bootstrap/overview-summary.html#java.io.File-.lastModified
+#
+# %%{1} the directory of the NetBeans cluster.
+%define lastModified() echo > %{1}/.lastModified
+
+# Creates artifacts of the NetBeans cluster.
+# %%{1} the directory of the NetBeans cluster.
+%define nbCluster() %{expand:%%noautoupdate %{1}} ; %{expand:%%lastModified %{1}} ;
+
+# Links the system JAR.
+# %%{1} - the sys jar
+# %%{2} - the symlink name/path (optional)
+%global lnSysJAR() \
+ if [ -f %{_javadir}/%{1} ] ; then \
+ %__ln_s -f %{_javadir}/%{*} ; \
+ else \
+ echo "%{1} doesn't exist." ; exit 1 ; \
+ fi ;
+
+# Links the system JAR.
+# %%{1} - the sys jar
+# %%{2} - the symlink name/path (optional)
+%global lnSys() \
+ if [ -f %{1} ] ; then \
+ %__ln_s -f %{*} ; \
+ else \
+ echo "%{1} doesn't exist." ; exit 1 ; \
+ fi ;
+
+%global rm_files_log ./rmFiles.lst
+
+# Removes all specified files, and creates the file rmFiles.lst.
+# %%{1} - the iname value, e.g. "*.zip"
+%global rmFiles() \
+ find . -type f \\( -iname %{1} \\) | \
+ tee -a %{rm_files_log} | xargs -t %__rm -f ;
+
+%global debug_package %{nil}
+
+Name: %{nb_}
+Version: %{nb_ver}
+Release: 2%{?dist}
+Summary: Integrated Development Environment (IDE)
+Group: Development/Tools
+License: GPLv2 with exceptions or CDDL
+Vendor: netbeans.org
+URL: http://www.netbeans.org
+
+# Officially released zip is used:
+Source0: http://download.netbeans.org/%{nb_}/%{version}/final/zip/%{nb_}-%{version}-%{nb_release_time}-src.zip
+
+Source1: %{name}-ide.desktop-template
+%define nb_desktop_template %{SOURCE1}
+
+# Do not relese binary files
+Patch0: do-not-release-external-jars.patch
+# create a smaller netbeans cluster
+Patch1: smaller-netbeans.patch
+Patch2: remove-dependencies-on-unbuilt-clusters.patch
+# do not distribute non-linux bits
+Patch3: only-linux-native-libs.patch
+# do not distribute windows launchers
+Patch4: no-windows-exec.patch
+Patch5: do-not-copy-windows-launcher.patch
+Patch6: no-windows-binaries.patch
+# compat with newer mylyn
+Patch7: mylyn-internal-api-changes.patch
+# compat with java-1.7.0-openjdk
+Patch8: db-jdk7-compat.patch
+# no ant-libs
+Patch9: no-ant-libs.patch
+# no -werror
+Patch10: werror-is-a-bad-idea.patch
+# compatibility with netbeans-javaparser
+Patch11: netbeans-javaparser-7.0.1-compat.patch
+# changes to the launcher
+Patch12: ide-launcher.patch
+# add missing xml apis to classpath
+# fix for https://bugzilla.redhat.com/show_bug.cgi?id=670303
+Patch13: add-xml-commons-apis-to-classpath.patch
+Patch14: svn-support.patch
+
+BuildArch: noarch
+
+BuildRequires: jpackage-utils
+BuildRequires: java-devel >= 1:1.6.0
+
+BuildRequires: ant >= 0:1.7.0
+BuildRequires: ant-junit >= 0:1.7.0
+BuildRequires: antlr3-java
+BuildRequires: apache-commons-codec
+BuildRequires: appframework >= 1.03
+BuildRequires: beansbinding >= 1.2.1
+BuildRequires: bindex >= 2.2
+BuildRequires: bytelist
+BuildRequires: desktop-file-utils
+BuildRequires: eclipse-mylyn
+BuildRequires: eclipse-mylyn-commons
+BuildRequires: eclipse-mylyn-tasks-bugzilla
+BuildRequires: eclipse-subclipse
+BuildRequires: felix-osgi-core >= 1.4.0
+BuildRequires: felix-osgi-compendium >= 1.4.0
+BuildRequires: felix-main >= 1.4.0
+BuildRequires: flute
+BuildRequires: freemarker >= 2.3.8
+BuildRequires: ini4j
+BuildRequires: jakarta-commons-logging >= 1.0.4
+BuildRequires: jakarta-oro >= 2.0.8
+BuildRequires: jakarta-commons-net >= 1.4.1
+BuildRequires: javahelp2 >= 2.0.05
+BuildRequires: jemmy
+BuildRequires: jsch
+BuildRequires: jna >= 3.0.9
+BuildRequires: jna-contrib
+BuildRequires: junit >= 3.8.2
+BuildRequires: junit4 >= 4.5
+BuildRequires: jvyamlb
+BuildRequires: jzlib
+BuildRequires: libicns-utils
+BuildRequires: lucene >= 2.4.1
+BuildRequires: netbeans-javaparser = %{version}
+BuildRequires: netbeans-svnclientadapter >= %{svnclientadapter_ver}
+BuildRequires: sac
+BuildRequires: simplevalidation
+BuildRequires: stringtemplate
+BuildRequires: subversion-javahl
+BuildRequires: swing-layout >= 0:1.0
+BuildRequires: swingx
+BuildRequires: unzip
+BuildRequires: xerces-j2 >= 2.7.1
+BuildRequires: %{xml_resolver} >= %{xml_resolver_ver}
+
+Requires: jpackage-utils
+Requires: java >= 1:1.6.0
+Requires: filesystem
+Requires: %{nb_apisupport_vpkg} = %{version}-%{release}
+Requires: %{nb_ide_vpkg} = %{version}-%{release}
+Requires: %{nb_java_vpkg} = %{version}-%{release}
+Requires: %{nb_harness_vpkg} >= %{nb_ver_major}
+Requires: %{nb_platform_vpkg} >= %{nb_ver_major}
+Requires: lucene >= 2.4.1
+Requires: junit >= 3.8.2
+Requires: junit4 >= 4.5
+
+%description
+NetBeans IDE is an Integrated Development Environment (IDE) for Java/JavaFX,
+C/C++, Ruby, PHP, etc. The NetBeans IDE is oriented on wide audience of
+developers from beginners up to experts. A developer can find useful set of
+the development tools that are embedded in the IDE or can be integrated with.
+The NetBeans IDE is the modular system and it can be configured according to
+user needs. Please, visit http://www.netbeans.org/ for more information about
+this open-source project.
+
+%package %{nb_apisupport}
+
+Summary: Common NetBeans Platform Development Related Libraries for NetBeans
+Group: Development/Tools
+Requires: jpackage-utils
+Requires: java >= 1:1.6.0
+Requires: %{nb_ide_vpkg} = %{version}-%{release}
+Requires: %{nb_java_vpkg} = %{version}-%{release}
+Requires: %{nb_platform_vpkg} >= %{nb_major_ver}
+Requires: %{nb_harness_vpkg} >= %{nb_major_ver}
+
+Provides: %{nb_apisupport_vpkg} = %{version}-%{release}
+
+%description %{nb_apisupport}
+The NetBeans appisupport cluster, version %{nb_apisupport_ver}.
+Common libraries for development of NetBeans Platform modular extensions.
+
+
+%package %{nb_ide}
+
+Summary: Integrated Development Environment (IDE) Libraries for NetBeans
+Group: Development/Tools
+
+Requires: java >= 1:1.6.0
+Requires: jpackage-utils
+
+Requires: antlr3-java
+Requires: bytelist
+Requires: flute
+Requires: freemarker >= 2.3.8
+Requires: ini4j
+Requires: jakarta-commons-logging >= 1.0.4
+Requires: jakarta-oro >= 2.0.8
+Requires: jakarta-commons-net >= 1.4.1
+Requires: jsch
+Requires: jvyamlb
+Requires: jzlib
+# A requirement for an owner of the /usr/share/netbeans directory
+Requires: netbeans-svnclientadapter >= %{svnclientadapter_ver}
+Requires: %{nb_cvsclient_pkg} >= %{version}
+Requires: sac
+Requires: subversion-javahl
+Requires: swingx
+Requires: xerces-j2 >= 2.7.1
+Requires: %{xml_resolver} >= %{xml_resolver_ver}
+Requires: %{nb_platform_vpkg} >= %{nb_major_ver}
+
+Provides: %{nb_ide_vpkg} = %{version}-%{release}
+
+%description %{nb_ide}
+The NetBeans ide cluster, version %{nb_ide_ver}.
+Common languages independent libraries for use in the IDE.
+
+
+%package %{nb_java}
+
+Summary: Common Java Related Libraries for NetBeans
+Group: Development/Tools
+Requires: jpackage-utils
+Requires: java >= 1:1.6.0
+Requires: java-sdk >= 1:1.6.0
+Requires: java-javadoc >= 0:1.6.0
+Requires: netbeans-javaparser = %{version}
+Requires: appframework >= 1.03
+Requires: beansbinding >= 1.2.1
+Requires: ant >= 1.7.0
+Requires: ant-junit >= 1.7.0
+Requires: ant-nodeps >= 1.7.0
+Requires: ant-trax >= 1.7.0
+Requires: %{nb_ide_vpkg} = %{version}-%{release}
+# A requirement for an owner of the /usr/share/netbeans directory
+Requires: %{nb_platform_vpkg} >= %{nb_major_ver}
+
+Provides: %{nb_java_vpkg} = %{version}-%{release}
+
+%description %{nb_java}
+The NetBeans java cluster, version %{nb_java_ver}.
+Common libraries for the NetBeans Java IDE.
+
+
+%package %{nb_cvsclient}
+
+Summary: NetBeans CVS Client Library
+Group: Development/Tools
+Requires: jpackage-utils
+Requires: java >= 1:1.6.0
+
+%description %{nb_cvsclient}
+Implementation of the client side of CVS server connection.
+Local connections are not supported.
+
+%package %{nb_javadoc}
+Summary: Javadoc documentation for NetBeans
+Group: Documentation
+BuildArch: noarch
+
+%description %{nb_javadoc}
+Javadoc for netbeans.
+
+
+%prep
+%setup -q -c
+
+# delete binaries shipped with netbeans
+%rmFiles "binaries-list"
+%rmFiles "*.dll"
+%rmFiles "*.exe"
+%rmFiles "*.jar"
+%rmFiles "*.ser"
+%rmFiles "*.so"
+%rmFiles "*.zip"
+rm -rf dlight.nativeexecution/release
+
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+
+%build
+
+IDE_EXT_DIR=%{build_nb_dir}/%{nb_ide}/modules/ext
+%{__mkdir_p} ${IDE_EXT_DIR}
+%lnSysJAR %{xml_resolver_jar} ${IDE_EXT_DIR}/resolver-1.2.jar
+%lnSysJAR ValidationAPI.jar ${IDE_EXT_DIR}/ValidationAPI.jar
+
+# The freemarker 2.2 isn't compatible with 2.3. It means that future versions can be incompatible too.
+# Therefore, we must use the freemarker-2.3.jar link instead of freemarker.jar
+%lnSysJAR antlr3-runtime.jar ${IDE_EXT_DIR}/antlr-runtime-3.1.3.jar
+%lnSysJAR flute.jar ${IDE_EXT_DIR}/flute-1.3.jar
+%lnSysJAR freemarker.jar ${IDE_EXT_DIR}/freemarker-2.3.8.jar
+%lnSysJAR %{svnclientadapter_jar} ${IDE_EXT_DIR}/svnClientAdapter-1.6.13.jar
+%lnSysJAR xerces-j2.jar ${IDE_EXT_DIR}/xerces-2.8.0.jar
+%lnSysJAR commons-logging.jar ${IDE_EXT_DIR}/commons-logging-%{commons_logging_ver}.jar
+%lnSysJAR jakarta-oro.jar ${IDE_EXT_DIR}/jakarta-oro-2.0.8.jar
+%lnSysJAR commons-net.jar ${IDE_EXT_DIR}/commons-net-1.4.1.jar
+%lnSysJAR jzlib.jar ${IDE_EXT_DIR}/jzlib-1.0.7.jar
+%lnSysJAR bytelist.jar ${IDE_EXT_DIR}/bytelist-0.1.jar
+%lnSysJAR jvyamlb.jar ${IDE_EXT_DIR}/jvyamlb-0.2.3.jar
+%lnSysJAR sac.jar ${IDE_EXT_DIR}/sac-1.3.jar
+%lnSysJAR svn-javahl.jar ${IDE_EXT_DIR}/svnjavahl-%{svnjavahl_ver}.jar
+%lnSysJAR swingx.jar ${IDE_EXT_DIR}/swingx-0.9.5.jar
+
+JAVA_EXT_DIR=%{build_nb_dir}/%{nb_java}/modules/ext
+%{__mkdir_p} ${JAVA_EXT_DIR}
+%lnSysJAR netbeans-javaparser-api.jar ${JAVA_EXT_DIR}/javac-api-nb-7.0-b07.jar
+%lnSysJAR netbeans-javaparser-impl.jar ${JAVA_EXT_DIR}/javac-impl-nb-7.0-b07.jar
+%lnSysJAR appframework.jar ${JAVA_EXT_DIR}/appframework-1.0.3.jar
+%lnSysJAR beansbinding.jar ${JAVA_EXT_DIR}/beansbinding-1.2.1.jar
+%lnSysJAR junit.jar ${JAVA_EXT_DIR}/junit-3.8.2.jar
+%lnSysJAR junit4.jar ${JAVA_EXT_DIR}/junit-4.5.jar
+
+# To build the netbeans modules the installed jars will be used instead of pre-packaged ones
+%{__mkdir_p} apisupport.harness/external
+%lnSysJAR apache-commons-codec.jar libs.commons_codec/external/apache-commons-codec-1.3.jar
+%lnSysJAR commons-httpclient.jar libs.bugtracking/external/commons-httpclient-3.1.jar
+%lnSysJAR commons-lang.jar libs.bugtracking/external/commons-lang-2.3.jar
+%lnSysJAR commons-logging.jar libs.commons_logging/external/commons-logging-1.1.jar
+%lnSysJAR bindex.jar apisupport.harness/external/bindex-2.2.jar
+%lnSys %{_datadir}/eclipse/dropins/mylyn/eclipse/plugins/org.eclipse.mylyn.tasks.core_3.6.0.v20110608-1400.jar libs.bugtracking/external/org.eclipse.mylyn.tasks.core_3.3.1.jar
+%lnSys %{_datadir}/eclipse/dropins/mylyn/eclipse/plugins/org.eclipse.mylyn.tasks.core_3.6.0.v20110608-1400.jar libs.bugtracking/external/org.eclipse.mylyn.commons.core_3.3.1.jar
+%lnSys %{_datadir}/eclipse/dropins/mylyn-commons/eclipse/plugins/org.eclipse.mylyn.commons.net_3.6.0.v20110608-1400.jar libs.bugtracking/external/org.eclipse.mylyn.commons.net_3.3.0.jar
+%lnSys %{_datadir}/eclipse/dropins/mylyn-bugzilla/eclipse/plugins/org.eclipse.mylyn.bugzilla.core_3.6.3.v20111014-0100.jar libs.bugzilla/external/org.eclipse.mylyn.bugzilla.core_3.3.1.jar
+#%lnSys %{_datadir}/eclipse/dropins/subclipse-clientadapter/eclipse/plugins/org.tigris.subversion.clientadapter_1.6.12.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.6.13.jar
+%lnSysJAR felix/org.osgi.core.jar libs.osgi/external/osgi.core-4.2.jar
+%lnSysJAR felix/org.osgi.compendium.jar libs.osgi/external/osgi.cmpn-4.2.jar
+%lnSysJAR javahelp2.jar apisupport.harness/external/jsearch-2.0_05.jar
+%lnSysJAR javahelp2.jar javahelp/external/jhall-2.0_05.jar
+%lnSysJAR lucene.jar libs.lucene/external/lucene-core-3.0.3.jar
+%lnSysJAR ini4j.jar libs.ini4j/external/ini4j-0.5.1.jar
+%lnSysJAR javahelp2.jar javahelp/external/jhall-2.0_05.jar
+%lnSysJAR jemmy.jar jemmy/external/jemmy-2.3.0.0.jar
+%lnSysJAR jna.jar libs.jna/external/jna-3.2.7.jar
+%lnSysJAR jna/platform.jar core.nativeaccess/external/platform-3.2.7.jar
+%lnSysJAR jsch.jar libs.jsch/external/jsch-0.1.44.jar
+%lnSysJAR junit4.jar libs.junit4/external/junit-4.8.2.jar
+%lnSysJAR netbeans-javaparser-api.jar libs.javacapi/external/javac-api-nb-7.0-b07.jar
+%lnSysJAR netbeans-javaparser-impl.jar libs.javacimpl/external/javac-impl-nb-7.0-b07.jar
+%lnSysJAR netbeans-svnclientadapter.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-1.6.13.jar
+%lnSysJAR swing-layout.jar o.jdesktop.layout/external/swing-layout-1.0.4.jar
+
+#
+# HACK. We build all of netbeans (including platform/harness), but we do not
+# install platform or harness. Use the separate netbeans-platform package
+# instead.
+#
+
+# build netbeans
+%{ant_nb_opt} \
+-Dlibs.beans-binding.classpath=%{_javadir}/beansbinding.jar \
+-Dext.binaries.downloaded=true \
+-Dcluster.config=basic \
+-f nbbuild/build.xml build-nozip
+
+# Generate higher quality png icons
+icns2png -x ide.branding/release/netbeans.icns
+
+# Build desktop file
+%{__cp} -p %{nb_desktop_template} %{nb_desktop}
+sed --in-place "s|<nb_ver>|%{nb_ver}|g" %{nb_desktop}
+sed --in-place "s|<nb_launcher>|%{nb_launcher}|g" %{nb_desktop}
+
+
+rm -f %{build_nb_dir}/%{nb_harness}/suite.xml.orig
+
+%install
+
+# Installs the specified source(s) in the destination directory.
+# $1 the destination directory.
+# $2 the source(s), e.g. nbbuild/netbeans/platform8/* .
+install_package() {
+ DISTDIR=$1
+ shift
+ SOURCES=$*
+ %{__mkdir_p} ${DISTDIR}
+ %{__cp} -pr ${SOURCES} ${DISTDIR}
+}
+
+# Install apisupport
+install_package %{buildroot}%{nb_apisupport_dir} %{build_nb_dir}/%{nb_apisupport}/*
+%nbCluster %{buildroot}%{nb_apisupport_dir}
+
+# Install ide
+install_package %{buildroot}%{nb_ide_dir} %{build_nb_dir}/%{nb_ide}/*
+%nbCluster %{buildroot}%{nb_ide_dir}
+
+
+# Install cvsclient (extract from ide)
+
+install -d -m 0755 %{buildroot}%{_javadir}
+# jar
+install -m 644 %{buildroot}%{nb_cvsclient_dir}/%{nb_cvsclient_jar} \
+ %{buildroot}%{_javadir}/%{nb_cvsclient_sysjar}
+# versionless link to the system jar
+(cd %{buildroot}%{_javadir} && \
+ %__ln_s %{nb_cvsclient_sysjar} %{nb_cvsclient_sysln})
+# linking the ide to the system jar
+(cd %{buildroot}%{nb_cvsclient_dir} && \
+ %__ln_s -f %{_javadir}/%{nb_cvsclient_sysjar} %{nb_cvsclient_jar})
+
+# Install java
+install_package %{buildroot}%{nb_java_dir} %{build_nb_dir}/%{nb_java}/*
+# install java ant
+install -d -m 755 %{buildroot}%{nb_java_dir}/ant/bin
+install -d -m 755 %{buildroot}%{nb_java_dir}/ant/lib
+%nbCluster %{buildroot}%{nb_java_dir}
+
+# "linking" Java API javadoc
+%define nb_java_cSP_dir %{nb_java_dir}/config/Services/Platforms
+%define JDK_ver 1.6
+%{__mkdir_p} %{buildroot}%{nb_java_cSP_dir}/org-netbeans-api-java-Platform/
+cat <<KONEC >%{buildroot}%{nb_java_cSP_dir}/org-netbeans-api-java-Platform/default_platform.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE platform PUBLIC "-//NetBeans//DTD Java PlatformDefinition 1.0//EN"
+ "http://www.netbeans.org/dtds/java-platformdefinition-1_0.dtd">
+<platform default="yes" name="JDK %{JDK_ver} (Default)">
+ <properties>
+ <property name="platform.ant.name" value="default_platform"/>
+ </properties>
+ <javadoc>
+ <resource>file:/usr/share/javadoc/java/</resource>
+ </javadoc>
+</platform>
+KONEC
+
+
+
+# linking the Ant components
+pushd %{buildroot}%{nb_java_dir}/ant
+ %{__ln_s} -f %{ant_bin_dir}/ant bin/ant
+ %{__ln_s} -f %{ant_bin_dir}/antRun bin/antRun
+ %{__ln_s} -f %{ant_etc_dir} etc
+# - jars
+ pushd lib
+ %{__ln_s} -f %{ant_lib_dir}/ant.jar ant.jar
+ %{__ln_s} -f %{ant_lib_dir}/ant-launcher.jar ant-launcher.jar
+ %{__ln_s} -f %{ant_lib_dir2}/ant-junit.jar ant-junit.jar
+ %{__ln_s} -f %{ant_lib_dir2}/ant-nodeps.jar ant-nodeps.jar
+ popd
+popd
+
+# Install nb
+install_package %{buildroot}%{nb_nb_dir} %{build_nb_dir}/%{nb_nb}/*
+# install nb bin (launcher)
+install_package %{buildroot}%{nb_bin_dir} %{build_nb_dir}/bin/*
+# install nb etc (netbeans.conf, netbeans.clusters)
+install_package %{buildroot}%{nb_etc_dir} %{build_nb_dir}/etc/*
+# inistall nb/nbX.X config
+echo -n "%{nb_distro_id}" > %{buildroot}%{nb_nb_config_dir}/productid
+%nbCluster %{buildroot}%{nb_nb_dir}
+
+# Links to nbX.X components
+pushd %{buildroot}%{nb_dir}
+ %{__ln_s} ../%{nb_harness} %{nb_harness}
+ %{__ln_s} ../%{nb_apisupport}%{nb_apisupport_ver} %{nb_apisupport}
+ %{__ln_s} ../%{nb_ide}%{nb_ide_ver} %{nb_ide}
+ %{__ln_s} ../%{nb_java}%{nb_java_ver} %{nb_java}
+ %{__ln_s} ../%{nb_platform}%{nb_platform_ver} %{nb_platform}
+popd
+
+# Install icons
+%{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/16x16/apps
+cp -a netbeans_16x16x32.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/netbeans.png
+%{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
+cp -a netbeans_32x32x32.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/netbeans.png
+%{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
+cp -a netbeans_48x48x32.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/netbeans.png
+%{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps
+cp -a netbeans_128x128x32.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/netbeans.png
+
+# Install desktop file
+desktop-file-validate %{nb_desktop}
+install -d -m 755 %{buildroot}%{_datadir}/applications/%{nb_org}
+desktop-file-install --vendor="" \
+ --dir=%{buildroot}%{_datadir}/applications/%{nb_org} \
+ %{nb_desktop}
+
+%post
+%{__alternatives} --install %{_bindir}/%{nb_} %{nb_} %{nb_launcher} %{nb_alt_priority}
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%preun
+if [ "$1" = "0" ]; then
+ %{__alternatives} --remove %{nb_} %{nb_launcher}
+fi
+
+%postun
+if [ $1 -eq 0 ] ; then
+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+%files
+%{nb_dir}
+%docdir %{nb_nb_dir}/docs
+%attr(755,root,root) %{nb_launcher}
+%dir %{_datadir}/applications/%{nb_org}/
+%{_datadir}/applications/%{nb_org}/%{nb_desktop}
+%{_datadir}/icons/hicolor/*/apps/netbeans.png
+%doc %{nb_legaldoc_dir}/*
+
+%files %{nb_apisupport}
+%defattr(-,root,root,-)
+%{nb_apisupport_dir}/
+%doc %{nb_license}
+
+%files %{nb_ide}
+%defattr(-,root,root,-)
+%{nb_ide_dir}/
+%doc %{nb_license}
+
+%files %{nb_java}
+%defattr(-,root,root,-)
+%{nb_java_dir}/
+%doc %{nb_license}
+
+%files %{nb_cvsclient}
+%defattr(-,root,root,-)
+%{_javadir}/%{nb_cvsclient_sysjar}
+%{_javadir}/%{nb_cvsclient_sysln}
+%doc %{nb_license}
+
+%changelog
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Nov 08 2011 Omair Majid <omajid at redhat.com> - 7.0.1-1
+- Update to 7.0.1
+
+* Thu Sep 22 2011 Omair Majid <omajid at redhat.com> - 6.9-5
+- Fix rhbz670303
+
+* Mon Sep 19 2011 Omair Majid <omajid at redhat.com> - 6.9-4
+- Fix rhbz715654
+- Fix rhbz702842
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Sep 01 2010 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.9-2
+- Fix for https://netbeans.org/bugzilla/show_bug.cgi?id=189196
+
+* Mon Feb 15 2010 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.9-1
+- introduce the cvsclient subpackage
+ https://bugzilla.redhat.com/show_bug.cgi?id=572165
+- re-base for the NetBeans 6.9
+
+* Mon Feb 15 2010 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.8-6
+- Provide vpkg for all cluster packages, but not harness
+- stub jar files: jsr223, swing-worker
+- swingx
+
+* Thu Feb 11 2010 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.8-5
+- add dependencies on Jruby's pkgs: bytelist, jvyamlb
+- clean up comments
+
+* Wed Feb 10 2010 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.8-4
+- set priority of alternatives to 680
+- remove the fake tag 'provides' needed only for rebuilding maven-scm
+
+* Mon Feb 08 2010 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.8-3
+- a fake tag 'provides' needed only for rebuilding maven-scm
+
+* Sat Feb 06 2010 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.8-2
+- remove dependencies on Jruby's pkgs: bytelist, jvyamlb
+
+* Thu Nov 26 2009 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.8-1
+- re-base for the NetBeans 6.8
+
+* Sat May 23 2009 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.7.1-1
+- re-base for the NetBeans 6.7.1
diff --git a/no-ant-libs.patch b/no-ant-libs.patch
new file mode 100644
index 0000000..6d0ff19
--- /dev/null
+++ b/no-ant-libs.patch
@@ -0,0 +1,29 @@
+diff -ruN netbeans-7.0.1/o.apache.tools.ant.module/build.xml netbeans-7.0.1/o.apache.tools.ant.module/build.xml
+--- netbeans-7.0.1/o.apache.tools.ant.module/build.xml 2011-07-28 20:46:16.000000000 -0400
++++ netbeans-7.0.1/o.apache.tools.ant.module/build.xml 2011-10-28 11:29:58.814999717 -0400
+@@ -79,14 +79,6 @@
+
+ <target name="netbeans-extra" depends="jar-bridge">
+ <mkdir dir="${cluster}/ant/lib"/>
+- <copy todir="${cluster}/ant/lib">
+- <fileset dir="external/lib"/>
+- </copy>
+- <unzip dest="${cluster}/ant">
+- <fileset dir="external">
+- <include name="ant-misc-*.zip"/>
+- </fileset>
+- </unzip>
+ </target>
+
+ <target name="test-build" depends="jar-bridge,projectized-common.test-build"/>
+diff -ruN netbeans-7.0.1/o.apache.tools.ant.module/external/build.xml netbeans-7.0.1/o.apache.tools.ant.module/external/build.xml
+--- netbeans-7.0.1/o.apache.tools.ant.module/external/build.xml 2011-07-28 20:46:16.000000000 -0400
++++ netbeans-7.0.1/o.apache.tools.ant.module/external/build.xml 2011-10-28 11:28:52.432000793 -0400
+@@ -45,7 +45,6 @@
+ -->
+ <project name="o.apache.tools.ant.module/external" default="unzip" basedir=".">
+ <target name="unzip">
+- <unzip src="ant-libs-1.8.2.zip" dest="lib"/>
+ </target>
+ <target name="clean">
+ <delete dir="lib"/>
diff --git a/no-windows-binaries.patch b/no-windows-binaries.patch
new file mode 100644
index 0000000..3cf48da
--- /dev/null
+++ b/no-windows-binaries.patch
@@ -0,0 +1,14 @@
+diff -Nur netbeans-7.0.1/o.n.bootstrap/nbproject/project.properties netbeans-7.0.1/o.n.bootstrap/nbproject/project.properties
+--- netbeans-7.0.1/o.n.bootstrap/nbproject/project.properties 2010-05-31 20:58:20.000000000 +0400
++++ netbeans-7.0.1/o.n.bootstrap/nbproject/project.properties 2010-06-09 06:00:01.324176694 +0400
+@@ -45,8 +45,8 @@
+ module.jar.dir=lib
+ module.jar.basename=boot.jar
+ release.launcher/unix/nbexec=lib/nbexec
+-release.launcher/windows/nbexec.exe=lib/nbexec.exe
+-release.launcher/windows/nbexec.dll=lib/nbexec.dll
++# release.launcher/windows/nbexec.exe=lib/nbexec.exe
++# release.launcher/windows/nbexec.dll=lib/nbexec.dll
+ nbm.executable.files=lib/nbexec
+
+ javadoc.arch=${basedir}/arch.xml
diff --git a/no-windows-exec.patch b/no-windows-exec.patch
new file mode 100644
index 0000000..3453622
--- /dev/null
+++ b/no-windows-exec.patch
@@ -0,0 +1,22 @@
+--- netbeans-7.0.1/nbbuild/build.xml 2010-06-10 15:20:46.000000000 +0400
++++ netbeans-7.0.1/nbbuild/build.xml 2010-07-15 15:18:04.805684320 +0400
+@@ -149,7 +149,9 @@
+
+ <target name="init-module-list" depends="bootstrap,init-tasks">
+ <!-- Define modules. -->
++<!--
+ <checkmoduleconfigs nbroot=".."/>
++-->
+ <resolvelist name="allmodules" list="${nb.clusters.list}"/>
+ <pathconvert property="modules.fullpath" >
+ <path>
+@@ -299,7 +301,9 @@
+ <mkdir dir="${netbeans.dest.dir}/bin" />
+ <copy file="../ide/launcher/unix/netbeans" todir="${netbeans.dest.dir}/bin" />
+ <chmod file="${netbeans.dest.dir}/bin/netbeans" perm="ugo+rx"/>
++<!--
+ <copy file="../ide/launcher/windows/netbeans.exe" todir="${netbeans.dest.dir}/bin" />
++-->
+ <!-- if anybody knows better place for icons, let me know: jtulach at netbeans.org -->
+
+ <mkdir dir="${netbeans.dest.dir}/etc" />
diff --git a/only-linux-native-libs.patch b/only-linux-native-libs.patch
new file mode 100644
index 0000000..dbdb048
--- /dev/null
+++ b/only-linux-native-libs.patch
@@ -0,0 +1,40 @@
+--- netbeans/nbi/engine/build.xml 2011-06-03 12:06:03.944704192 -0400
++++ netbeans/nbi/engine/build.xml 2011-06-06 10:41:13.523881745 -0400
+@@ -111,37 +111,13 @@
+
+ <target name="copy-jnilibs">
+ <mkdir dir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir}"/>
+- <mkdir dir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.windows}"/>
+ <mkdir dir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.linux}"/>
+- <mkdir dir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.solaris-sparc}"/>
+- <mkdir dir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.solaris-x86}"/>
+- <mkdir dir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.macosx}"/>
+-
+- <copy file="${native.dirname}/${native.jnilib.dir.windows}/${native.dist.dir}/${native.jnilib.file.windows.i386}"
+- todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.windows}"/>
+- <copy file="${native.dirname}/${native.jnilib.dir.windows}/${native.dist.dir}/${native.jnilib.file.windows.amd64}"
+- todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.windows}"/>
+- <copy file="${native.dirname}/${native.jnilib.dir.windows}/${native.dist.dir}/${native.jnilib.file.windows.ia64}"
+- todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.windows}"/>
+ <copy file="${native.dirname}/${native.jnilib.dir.linux}/${native.dist.dir}/${native.jnilib.file.linux.i386}"
+ todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.linux}"/>
+- <copy file="${native.dirname}/${native.jnilib.dir.linux}/${native.dist.dir}/${native.jnilib.file.linux.amd64}"
+- todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.linux}"/>
+- <copy file="${native.dirname}/${native.jnilib.dir.solaris-x86}/${native.dist.dir}/${native.jnilib.file.solaris-x86}"
+- todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.solaris-x86}"/>
+- <copy file="${native.dirname}/${native.jnilib.dir.solaris-x86}/${native.dist.dir}/${native.jnilib.file.solaris-amd64}"
+- todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.solaris-x86}"/>
+- <copy file="${native.dirname}/${native.jnilib.dir.solaris-sparc}/${native.dist.dir}/${native.jnilib.file.solaris-sparc}"
+- todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.solaris-sparc}"/>
+- <copy file="${native.dirname}/${native.jnilib.dir.solaris-sparc}/${native.dist.dir}/${native.jnilib.file.solaris-sparcv9}"
+- todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.solaris-sparc}"/>
+- <copy file="${native.dirname}/${native.jnilib.dir.macosx}/${native.dist.dir}/${native.jnilib.file.macosx}"
+- todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.macosx}"/>
+ </target>
+
+ <target name="copy-launchers">
+
+- <antcall target="copy-windows-launcher"/>
+ <antcall target="copy-unix-launcher"/>
+
+ </target>
diff --git a/remove-dependencies-on-unbuilt-clusters.patch b/remove-dependencies-on-unbuilt-clusters.patch
new file mode 100644
index 0000000..8e7006a
--- /dev/null
+++ b/remove-dependencies-on-unbuilt-clusters.patch
@@ -0,0 +1,215 @@
+diff -ruN netbeans-7.0.1-pristine/apisupport.kit/nbproject/project.xml netbeans-7.0.1-patched/apisupport.kit/nbproject/project.xml
+--- netbeans-7.0.1-pristine/apisupport.kit/nbproject/project.xml 2011-07-28 20:44:52.000000000 -0400
++++ netbeans-7.0.1-patched/apisupport.kit/nbproject/project.xml 2011-11-07 21:51:27.870999663 -0500
+@@ -12,43 +12,18 @@
+ </run-dependency>
+ </dependency>
+ <dependency>
+- <code-name-base>org.netbeans.modules.apisupport.crudsample</code-name-base>
+- <run-dependency>
+- <specification-version>1.6.1</specification-version>
+- </run-dependency>
+- </dependency>
+- <dependency>
+- <code-name-base>org.netbeans.modules.apisupport.feedreader</code-name-base>
+- <run-dependency>
+- <release-version>1</release-version>
+- <specification-version>1.17.1</specification-version>
+- </run-dependency>
+- </dependency>
+- <dependency>
+ <code-name-base>org.netbeans.modules.apisupport.harness</code-name-base>
+ <run-dependency>
+ <specification-version>1.26.1</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+- <code-name-base>org.netbeans.modules.apisupport.installer</code-name-base>
+- <run-dependency>
+- <specification-version>1.6.1</specification-version>
+- </run-dependency>
+- </dependency>
+- <dependency>
+ <code-name-base>org.netbeans.modules.apisupport.osgidemo</code-name-base>
+ <run-dependency>
+ <specification-version>1.6.1</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+- <code-name-base>org.netbeans.modules.apisupport.paintapp</code-name-base>
+- <run-dependency>
+- <specification-version>1.14.1</specification-version>
+- </run-dependency>
+- </dependency>
+- <dependency>
+ <code-name-base>org.netbeans.modules.apisupport.project</code-name-base>
+ <run-dependency>
+ <release-version>1</release-version>
+diff -ruN netbeans-7.0.1-pristine/editor.kit/nbproject/project.xml netbeans-7.0.1-patched/editor.kit/nbproject/project.xml
+--- netbeans-7.0.1-pristine/editor.kit/nbproject/project.xml 2011-07-28 20:45:22.000000000 -0400
++++ netbeans-7.0.1-patched/editor.kit/nbproject/project.xml 2011-11-07 10:40:43.521000031 -0500
+@@ -6,13 +6,6 @@
+ <code-name-base>org.netbeans.modules.editor.kit</code-name-base>
+ <module-dependencies>
+ <dependency>
+- <code-name-base>org.netbeans.modules.css.visual</code-name-base>
+- <run-dependency>
+- <release-version>1</release-version>
+- <specification-version>2.17.1</specification-version>
+- </run-dependency>
+- </dependency>
+- <dependency>
+ <code-name-base>org.netbeans.modules.editor.actions</code-name-base>
+ <run-dependency>
+ <release-version>1</release-version>
+@@ -27,27 +20,6 @@
+ </run-dependency>
+ </dependency>
+ <dependency>
+- <code-name-base>org.netbeans.modules.html</code-name-base>
+- <run-dependency>
+- <release-version>1</release-version>
+- <specification-version>1.36.1</specification-version>
+- </run-dependency>
+- </dependency>
+- <dependency>
+- <code-name-base>org.netbeans.modules.html.parser</code-name-base>
+- <run-dependency>
+- <release-version>1</release-version>
+- <specification-version>1.4.1.1</specification-version>
+- </run-dependency>
+- </dependency>
+- <dependency>
+- <code-name-base>org.netbeans.modules.html.validation</code-name-base>
+- <run-dependency>
+- <release-version>1</release-version>
+- <specification-version>1.6.1</specification-version>
+- </run-dependency>
+- </dependency>
+- <dependency>
+ <code-name-base>org.netbeans.modules.image</code-name-base>
+ <run-dependency>
+ <release-version>1</release-version>
+@@ -55,13 +27,6 @@
+ </run-dependency>
+ </dependency>
+ <dependency>
+- <code-name-base>org.netbeans.modules.javascript.kit</code-name-base>
+- <run-dependency>
+- <release-version>1</release-version>
+- <specification-version>0.115.1</specification-version>
+- </run-dependency>
+- </dependency>
+- <dependency>
+ <code-name-base>org.netbeans.modules.languages.diff</code-name-base>
+ <run-dependency>
+ <specification-version>1.16.1</specification-version>
+@@ -94,13 +59,6 @@
+ </run-dependency>
+ </dependency>
+ <dependency>
+- <code-name-base>org.netbeans.modules.xml.core</code-name-base>
+- <run-dependency>
+- <release-version>2</release-version>
+- <specification-version>1.25.1.4</specification-version>
+- </run-dependency>
+- </dependency>
+- <dependency>
+ <code-name-base>org.netbeans.modules.xml.lexer</code-name-base>
+ <run-dependency>
+ <specification-version>1.13.1</specification-version>
+@@ -126,13 +84,6 @@
+ <specification-version>1.26.1</specification-version>
+ </run-dependency>
+ </dependency>
+- <dependency>
+- <code-name-base>org.netbeans.modules.xsl</code-name-base>
+- <run-dependency>
+- <release-version>1</release-version>
+- <specification-version>1.26.1</specification-version>
+- </run-dependency>
+- </dependency>
+ </module-dependencies>
+ <public-packages/>
+ </data>
+diff -ruN netbeans-7.0.1-pristine/ide.kit/nbproject/project.xml netbeans-7.0.1-patched/ide.kit/nbproject/project.xml
+--- netbeans-7.0.1-pristine/ide.kit/nbproject/project.xml 2011-07-28 20:45:40.000000000 -0400
++++ netbeans-7.0.1-patched/ide.kit/nbproject/project.xml 2011-11-07 10:38:25.720000032 -0500
+@@ -26,12 +26,6 @@
+ </run-dependency>
+ </dependency>
+ <dependency>
+- <code-name-base>org.netbeans.modules.dlight.terminal</code-name-base>
+- <run-dependency>
+- <specification-version>1.6.1.1</specification-version>
+- </run-dependency>
+- </dependency>
+- <dependency>
+ <code-name-base>org.netbeans.modules.editor.bookmarks</code-name-base>
+ <run-dependency>
+ <release-version>1</release-version>
+@@ -136,13 +130,6 @@
+ </run-dependency>
+ </dependency>
+ <dependency>
+- <code-name-base>org.netbeans.modules.httpserver</code-name-base>
+- <run-dependency>
+- <release-version>2</release-version>
+- <specification-version>2.19.1.42</specification-version>
+- </run-dependency>
+- </dependency>
+- <dependency>
+ <code-name-base>org.netbeans.modules.jumpto</code-name-base>
+ <run-dependency>
+ <release-version>1</release-version>
+diff -ruN netbeans-7.0.1-pristine/java.kit/nbproject/project.xml netbeans-7.0.1-patched/java.kit/nbproject/project.xml
+--- netbeans-7.0.1-pristine/java.kit/nbproject/project.xml 2011-07-28 20:45:56.000000000 -0400
++++ netbeans-7.0.1-patched/java.kit/nbproject/project.xml 2011-11-07 10:38:25.778000031 -0500
+@@ -42,20 +42,6 @@
+ </run-dependency>
+ </dependency>
+ <dependency>
+- <code-name-base>org.netbeans.modules.j2ee.metadata</code-name-base>
+- <run-dependency>
+- <release-version>0</release-version>
+- <specification-version>1.15.1</specification-version>
+- </run-dependency>
+- </dependency>
+- <dependency>
+- <code-name-base>org.netbeans.modules.j2ee.metadata.model.support</code-name-base>
+- <run-dependency>
+- <release-version>1</release-version>
+- <specification-version>1.12.1</specification-version>
+- </run-dependency>
+- </dependency>
+- <dependency>
+ <code-name-base>org.netbeans.modules.java.debug</code-name-base>
+ <run-dependency>
+ <specification-version>1.19.1.1.15.17</specification-version>
+@@ -202,26 +188,6 @@
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.13.1</specification-version>
+- </run-dependency>
+- </dependency>
+- <dependency>
+- <code-name-base>org.netbeans.modules.websvc.jaxws21</code-name-base>
+- <run-dependency>
+- <release-version>1</release-version>
+- <specification-version>1.14.1</specification-version>
+- </run-dependency>
+- </dependency>
+- <dependency>
+- <code-name-base>org.netbeans.modules.websvc.jaxws21api</code-name-base>
+- <run-dependency>
+- <release-version>1</release-version>
+- </run-dependency>
+- </dependency>
+- <dependency>
+- <code-name-base>org.netbeans.modules.xml.jaxb</code-name-base>
+- <run-dependency>
+- <release-version>1</release-version>
+- <specification-version>1.13.1</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
diff --git a/smaller-netbeans.patch b/smaller-netbeans.patch
new file mode 100644
index 0000000..652726d
--- /dev/null
+++ b/smaller-netbeans.patch
@@ -0,0 +1,502 @@
+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,\
diff --git a/sources b/sources
new file mode 100644
index 0000000..437ca25
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+ce62363816ec52a3a8ed7655e7a93add netbeans-7.0.1-201107282000-src.zip
diff --git a/svn-support.patch b/svn-support.patch
new file mode 100644
index 0000000..04987c1
--- /dev/null
+++ b/svn-support.patch
@@ -0,0 +1,24 @@
+diff -ruN netbeans-7.0.1-pristine/libs.svnClientAdapter/nbproject/project.xml netbeans-7.0.1-patched/libs.svnClientAdapter/nbproject/project.xml
+--- netbeans-7.0.1-pristine/libs.svnClientAdapter/nbproject/project.xml 2011-07-28 20:46:08.000000000 -0400
++++ netbeans-7.0.1-patched/libs.svnClientAdapter/nbproject/project.xml 2011-11-04 20:48:31.063000679 -0400
+@@ -81,6 +81,7 @@
+ <package>org.netbeans.libs.svnclientadapter</package>
+ <package>org.tigris.subversion.svnclientadapter</package>
+ <package>org.tigris.subversion.svnclientadapter.utils</package>
++ <package>org.tigris.subversion.svnclientadapter.javahl</package>
+ </friend-packages>
+ <class-path-extension>
+ <runtime-relative-path>ext/svnClientAdapter-main-1.6.13.jar</runtime-relative-path>
+diff -ruN netbeans-7.0.1-pristine/libs.svnClientAdapter.javahl/nbproject/project.xml netbeans-7.0.1-patched/libs.svnClientAdapter.javahl/nbproject/project.xml
+--- netbeans-7.0.1-pristine/libs.svnClientAdapter.javahl/nbproject/project.xml 2011-07-28 20:46:08.000000000 -0400
++++ netbeans-7.0.1-patched/libs.svnClientAdapter.javahl/nbproject/project.xml 2011-11-04 20:49:58.252999407 -0400
+@@ -95,8 +95,7 @@
+ </test-dependencies>
+ <public-packages/>
+ <class-path-extension>
+- <runtime-relative-path>ext/svnClientAdapter-javahl-1.6.13.jar</runtime-relative-path>
+- <binary-origin>external/svnClientAdapter-javahl-1.6.13.jar</binary-origin>
++ <runtime-relative-path>ext/svnClientAdapter-main-1.6.13.jar</runtime-relative-path>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/svnjavahl-1.6.0.jar</runtime-relative-path>
diff --git a/werror-is-a-bad-idea.patch b/werror-is-a-bad-idea.patch
new file mode 100644
index 0000000..1b29ee4
--- /dev/null
+++ b/werror-is-a-bad-idea.patch
@@ -0,0 +1,11 @@
+--- netbeans-7.0.1/classfile/nbproject/project.properties 2011-07-28 20:44:56.000000000 -0400
++++ netbeans-7.0.1/classfile/nbproject/project.properties 2011-10-28 11:52:09.256000672 -0400
+@@ -41,7 +41,7 @@
+ # made subject to such option by the copyright holder.
+
+ is.autoload=true
+-javac.compilerargs=-Xlint:all -Werror
++javac.compilerargs=-Xlint:all
+ javac.source=1.6
+ javadoc.arch=${basedir}/arch.xml
+ javadoc.apichanges=${basedir}/apichanges.xml
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/netbeans.git/commit/?h=master&id=001c6564f56d997a8ccd33425816a11b9ad3ce30
More information about the scm-commits
mailing list