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:08:54 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/Bundle.properties
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/glassfish.common/src/org/netbeans/modules/glassfish/spi/Bundle.properties Wed Jun 05 15:08:54 2013 +0200
@@ -0,0 +1,43 @@
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#
+# Copyright 2013 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]"
+#
+# 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.
+#
+# Contributor(s):
+#
+# Portions Copyrighted 2013 Sun Microsystems, Inc.
+
+ServerUtilities.updateModule=It seems that you are using obsolete \
+GlassFish Server module.
Please check for GlassFish Server modules \
+update.
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:08:54 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:08:54 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:08:54 2013 +0200
@@ -135,7 +135,7 @@
0-1
- 1.30
+ 1.34