Attachment #135388 for bug #230645

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 230645
Collapse All | Expand All

Lines 3-8 Link Here

(-)a/glassfish.common/manifest.mf (-1 / +1 lines)
3	OpenIDE-Module-Install: org/netbeans/modules/glassfish/common/Installer.class	3	OpenIDE-Module-Install: org/netbeans/modules/glassfish/common/Installer.class
4	OpenIDE-Module-Layer: org/netbeans/modules/glassfish/common/layer.xml	4	OpenIDE-Module-Layer: org/netbeans/modules/glassfish/common/layer.xml
5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/glassfish/common/Bundle.properties	5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/glassfish/common/Bundle.properties
6	OpenIDE-Module-Specification-Version: 1.33	6	OpenIDE-Module-Specification-Version: 1.34
7	OpenIDE-Module-Provides: org.netbeans.modules.glassfish.common	7	OpenIDE-Module-Provides: org.netbeans.modules.glassfish.common
8		8




# 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=<html>It seems that you are using obsolete \
GlassFish Server module.<br/>Please check for GlassFish Server modules \
update.</html>

Lines 58-67 Link Here

(-)a/glassfish.common/src/org/netbeans/modules/glassfish/spi/ServerUtilities.java (-4 / +21 lines)
58	import org.netbeans.modules.glassfish.common.ServerDetails;	58	import org.netbeans.modules.glassfish.common.ServerDetails;
59	import org.netbeans.modules.glassfish.common.wizards.GlassfishWizardProvider;	59	import org.netbeans.modules.glassfish.common.wizards.GlassfishWizardProvider;
60	import org.netbeans.spi.server.ServerInstanceProvider;	60	import org.netbeans.spi.server.ServerInstanceProvider;
		61	import org.openide.DialogDisplayer;
		62	import org.openide.NotifyDescriptor;
61	import org.openide.WizardDescriptor;	63	import org.openide.WizardDescriptor;
62	import org.openide.filesystems.FileObject;	64	import org.openide.filesystems.FileObject;
63	import org.openide.filesystems.FileUtil;	65	import org.openide.filesystems.FileUtil;
64	import org.openide.util.Lookup;	66	import org.openide.util.Lookup;
		67	import org.openide.util.NbBundle;
65		68
66		69
67	/**	70	/**
Lines 89-98 Link Here
89	this.gwp = gwp;	92	this.gwp = gwp;
90	}	93	}
91		94
92	// public static ServerUtilities getPreludeUtilities() {	95	/**
93	// GlassfishInstanceProvider gip = GlassfishInstanceProvider.getPrelude();	96	* Display javaee module update warning.
94	// return null == gip ? null : new ServerUtilities(gip,null);	97	*/
95	// }	98	private static void missingHk2LibraryProvider() {
		99	String message = NbBundle.getMessage(ServerUtilities.class,
		100	"ServerUtilities.updateModule");
		101	NotifyDescriptor notifyDescriptor
		102	= new NotifyDescriptor.Message(message);
		103	DialogDisplayer.getDefault().notify(notifyDescriptor);
		104	}
		105
		106	// Restored back using standard GF v3 settings because v3 Prelude
		107	// is not supported anymore. User gets warning to update javaee module.
		108	public static ServerUtilities getPreludeUtilities() {
		109	missingHk2LibraryProvider();
		110	GlassfishInstanceProvider gip = GlassfishInstanceProvider.getProvider();
		111	return null == gip ? null : new ServerUtilities(gip,null);
		112	}
96		113
97	public static ServerUtilities getEe6Utilities() {	114	public static ServerUtilities getEe6Utilities() {
98	GlassfishInstanceProvider gip = GlassfishInstanceProvider.getProvider();	115	GlassfishInstanceProvider gip = GlassfishInstanceProvider.getProvider();

Lines 4-8 Link Here

(-)a/glassfish.javaee/manifest.mf (-1 / +1 lines)
4	OpenIDE-Module-Layer: org/netbeans/modules/glassfish/javaee/layer.xml	4	OpenIDE-Module-Layer: org/netbeans/modules/glassfish/javaee/layer.xml
5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/glassfish/javaee/Bundle.properties	5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/glassfish/javaee/Bundle.properties
6	OpenIDE-Module-Provides: org.netbeans.modules.serverplugins.javaee	6	OpenIDE-Module-Provides: org.netbeans.modules.serverplugins.javaee
7	OpenIDE-Module-Specification-Version: 1.23	7	OpenIDE-Module-Specification-Version: 1.24
8		8

Lines 135-141 Link Here

(-)a/glassfish.javaee/nbproject/project.xml (-1 / +1 lines)
135	<compile-dependency/>	135	<compile-dependency/>
136	<run-dependency>	136	<run-dependency>
137	<release-version>0-1</release-version>	137	<release-version>0-1</release-version>
138	<specification-version>1.30</specification-version>	138	<specification-version>1.34</specification-version>
139	</run-dependency>	139	</run-dependency>
140	</dependency>	140	</dependency>
141	<dependency>	141	<dependency>

Return to bug 230645

Added Link Here

(-)8997f97391c0 (+43 lines)
1	# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2	#
3	# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
4	#
5	# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
6	# Other names may be trademarks of their respective owners.
7	#
8	# The contents of this file are subject to the terms of either the GNU
9	# General Public License Version 2 only ("GPL") or the Common
10	# Development and Distribution License("CDDL") (collectively, the
11	# "License"). You may not use this file except in compliance with the
12	# License. You can obtain a copy of the License at
13	# http://www.netbeans.org/cddl-gplv2.html
14	# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
15	# specific language governing permissions and limitations under the
16	# License. When distributing the software, include this License Header
17	# Notice in each file and include the License file at
18	# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
19	# particular file as subject to the "Classpath" exception as provided
20	# by Oracle in the GPL Version 2 section of the License file that
21	# accompanied this code. If applicable, add the following below the
22	# License Header, with the fields enclosed by brackets [] replaced by
23	# your own identifying information:
24	# "Portions Copyrighted [year] [name of copyright owner]"
25	#
26	# If you wish your version of this file to be governed by only the CDDL
27	# or only the GPL Version 2, indicate your decision by adding
28	# "[Contributor] elects to include this software in this distribution
29	# under the [CDDL or GPL Version 2] license." If you do not indicate a
30	# single choice of license, a recipient has the option to distribute
31	# your version of this file under either the CDDL, the GPL Version 2 or
32	# to extend the choice of license to its licensees as provided above.
33	# However, if you add GPL Version 2 code and therefore, elected the GPL
34	# Version 2 license, then the option applies only if the new code is
35	# made subject to such option by the copyright holder.
36	#
37	# Contributor(s):
38	#
39	# Portions Copyrighted 2013 Sun Microsystems, Inc.
40
41	ServerUtilities.updateModule=<html>It seems that you are using obsolete \
42	GlassFish Server module.<br/>Please check for GlassFish Server modules \
43	update.</html>