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

(-)a/glassfish.common/manifest.mf (-1 / +1 lines)
Lines 3-8 Link Here
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
(-)a/glassfish.common/src/org/netbeans/modules/glassfish/spi/ServerUtilities.java (-4 / +21 lines)
Lines 58-67 Link Here
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();
(-)a/glassfish.javaee/manifest.mf (-1 / +1 lines)
Lines 4-8 Link Here
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
(-)a/glassfish.javaee/nbproject/project.xml (-1 / +1 lines)
Lines 135-141 Link Here
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