netbeans/files/digest-netbeans-5.5-r1: optimized 5.5-r1 ebuild for merge speed, changed jdk and jre to >=1.5, removed patches; nb 6.0: removed some repoman warnings

svn path=/migrated-java-experimental-overlay/; revision=3260

12 files changed, 50 insertions, 547 deletions

diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog
index 69a24226..035bacbc 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Nov 2006; Miroslav Šulc <miroslav.sulc@startnet.cz> ChangeLog:
+  optimized 5.5-r1 ebuild for merge speed, changed jdk and jre to >=1.5,
+  removed patches; nb 6.0: removed some repoman warnings
+
   28 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org> ChangeLog:
   Removing 5.0 ebuild its broken, and all effort will go into furture releases
   like 5.5, 6.0 and so on. Added change accidentally applied to 5.5_beta to
diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index c408baef..d457780d 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -1,27 +1,3 @@
-AUX 5.5/deps-txt.patch 511 RMD160 94f7f487bc0007ddcf4522cbb9554d5d59b4a202 SHA1 f1255ea6ee8880345f2e8fa976ad6958bd83c4a4 SHA256 8b2a4041825adb2ee714d5b635024bb28efef3e9d24b3018b12db5c12e52c394
-MD5 01a15f1329edc1694152b4da9fe1bce0 files/5.5/deps-txt.patch 511
-RMD160 94f7f487bc0007ddcf4522cbb9554d5d59b4a202 files/5.5/deps-txt.patch 511
-SHA256 8b2a4041825adb2ee714d5b635024bb28efef3e9d24b3018b12db5c12e52c394 files/5.5/deps-txt.patch 511
-AUX 5.5/files-layout-txt.patch 24278 RMD160 72d66b55b16c165dc98a67dcc40752e43ab9697b SHA1 2dedc0e59d035ca0283dc583976a6ec9f232e69c SHA256 bce424c54e287cd269272e5e64db66b7c5b9ade4431906dfd38fb40b059b3186
-MD5 b9447a412487f185db3332c19f921558 files/5.5/files-layout-txt.patch 24278
-RMD160 72d66b55b16c165dc98a67dcc40752e43ab9697b files/5.5/files-layout-txt.patch 24278
-SHA256 bce424c54e287cd269272e5e64db66b7c5b9ade4431906dfd38fb40b059b3186 files/5.5/files-layout-txt.patch 24278
-AUX 5.5/mdr_extras_jdbcstorage_build.xml.patch 1787 RMD160 836321e4bad7b06abfe42e9bad8387724b68d8a7 SHA1 f708acc4565a67a35e30a6e76d1562979743fd37 SHA256 7685c67bf71dfca7f71b82af6b4a1d05fb90afbb24b72515df7332430e33860f
-MD5 90fca9a67bccdec94f44d6d8971b88e1 files/5.5/mdr_extras_jdbcstorage_build.xml.patch 1787
-RMD160 836321e4bad7b06abfe42e9bad8387724b68d8a7 files/5.5/mdr_extras_jdbcstorage_build.xml.patch 1787
-SHA256 7685c67bf71dfca7f71b82af6b4a1d05fb90afbb24b72515df7332430e33860f files/5.5/mdr_extras_jdbcstorage_build.xml.patch 1787
-AUX 5.5/mdr_extras_mdrant_build.xml.patch 1777 RMD160 724a5f79e993e8a1924d36691ed0808694768ccb SHA1 adbf6363754b77dd5eb310809ca71571f91bcc32 SHA256 476082ad5558dd771a291e9172666e2ad82fa61bc94f5adef841991a86fcec37
-MD5 1fa768b97ba22a33da97ed633ffad78c files/5.5/mdr_extras_mdrant_build.xml.patch 1777
-RMD160 724a5f79e993e8a1924d36691ed0808694768ccb files/5.5/mdr_extras_mdrant_build.xml.patch 1777
-SHA256 476082ad5558dd771a291e9172666e2ad82fa61bc94f5adef841991a86fcec37 files/5.5/mdr_extras_mdrant_build.xml.patch 1777
-AUX 5.5/modules-txt.patch 485 RMD160 a437c7a9048e5f3941f13798bfe921fc80f90cf2 SHA1 93ee5c8af702b2bde38e00c38104bc6087cd633a SHA256 3ec06df27e29bd2d708bf253bba4059620c57070d60549b0fc8f03d81eebd3b5
-MD5 f87d1c0d3181a05cb99f1595d7a75de2 files/5.5/modules-txt.patch 485
-RMD160 a437c7a9048e5f3941f13798bfe921fc80f90cf2 files/5.5/modules-txt.patch 485
-SHA256 3ec06df27e29bd2d708bf253bba4059620c57070d60549b0fc8f03d81eebd3b5 files/5.5/modules-txt.patch 485
-AUX 5.5/public-packages-txt.patch 674 RMD160 94bf2c4d192d4718b9c4958ec8e3f467ac9a11d4 SHA1 2a3db3c49feb352ab6bce1bb30e5d06df4fddaee SHA256 1e6357b7355eb21789d779c532cd7df3a1325ce2a637e5735e76cf4e0518d7f3
-MD5 1268cd79a9c91aa172746702a001445c files/5.5/public-packages-txt.patch 674
-RMD160 94bf2c4d192d4718b9c4958ec8e3f467ac9a11d4 files/5.5/public-packages-txt.patch 674
-SHA256 1e6357b7355eb21789d779c532cd7df3a1325ce2a637e5735e76cf4e0518d7f3 files/5.5/public-packages-txt.patch 674
 AUX 5.5/startscript.sh 421 RMD160 6494dc2a8d810d37f9eea36b4cf759aea8ec92d9 SHA1 2b15c71af3e585e57ecc3712144205ae5119a016 SHA256 dfd619a0a71b28e17facb015e8d4be79c495361f29e97da4cf55ced7f3f87b5f
 MD5 06cb85e3af52ad431914dd95f3ed4eff files/5.5/startscript.sh 421
 RMD160 6494dc2a8d810d37f9eea36b4cf759aea8ec92d9 files/5.5/startscript.sh 421
@@ -42,24 +18,23 @@ AUX emptyunscramble.xsl 405 RMD160 8981ca79c9d05840906fe6070b048db88fcd955a SHA1
 MD5 a80b4daebbce9c3aa54890ab458f8ecd files/emptyunscramble.xsl 405
 RMD160 8981ca79c9d05840906fe6070b048db88fcd955a files/emptyunscramble.xsl 405
 SHA256 4914ed84313cb534bd00dd824b81e6266d9a23fdfc4f95944678b7494d8c15e6 files/emptyunscramble.xsl 405
-DIST netbeans-5.5-files-layout-txt.patch.bz2 2543 RMD160 7650d3ede210872779164d78c0624468e29da9e8 SHA1 9f11852bfa5d3a965ecbee3abc9e7efb4ad5b60b SHA256 311b21d53b5f27b9c12d9139157179d908ae3c1a57a6f2adb46cbd1f4ddfc81a
 DIST netbeans-5_5-ide_sources.tar.bz2 109745446 RMD160 075f33dbbc666ee00dc8b25281a43dcf49d84247 SHA1 255b863e41c23abc00678a228f881c697160bd2a SHA256 ee521fa4a4807cc41b567ff6bff6d927a61415a4246fd4e6cc24f511b5827999
 DIST netbeans-5_5-javadoc.tar.bz2 11345846 RMD160 745641defdb56f0e860e3c46f0275f3b44efe808 SHA1 64603756c56a216315d0598ea20bfcdc429598c2 SHA256 50851849d0121e5ffa36cd5e3b9c366d40f9e2cdce4b58f030bb6716e3438c33
 DIST netbeans-6_0-daily-docs-200610231800-javadoc-23_Oct_2006_1800.tar.bz2 25030422 RMD160 b0168cc6036c27d9ae1af0a88f4771be62887fb8 SHA1 48ace523619c6e278f377dca88743acb084da3b6 SHA256 1bd4344c13e6e7a4363516a954199da4b452f253c26dea6081fa2e10eeaafb46
 DIST netbeans-6_0-daily-src-200610231800-ide_sources-23_Oct_2006_1800.tar.bz2 123762213 RMD160 185670460414f7f117592da0deed7a0c9e57bbc2 SHA1 a237d610bbe5a51570f1e5ce50c41a9ce7107cd9 SHA256 5775cdaee54d0e9f3ba7c8ed90b5cef5f16c74594fb91f2d1e9bb64b37800a07
 DIST netbeans-6_0-daily-src-200611091900-ide_sources-9_Nov_2006_1900.tar.bz2 124191991 RMD160 c8481ee0a2a2a29935898d6c57698670dc6b4b5b SHA1 93331392aa461a6ca768ef31bf40ef8b45ccb01a SHA256 328275f0f903908c077f7f8d78515c6abf63329659d4445e4697579cdb4d75dd
-EBUILD netbeans-5.5-r1.ebuild 12332 RMD160 ffa90f4be2fc745e563c194ecd04f9dcd731cdce SHA1 3ae16b7a9e6bfd5e1fb19d13f3a88671c9a6dfe7 SHA256 d127931d859b5d8aa7899e396ef3f5e75d1c56db6e6e3a7fa293cc7780ea9582
-MD5 3b90047dd52855e8bd8bae7ebb40e949 netbeans-5.5-r1.ebuild 12332
-RMD160 ffa90f4be2fc745e563c194ecd04f9dcd731cdce netbeans-5.5-r1.ebuild 12332
-SHA256 d127931d859b5d8aa7899e396ef3f5e75d1c56db6e6e3a7fa293cc7780ea9582 netbeans-5.5-r1.ebuild 12332
-EBUILD netbeans-6.0_alpha20061023.ebuild 15926 RMD160 c6fa92ee8763a9ca27c957968c4d3a0e535145a0 SHA1 1a15c6fce5e685c064f65bee6adf3f60b78d25c2 SHA256 a91ab03a758793668a8078291e3b72d3ff7231bbfc2a35b9e2ac2a16578afb1b
-MD5 5a25e23e55c2f78e9ed00aa19ae7232c netbeans-6.0_alpha20061023.ebuild 15926
-RMD160 c6fa92ee8763a9ca27c957968c4d3a0e535145a0 netbeans-6.0_alpha20061023.ebuild 15926
-SHA256 a91ab03a758793668a8078291e3b72d3ff7231bbfc2a35b9e2ac2a16578afb1b netbeans-6.0_alpha20061023.ebuild 15926
-EBUILD netbeans-6.0_alpha20061109.ebuild 14977 RMD160 0d794c63eb7a30abe00cad1f43003b3c6c55d830 SHA1 abac0e0979e2e059e6398292654a7aff047728f8 SHA256 5715aacaa9b14af91c82919129da3e84eaa58d75213b5ed31993ad996e96304d
-MD5 e1c4fef1962136f6de08ed92f9ceb5c6 netbeans-6.0_alpha20061109.ebuild 14977
-RMD160 0d794c63eb7a30abe00cad1f43003b3c6c55d830 netbeans-6.0_alpha20061109.ebuild 14977
-SHA256 5715aacaa9b14af91c82919129da3e84eaa58d75213b5ed31993ad996e96304d netbeans-6.0_alpha20061109.ebuild 14977
+EBUILD netbeans-5.5-r1.ebuild 11873 RMD160 e6cd392e9b224089cc0946a99cf44ca2fe933ffc SHA1 ec77f21a2fec584b59b968194178cb805a870b65 SHA256 18759fc7fe9febb582ce36fc6a3e590678d828b8b69471807795dd9b0f1a7c87
+MD5 084a2ae7b96efd714fc8de982f758da3 netbeans-5.5-r1.ebuild 11873
+RMD160 e6cd392e9b224089cc0946a99cf44ca2fe933ffc netbeans-5.5-r1.ebuild 11873
+SHA256 18759fc7fe9febb582ce36fc6a3e590678d828b8b69471807795dd9b0f1a7c87 netbeans-5.5-r1.ebuild 11873
+EBUILD netbeans-6.0_alpha20061023.ebuild 15912 RMD160 65a8d0bdf4e70544dd64e09c95a0a5d10fc2d5d3 SHA1 288cd46b6eb5f08a38a1f420181c21d79e8e4a8a SHA256 c465168894e4afafe3dc61f8799014005fad07a431ad350202ca94b80f96df79
+MD5 282c5807ef0bcf318cf08e698fe60e52 netbeans-6.0_alpha20061023.ebuild 15912
+RMD160 65a8d0bdf4e70544dd64e09c95a0a5d10fc2d5d3 netbeans-6.0_alpha20061023.ebuild 15912
+SHA256 c465168894e4afafe3dc61f8799014005fad07a431ad350202ca94b80f96df79 netbeans-6.0_alpha20061023.ebuild 15912
+EBUILD netbeans-6.0_alpha20061109.ebuild 14963 RMD160 4e281364696ca2d6ad00513150dceb1d3f0e8540 SHA1 d39aedcfa61124f24b182c63f42b8882a7e47179 SHA256 a1fa6261dbf145eb0a83c750198c4400bfae0849d703467d87b389f85e3484af
+MD5 6c36234a6285e1e6d41f78f787b90662 netbeans-6.0_alpha20061109.ebuild 14963
+RMD160 4e281364696ca2d6ad00513150dceb1d3f0e8540 netbeans-6.0_alpha20061109.ebuild 14963
+SHA256 a1fa6261dbf145eb0a83c750198c4400bfae0849d703467d87b389f85e3484af netbeans-6.0_alpha20061109.ebuild 14963
 MISC ChangeLog 6475 RMD160 7093cbbd7ea72027c12309b920a5742ab5dbc236 SHA1 e8ce98188c867451a885bc7f69db1d71acb6846a SHA256 b7df68d9d8fe40482c5b85e50834515b913f9e3da64216dcbe56bfb379b66f1d
 MD5 2944151cdc08f43a5ab84b25546ffac3 ChangeLog 6475
 RMD160 7093cbbd7ea72027c12309b920a5742ab5dbc236 ChangeLog 6475
@@ -68,9 +43,9 @@ MISC metadata.xml 1128 RMD160 9ba1b3fec0fedacd10416e7c61edfecada1912cd SHA1 997b
 MD5 e7fcbf7f5131562425fda47afe3b39b9 metadata.xml 1128
 RMD160 9ba1b3fec0fedacd10416e7c61edfecada1912cd metadata.xml 1128
 SHA256 8c524b060fdbfc4aa432a528c2e78ad05eb20fcf4bc8973c1c8366699bb90b5a metadata.xml 1128
-MD5 c8a0b3075b05eee17b3d72a4e0ae3da6 files/digest-netbeans-5.5-r1 849
-RMD160 698fc8a03d93e1d953518e85a154f81c39420a16 files/digest-netbeans-5.5-r1 849
-SHA256 106a591a21d31b7b730bf5f922f7f2fcf26eb87d1f9e8f9e808cf8be9b9ea09c files/digest-netbeans-5.5-r1 849
+MD5 941a64540f925f5b9c672d7aab71fcb4 files/digest-netbeans-5.5-r1 557
+RMD160 8811d7450a173585439b243004eab0b615f505e8 files/digest-netbeans-5.5-r1 557
+SHA256 b47a0c7239e8eadf6723160c9c9a3e02fafffcaebee20d758da0359c27afd923 files/digest-netbeans-5.5-r1 557
 MD5 41745dcb5387aac35e780a6e65766373 files/digest-netbeans-6.0_alpha20061023 800
 RMD160 624f5f87cde04dbfefcec6c439eab43595b3ce4b files/digest-netbeans-6.0_alpha20061023 800
 SHA256 5d3bea52c5ba3e37231d9ee36efd76a3ad3ca2773a8644e423b51f46e9b6f246 files/digest-netbeans-6.0_alpha20061023 800
diff --git a/dev-util/netbeans/files/5.5/deps-txt.patch b/dev-util/netbeans/files/5.5/deps-txt.patch
deleted file mode 100644
index 0307ecf4..00000000
--- a/dev-util/netbeans/files/5.5/deps-txt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ide/golden/deps.txt	2006-10-03 02:31:07.000000000 +0200
-+++ deps.txt	2006-10-08 22:57:14.000000000 +0200
-@@ -2145,8 +2145,6 @@
-   REQUIRES org.openide.text (platform)
-   REQUIRES org.openide.util (platform)
-   REQUIRES org.openide.windows (platform)
--MODULE org.netbeans.modules.tomcat5.bundled/1 (j2ee)
--  REQUIRES org.netbeans.modules.tomcat5/1 (j2ee)
- MODULE org.netbeans.modules.updatecenters/1 (nb)
-   REQUIRES org.netbeans.modules.autoupdate/1 (platform)
-   REQUIRES org.openide.modules.ModuleFormat1
diff --git a/dev-util/netbeans/files/5.5/files-layout-txt.patch b/dev-util/netbeans/files/5.5/files-layout-txt.patch
deleted file mode 100644
index 05404166..00000000
--- a/dev-util/netbeans/files/5.5/files-layout-txt.patch
+++ /dev/null
@@ -1,348 +0,0 @@
---- ide/golden/files-layout.txt	2006-10-03 02:31:07.000000000 +0200
-+++ files-layout.txt	2006-10-08 22:12:21.000000000 +0200
-@@ -6,313 +6,6 @@
- enterprise3/ant/sources/org/netbeans/modules/web/project/ant/JspC.java
- enterprise3/ant/sources/org/netbeans/modules/web/project/ant/JspCSingle.java
- enterprise3/ant/sources/org/netbeans/modules/websvc/core/ant/WsClientUpToDate.java
--enterprise3/apache-tomcat-5.5.17/LICENSE
--enterprise3/apache-tomcat-5.5.17/NOTICE
--enterprise3/apache-tomcat-5.5.17/RELEASE-NOTES
--enterprise3/apache-tomcat-5.5.17/RUNNING.txt
--enterprise3/apache-tomcat-5.5.17/bin/bootstrap.jar
--enterprise3/apache-tomcat-5.5.17/bin/catalina-tasks.xml
--enterprise3/apache-tomcat-5.5.17/bin/catalina.bat
--enterprise3/apache-tomcat-5.5.17/bin/catalina.sh
--enterprise3/apache-tomcat-5.5.17/bin/commons-daemon.jar
--enterprise3/apache-tomcat-5.5.17/bin/commons-logging-api.jar
--enterprise3/apache-tomcat-5.5.17/bin/cpappend.bat
--enterprise3/apache-tomcat-5.5.17/bin/digest.bat
--enterprise3/apache-tomcat-5.5.17/bin/digest.sh
--enterprise3/apache-tomcat-5.5.17/bin/jkstatus-tasks.xml
--enterprise3/apache-tomcat-5.5.17/bin/jmx.jar
--enterprise3/apache-tomcat-5.5.17/bin/jmxaccessor-tasks.xml
--enterprise3/apache-tomcat-5.5.17/bin/jsvc.tar.gz
--enterprise3/apache-tomcat-5.5.17/bin/service.bat
--enterprise3/apache-tomcat-5.5.17/bin/setclasspath.bat
--enterprise3/apache-tomcat-5.5.17/bin/setclasspath.sh
--enterprise3/apache-tomcat-5.5.17/bin/shutdown.bat
--enterprise3/apache-tomcat-5.5.17/bin/shutdown.sh
--enterprise3/apache-tomcat-5.5.17/bin/startup.bat
--enterprise3/apache-tomcat-5.5.17/bin/startup.sh
--enterprise3/apache-tomcat-5.5.17/bin/tomcat-juli.jar
--enterprise3/apache-tomcat-5.5.17/bin/tomcat-native.tar.gz
--enterprise3/apache-tomcat-5.5.17/bin/tomcat5.exe
--enterprise3/apache-tomcat-5.5.17/bin/tomcat5w.exe
--enterprise3/apache-tomcat-5.5.17/bin/tool-wrapper.bat
--enterprise3/apache-tomcat-5.5.17/bin/tool-wrapper.sh
--enterprise3/apache-tomcat-5.5.17/bin/version.bat
--enterprise3/apache-tomcat-5.5.17/bin/version.sh
--enterprise3/apache-tomcat-5.5.17/common/classes/dummy
--enterprise3/apache-tomcat-5.5.17/common/endorsed/xercesImpl.jar
--enterprise3/apache-tomcat-5.5.17/common/endorsed/xml-apis.jar
--enterprise3/apache-tomcat-5.5.17/common/i18n/tomcat-i18n-en.jar
--enterprise3/apache-tomcat-5.5.17/common/i18n/tomcat-i18n-es.jar
--enterprise3/apache-tomcat-5.5.17/common/i18n/tomcat-i18n-fr.jar
--enterprise3/apache-tomcat-5.5.17/common/i18n/tomcat-i18n-ja.jar
--enterprise3/apache-tomcat-5.5.17/common/lib/ant.jar
--enterprise3/apache-tomcat-5.5.17/common/lib/commons-el.jar
--enterprise3/apache-tomcat-5.5.17/common/lib/jasper-compiler.jar
--enterprise3/apache-tomcat-5.5.17/common/lib/jasper-runtime.jar
--enterprise3/apache-tomcat-5.5.17/common/lib/jsp-api.jar
--enterprise3/apache-tomcat-5.5.17/common/lib/naming-factory-dbcp.jar
--enterprise3/apache-tomcat-5.5.17/common/lib/naming-factory.jar
--enterprise3/apache-tomcat-5.5.17/common/lib/naming-resources.jar
--enterprise3/apache-tomcat-5.5.17/common/lib/org-netbeans-modules-schema2beans.jar
--enterprise3/apache-tomcat-5.5.17/common/lib/org-netbeans-modules-web-httpmonitor.jar
--enterprise3/apache-tomcat-5.5.17/common/lib/servlet-api.jar
--enterprise3/apache-tomcat-5.5.17/conf/Catalina/localhost/admin.xml
--enterprise3/apache-tomcat-5.5.17/conf/Catalina/localhost/host-manager.xml
--enterprise3/apache-tomcat-5.5.17/conf/Catalina/localhost/manager.xml
--enterprise3/apache-tomcat-5.5.17/conf/catalina.policy
--enterprise3/apache-tomcat-5.5.17/conf/catalina.properties
--enterprise3/apache-tomcat-5.5.17/conf/context.xml
--enterprise3/apache-tomcat-5.5.17/conf/logging.properties
--enterprise3/apache-tomcat-5.5.17/conf/server-minimal.xml
--enterprise3/apache-tomcat-5.5.17/conf/server.xml
--enterprise3/apache-tomcat-5.5.17/conf/tomcat-users.xml
--enterprise3/apache-tomcat-5.5.17/conf/web.xml
--enterprise3/apache-tomcat-5.5.17/logs/dummy
--enterprise3/apache-tomcat-5.5.17/server/lib/catalina-ant-jmx.jar
--enterprise3/apache-tomcat-5.5.17/server/lib/catalina-ant.jar
--enterprise3/apache-tomcat-5.5.17/server/lib/catalina-cluster.jar
--enterprise3/apache-tomcat-5.5.17/server/lib/catalina-optional.jar
--enterprise3/apache-tomcat-5.5.17/server/lib/catalina-storeconfig.jar
--enterprise3/apache-tomcat-5.5.17/server/lib/catalina.jar
--enterprise3/apache-tomcat-5.5.17/server/lib/commons-modeler.jar
--enterprise3/apache-tomcat-5.5.17/server/lib/servlets-cgi.renametojar
--enterprise3/apache-tomcat-5.5.17/server/lib/servlets-default.jar
--enterprise3/apache-tomcat-5.5.17/server/lib/servlets-invoker.jar
--enterprise3/apache-tomcat-5.5.17/server/lib/servlets-ssi.renametojar
--enterprise3/apache-tomcat-5.5.17/server/lib/servlets-webdav.jar
--enterprise3/apache-tomcat-5.5.17/server/lib/tomcat-ajp.jar
--enterprise3/apache-tomcat-5.5.17/server/lib/tomcat-apr.jar
--enterprise3/apache-tomcat-5.5.17/server/lib/tomcat-coyote.jar
--enterprise3/apache-tomcat-5.5.17/server/lib/tomcat-http.jar
--enterprise3/apache-tomcat-5.5.17/server/lib/tomcat-jkstatus-ant.jar
--enterprise3/apache-tomcat-5.5.17/server/lib/tomcat-util.jar
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/WEB-INF/controls.tld
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/WEB-INF/lib/catalina-admin.jar
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/WEB-INF/lib/commons-beanutils.jar
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/WEB-INF/lib/commons-collections.jar
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/WEB-INF/lib/commons-digester-1.7.jar
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/WEB-INF/lib/struts.jar
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/WEB-INF/struts-config.xml
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/WEB-INF/web.xml
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/admin.css
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/admin.xml
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/BlueTile.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/Connector.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/Context.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/Datasource.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/DefaultContext.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/EnvironmentEntries.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/Groups.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/Host.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/Logger.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/Login.jpg
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/LoginBackgroundTile.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/Mailsession.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/PaperTexture.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/Realm.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/ResourceLink.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/Roles.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/Server.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/Service.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/Thumbs.db
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/TomcatBanner.jpg
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/Users.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/Valve.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/folder_16_pad.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/handledownlast.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/handledownmiddle.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/handlerightlast.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/handlerightmiddle.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/linelastnode.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/linemiddlenode.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/images/linevertical.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/admin/tree-control-test.css
--enterprise3/apache-tomcat-5.5.17/server/webapps/host-manager/WEB-INF/lib/catalina-host-manager.jar
--enterprise3/apache-tomcat-5.5.17/server/webapps/host-manager/WEB-INF/web.xml
--enterprise3/apache-tomcat-5.5.17/server/webapps/host-manager/host-manager.xml
--enterprise3/apache-tomcat-5.5.17/server/webapps/host-manager/images/add.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/host-manager/images/asf-logo.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/host-manager/images/code.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/host-manager/images/design.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/host-manager/images/docs.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/host-manager/images/fix.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/host-manager/images/tomcat.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/host-manager/images/update.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/host-manager/images/void.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/host-manager/manager.xml
--enterprise3/apache-tomcat-5.5.17/server/webapps/manager/WEB-INF/lib/catalina-manager.jar
--enterprise3/apache-tomcat-5.5.17/server/webapps/manager/WEB-INF/lib/commons-fileupload-1.0.jar
--enterprise3/apache-tomcat-5.5.17/server/webapps/manager/WEB-INF/web.xml
--enterprise3/apache-tomcat-5.5.17/server/webapps/manager/html-manager-howto.html
--enterprise3/apache-tomcat-5.5.17/server/webapps/manager/images/add.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/manager/images/asf-logo.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/manager/images/code.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/manager/images/design.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/manager/images/docs.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/manager/images/fix.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/manager/images/tomcat.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/manager/images/update.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/manager/images/void.gif
--enterprise3/apache-tomcat-5.5.17/server/webapps/manager/manager-howto.html
--enterprise3/apache-tomcat-5.5.17/server/webapps/manager/manager.xml
--enterprise3/apache-tomcat-5.5.17/server/webapps/manager/status.xsd
--enterprise3/apache-tomcat-5.5.17/server/webapps/manager/xform.xsl
--enterprise3/apache-tomcat-5.5.17/temp/bugzilla37035-safeToDelete.tmp
--enterprise3/apache-tomcat-5.5.17/temp/dummy
--enterprise3/apache-tomcat-5.5.17/webapps/ROOT/RELEASE-NOTES.txt
--enterprise3/apache-tomcat-5.5.17/webapps/ROOT/WEB-INF/lib/catalina-root.jar
--enterprise3/apache-tomcat-5.5.17/webapps/ROOT/WEB-INF/web.xml
--enterprise3/apache-tomcat-5.5.17/webapps/ROOT/admin/index.html
--enterprise3/apache-tomcat-5.5.17/webapps/ROOT/asf-logo-wide.gif
--enterprise3/apache-tomcat-5.5.17/webapps/ROOT/favicon.ico
--enterprise3/apache-tomcat-5.5.17/webapps/ROOT/index.jsp
--enterprise3/apache-tomcat-5.5.17/webapps/ROOT/tomcat-power.gif
--enterprise3/apache-tomcat-5.5.17/webapps/ROOT/tomcat.gif
--enterprise3/apache-tomcat-5.5.17/webapps/balancer/META-INF/context.xml
--enterprise3/apache-tomcat-5.5.17/webapps/balancer/WEB-INF/config/rules.xml
--enterprise3/apache-tomcat-5.5.17/webapps/balancer/WEB-INF/lib/catalina-balancer.jar
--enterprise3/apache-tomcat-5.5.17/webapps/balancer/WEB-INF/web.xml
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/RELEASE-NOTES.txt
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/WEB-INF/web.xml
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/appdev/build.xml.txt
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/appdev/deployment.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/appdev/index.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/appdev/installation.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/appdev/introduction.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/appdev/printer/build.xml.txt
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/appdev/printer/deployment.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/appdev/printer/index.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/appdev/printer/installation.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/appdev/printer/introduction.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/appdev/printer/processes.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/appdev/printer/source.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/appdev/printer/web.xml.txt
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/appdev/processes.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/appdev/sample/build.xml
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/appdev/sample/docs/README.txt
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/appdev/sample/index.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/appdev/sample/sample.war
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/appdev/sample/src/mypackage/Hello.java
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/appdev/sample/web/WEB-INF/web.xml
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/appdev/sample/web/hello.jsp
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/appdev/sample/web/images/tomcat.gif
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/appdev/sample/web/index.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/appdev/source.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/appdev/web.xml.txt
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/apr.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/architecture/index.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/architecture/overview.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/architecture/printer/index.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/architecture/printer/overview.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/architecture/printer/requestProcess.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/architecture/printer/startup.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/architecture/requestProcess.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/architecture/requestProcess/requestProcess.pdf
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/architecture/requestProcess/roseModel.mdl
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/architecture/startup.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/architecture/startup/serverStartup.pdf
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/architecture/startup/serverStartup.txt
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/balancer-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/build.xml
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/building.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/cgi-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/changelog.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/class-loader-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/cluster-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/config/ajp.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/config/context.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/config/engine.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/config/globalresources.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/config/host.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/config/http.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/config/index.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/config/loader.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/config/manager.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/config/printer/ajp.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/config/printer/context.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/config/printer/engine.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/config/printer/globalresources.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/config/printer/host.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/config/printer/http.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/config/printer/index.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/config/printer/loader.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/config/printer/manager.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/config/printer/realm.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/config/printer/resources.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/config/printer/server.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/config/printer/service.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/config/printer/valve.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/config/realm.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/config/resources.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/config/server.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/config/service.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/config/valve.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/connectors.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/default-servlet.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/deployer-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/developers.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/html-manager-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/images/add.gif
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/images/asf-logo.gif
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/images/code.gif
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/images/design.gif
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/images/docs.gif
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/images/fix.gif
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/images/printer.gif
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/images/tomcat.gif
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/images/update.gif
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/images/void.gif
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/index.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/introduction.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/jasper-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/jndi-datasource-examples-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/jndi-resources-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/logging.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/manager-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/mbeans-descriptor-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/monitoring.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/apr.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/balancer-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/building.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/cgi-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/changelog.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/class-loader-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/cluster-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/connectors.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/default-servlet.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/deployer-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/developers.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/html-manager-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/index.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/introduction.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/jasper-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/jndi-datasource-examples-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/jndi-resources-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/logging.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/manager-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/mbeans-descriptor-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/monitoring.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/proxy-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/realm-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/security-manager-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/setup.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/ssi-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/ssl-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/status.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/printer/windows-service-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/proxy-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/realm-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/security-manager-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/setup.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/ssi-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/ssl-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/status.html
--enterprise3/apache-tomcat-5.5.17/webapps/tomcat-docs/windows-service-howto.html
--enterprise3/apache-tomcat-5.5.17/webapps/webdav/WEB-INF/web.xml
--enterprise3/apache-tomcat-5.5.17/webapps/webdav/index.html
--enterprise3/apache-tomcat-5.5.17/webapps/webdav/tomcat-power.gif
--enterprise3/apache-tomcat-5.5.17/webapps/webdav/tomcat.gif
--enterprise3/apache-tomcat-5.5.17/work/dummy
- enterprise3/config/Modules/org-netbeans-api-web-webmodule.xml
- enterprise3/config/Modules/org-netbeans-libs-glassfish_logging.xml
- enterprise3/config/Modules/org-netbeans-modules-dbschema.xml
-@@ -347,7 +40,6 @@
- enterprise3/config/Modules/org-netbeans-modules-j2eeapis.xml
- enterprise3/config/Modules/org-netbeans-modules-j2eeserver.xml
- enterprise3/config/Modules/org-netbeans-modules-servletjspapi.xml
--enterprise3/config/Modules/org-netbeans-modules-tomcat5-bundled.xml
- enterprise3/config/Modules/org-netbeans-modules-tomcat5.xml
- enterprise3/config/Modules/org-netbeans-modules-web-core-syntax.xml
- enterprise3/config/Modules/org-netbeans-modules-web-core.xml
-@@ -377,7 +69,6 @@
- enterprise3/modules/docs/org-netbeans-modules-j2ee-sun-appsrv81.jar
- enterprise3/modules/docs/org-netbeans-modules-tomcat5.jar
- enterprise3/modules/docs/org-netbeans-modules-web-monitor.jar
--enterprise3/modules/eager/tomcat5-bundled.jar
- enterprise3/modules/ext/appsrvbridge.jar
- enterprise3/modules/ext/blueprints/bp-ui-14.jar
- enterprise3/modules/ext/blueprints/bp-ui-5.jar
-@@ -499,7 +190,6 @@
- enterprise3/update_tracking/org-netbeans-modules-j2eeapis.xml
- enterprise3/update_tracking/org-netbeans-modules-j2eeserver.xml
- enterprise3/update_tracking/org-netbeans-modules-servletjspapi.xml
--enterprise3/update_tracking/org-netbeans-modules-tomcat5-bundled.xml
- enterprise3/update_tracking/org-netbeans-modules-tomcat5.xml
- enterprise3/update_tracking/org-netbeans-modules-web-core-syntax.xml
- enterprise3/update_tracking/org-netbeans-modules-web-core.xml
-@@ -519,6 +209,7 @@
- enterprise3/update_tracking/org-netbeans-modules-websvc-websvcapi.xml
- harness/README
- harness/build.xml
-+harness/build.xml.orig
- harness/common.xml
- harness/config/Modules/org-netbeans-modules-apisupport-harness.xml
- harness/etc/app.clusters
diff --git a/dev-util/netbeans/files/5.5/mdr_extras_jdbcstorage_build.xml.patch b/dev-util/netbeans/files/5.5/mdr_extras_jdbcstorage_build.xml.patch
deleted file mode 100644
index 29de4607..00000000
--- a/dev-util/netbeans/files/5.5/mdr_extras_jdbcstorage_build.xml.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- netbeans-src/mdr/extras/jdbcstorage/build.xml	2006-10-05 16:58:43.000000000 +1300
-+++ netbeans-src/mdr/extras/jdbcstorage/build-new.xml	2006-10-05 17:09:48.000000000 +1300
-@@ -1,20 +1,20 @@
- <?xml version="1.0" encoding="UTF-8"?>
- 
- <!-- The contents of this file are subject to the terms of the Common Development
--<!-- and Distribution License (the License). You may not use this file except in
--<!-- compliance with the License.
-+ and Distribution License (the License). You may not use this file except in
-+ compliance with the License.
-  
--<!-- You can obtain a copy of the License at http://www.netbeans.org/cddl.html
--<!-- or http://www.netbeans.org/cddl.txt.
--<!-- 
--<!-- When distributing Covered Code, include this CDDL Header Notice in each file
--<!-- and include the License file at http://www.netbeans.org/cddl.txt.
--<!-- If applicable, add the following below the CDDL Header, with the fields
--<!-- enclosed by brackets [] replaced by your own identifying information:
--<!-- "Portions Copyrighted [year] [name of copyright owner]"
-+ You can obtain a copy of the License at http://www.netbeans.org/cddl.html
-+ or http://www.netbeans.org/cddl.txt.
-+ 
-+ When distributing Covered Code, include this CDDL Header Notice in each file
-+ and include the License file at http://www.netbeans.org/cddl.txt.
-+ If applicable, add the following below the CDDL Header, with the fields
-+ enclosed by brackets [] replaced by your own identifying information:
-+ "Portions Copyrighted [year] [name of copyright owner]"
-  
- The Original Software is NetBeans. The Initial Developer of the Original
--<!-- Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-+ Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
- Microsystems, Inc. All Rights Reserved.
- -->
- 
diff --git a/dev-util/netbeans/files/5.5/mdr_extras_mdrant_build.xml.patch b/dev-util/netbeans/files/5.5/mdr_extras_mdrant_build.xml.patch
deleted file mode 100644
index 53c2e76a..00000000
--- a/dev-util/netbeans/files/5.5/mdr_extras_mdrant_build.xml.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- build.ns-src/mdr/extras/mdrant/build.xml	2006-10-05 17:19:25.000000000 +1300
-+++ netbeans-src/mdr/extras/mdrant/build-new.xml	2006-10-05 17:43:31.000000000 +1300
-@@ -1,20 +1,20 @@
- <?xml version="1.0" encoding="UTF-8"?>
- 
- <!-- The contents of this file are subject to the terms of the Common Development
--<!-- and Distribution License (the License). You may not use this file except in
--<!-- compliance with the License.
-+ and Distribution License (the License). You may not use this file except in
-+ compliance with the License.
-  
--<!-- You can obtain a copy of the License at http://www.netbeans.org/cddl.html
--<!-- or http://www.netbeans.org/cddl.txt.
--<!-- 
--<!-- When distributing Covered Code, include this CDDL Header Notice in each file
--<!-- and include the License file at http://www.netbeans.org/cddl.txt.
--<!-- If applicable, add the following below the CDDL Header, with the fields
--<!-- enclosed by brackets [] replaced by your own identifying information:
--<!-- "Portions Copyrighted [year] [name of copyright owner]"
-+ You can obtain a copy of the License at http://www.netbeans.org/cddl.html
-+ or http://www.netbeans.org/cddl.txt.
-+ 
-+ When distributing Covered Code, include this CDDL Header Notice in each file
-+ and include the License file at http://www.netbeans.org/cddl.txt.
-+ If applicable, add the following below the CDDL Header, with the fields
-+ enclosed by brackets [] replaced by your own identifying information:
-+ "Portions Copyrighted [year] [name of copyright owner]"
-  
- The Original Software is NetBeans. The Initial Developer of the Original
--<!-- Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-+ Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
- Microsystems, Inc. All Rights Reserved.
- -->
- 
diff --git a/dev-util/netbeans/files/5.5/modules-txt.patch b/dev-util/netbeans/files/5.5/modules-txt.patch
deleted file mode 100644
index 198e8155..00000000
--- a/dev-util/netbeans/files/5.5/modules-txt.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ide/golden/modules.txt	2006-10-03 02:31:07.000000000 +0200
-+++ modules.txt	2006-10-08 22:35:13.000000000 +0200
-@@ -148,7 +148,6 @@
- MODULE org.netbeans.modules.tasklist.core/2 (ide)
- MODULE org.netbeans.modules.tasklist.docscan/2 (ide)
- MODULE org.netbeans.modules.tomcat5/1 (j2ee)
--MODULE org.netbeans.modules.tomcat5.bundled/1 (j2ee)
- MODULE org.netbeans.modules.updatecenters/1 (nb)
- MODULE org.netbeans.modules.usersguide/1 (ide)
- MODULE org.netbeans.modules.utilities/1 (ide)
diff --git a/dev-util/netbeans/files/5.5/public-packages-txt.patch b/dev-util/netbeans/files/5.5/public-packages-txt.patch
deleted file mode 100644
index b7e68f80..00000000
--- a/dev-util/netbeans/files/5.5/public-packages-txt.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- ide/golden/public-packages.txt	2006-05-09 04:48:57.000000000 -0400
-+++ netbeans-src/nbbuild/build/generated/public-packages.txt	2006-09-21 01:43:29.000000000 -0400
-@@ -77,6 +77,7 @@
- org.apache.xml.resolver.readers
- org.apache.xml.resolver.tools
- org.apache.xml.serialize
-+org.apache.xmlcommons
- org.jdesktop.layout
- org.netbeans.api.db.explorer
- org.netbeans.api.db.explorer.support
-@@ -274,5 +275,14 @@
- org.openide.windows
- org.openide.xml
- org.openidex.search
-+org.w3c.dom
-+org.w3c.dom.css
-+org.w3c.dom.events
- org.w3c.dom.html
- org.w3c.dom.ranges
-+org.w3c.dom.stylesheets
-+org.w3c.dom.traversal
-+org.w3c.dom.views
-+org.xml.sax
-+org.xml.sax.ext
-+org.xml.sax.helpers
diff --git a/dev-util/netbeans/files/digest-netbeans-5.5-r1 b/dev-util/netbeans/files/digest-netbeans-5.5-r1
index 3851987f..219e4f0d 100644
--- a/dev-util/netbeans/files/digest-netbeans-5.5-r1
+++ b/dev-util/netbeans/files/digest-netbeans-5.5-r1
@@ -1,6 +1,3 @@
-MD5 72c8b1462df3a642285e2b4c9b197e82 netbeans-5.5-files-layout-txt.patch.bz2 2543
-RMD160 7650d3ede210872779164d78c0624468e29da9e8 netbeans-5.5-files-layout-txt.patch.bz2 2543
-SHA256 311b21d53b5f27b9c12d9139157179d908ae3c1a57a6f2adb46cbd1f4ddfc81a netbeans-5.5-files-layout-txt.patch.bz2 2543
 MD5 de16a300f772af6b7d29a9d8ddf5a043 netbeans-5_5-ide_sources.tar.bz2 109745446
 RMD160 075f33dbbc666ee00dc8b25281a43dcf49d84247 netbeans-5_5-ide_sources.tar.bz2 109745446
 SHA256 ee521fa4a4807cc41b567ff6bff6d927a61415a4246fd4e6cc24f511b5827999 netbeans-5_5-ide_sources.tar.bz2 109745446
diff --git a/dev-util/netbeans/netbeans-5.5-r1.ebuild b/dev-util/netbeans/netbeans-5.5-r1.ebuild
index 5562fd7d..e409297f 100644
--- a/dev-util/netbeans/netbeans-5.5-r1.ebuild
+++ b/dev-util/netbeans/netbeans-5.5-r1.ebuild
@@ -39,10 +39,8 @@ MY_PV=${MY_PV/./_}
 BASELOCATION="http://us1.mirror.netbeans.org/download/${MY_PV/-//}/fcs/200610171010"
 MAINTARBALL="netbeans-${MY_PV}-ide_sources.tar.bz2"
 JAVADOCTARBALL="netbeans-${MY_PV}-javadoc.tar.bz2"
-FILELAYOUTPATCH="netbeans-5.5-files-layout-txt.patch.bz2"
 
 SRC_URI="${BASELOCATION}/${MAINTARBALL}
-	mirror://gentoo/${FILELAYOUTPATCH}
 	 doc? ( ${BASELOCATION}/${JAVADOCTARBALL} )"
 
 LICENSE="Apache-1.1 Apache-2.0 SPL W3C sun-bcla-j2eeeditor sun-bcla-javac sun-javac as-is docbook sun-resolver"
@@ -57,30 +55,30 @@ IUSE="debug doc"
 #		 =dev-java/jaxen-1.1*
 #		  dev-java/jtidy
 
-RDEPEND="=virtual/jre-1.5*
-		  >=dev-java/commons-logging-1.0
-		   dev-java/commons-el
-		   dev-java/sun-jmx
-		  =dev-java/junit-3.8*
-		  =dev-java/servletapi-2.2*
-		  =dev-java/servletapi-2.3*
-		  =dev-java/servletapi-2.4*
-		   dev-java/sac
-		   dev-java/flute
-		 >=dev-java/jmi-interface-1.0-r1
-		 >=dev-java/javahelp-bin-2.0.02-r1
-		  =www-servers/tomcat-5.5*
-		   dev-java/sun-j2ee-deployment-bin
-		   dev-java/xml-commons
-		   dev-java/jakarta-jstl
-		 >=dev-java/xerces-2.8.0
-		 =dev-java/swing-layout-1*
-		   dev-java/jsch 
-		   dev-java/jgoodies-forms
-		  =dev-java/gnu-jaf-1*
+RDEPEND=">=virtual/jre-1.5*
+		>=dev-java/commons-logging-1.0
+		dev-java/commons-el
+		dev-java/sun-jmx
+		=dev-java/junit-3.8*
+		=dev-java/servletapi-2.2*
+		=dev-java/servletapi-2.3*
+		=dev-java/servletapi-2.4*
+		dev-java/sac
+		dev-java/flute
+		>=dev-java/jmi-interface-1.0-r1
+		>=dev-java/javahelp-bin-2.0.02-r1
+		=www-servers/tomcat-5.5*
+		dev-java/sun-j2ee-deployment-bin
+		dev-java/xml-commons
+		dev-java/jakarta-jstl
+		>=dev-java/xerces-2.8.0
+		=dev-java/swing-layout-1*
+		dev-java/jsch
+		dev-java/jgoodies-forms
+		=dev-java/gnu-jaf-1*
 		   "
 DEPEND="${RDEPEND}
-		=virtual/jdk-1.5*
+		>=virtual/jdk-1.5*
 		>=dev-java/ant-1.6.2
 		  dev-util/pmd
 		  dev-libs/libxslt
@@ -123,6 +121,7 @@ IDE_VERSION="7"
 PLATFORM="6"
 MY_FDIR="${FILESDIR}/${SLOT}"
 DESTINATION="${ROOT}usr/share/netbeans-${SLOT}"
+JAVA_PKG_BSFIX="off"
 
 antflags=""
 
@@ -164,16 +163,6 @@ src_unpack () {
 		rm -f *.zip
 	fi
 
-	cd ${S}
-	unpack ${FILELAYOUTPATCH}
-
-	epatch netbeans-5.5-files-layout-txt.patch
-	epatch ${FILESDIR}/${SLOT}/modules-txt.patch
-	epatch ${FILESDIR}/${SLOT}/deps-txt.patch
-	epatch ${FILESDIR}/${SLOT}/public-packages-txt.patch
-	epatch ${FILESDIR}/${SLOT}/mdr_extras_jdbcstorage_build.xml.patch
-	epatch ${FILESDIR}/${SLOT}/mdr_extras_mdrant_build.xml.patch
-
 	cd ${S}/nbbuild
 	# Disable the bundled Tomcat in favor of Portage installed version
 	sed -i -e "s%tomcatint/tomcat5/bundled,%%g" *.properties
@@ -191,7 +180,7 @@ src_compile() {
 
 	# Specify the build-nozip target otherwise it will build
 	# a zip file of the netbeans folder, which will copy directly.
-	eant ${antflags}
+	eant ${antflags} build-nozip
 
 	# Remove non-x86 Linux binaries
 	find ${BUILDDESTINATION} -type f \
diff --git a/dev-util/netbeans/netbeans-6.0_alpha20061023.ebuild b/dev-util/netbeans/netbeans-6.0_alpha20061023.ebuild
index f8daf54d..0160cd9e 100644
--- a/dev-util/netbeans/netbeans-6.0_alpha20061023.ebuild
+++ b/dev-util/netbeans/netbeans-6.0_alpha20061023.ebuild
@@ -246,14 +246,14 @@ pkg_postinst () {
 	elog "want to use ant-1.7 with Netbeans because default Netbeans  "
 	elog "configuration doesn't work with Gentoo ant-1.7.             "
 	elog
-        elog "If you are using some packages on top of Netbeans, you have"
-        elog "to re-emerge them now.                                     "
+	elog "If you are using some packages on top of Netbeans, you have"
+	elog "to re-emerge them now.                                     "
 }
 
 pkg_postrm() {
-#	einfo "Removing symlinks to jars from"
-#	einfo "${DESTINATION}"
-#	find ${DESTINATION} -type l | xargs rm -fr
+	#einfo "Removing symlinks to jars from"
+	#einfo "${DESTINATION}"
+	#find ${DESTINATION} -type l | xargs rm -fr
 
 	if ! test -e /usr/bin/netbeans-${SLOT}; then
 		einfo "Because of the way Portage works at the moment"
diff --git a/dev-util/netbeans/netbeans-6.0_alpha20061109.ebuild b/dev-util/netbeans/netbeans-6.0_alpha20061109.ebuild
index c1103533..4e41120d 100644
--- a/dev-util/netbeans/netbeans-6.0_alpha20061109.ebuild
+++ b/dev-util/netbeans/netbeans-6.0_alpha20061109.ebuild
@@ -253,8 +253,8 @@ pkg_postinst () {
 	elog "want to use ant-1.7 with Netbeans because default Netbeans  "
 	elog "configuration doesn't work with Gentoo ant-1.7.             "
 	elog
-        elog "If you are using some packages on top of Netbeans, you have"
-        elog "to re-emerge them now.                                     "
+	elog "If you are using some packages on top of Netbeans, you have"
+	elog "to re-emerge them now.                                     "
 }
 
 pkg_postrm() {