diff -r 8997f97391c0 glassfish.common/manifest.mf
--- a/glassfish.common/manifest.mf Tue Jun 04 12:30:26 2013 +0200
+++ b/glassfish.common/manifest.mf Wed Jun 05 15:06:15 2013 +0200
@@ -3,6 +3,6 @@
OpenIDE-Module-Install: org/netbeans/modules/glassfish/common/Installer.class
OpenIDE-Module-Layer: org/netbeans/modules/glassfish/common/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/glassfish/common/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.33
+OpenIDE-Module-Specification-Version: 1.34
OpenIDE-Module-Provides: org.netbeans.modules.glassfish.common
diff -r 8997f97391c0 glassfish.common/src/org/netbeans/modules/glassfish/spi/ServerUtilities.java
--- a/glassfish.common/src/org/netbeans/modules/glassfish/spi/ServerUtilities.java Tue Jun 04 12:30:26 2013 +0200
+++ b/glassfish.common/src/org/netbeans/modules/glassfish/spi/ServerUtilities.java Wed Jun 05 15:06:15 2013 +0200
@@ -58,10 +58,13 @@
import org.netbeans.modules.glassfish.common.ServerDetails;
import org.netbeans.modules.glassfish.common.wizards.GlassfishWizardProvider;
import org.netbeans.spi.server.ServerInstanceProvider;
+import org.openide.DialogDisplayer;
+import org.openide.NotifyDescriptor;
import org.openide.WizardDescriptor;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Lookup;
+import org.openide.util.NbBundle;
/**
@@ -89,10 +92,24 @@
this.gwp = gwp;
}
-// public static ServerUtilities getPreludeUtilities() {
-// GlassfishInstanceProvider gip = GlassfishInstanceProvider.getPrelude();
-// return null == gip ? null : new ServerUtilities(gip,null);
-// }
+ /**
+ * Display javaee module update warning.
+ */
+ private static void missingHk2LibraryProvider() {
+ String message = NbBundle.getMessage(ServerUtilities.class,
+ "ServerUtilities.updateModule");
+ NotifyDescriptor notifyDescriptor
+ = new NotifyDescriptor.Message(message);
+ DialogDisplayer.getDefault().notify(notifyDescriptor);
+ }
+
+ // Restored back using standard GF v3 settings because v3 Prelude
+ // is not supported anymore. User gets warning to update javaee module.
+ public static ServerUtilities getPreludeUtilities() {
+ missingHk2LibraryProvider();
+ GlassfishInstanceProvider gip = GlassfishInstanceProvider.getProvider();
+ return null == gip ? null : new ServerUtilities(gip,null);
+ }
public static ServerUtilities getEe6Utilities() {
GlassfishInstanceProvider gip = GlassfishInstanceProvider.getProvider();
diff -r 8997f97391c0 glassfish.javaee/manifest.mf
--- a/glassfish.javaee/manifest.mf Tue Jun 04 12:30:26 2013 +0200
+++ b/glassfish.javaee/manifest.mf Wed Jun 05 15:06:15 2013 +0200
@@ -4,5 +4,5 @@
OpenIDE-Module-Layer: org/netbeans/modules/glassfish/javaee/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/glassfish/javaee/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.modules.serverplugins.javaee
-OpenIDE-Module-Specification-Version: 1.23
+OpenIDE-Module-Specification-Version: 1.24
diff -r 8997f97391c0 glassfish.javaee/nbproject/project.xml
--- a/glassfish.javaee/nbproject/project.xml Tue Jun 04 12:30:26 2013 +0200
+++ b/glassfish.javaee/nbproject/project.xml Wed Jun 05 15:06:15 2013 +0200
@@ -135,7 +135,7 @@
0-1
- 1.30
+ 1.34