Commit cd44e0f1 authored by Andres Mejia's avatar Andres Mejia

Update packaging to get it ready for distribution with Debian.

  * Update packaging to use 3.0 (quilt) source format.
  * Update packaging to use dh with javahelper.
  * Bump to Standards-Version 3.9.1.
  * Refresh all patches.
  * Use Java SwingWorker included in standard JDK distribution.
  * Migrate to junit4.
  * Migrate to libservlet2.5-java.
  * Migrate to use Better Swing Application Framework.
  * Use standard svnclientadapter from subclipse.
  * Migrate to ini4j-0.5.2-SNAPSHOT.
parent a5003acb
...@@ -4,8 +4,18 @@ netbeans (6.9-1) unstable; urgency=low ...@@ -4,8 +4,18 @@ netbeans (6.9-1) unstable; urgency=low
(Closes: #543907) (Closes: #543907)
(Closes: #478762) (Closes: #478762)
* Add Debian Java team as Maintainer, Yulia and myself as Uploaders. * Add Debian Java team as Maintainer, Yulia and myself as Uploaders.
* Update packaging to use 3.0 (quilt) source format.
-- Andres Mejia <mcitadel@gmail.com> Fri, 07 Jan 2011 17:00:35 -0500 * Update packaging to use dh with javahelper.
* Bump to Standards-Version 3.9.1.
* Refresh all patches.
* Use Java SwingWorker included in standard JDK distribution.
* Migrate to junit4.
* Migrate to libservlet2.5-java.
* Migrate to use Better Swing Application Framework.
* Use standard svnclientadapter from subclipse.
* Migrate to ini4j-0.5.2-SNAPSHOT.
-- Andres Mejia <mcitadel@gmail.com> Sun, 23 Jan 2011 15:42:29 -0500
netbeans (6.9-0ubuntu2) maverick; urgency=low netbeans (6.9-0ubuntu2) maverick; urgency=low
......
Source: netbeans Source: netbeans
Section: contrib/devel Section: contrib/java
Priority: optional Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Yulia Novozhilova <Yulia.Novozhilova@sun.com>, Uploaders: Yulia Novozhilova <Yulia.Novozhilova@sun.com>,
Andres Mejia <mcitadel@gmail.com> Andres Mejia <mcitadel@gmail.com>
Build-Depends: debhelper (>= 7), cdbs (>= 0.4.63), Build-Depends: debhelper (>= 7.0.50~), javahelper, ant (>= 1.7.0),
ant (>= 1.7.0), ant-optional (>= 1.7.0), ant-optional (>= 1.7.0), default-jdk, javahelp2,
default-jdk, javahelp2 libswing-layout-java (>= 1.0.3), libnb-platform12-java (>= 6.9),
Build-Depends-Indep: libswing-layout-java (>= 1.0.3), libnb-platform-devel-java (>= 6.9), libnb-javaparser-java (>= 6.9),
libnb-platform12-java (>= 6.9), libnb-platform-devel-java (>= 6.9), libsvnclientadapter-java, libfreemarker-java, libjsch-java (>= 0.1.42),
libnb-javaparser-java (>= 6.9), libnb-svnclientadapter-java (>= 6.7), libxml-commons-resolver1.1-java (>= 1.2-3), libxerces2-java,
libfreemarker-java, libjsch-java (>= 0.1.42), libxml-commons-resolver1.1-java (>= 1.2-3), liblucene2-java (>= 2.4.1), libbetter-appframework-java, libbeansbinding-java,
libxerces2-java, liblucene2-java (>= 2.4.1), libappframework-java, junit4, libcommons-logging-java, libini4j-java (>=0.4.1), libsvn-java,
libbeansbinding-java, junit, libcommons-logging-java, liboro-java, libcommons-net-java, jruby (>=1.5.1), libswingx-java (>=0.9.5),
libini4j-java (>=0.4.1), libsvn-java, liboro-java, libcommons-net-java, libswingworker-java, libjzlib-java (>= 1.0.7), libservlet2.5-java, w3c-dtd-xhtml, libjvyamlb-java
jruby (>=1.5.1), libswingx-java (>=0.9.5), libjzlib-java (>= 1.0.7), libservlet2.3-java, w3c-dtd-xhtml, Standards-Version: 3.9.1
libjvyamlb-java Homepage: http://netbeans.org/
Standards-Version: 3.9.0 Vcs-Browser: http://git.debian.org/?p=pkg-java/netbeans.git
Homepage: http://www.netbeans.org Vcs-Git: git://git.debian.org/git/pkg-java/netbeans.git
Package: netbeans Package: netbeans
Architecture: all Architecture: all
Section: contrib/devel Depends: ${java:Depends}, ${misc:Depends}, libnb-platform12-java (>= 6.9),
Depends: ${misc:Depends}, libnb-platform12-java (>= 6.9),
libnb-ide13-java (= ${binary:Version}), libnb-ide13-java (= ${binary:Version}),
libnb-java4-java (= ${binary:Version}), libnb-java4-java (= ${binary:Version}),
libnb-apisupport2-java (= ${binary:Version}) libnb-apisupport2-java (= ${binary:Version})
...@@ -36,29 +35,30 @@ Description: Extensible Java IDE ...@@ -36,29 +35,30 @@ Description: Extensible Java IDE
Package: libnb-ide13-java Package: libnb-ide13-java
Architecture: all Architecture: all
Section: contrib/java Depends: ${java:Depends}, ${misc:Depends}, libnb-platform12-java (>= 6.9),
Depends: ${misc:Depends}, libnb-platform12-java (>= 6.9), libfreemarker-java, libjsch-java(>=0.1.42), libfreemarker-java, libjsch-java (>=0.1.42),
libxml-commons-resolver1.1-java(>= 1.2-3), libnb-svnclientadapter-java (>= 6.7), libxml-commons-resolver1.1-java (>= 1.2-3), libsvnclientadapter-java,
libxerces2-java, libcommons-logging-java, libini4j-java(>=0.4.1), liblucene2-java(>=2.3.2), libxerces2-java, libcommons-logging-java, libini4j-java (>=0.4.1),
libsvn-java, liboro-java, libcommons-net-java, jruby (>=1.5.1), libswingx-java (>=0.9.5), liblucene2-java (>=2.3.2), libsvn-java, liboro-java, libcommons-net-java,
libjzlib-java (>= 1.0.7), libservlet2.3-java, liblog4j1.2-java jruby (>=1.5.1), libswingx-java (>=0.9.5), libjzlib-java (>= 1.0.7),
libservlet2.5-java, liblog4j1.2-java
Description: Common Integrated Development Environment Libraries for NetBeans Description: Common Integrated Development Environment Libraries for NetBeans
Common languages independent libraries for use in the NetBeans IDE. Common languages independent libraries for use in the NetBeans IDE.
Package: libnb-java4-java Package: libnb-java4-java
Architecture: all Architecture: all
Section: contrib/java Depends: ${java:Depends}, ${misc:Depends}, default-jdk,
Depends: ${misc:Depends}, default-jdk | sun-java6-jdk, libnb-platform12-java (>= 6.9), libnb-platform12-java (>= 6.9), libnb-ide13-java (= ${binary:Version}),
libnb-ide13-java (= ${binary:Version}), libnb-javaparser-java (>= 6.9), libnb-javaparser-java (>= 6.9), libbetter-appframework-java,
libappframework-java, ant (>= 1.7.0), ant-optional (>= 1.7.0), ant (>= 1.7.0), ant-optional (>= 1.7.0), libbeansbinding-java, junit4,
libbeansbinding-java, junit, libswingworker-java, default-jdk-doc | sun-java6-doc default-jdk-doc
Description: Common Java Related Libraries for NetBeans Description: Common Java Related Libraries for NetBeans
Common libraries for the NetBeans Java IDE. Common libraries for the NetBeans Java IDE.
Package: libnb-apisupport2-java Package: libnb-apisupport2-java
Architecture: all Architecture: all
Section: contrib/java Depends: ${java:Depends}, ${misc:Depends}, libnb-platform12-java (>= 6.9),
Depends: ${misc:Depends}, libnb-platform12-java (>= 6.9), libnb-platform-devel-java (>= 6.9), libnb-platform-devel-java (>= 6.9), libnb-ide13-java (= ${binary:Version}),
libnb-ide13-java (= ${binary:Version}), libnb-java4-java (= ${binary:Version}) libnb-java4-java (= ${binary:Version})
Description: Common NetBeans Platform Development Related Libraries for NetBeans Description: Common NetBeans Platform Development Related Libraries for NetBeans
Common libraries for development of NetBeans Platform modular extensions. Common libraries for development of NetBeans Platform modular extensions.
usr/share/netbeans/apisupport2
usr/share/netbeans/6.9/bin
usr/share/netbeans/6.9/etc
usr/share/netbeans/6.9/nb/var
usr/share/netbeans/6.9/nb/config
etc
diff -Nur -x '*.orig' -x '*~' netbeans-6.9/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties netbeans-6.9.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties --- a/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties
--- netbeans-6.9/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties 2010-08-11 16:04:56.000000000 +0400 +++ b/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties
+++ netbeans-6.9.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties 2010-08-11 17:17:43.000000000 +0400
@@ -53,9 +53,11 @@ @@ -53,9 +53,11 @@
Services/AutoupdateType/beta-update-provider.instance=NetBeans Beta Services/AutoupdateType/beta-update-provider.instance=NetBeans Beta
Services/AutoupdateType/thirdparty-update-provider.instance=3rd Party Plugins Services/AutoupdateType/thirdparty-update-provider.instance=3rd Party Plugins
...@@ -13,9 +12,8 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/updatecenters/src/org/netbeans/module ...@@ -13,9 +12,8 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/updatecenters/src/org/netbeans/module
URL_PluginPortal=http://plugins.netbeans.org/nbpluginportal/updates/6.9/catalog.xml.gz URL_PluginPortal=http://plugins.netbeans.org/nbpluginportal/updates/6.9/catalog.xml.gz
+URL_Standard_Ubuntu=http://updates.netbeans.org/netbeans/updates/6.9/uc/final/ubuntu/catalog.xml.gz?{$netbeans.hash.code} +URL_Standard_Ubuntu=http://updates.netbeans.org/netbeans/updates/6.9/uc/final/ubuntu/catalog.xml.gz?{$netbeans.hash.code}
diff -Nur -x '*.orig' -x '*~' netbeans-6.9/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml netbeans-6.9.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml --- a/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
--- netbeans-6.9/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml 2010-08-11 16:04:56.000000000 +0400 +++ b/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
+++ netbeans-6.9.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml 2010-08-11 17:18:34.000000000 +0400
@@ -55,7 +55,7 @@ @@ -55,7 +55,7 @@
<attr name="iconBase" stringvalue="org/netbeans/modules/updatecenters/resources/updateAction.gif"/> <attr name="iconBase" stringvalue="org/netbeans/modules/updatecenters/resources/updateAction.gif"/>
<attr name="url" bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#URL_Standard"/> <attr name="url" bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#URL_Standard"/>
......
diff -Nur netbeans-6.9/o.apache.tools.ant.module/build.xml netbeans-6.9.new/o.apache.tools.ant.module/build.xml --- a/o.apache.tools.ant.module/build.xml
--- netbeans-6.9/o.apache.tools.ant.module/build.xml 2010-06-10 15:20:50.000000000 +0400 +++ b/o.apache.tools.ant.module/build.xml
+++ netbeans-6.9.new/o.apache.tools.ant.module/build.xml 2010-07-14 19:49:51.126679798 +0400
@@ -78,6 +78,7 @@ @@ -78,6 +78,7 @@
</target> </target>
...@@ -17,9 +16,8 @@ diff -Nur netbeans-6.9/o.apache.tools.ant.module/build.xml netbeans-6.9.new/o.ap ...@@ -17,9 +16,8 @@ diff -Nur netbeans-6.9/o.apache.tools.ant.module/build.xml netbeans-6.9.new/o.ap
</target> </target>
<target name="test-build" depends="jar-bridge,projectized-common.test-build"/> <target name="test-build" depends="jar-bridge,projectized-common.test-build"/>
diff -Nur netbeans-6.9/o.apache.tools.ant.module/external/build.xml netbeans-6.9.new/o.apache.tools.ant.module/external/build.xml --- a/o.apache.tools.ant.module/external/build.xml
--- netbeans-6.9/o.apache.tools.ant.module/external/build.xml 2010-06-10 15:20:50.000000000 +0400 +++ b/o.apache.tools.ant.module/external/build.xml
+++ netbeans-6.9.new/o.apache.tools.ant.module/external/build.xml 2010-07-14 19:53:47.904672448 +0400
@@ -45,7 +45,9 @@ @@ -45,7 +45,9 @@
--> -->
<project name="o.apache.tools.ant.module/external" default="unzip" basedir="."> <project name="o.apache.tools.ant.module/external" default="unzip" basedir=".">
......
diff -Nur -x '*.orig' -x '*~' netbeans-6.9/nbbuild/build.xml netbeans-6.9.new/nbbuild/build.xml --- a/nbbuild/build.xml
--- netbeans-6.9/nbbuild/build.xml 2010-06-10 15:20:46.000000000 +0400 +++ b/nbbuild/build.xml
+++ netbeans-6.9.new/nbbuild/build.xml 2010-08-06 19:35:33.000000000 +0400
@@ -149,7 +149,6 @@ @@ -149,7 +149,6 @@
<target name="init-module-list" depends="bootstrap,init-tasks"> <target name="init-module-list" depends="bootstrap,init-tasks">
......
diff -Nur netbeans-6.9/ide/launcher/unix/netbeans netbeans-6.9.new/ide/launcher/unix/netbeans --- a/ide/launcher/unix/netbeans
--- netbeans-6.9/ide/launcher/unix/netbeans 2010-06-10 15:19:10.000000000 +0400 +++ b/ide/launcher/unix/netbeans
+++ netbeans-6.9.new/ide/launcher/unix/netbeans 2010-07-22 04:03:54.905999281 +0400
@@ -41,6 +41,17 @@ @@ -41,6 +41,17 @@
# Version 2 license, then the option applies only if the new code is # Version 2 license, then the option applies only if the new code is
# made subject to such option by the copyright holder. # made subject to such option by the copyright holder.
......
diff -Nur -x '*.orig' -x '*~' netbeans-6.9/ide/launcher/unix/netbeans netbeans-6.9.new/ide/launcher/unix/netbeans --- a/ide/launcher/unix/netbeans
--- netbeans-6.9/ide/launcher/unix/netbeans 2010-08-11 17:25:55.000000000 +0400 +++ b/ide/launcher/unix/netbeans
+++ netbeans-6.9.new/ide/launcher/unix/netbeans 2010-08-11 17:28:52.000000000 +0400
@@ -211,6 +211,7 @@ @@ -211,6 +211,7 @@
--branding nb \ --branding nb \
--clusters '"$netbeans_clusters"' \ --clusters '"$netbeans_clusters"' \
......
diff -Nur netbeans-6.9/libs.svnClientAdapter/src/org/netbeans/libs/svnclientadapter/SvnClientAdapterFactory.java netbeans-6.9.new/libs.svnClientAdapter/src/org/netbeans/libs/svnclientadapter/SvnClientAdapterFactory.java --- a/libs.svnClientAdapter/src/org/netbeans/libs/svnclientadapter/SvnClientAdapterFactory.java
--- netbeans-6.9/libs.svnClientAdapter/src/org/netbeans/libs/svnclientadapter/SvnClientAdapterFactory.java 2010-06-10 15:20:26.000000000 +0400 +++ b/libs.svnClientAdapter/src/org/netbeans/libs/svnclientadapter/SvnClientAdapterFactory.java
+++ netbeans-6.9.new/libs.svnClientAdapter/src/org/netbeans/libs/svnclientadapter/SvnClientAdapterFactory.java 2010-07-20 06:58:22.586364869 +0400
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
import org.tigris.subversion.svnclientadapter.SVNClientException; import org.tigris.subversion.svnclientadapter.SVNClientException;
import org.tigris.subversion.svnclientadapter.javahl.JhlClientAdapter; import org.tigris.subversion.svnclientadapter.javahl.JhlClientAdapter;
......
diff -Nur -x '*.orig' -x '*~' netbeans-6.9/apisupport.kit/nbproject/project.xml netbeans-6.9.new/apisupport.kit/nbproject/project.xml --- a/apisupport.kit/nbproject/project.xml
--- netbeans-6.9/apisupport.kit/nbproject/project.xml 2010-08-11 17:51:53.000000000 +0400 +++ b/apisupport.kit/nbproject/project.xml
+++ netbeans-6.9.new/apisupport.kit/nbproject/project.xml 2010-08-11 17:58:46.000000000 +0400 @@ -12,41 +12,16 @@
@@ -12,43 +12,18 @@
</run-dependency> </run-dependency>
</dependency> </dependency>
<dependency> <dependency>
...@@ -34,20 +33,17 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/apisupport.kit/nbproject/project.xml ...@@ -34,20 +33,17 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/apisupport.kit/nbproject/project.xml
<run-dependency> <run-dependency>
<specification-version>1.1</specification-version> <specification-version>1.1</specification-version>
</run-dependency> </run-dependency>
</dependency> - </dependency>
<dependency> - <dependency>
- <code-name-base>org.netbeans.modules.apisupport.paintapp</code-name-base> - <code-name-base>org.netbeans.modules.apisupport.paintapp</code-name-base>
- <run-dependency> - <run-dependency>
- <specification-version>1.1</specification-version> - <specification-version>1.1</specification-version>
- </run-dependency> - </run-dependency>
- </dependency> </dependency>
- <dependency> <dependency>
<code-name-base>org.netbeans.modules.apisupport.project</code-name-base> <code-name-base>org.netbeans.modules.apisupport.project</code-name-base>
<run-dependency> --- a/editor.kit/nbproject/project.xml
<release-version>1</release-version> +++ b/editor.kit/nbproject/project.xml
diff -Nur -x '*.orig' -x '*~' netbeans-6.9/editor.kit/nbproject/project.xml netbeans-6.9.new/editor.kit/nbproject/project.xml
--- netbeans-6.9/editor.kit/nbproject/project.xml 2010-08-11 17:51:53.000000000 +0400
+++ netbeans-6.9.new/editor.kit/nbproject/project.xml 2010-08-11 17:59:25.000000000 +0400
@@ -6,13 +6,6 @@ @@ -6,13 +6,6 @@
<code-name-base>org.netbeans.modules.editor.kit</code-name-base> <code-name-base>org.netbeans.modules.editor.kit</code-name-base>
<module-dependencies> <module-dependencies>
...@@ -105,9 +101,8 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/editor.kit/nbproject/project.xml netb ...@@ -105,9 +101,8 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/editor.kit/nbproject/project.xml netb
</module-dependencies> </module-dependencies>
<public-packages/> <public-packages/>
</data> </data>
diff -Nur -x '*.orig' -x '*~' netbeans-6.9/ide.kit/nbproject/project.xml netbeans-6.9.new/ide.kit/nbproject/project.xml --- a/ide.kit/nbproject/project.xml
--- netbeans-6.9/ide.kit/nbproject/project.xml 2010-08-11 17:51:53.000000000 +0400 +++ b/ide.kit/nbproject/project.xml
+++ netbeans-6.9.new/ide.kit/nbproject/project.xml 2010-08-11 17:56:38.000000000 +0400
@@ -129,6 +129,7 @@ @@ -129,6 +129,7 @@
<specification-version>1.11</specification-version> <specification-version>1.11</specification-version>
</run-dependency> </run-dependency>
...@@ -139,9 +134,8 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/ide.kit/nbproject/project.xml netbean ...@@ -139,9 +134,8 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/ide.kit/nbproject/project.xml netbean
</module-dependencies> </module-dependencies>
<test-dependencies> <test-dependencies>
<test-type> <test-type>
diff -Nur -x '*.orig' -x '*~' netbeans-6.9/java.kit/nbproject/project.xml netbeans-6.9.new/java.kit/nbproject/project.xml --- a/java.kit/nbproject/project.xml
--- netbeans-6.9/java.kit/nbproject/project.xml 2010-08-11 17:51:53.000000000 +0400 +++ b/java.kit/nbproject/project.xml
+++ netbeans-6.9.new/java.kit/nbproject/project.xml 2010-08-11 17:59:50.000000000 +0400
@@ -205,26 +205,6 @@ @@ -205,26 +205,6 @@
</run-dependency> </run-dependency>
</dependency> </dependency>
......
diff -Nur -x '*.orig' -x '*~' netbeans-6.9/nbbuild/cluster.properties netbeans-6.9.new/nbbuild/cluster.properties --- a/nbbuild/cluster.properties
--- netbeans-6.9/nbbuild/cluster.properties 2010-08-11 16:04:56.000000000 +0400 +++ b/nbbuild/cluster.properties
+++ netbeans-6.9.new/nbbuild/cluster.properties 2010-08-11 17:22:31.000000000 +0400
@@ -112,9 +112,7 @@ @@ -112,9 +112,7 @@
clusters.config.java.list=\ clusters.config.java.list=\
${clusters.config.platform.list},\ ${clusters.config.platform.list},\
......
diff -Nur -x '*.orig' -x '*~' netbeans-6.9/ide/launcher/netbeans.conf netbeans-6.9.new/ide/launcher/netbeans.conf --- a/ide/launcher/netbeans.conf
--- netbeans-6.9/ide/launcher/netbeans.conf 2010-06-10 15:19:10.000000000 +0400 +++ b/ide/launcher/netbeans.conf
+++ netbeans-6.9.new/ide/launcher/netbeans.conf 2010-08-11 17:33:29.000000000 +0400
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
# Options used by NetBeans launcher by default, can be overridden by explicit # Options used by NetBeans launcher by default, can be overridden by explicit
......
diff -Nur -x '*.orig' -x '*~' netbeans-6.9/junit/src/org/netbeans/modules/junit/Bundle.properties netbeans-6.9.new/junit/src/org/netbeans/modules/junit/Bundle.properties --- a/junit/src/org/netbeans/modules/junit/Bundle.properties
--- netbeans-6.9/junit/src/org/netbeans/modules/junit/Bundle.properties 2010-06-10 15:20:14.000000000 +0400 +++ b/junit/src/org/netbeans/modules/junit/Bundle.properties
+++ netbeans-6.9.new/junit/src/org/netbeans/modules/junit/Bundle.properties 2010-08-05 15:37:50.000000000 +0400
@@ -399,7 +399,7 @@ @@ -399,7 +399,7 @@
#names of the JUnit libraries #names of the JUnit libraries
...@@ -10,9 +9,8 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/junit/src/org/netbeans/modules/junit/ ...@@ -10,9 +9,8 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/junit/src/org/netbeans/modules/junit/
MSG_MISSING_TEST=The directory for tests was not found. Use source directory instead? MSG_MISSING_TEST=The directory for tests was not found. Use source directory instead?
MSG_MISSING_TEST_TITLE=Missing Test Directory MSG_MISSING_TEST_TITLE=Missing Test Directory
diff -Nur -x '*.orig' -x '*~' netbeans-6.9/junit/src/org/netbeans/modules/junit/resources/junit_4_5_lib.xml netbeans-6.9.new/junit/src/org/netbeans/modules/junit/resources/junit_4_5_lib.xml --- a/junit/src/org/netbeans/modules/junit/resources/junit_4_5_lib.xml
--- netbeans-6.9/junit/src/org/netbeans/modules/junit/resources/junit_4_5_lib.xml 2010-06-10 15:20:14.000000000 +0400 +++ /dev/null
+++ netbeans-6.9.new/junit/src/org/netbeans/modules/junit/resources/junit_4_5_lib.xml 1970-01-01 03:00:00.000000000 +0300
@@ -1,68 +0,0 @@ @@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> -<?xml version="1.0" encoding="UTF-8"?>
-<!-- -<!--
...@@ -82,9 +80,8 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/junit/src/org/netbeans/modules/junit/ ...@@ -82,9 +80,8 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/junit/src/org/netbeans/modules/junit/
- <resource>http://repo1.maven.org/maven2/junit/junit/4.4/junit-4.4.pom</resource> - <resource>http://repo1.maven.org/maven2/junit/junit/4.4/junit-4.4.pom</resource>
- </volume> - </volume>
-</library> -</library>
diff -Nur -x '*.orig' -x '*~' netbeans-6.9/junit/src/org/netbeans/modules/junit/resources/junit_4_8_lib.xml netbeans-6.9.new/junit/src/org/netbeans/modules/junit/resources/junit_4_8_lib.xml --- /dev/null
--- netbeans-6.9/junit/src/org/netbeans/modules/junit/resources/junit_4_8_lib.xml 1970-01-01 03:00:00.000000000 +0300 +++ b/junit/src/org/netbeans/modules/junit/resources/junit_4_8_lib.xml
+++ netbeans-6.9.new/junit/src/org/netbeans/modules/junit/resources/junit_4_8_lib.xml 2010-08-05 15:52:53.000000000 +0400
@@ -0,0 +1,66 @@ @@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?>
+<!-- +<!--
...@@ -152,9 +149,8 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/junit/src/org/netbeans/modules/junit/ ...@@ -152,9 +149,8 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/junit/src/org/netbeans/modules/junit/
+ <resource>http://repo1.maven.org/maven2/junit/junit/4.4/junit-4.4.pom</resource> + <resource>http://repo1.maven.org/maven2/junit/junit/4.4/junit-4.4.pom</resource>
+ </volume> + </volume>
+</library> +</library>
diff -Nur -x '*.orig' -x '*~' netbeans-6.9/junit/src/org/netbeans/modules/junit/resources/layer.xml netbeans-6.9.new/junit/src/org/netbeans/modules/junit/resources/layer.xml --- a/junit/src/org/netbeans/modules/junit/resources/layer.xml
--- netbeans-6.9/junit/src/org/netbeans/modules/junit/resources/layer.xml 2010-06-10 15:20:14.000000000 +0400 +++ b/junit/src/org/netbeans/modules/junit/resources/layer.xml
+++ netbeans-6.9.new/junit/src/org/netbeans/modules/junit/resources/layer.xml 2010-08-05 15:53:45.000000000 +0400
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
<file name="junit-3.8.2.xml" url="junit_3_8_2_lib.xml"> <file name="junit-3.8.2.xml" url="junit_3_8_2_lib.xml">
<attr name="displayName" bundlevalue="org.netbeans.modules.junit.Bundle#junit"/> <attr name="displayName" bundlevalue="org.netbeans.modules.junit.Bundle#junit"/>
...@@ -164,9 +160,8 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/junit/src/org/netbeans/modules/junit/ ...@@ -164,9 +160,8 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/junit/src/org/netbeans/modules/junit/
<attr name="displayName" bundlevalue="org.netbeans.modules.junit.Bundle#junit_4"/> <attr name="displayName" bundlevalue="org.netbeans.modules.junit.Bundle#junit_4"/>
</file> </file>
</folder> </folder>
diff -Nur -x '*.orig' -x '*~' netbeans-6.9/libs.junit4/nbproject/project.xml netbeans-6.9.new/libs.junit4/nbproject/project.xml --- a/libs.junit4/nbproject/project.xml
--- netbeans-6.9/libs.junit4/nbproject/project.xml 2010-06-10 15:20:24.000000000 +0400 +++ b/libs.junit4/nbproject/project.xml
+++ netbeans-6.9.new/libs.junit4/nbproject/project.xml 2010-08-05 16:02:54.000000000 +0400
@@ -63,8 +63,12 @@ @@ -63,8 +63,12 @@
<package>org.junit.runners</package> <package>org.junit.runners</package>
</public-packages> </public-packages>
...@@ -182,9 +177,8 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/libs.junit4/nbproject/project.xml net ...@@ -182,9 +177,8 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/libs.junit4/nbproject/project.xml net
</class-path-extension> </class-path-extension>
</data> </data>
</configuration> </configuration>
diff -Nur -x '*.orig' -x '*~' netbeans-6.9/nbbuild/build.properties netbeans-6.9.new/nbbuild/build.properties --- a/nbbuild/build.properties
--- netbeans-6.9/nbbuild/build.properties 2010-06-10 15:20:46.000000000 +0400 +++ b/nbbuild/build.properties
+++ netbeans-6.9.new/nbbuild/build.properties 2010-08-05 16:03:22.000000000 +0400
@@ -79,7 +79,7 @@ @@ -79,7 +79,7 @@
stop.when.clean.error=true stop.when.clean.error=true
......
Description: Changes made by netbeans build system. These are not meant to be
forwared to upstream.
Forwarded: not-needed
Last-Update: 2011-01-23
--- a/nbbuild/build.properties
+++ b/nbbuild/build.properties
@@ -150,7 +150,6 @@
lexer,\
api.xml,\
o.apache.tools.ant.module,\
- db,\
spi.quicksearch,\
print,\
extexecution
--- /dev/null
+++ b/nbbuild/build.properties_orig
@@ -0,0 +1,218 @@
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#
+# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#
+# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+# Other names may be trademarks of their respective owners.
+#
+# The contents of this file are subject to the terms of either the GNU
+# General Public License Version 2 only ("GPL") or the Common
+# Development and Distribution License("CDDL") (collectively, 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-gplv2.html
+# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+# specific language governing permissions and limitations under the
+# License. When distributing the software, include this License Header
+# Notice in each file and include the License file at
+# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the GPL Version 2 section of the License file that
+# accompanied this code. If applicable, add the following below the
+# License Header, with the fields enclosed by brackets [] replaced by
+# your own identifying information:
+# "Portions Copyrighted [year] [name of copyright owner]"
+#
+# Contributor(s):
+#
+# The Original Software is NetBeans. The Initial Developer of the Original
+# Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun
+# Microsystems, Inc. All Rights Reserved.
+#
+# If you wish your version of this file to be governed by only the CDDL
+# or only the GPL Version 2, indicate your decision by adding
+# "[Contributor] elects to include this software in this distribution
+# under the [CDDL or GPL Version 2] license." If you do not indicate a
+# single choice of license, a recipient has the option to distribute
+# your version of this file under either the CDDL, the GPL Version 2 or
+# to extend the choice of license to its licensees as provided above.
+# However, if you add GPL Version 2 code and therefore, elected the GPL
+# Version 2 license, then the option applies only if the new code is
+# made subject to such option by the copyright holder.
+
+netbeans.dest=netbeans
+test.dist.dir=build/testdist
+
+test.user.dir=testuserdir
+nb.run.validation=true
+# Options to pass to NetBeans when starting it with "ant tryme":
+build.compiler.debug=on
+tryme.args=-J-Dnetbeans.full.hack=true
+
+# Information about branch of previous release
+# needed to help us generate list of changes since then
+previous.release.year=2009
+previous.release.month=12
+previous.release.day=10
+
+# Useful for "always successful" build, when you don't care of some
+# particular (and currently broken) modules
+stop.when.broken.modules=true
+
+# resolve compile time dependencies and merge all dependent modules
+# set to true and command `ant -Dmodules=javacvs` will build IDE
+# with working module javacvs
+merge.dependent.modules=true
+
+# usefull for NBM build. <nbmerge> can set it to the list
+# of successfuly built modules => can create NBM for them
+# the most powerful combination is to set value to "modules"
+# and set stop.when.broken.modules to false
+built.modules.property=
+
+# resolve compile-time dependencies during cleaning working repository
+# set it to true if you want to clean also modules, your module(s) depends on
+resolve.clean.dependencies=false
+
+# stop, if the module have got wrong "clean" target
+# if set to false, clean build never fail on calls of the clean targets.
+stop.when.clean.error=true
+
+test.unit.cp=\
+ ../libs.junit4/external/junit-4.8.jar:\
+ netbeans/harness/modules/org-netbeans-modules-nbjunit.jar:\
+ netbeans/harness/modules/org-netbeans-insane.jar:\
+ ../o.apache.tools.ant.module/external/lib/ant-nodeps.jar:\
+ ../o.apache.tools.ant.module/external/lib/ant-junit.jar:\
+ ../o.apache.tools.ant.module/external/lib/ant-launcher.jar:\
+ ../o.apache.tools.ant.module/external/lib/ant.jar:\
+ nbantext.jar
+
+# make javadoc for these packages
+# - the list will be shared for signature API tests!
+# - for javadoc you may specify org.foo.*, the trailing ".*"
+# will be stripped for signature API tests
+javadoc.packages=\
+ org.netbeans.api.*,\
+ org.netbeans.spi.*
+
+# List of modules that provide stable javadoc
+config.javadoc.stable=\
+ api.annotations.common,\
+ autoupdate.services,\
+ core.ide,\
+ openide.util,\
+ openide.util.lookup,\
+ openide.actions,\
+ openide.awt,\
+ openide.dialogs,\
+ openide.nodes,\
+ openide.explorer,\
+ openide.filesystems,\
+ openide.modules,\
+ openide.text,\
+ openide.windows,\
+ openide.loaders,\
+ openide.io,\
+ api.progress,\
+ sendopts,\
+ settings,\
+ javahelp,\
+ keyring,\
+ spi.palette,\
+ options.api,\
+ spi.tasklist,\
+ openide.execution,\
+ queries,\
+ editor.codetemplates,\
+ editor.errorstripe.api,\
+ editor.mimelookup,\
+ editor.settings,\
+ spi.navigator,\
+ diff,\
+ projectapi,\
+ projectuiapi,\
+ project.libraries,\
+ api.debugger,\
+ spi.viewmodel,\
+ spi.debugger.ui,\
+ api.debugger.jpda,\
+ project.ant,\
+ api.visual,\
+ api.java,\
+ api.java.classpath,\
+ java.platform,\
+ java.project,\
+ java.source,\
+ java.sourceui,\
+ editor.fold,\
+ editor.completion,\
+ lexer,\
+ api.xml,\
+ o.apache.tools.ant.module,\
+ db,\
+ spi.quicksearch,\
+ print,\
+ extexecution
+
+#FIXME: changes for retouche merge:
+# editor/codetemplates,\
+
+# List of javadocs under development
+config.javadoc.devel=\
+ nbjunit,\
+ o.openidex.util,\
+ core.netigso,\
+ core.multiview,\
+ o.n.swing.outline,\
+ o.n.swing.tabcontrol,\
+ editor.indent,\
+ editor.lib2,\
+ editor.bracesmatching,\
+ editor.guards,\
+ j2ee.metadata,\
+ parsing.api,\
+ refactoring.api,\
+ refactoring.java,\
+ server,\
+ spi.editor.hints,\
+ api.web.webmodule
+
+# List of javadocs dedicated just for friend usage
+config.javadoc.friend=\
+ o.n.bootstrap,\
+ core.startup,\
+ classfile,\
+ o.n.swing.plaf,\
+ editor.util,\
+ editor.settings.storage,\
+ editor.lib,\
+ editor,\
+ j2ee.dd,\
+ j2eeserver,\
+ java.api.common,\
+ java.j2seproject,\
+ junit,\
+ uihandler,\
+ lib.uihandler,\
+ masterfs,\
+ projectui
+
+# List of old and deprecated APIs for building complete javadoc
+
+config.javadoc.deprecated=\
+ openide.compat,\
+ openide.options,\
+ openide.util.enumerations
+
+# List of all javadocs for development version
+# is composed from the javadocs split by stability
+# categories, for release it shall contain just stable ones
+config.javadoc.all=\
+ ${config.javadoc.stable}
+
+# list of modules for jnlp:
+config.jnlp.stable=\
+ ${nb.cluster.platform},\
+ ${nb.cluster.ide},\
+ ${nb.cluster.java}
Description: Changes to get netbeans working with ini4j-0.5.2-SNAPSHOT. Patch
is based off of upstream hg commit.
Author: Andres Mejia <mcitadel@gmail.com>
Origin: upstream, http://hg.netbeans.org/main-silver?cmd=changeset;node=b52ba606f1ce
Forwarded: not-needed
Last-Update: 2011-01-23
--- a/hudson.mercurial/src/org/netbeans/modules/hudson/mercurial/HudsonMercurialSCM.java
+++ b/hudson.mercurial/src/org/netbeans/modules/hudson/mercurial/HudsonMercurialSCM.java
@@ -55,7 +55,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
import org.ini4j.Ini;
-import org.ini4j.InvalidIniFormatException;
+import org.ini4j.InvalidFileFormatException;
import org.netbeans.modules.hudson.api.ConnectionBuilder;
import org.netbeans.modules.hudson.api.HudsonJob;
import org.netbeans.modules.hudson.spi.HudsonJobChangeItem;
@@ -212,7 +212,7 @@
} finally {
is.close();
}
- } catch (InvalidIniFormatException x) {
+ } catch (InvalidFileFormatException x) {
LOG.log(Level.FINE, "{0} was malformed, perhaps no workspace: {1}", new Object[] {hgrc, x});
return null;
} catch (FileNotFoundException x) {
--- a/libs.ini4j/nbproject/project.xml
+++ b/libs.ini4j/nbproject/project.xml
@@ -63,10 +63,11 @@
<friend>org.netbeans.modules.mercurial</friend>
<friend>org.netbeans.modules.subversion</friend>
<package>org.ini4j</package>
+ <package>org.ini4j.spi</package>
</friend-packages>
<class-path-extension>
- <runtime-relative-path>ext/ini4j-0.4.1.jar</runtime-relative-path>
- <binary-origin>external/ini4j-0.4.1.jar</binary-origin>
+ <runtime-relative-path>ext/ini4j-0.5.2-SNAPSHOT.jar</runtime-relative-path>
+ <binary-origin>external/ini4j-0.5.2-SNAPSHOT.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
--- a/mercurial/src/org/netbeans/modules/mercurial/config/HgConfigFiles.java
+++ b/mercurial/src/org/netbeans/modules/mercurial/config/HgConfigFiles.java
@@ -56,7 +56,8 @@
import java.util.logging.Level;
import org.ini4j.Config;
import org.ini4j.Ini;
-import org.ini4j.InvalidIniFormatException;
+import org.ini4j.InvalidFileFormatException;
+import org.ini4j.Profile.Section;
import org.netbeans.modules.mercurial.HgModuleConfig;
import org.netbeans.modules.mercurial.Mercurial;
import org.netbeans.modules.mercurial.util.HgRepositoryContextCache;
@@ -96,7 +97,7 @@
private static final String WINDOWS_HG_RC_FILE = "Mercurial.ini"; // NOI18N
private static final String WINDOWS_DEFAULT_MECURIAL_INI_PATH = "C:\\Mercurial\\Mercurial.ini"; // NOI18N
private boolean bIsProjectConfig;
- private InvalidIniFormatException initException;
+ private IOException initException;
/**
* fileName of the configuration file
*/
@@ -345,14 +346,14 @@
}
} catch (FileNotFoundException ex) {