* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-enterprise/, dev-java/netbeans-enterprise/files/
@ 2011-02-17 17:00 Miroslav Šulc
0 siblings, 0 replies; only message in thread
From: Miroslav Šulc @ 2011-02-17 17:00 UTC (permalink / raw
To: gentoo-commits
commit: bafea8457fcd4651b6783bfe8ee3c9c1f6bafd86
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 17 16:59:54 2011 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Feb 17 16:59:54 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=bafea845
netbeans: added patch to netbeans-enterprise ebuild
---
dev-java/netbeans-enterprise/ChangeLog | 7 +
dev-java/netbeans-enterprise/Manifest | 5 +-
.../netbeans-enterprise/files/maven.j2ee.patch | 121 ++++++++++++++++++++
...tbeans-enterprise-7.0_beta_p20110216-r1.ebuild} | 2 +-
4 files changed, 132 insertions(+), 3 deletions(-)
diff --git a/dev-java/netbeans-enterprise/ChangeLog b/dev-java/netbeans-enterprise/ChangeLog
index 68cfa62..fa498e4 100644
--- a/dev-java/netbeans-enterprise/ChangeLog
+++ b/dev-java/netbeans-enterprise/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*netbeans-enterprise-7.0_beta_p20110216-r1 (17 Feb 2011)
+
+ 17 Feb 2011; Miroslav Šulc <fordfrog@gentoo.org>
+ -netbeans-enterprise-7.0_beta_p20110216.ebuild,
+ +netbeans-enterprise-7.0_beta_p20110216-r1.ebuild, +files/maven.j2ee.patch:
+ Added patch for maven.j2ee module to prevent NPE
+
*netbeans-enterprise-7.0_beta_p20110216 (17 Feb 2011)
17 Feb 2011; Miroslav Šulc <fordfrog@gentoo.org>
diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index d8efd83..bb40f09 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -1,3 +1,4 @@
+AUX maven.j2ee.patch 4166 RMD160 e00b1194bdfa44d80a339cb8a38def4b2de96a3a SHA1 5e488d5c5aec9b4bc3f3f87bfb87288553a9a66e SHA256 5b0e94bde7fffe3642bdb1f1d270a6b9c9edd4446095d8cbe2d7839a6288845e
DIST 123A7BAAE06D938E5E4533ED745EEE7377E73ED8-jersey-spring-1.3-javadoc.jar 55457 RMD160 8376afbec0a8004d5e591f966a2a12157102f15e SHA1 123a7baae06d938e5e4533ed745eee7377e73ed8 SHA256 a66c6f446e5f01e53c9eb7e29bc2092b9627de3e9c964f11b9a6b730d0aa3407
DIST 16CD40905B389B27AFD81DAFF8F163CEC810FBC6-metro-2.0.zip 15969889 RMD160 c7178a992d303eb3d6eba70a2bdc27d6d19e20e5 SHA1 16cd40905b389b27afd81daff8f163cec810fbc6 SHA256 d2d6d6fb711334657deb1debe4b546a6bee02a2714c2bab5823ad16477833ba4
DIST 1A48EDCF8DCFC76882C821931EB0529DB9AF5D9B-spring-webmvc-2.5.6.SEC01.jar 402348 RMD160 86c33d4674abbd9c6af22649da7e800eb3335420 SHA1 1a48edcf8dcfc76882c821931eb0529db9af5d9b SHA256 a432fa403f568e02e39effd52f2fe1672155a1c2c6273535d80aeee61ddd9a11
@@ -33,6 +34,6 @@ DIST netbeans-7.0-build.xml.patch.bz2 1381 RMD160 a7a885fdae6f1bc654ace5aae4832f
DIST netbeans-trunk-nightly-201102020000-src.zip 175334609 RMD160 8b6ec1df4a9727e9e51350de92438ab5c5a88add SHA1 072dda92c29679ecb4ed56856a6b288ac0e36ad1 SHA256 9a54191ba5bf4e7f4e6492213b41b91e97f52fb02cd367f8f01e9d9e5b6bacba
DIST netbeans-trunk-nightly-201102160501-src.zip 175599725 RMD160 b8b9eb6cce746e0d9851d1cf39d5676995b65822 SHA1 ea17dac535c6f9f8d1e3351d5f3b15171d80af86 SHA256 1945299474d8f34ca11284123d9f2e679a82c68b0548080cd63cc2b4c0327460
EBUILD netbeans-enterprise-7.0_beta_p20110202.ebuild 16157 RMD160 54b2b91b7e97c39070fb0a24761b074a284e1f1b SHA1 84719f6365f9d20212f562fed19995cbcdf2d79a SHA256 6b1f771561c9dcbf272e763aa7927d6971178632827c4b18570a711baca715f4
-EBUILD netbeans-enterprise-7.0_beta_p20110216.ebuild 16284 RMD160 52f8ceb42990a1ce3daf57204f5926380ab00383 SHA1 1f3a29329fce29c56b84f08858dcd8fbe25d354f SHA256 2546c5b727835d19199933cdebb49afff929645e8d97ef32595fff3a137660ef
-MISC ChangeLog 2632 RMD160 94084aca6746137d4f9cf4aee78585d8027bbd31 SHA1 0cc035b1914ce1f28543afc27c286e73cd6901eb SHA256 fe7c4366bcda4c6733e3e40ef8bf88f05bd1a2d640b22303ac223fcacd1cc48d
+EBUILD netbeans-enterprise-7.0_beta_p20110216-r1.ebuild 16315 RMD160 a67b642d3257676276611dfa45b9d38bcebd1ad4 SHA1 31f30fcc921392ce4a6ea988d906c4368ce2d6a7 SHA256 af117db14067252cd709027a5e077e6051c0e1ebe4af5a8ae8d1752bf7a6b929
+MISC ChangeLog 2922 RMD160 a715847c97e5bba29d8c3f990f575d32f1522558 SHA1 265674f8b5dfad760a8be82118003320d968b5c2 SHA256 df88a2f377916bebbddc7da7b282f519576f0dd02eceb37d12c1bb16bf7ecfd8
MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-enterprise/files/maven.j2ee.patch b/dev-java/netbeans-enterprise/files/maven.j2ee.patch
new file mode 100644
index 0000000..102f66a
--- /dev/null
+++ b/dev-java/netbeans-enterprise/files/maven.j2ee.patch
@@ -0,0 +1,121 @@
+# HG changeset patch
+# User David Konecny <dkonecny@netbeans.org>
+# Date 1297733655 -46800
+# Node ID 77ab1bc9a3694538d26a2eccfb448dad541a45fb
+# Parent 01bc40efffe1705ba9d7c1dbc3249e7f407cb0fc
+#195453 - NullPointerException at org.netbeans.modules.maven.j2ee.ejb.EjbRunCustomizerPanel.applyChanges
+
+diff --git a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/J2eeLookupProvider.java b/maven.j2ee/src/org/netbeans/modules/maven/j2ee/J2eeLookupProvider.java
+--- a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/J2eeLookupProvider.java
++++ b/maven.j2ee/src/org/netbeans/modules/maven/j2ee/J2eeLookupProvider.java
+@@ -91,7 +91,9 @@
+ ic.add(new ExecutionChecker(project));
+ ic.add(new SessionContent());
+ Provider prov = new Provider(project, ic);
+- ic.add(new POHImpl(project, prov));
++ POHImpl p = new POHImpl(project, prov);
++ ic.add(p);
++ ic.add(new POHImpl.Hook(p));
+ ic.add(new ContainerCPModifierImpl(project));
+ return prov;
+ }
+diff --git a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/POHImpl.java b/maven.j2ee/src/org/netbeans/modules/maven/j2ee/POHImpl.java
+--- a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/POHImpl.java
++++ b/maven.j2ee/src/org/netbeans/modules/maven/j2ee/POHImpl.java
+@@ -80,11 +80,7 @@
+ import org.openide.util.Exceptions;
+ import org.openide.util.NbBundle;
+
+-/**
+- *
+- * @author mkleint
+- */
+-public class POHImpl extends ProjectOpenedHook {
++public class POHImpl {
+ private final Project project;
+ private J2eeLookupProvider.Provider provider;
+ private PropertyChangeListener refreshListener;
+@@ -102,6 +98,7 @@
+
+ public void hackModuleServerChange() {
+ ProjectManager.mutex().postReadRequest(new Runnable() {
++ @Override
+ public void run() {
+ refreshAppServerAssignment();
+ }
+@@ -112,12 +109,13 @@
+ this.contextPath = path;
+ }
+
+- protected void projectOpened() {
++ private void projectOpened() {
+ refreshAppServerAssignment();
+ if (refreshListener == null) {
+ //#121148 when the user edits the file we need to reset the server instance
+ NbMavenProject watcher = project.getLookup().lookup(NbMavenProject.class);
+ refreshListener = new PropertyChangeListener() {
++ @Override
+ public void propertyChange(PropertyChangeEvent evt) {
+ if (NbMavenProject.PROP_PROJECT.equals(evt.getPropertyName())) {
+ hackModuleServerChange();
+@@ -163,7 +161,7 @@
+ USG_LOGGER.log(record);
+ }
+
+- protected synchronized void refreshAppServerAssignment() {
++ private synchronized void refreshAppServerAssignment() {
+ provider.hackModuleServerChange();
+
+ String[] ids = obtainServerIds(project);
+@@ -224,7 +222,7 @@
+ }
+ }
+
+- protected void projectClosed() {
++ private void projectClosed() {
+ //is null check necessary?
+ if (refreshListener != null) {
+ NbMavenProject watcher = project.getLookup().lookup(NbMavenProject.class);
+@@ -240,7 +238,7 @@
+ try {
+ copyOnSave.cleanup();
+ } catch (FileStateInvalidException ex) {
+- ex.printStackTrace();
++ Exceptions.printStackTrace(ex);
+ }
+ }
+ }
+@@ -302,6 +300,7 @@
+ putValue(Action.NAME, NbBundle.getMessage(POHImpl.class, "TXT_Add_Server"));
+ }
+
++ @Override
+ public void actionPerformed(ActionEvent e) {
+ String newOne = ServerManager.showAddServerInstanceWizard();
+ String serverType = null;
+@@ -363,4 +362,24 @@
+ });
+ }
+ }
++
++ public static class Hook extends ProjectOpenedHook {
++
++ private POHImpl poh;
++
++ public Hook(POHImpl poh) {
++ this.poh = poh;
++ }
++
++ @Override
++ protected void projectOpened() {
++ poh.projectOpened();
++ }
++
++ @Override
++ protected void projectClosed() {
++ poh.projectClosed();
++ }
++
++ }
+ }
+
diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-7.0_beta_p20110216.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-7.0_beta_p20110216-r1.ebuild
similarity index 99%
rename from dev-java/netbeans-enterprise/netbeans-enterprise-7.0_beta_p20110216.ebuild
rename to dev-java/netbeans-enterprise/netbeans-enterprise-7.0_beta_p20110216-r1.ebuild
index 7dfa401..bf1cac7 100644
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-7.0_beta_p20110216.ebuild
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-7.0_beta_p20110216-r1.ebuild
@@ -129,7 +129,7 @@ src_prepare() {
einfo "Deleting bundled class files..."
find -name "*.class" -type f | xargs rm -vf
- epatch netbeans-7.0-build.xml-r1.patch
+ epatch netbeans-7.0-build.xml-r1.patch "${FILESDIR}"/maven.j2ee.patch
# Support for custom patches
if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-02-17 17:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-17 17:00 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-enterprise/, dev-java/netbeans-enterprise/files/ Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox