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 232242
Collapse All | Expand All

(-)a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProject.java (-1 lines)
Lines 78-84 Link Here
78
import org.netbeans.modules.j2ee.clientproject.wsclient.AppClientProjectWebServicesClientSupport;
78
import org.netbeans.modules.j2ee.clientproject.wsclient.AppClientProjectWebServicesClientSupport;
79
import org.netbeans.modules.j2ee.clientproject.wsclient.AppClientProjectWebServicesSupportProvider;
79
import org.netbeans.modules.j2ee.clientproject.wsclient.AppClientProjectWebServicesSupportProvider;
80
import org.netbeans.modules.j2ee.common.SharabilityUtility;
80
import org.netbeans.modules.j2ee.common.SharabilityUtility;
81
import org.netbeans.modules.j2ee.common.Util;
82
import org.netbeans.modules.j2ee.common.project.spi.JavaEEProjectSettingsImplementation;
81
import org.netbeans.modules.j2ee.common.project.spi.JavaEEProjectSettingsImplementation;
83
import org.netbeans.modules.java.api.common.classpath.ClassPathModifier;
82
import org.netbeans.modules.java.api.common.classpath.ClassPathModifier;
84
import org.netbeans.modules.java.api.common.classpath.ClassPathSupport;
83
import org.netbeans.modules.java.api.common.classpath.ClassPathSupport;
(-)a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java (-3 / +2 lines)
Lines 72-78 Link Here
72
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
72
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
73
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform;
73
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform;
74
import org.netbeans.api.j2ee.core.Profile;
74
import org.netbeans.api.j2ee.core.Profile;
75
import org.netbeans.modules.j2ee.common.Util;
76
import org.netbeans.modules.j2ee.common.dd.DDHelper;
75
import org.netbeans.modules.j2ee.common.dd.DDHelper;
77
import org.netbeans.modules.j2ee.common.project.ProjectConstants;
76
import org.netbeans.modules.j2ee.common.project.ProjectConstants;
78
import org.netbeans.modules.j2ee.common.project.ui.J2EEProjectProperties;
77
import org.netbeans.modules.j2ee.common.project.ui.J2EEProjectProperties;
Lines 189-195 Link Here
189
                 resource = "org-netbeans-modules-j2ee-clientproject/application-client-5.xml"; // NOI18N
188
                 resource = "org-netbeans-modules-j2ee-clientproject/application-client-5.xml"; // NOI18N
190
        } else if (Profile.J2EE_14.equals(j2eeProfile)) {
189
        } else if (Profile.J2EE_14.equals(j2eeProfile)) {
191
                 resource = "org-netbeans-modules-j2ee-clientproject/application-client-1.4.xml"; // NOI18N
190
                 resource = "org-netbeans-modules-j2ee-clientproject/application-client-1.4.xml"; // NOI18N
192
        } else if (Util.isAtLeastJavaEE7Web(j2eeProfile)) {
191
        } else if (j2eeProfile != null && j2eeProfile.isAtLeast(Profile.JAVA_EE_7_WEB)) {
193
                 resource = "org-netbeans-modules-j2ee-clientproject/application-client-7.xml"; // NOI18N
192
                 resource = "org-netbeans-modules-j2ee-clientproject/application-client-7.xml"; // NOI18N
194
        } else {
193
        } else {
195
            resource = "org-netbeans-modules-j2ee-clientproject/application-client-6.xml"; // NOI18N
194
            resource = "org-netbeans-modules-j2ee-clientproject/application-client-6.xml"; // NOI18N
Lines 402-408 Link Here
402
                resource = "org-netbeans-modules-j2ee-clientproject/application-client-5.xml"; // NOI18N
401
                resource = "org-netbeans-modules-j2ee-clientproject/application-client-5.xml"; // NOI18N
403
            } else if (Profile.J2EE_14.equals(j2eeProfile)) {
402
            } else if (Profile.J2EE_14.equals(j2eeProfile)) {
404
                resource = "org-netbeans-modules-j2ee-clientproject/application-client-1.4.xml"; // NOI18N
403
                resource = "org-netbeans-modules-j2ee-clientproject/application-client-1.4.xml"; // NOI18N
405
            } else if (Util.isAtLeastJavaEE7Web(j2eeProfile)) {
404
            } else if (j2eeProfile != null && j2eeProfile.isAtLeast(Profile.JAVA_EE_7_WEB)) {
406
                 resource = "org-netbeans-modules-j2ee-clientproject/application-client-7.xml"; // NOI18N
405
                 resource = "org-netbeans-modules-j2ee-clientproject/application-client-7.xml"; // NOI18N
407
            } else {
406
            } else {
408
                resource = "org-netbeans-modules-j2ee-clientproject/application-client-6.xml"; // NOI18N
407
                resource = "org-netbeans-modules-j2ee-clientproject/application-client-6.xml"; // NOI18N
(-)a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/classpath/ClassPathSupportCallbackImpl.java (-1 lines)
Lines 49-55 Link Here
49
import java.util.List;
49
import java.util.List;
50
import java.util.Map;
50
import java.util.Map;
51
import org.netbeans.modules.j2ee.clientproject.AppClientProjectType;
51
import org.netbeans.modules.j2ee.clientproject.AppClientProjectType;
52
import org.netbeans.modules.j2ee.common.Util;
53
import org.netbeans.modules.j2ee.common.project.ProjectConstants;
52
import org.netbeans.modules.j2ee.common.project.ProjectConstants;
54
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
53
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
55
import org.netbeans.modules.java.api.common.classpath.ClassPathSupport;
54
import org.netbeans.modules.java.api.common.classpath.ClassPathSupport;
(-)a/j2ee.common/src/org/netbeans/modules/j2ee/common/Util.java (-222 lines)
Lines 1-222 Link Here
1
/*
2
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3
 *
4
 * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
5
 *
6
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7
 * Other names may be trademarks of their respective owners.
8
 *
9
 * The contents of this file are subject to the terms of either the GNU
10
 * General Public License Version 2 only ("GPL") or the Common
11
 * Development and Distribution License("CDDL") (collectively, the
12
 * "License"). You may not use this file except in compliance with the
13
 * License. You can obtain a copy of the License at
14
 * http://www.netbeans.org/cddl-gplv2.html
15
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
16
 * specific language governing permissions and limitations under the
17
 * License.  When distributing the software, include this License Header
18
 * Notice in each file and include the License file at
19
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
20
 * particular file as subject to the "Classpath" exception as provided
21
 * by Oracle in the GPL Version 2 section of the License file that
22
 * accompanied this code. If applicable, add the following below the
23
 * License Header, with the fields enclosed by brackets [] replaced by
24
 * your own identifying information:
25
 * "Portions Copyrighted [year] [name of copyright owner]"
26
 *
27
 * Contributor(s):
28
 *
29
 * The Original Software is NetBeans. The Initial Developer of the Original
30
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
31
 * Microsystems, Inc. All Rights Reserved.
32
 *
33
 * If you wish your version of this file to be governed by only the CDDL
34
 * or only the GPL Version 2, indicate your decision by adding
35
 * "[Contributor] elects to include this software in this distribution
36
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
37
 * single choice of license, a recipient has the option to distribute
38
 * your version of this file under either the CDDL, the GPL Version 2 or
39
 * to extend the choice of license to its licensees as provided above.
40
 * However, if you add GPL Version 2 code and therefore, elected the GPL
41
 * Version 2 license, then the option applies only if the new code is
42
 * made subject to such option by the copyright holder.
43
 */
44
45
package org.netbeans.modules.j2ee.common;
46
47
import java.util.logging.Level;
48
import java.util.logging.Logger;
49
import org.netbeans.api.annotations.common.NonNull;
50
import org.netbeans.api.j2ee.core.Profile;
51
import org.netbeans.api.project.Project;
52
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
53
import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
54
55
public class Util {
56
57
    private static final Logger LOGGER = Logger.getLogger(Util.class.getName());
58
    
59
    /**
60
     * Is J2EE version of a given project JavaEE 5 or higher?
61
     *
62
     * @param project J2EE project
63
     * @return true if J2EE version is JavaEE 5 or higher; otherwise false
64
     */
65
    public static boolean isJavaEE5orHigher(Project project) {
66
        if (project == null) {
67
            return false;
68
        }
69
        J2eeModuleProvider j2eeModuleProvider = project.getLookup().lookup(J2eeModuleProvider.class);
70
        if (j2eeModuleProvider != null) {
71
            J2eeModule j2eeModule = j2eeModuleProvider.getJ2eeModule();
72
            if (j2eeModule != null) {
73
                J2eeModule.Type type = j2eeModule.getType();
74
                String strVersion = j2eeModule.getModuleVersion();
75
                assert strVersion != null : "Module type " + j2eeModule.getType() + " returned null module version"; // NOI18N
76
                try {    
77
                    double version = Double.parseDouble(strVersion);
78
                    if (J2eeModule.Type.EJB.equals(type) && (version > 2.1)) {
79
                        return true;
80
                    }
81
                    if (J2eeModule.Type.WAR.equals(type) && (version > 2.4)) {
82
                        return true;
83
                    }
84
                    if (J2eeModule.Type.CAR.equals(type) && (version > 1.4)) {
85
                        return true;
86
                    }
87
                } catch (NumberFormatException ex) {
88
                    LOGGER.log(Level.INFO, "Module version invalid " + strVersion, ex);
89
                }                
90
            }
91
        }
92
        return false;
93
    }
94
95
    /**
96
     * Find out if the version of the given profile is at least Java EE 5 or higher.
97
     *
98
     * @param profile profile that we want to compare
99
     * @return true if the version of the given profile is Java EE 5 or higher,
100
     *         false otherwise
101
     * @since 1.75
102
     */
103
    public static boolean isAtLeastJavaEE5(@NonNull Profile profile) {
104
        return isVersionEqualOrHigher(profile, Profile.JAVA_EE_5);
105
    }
106
107
    /**
108
     * Find out if the version of the given profile is at least Java EE 6 Web or
109
     * higher. Please be aware that Java EE 6 Web is considered as lower than Java
110
     * EE 6 Full.
111
     *
112
     * @param profile profile that we want to compare
113
     * @return true if the version of the given profile is Java EE 6 Web or
114
     *         higher, false otherwise
115
     * @since 1.75
116
     */
117
    public static boolean isAtLeastJavaEE6Web(@NonNull Profile profile) {
118
        return isVersionEqualOrHigher(profile, Profile.JAVA_EE_6_WEB);
119
    }
120
121
    /**
122
     * Find out if the version of the given profile is at least Java EE 7 Web or
123
     * higher. Please be aware that Java EE 7 Web is considered as lower than Java
124
     * EE 7 Full.
125
     *
126
     * @param profile profile that we want to compare
127
     * @return true if the version of the given profile is Java EE 7 Web or
128
     *         higher, false otherwise
129
     * @since 1.79
130
     */
131
    public static boolean isAtLeastJavaEE7Web(@NonNull Profile profile) {
132
        return isVersionEqualOrHigher(profile, Profile.JAVA_EE_7_WEB);
133
    }
134
135
    /**
136
     * Compares if the first given profile has equal or higher Java EE version
137
     * in comparison to the second profile.
138
     *
139
     * Please be aware of the following rules:
140
     * <br/><br/>
141
     *
142
     * 1) Each Java EE X version is considered as lower than Java EE X+1 version
143
     * (this applies regardless on Web/Full specification and in reality it means
144
     * that even Java EE 6 Full version is considered as lower than Java EE 7 Web)
145
     * <br/><br/>
146
     *
147
     * 2) Each Java EE X Web version is considered as lower than Java EE X Full
148
     * <br/>
149
     *
150
     * @param profileToCompare profile that we want to compare
151
     * @param comparingVersion version which we are comparing with
152
     * @return <code>true</code> if the profile version is equal or higher in
153
     *         comparison with the second one, <code>false</code> otherwise
154
     * @since 1.75
155
     */
156
    private static boolean isVersionEqualOrHigher(
157
            @NonNull Profile profileToCompare,
158
            @NonNull Profile comparingVersion) {
159
160
        int comparisonResult = Profile.UI_COMPARATOR.compare(profileToCompare, comparingVersion);
161
        if (comparisonResult == 0) {
162
            // The same version for both
163
            return true;
164
165
        } else {
166
            String profileToCompareVersion = getProfileVersion(profileToCompare);
167
            String comparingProfileVersion = getProfileVersion(comparingVersion);
168
169
            // If the canonicalName is the same value we have to differ between Web and Full profile
170
            if (profileToCompareVersion.equals(comparingProfileVersion)) {
171
                return compareWebAndFull(profileToCompare, comparingVersion);
172
            } else {
173
                if (comparisonResult > 0) {
174
                    // profileToCompare has lower version than comparingVersion
175
                    return false;
176
                } else {
177
                    return true;
178
                }
179
            }
180
        }
181
    }
182
183
    private static boolean compareWebAndFull(
184
            @NonNull Profile profileToCompare,
185
            @NonNull Profile comparingVersion) {
186
187
        boolean isThisFullProfile = isFullProfile(profileToCompare);
188
        boolean isParamFullProfile = isFullProfile(comparingVersion);
189
190
        if (isThisFullProfile && isParamFullProfile) {
191
            // Both profiles are Java EE Full
192
            return true;
193
        }
194
        if (!isThisFullProfile && !isParamFullProfile) {
195
            // Both profiles are Java EE Web
196
            return true;
197
        }
198
        if (isThisFullProfile && !isParamFullProfile) {
199
            // profileToCompare is Java EE Full profile and comparingVersion is only Java EEWeb profile
200
            return true;
201
        }
202
        return false;
203
    }
204
205
    private static String getProfileVersion(@NonNull Profile profile) {
206
        String profileDetails = profile.toPropertiesString();
207
        int indexOfDash = profileDetails.indexOf("-");
208
        if (indexOfDash != -1) {
209
            return profileDetails.substring(0, indexOfDash);
210
        }
211
        return profileDetails;
212
    }
213
214
    private static boolean isFullProfile(@NonNull Profile profile) {
215
        final String profileDetails = profile.toPropertiesString();
216
        if (profileDetails.indexOf("-") == -1) {
217
            return true;
218
        }
219
        return false;
220
    }
221
    
222
}
(-)a/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/DDHelper.java (-3 / +2 lines)
Lines 51-57 Link Here
51
import org.netbeans.api.j2ee.core.Profile;
51
import org.netbeans.api.j2ee.core.Profile;
52
import org.netbeans.api.project.Project;
52
import org.netbeans.api.project.Project;
53
import org.netbeans.modules.j2ee.api.ejbjar.Ear;
53
import org.netbeans.modules.j2ee.api.ejbjar.Ear;
54
import org.netbeans.modules.j2ee.common.Util;
55
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
54
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
56
import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
55
import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
57
import org.openide.filesystems.FileLock;
56
import org.openide.filesystems.FileLock;
Lines 277-285 Link Here
277
            template = "ear-1.4.xml"; // NOI18N
276
            template = "ear-1.4.xml"; // NOI18N
278
        } else if (Profile.JAVA_EE_5.equals(profile) && forceCreation) {
277
        } else if (Profile.JAVA_EE_5.equals(profile) && forceCreation) {
279
            template = "ear-5.xml"; // NOI18N
278
            template = "ear-5.xml"; // NOI18N
280
        } else if (Util.isAtLeastJavaEE7Web(profile) && forceCreation) {
279
        } else if (profile != null && profile.isAtLeast(Profile.JAVA_EE_7_WEB) && forceCreation) {
281
            template = "ear-7.xml"; // NOI18N
280
            template = "ear-7.xml"; // NOI18N
282
        } else if (Util.isAtLeastJavaEE6Web(profile) && forceCreation) {
281
        } else if (profile != null && profile.isAtLeast(Profile.JAVA_EE_6_WEB) && forceCreation) {
283
            template = "ear-6.xml"; // NOI18N
282
            template = "ear-6.xml"; // NOI18N
284
        }
283
        }
285
284
(-)a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ArtifactCopyOnSaveSupport.java (-1 lines)
Lines 60-66 Link Here
60
import java.util.logging.Level;
60
import java.util.logging.Level;
61
import java.util.logging.Logger;
61
import java.util.logging.Logger;
62
import java.util.zip.ZipEntry;
62
import java.util.zip.ZipEntry;
63
import org.netbeans.modules.j2ee.common.Util;
64
import org.netbeans.modules.java.api.common.classpath.ClassPathSupport;
63
import org.netbeans.modules.java.api.common.classpath.ClassPathSupport;
65
import org.netbeans.modules.j2ee.deployment.devmodules.spi.ArtifactListener;
64
import org.netbeans.modules.j2ee.deployment.devmodules.spi.ArtifactListener;
66
import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
65
import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
(-)a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ProjectUtil.java (+41 lines)
Lines 44-54 Link Here
44
import java.io.IOException;
44
import java.io.IOException;
45
import java.util.HashSet;
45
import java.util.HashSet;
46
import java.util.Set;
46
import java.util.Set;
47
import java.util.logging.Level;
48
import java.util.logging.Logger;
47
import org.w3c.dom.Element;
49
import org.w3c.dom.Element;
48
import org.netbeans.api.j2ee.core.Profile;
50
import org.netbeans.api.j2ee.core.Profile;
49
import org.netbeans.api.project.Project;
51
import org.netbeans.api.project.Project;
50
import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment;
52
import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment;
51
import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException;
53
import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException;
54
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
52
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform;
55
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform;
53
import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
56
import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
54
import org.netbeans.modules.j2ee.persistence.spi.server.ServerStatusProvider;
57
import org.netbeans.modules.j2ee.persistence.spi.server.ServerStatusProvider;
Lines 59-64 Link Here
59
62
60
public class ProjectUtil {
63
public class ProjectUtil {
61
64
65
    private static final Logger LOGGER = Logger.getLogger(ProjectUtil.class.getName());
66
62
    public static void updateDirsAttributeInCPSItem(org.netbeans.modules.java.api.common.classpath.ClassPathSupport.Item item,
67
    public static void updateDirsAttributeInCPSItem(org.netbeans.modules.java.api.common.classpath.ClassPathSupport.Item item,
63
            Element element) {
68
            Element element) {
64
        String dirs = item.getAdditionalProperty(ProjectConstants.DESTINATION_DIRECTORY);
69
        String dirs = item.getAdditionalProperty(ProjectConstants.DESTINATION_DIRECTORY);
Lines 177-180 Link Here
177
        return isValidServerInstance(j2eeModuleProvider);
182
        return isValidServerInstance(j2eeModuleProvider);
178
    }
183
    }
179
184
185
    /**
186
     * Is J2EE version of a given project JavaEE 5 or higher?
187
     *
188
     * @param project J2EE project
189
     * @return true if J2EE version is JavaEE 5 or higher; otherwise false
190
     */
191
    public static boolean isJavaEE5orHigher(Project project) {
192
        if (project == null) {
193
            return false;
194
        }
195
        J2eeModuleProvider j2eeModuleProvider = project.getLookup().lookup(J2eeModuleProvider.class);
196
        if (j2eeModuleProvider != null) {
197
            J2eeModule j2eeModule = j2eeModuleProvider.getJ2eeModule();
198
            if (j2eeModule != null) {
199
                J2eeModule.Type type = j2eeModule.getType();
200
                String strVersion = j2eeModule.getModuleVersion();
201
                assert strVersion != null : "Module type " + j2eeModule.getType() + " returned null module version";
202
                try {
203
                    double version = Double.parseDouble(strVersion);
204
                    if (J2eeModule.Type.EJB.equals(type) && (version > 2.1)) {
205
                        return true;
206
                    }
207
                    if (J2eeModule.Type.WAR.equals(type) && (version > 2.4)) {
208
                        return true;
209
                    }
210
                    if (J2eeModule.Type.CAR.equals(type) && (version > 1.4)) {
211
                        return true;
212
                    }
213
                } catch (NumberFormatException ex) {
214
                    LOGGER.log(Level.INFO, "Module version invalid " + strVersion, ex);
215
                }
216
            }
217
        }
218
        return false;
219
    }
220
180
}
221
}
(-)a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2EEProjectProperties.java (-4 lines)
Lines 55-68 Link Here
55
import org.netbeans.api.j2ee.core.Profile;
55
import org.netbeans.api.j2ee.core.Profile;
56
import org.netbeans.api.project.Project;
56
import org.netbeans.api.project.Project;
57
import org.netbeans.modules.j2ee.common.ClasspathUtil;
57
import org.netbeans.modules.j2ee.common.ClasspathUtil;
58
import org.netbeans.modules.j2ee.common.Util;
59
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
60
import org.netbeans.modules.j2ee.deployment.devmodules.api.AntDeploymentHelper;
58
import org.netbeans.modules.j2ee.deployment.devmodules.api.AntDeploymentHelper;
61
import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment;
59
import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment;
62
import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException;
60
import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException;
63
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
61
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
64
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform;
62
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform;
65
import org.netbeans.modules.j2ee.deployment.devmodules.api.ServerInstance;
66
import org.netbeans.modules.java.api.common.classpath.ClassPathSupport;
63
import org.netbeans.modules.java.api.common.classpath.ClassPathSupport;
67
import org.netbeans.modules.javaee.specs.support.api.JaxWs;
64
import org.netbeans.modules.javaee.specs.support.api.JaxWs;
68
import org.netbeans.modules.websvc.wsstack.api.WSStack;
65
import org.netbeans.modules.websvc.wsstack.api.WSStack;
Lines 70-76 Link Here
70
import org.netbeans.spi.project.support.ant.EditableProperties;
67
import org.netbeans.spi.project.support.ant.EditableProperties;
71
import org.openide.filesystems.FileObject;
68
import org.openide.filesystems.FileObject;
72
import org.openide.filesystems.FileUtil;
69
import org.openide.filesystems.FileUtil;
73
import org.openide.util.Parameters;
74
70
75
71
76
/** Helper class. Defines constants for properties. Knows the proper
72
/** Helper class. Defines constants for properties. Knows the proper
(-)a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.java (-1 lines)
Lines 75-81 Link Here
75
import org.netbeans.api.java.platform.JavaPlatform;
75
import org.netbeans.api.java.platform.JavaPlatform;
76
import org.netbeans.api.java.platform.Specification;
76
import org.netbeans.api.java.platform.Specification;
77
import org.netbeans.api.project.ant.AntArtifactQuery;
77
import org.netbeans.api.project.ant.AntArtifactQuery;
78
import org.netbeans.modules.j2ee.common.Util;
79
import org.netbeans.modules.j2ee.deployment.devmodules.api.ServerInstance;
78
import org.netbeans.modules.j2ee.deployment.devmodules.api.ServerInstance;
80
import org.netbeans.spi.project.support.ant.PropertyUtils;
79
import org.netbeans.spi.project.support.ant.PropertyUtils;
81
import org.openide.WizardDescriptor;
80
import org.openide.WizardDescriptor;
(-)a/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/UtilTest.java (-96 lines)
Lines 1-96 Link Here
1
/*
2
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3
 *
4
 * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
5
 *
6
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7
 * Other names may be trademarks of their respective owners.
8
 *
9
 * The contents of this file are subject to the terms of either the GNU
10
 * General Public License Version 2 only ("GPL") or the Common
11
 * Development and Distribution License("CDDL") (collectively, the
12
 * "License"). You may not use this file except in compliance with the
13
 * License. You can obtain a copy of the License at
14
 * http://www.netbeans.org/cddl-gplv2.html
15
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
16
 * specific language governing permissions and limitations under the
17
 * License.  When distributing the software, include this License Header
18
 * Notice in each file and include the License file at
19
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
20
 * particular file as subject to the "Classpath" exception as provided
21
 * by Oracle in the GPL Version 2 section of the License file that
22
 * accompanied this code. If applicable, add the following below the
23
 * License Header, with the fields enclosed by brackets [] replaced by
24
 * your own identifying information:
25
 * "Portions Copyrighted [year] [name of copyright owner]"
26
 *
27
 * Contributor(s):
28
 *
29
 * The Original Software is NetBeans. The Initial Developer of the Original
30
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
31
 * Microsystems, Inc. All Rights Reserved.
32
 *
33
 * If you wish your version of this file to be governed by only the CDDL
34
 * or only the GPL Version 2, indicate your decision by adding
35
 * "[Contributor] elects to include this software in this distribution
36
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
37
 * single choice of license, a recipient has the option to distribute
38
 * your version of this file under either the CDDL, the GPL Version 2 or
39
 * to extend the choice of license to its licensees as provided above.
40
 * However, if you add GPL Version 2 code and therefore, elected the GPL
41
 * Version 2 license, then the option applies only if the new code is
42
 * made subject to such option by the copyright holder.
43
 */
44
45
package org.netbeans.modules.j2ee.common;
46
47
import java.io.File;
48
import java.io.IOException;
49
import java.net.MalformedURLException;
50
import java.net.URL;
51
import java.util.Arrays;
52
import java.util.Collections;
53
import java.util.LinkedHashMap;
54
import java.util.LinkedList;
55
import java.util.List;
56
import static junit.framework.Assert.assertFalse;
57
import static junit.framework.Assert.assertTrue;
58
import org.netbeans.api.j2ee.core.Profile;
59
import org.netbeans.junit.NbTestCase;
60
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
61
import org.openide.filesystems.FileUtil;
62
63
/**
64
 *
65
 * @author sherold
66
 */
67
public class UtilTest extends NbTestCase {
68
    
69
    /** Creates a new instance of UtilTest */
70
    public UtilTest(String testName) {
71
        super(testName);
72
    }
73
74
    public void testIsHigherJavaEEVersionJavaEE5() {
75
        assertFalse(Util.isAtLeastJavaEE5(Profile.J2EE_13));
76
        assertFalse(Util.isAtLeastJavaEE5(Profile.J2EE_14));
77
78
        assertTrue(Util.isAtLeastJavaEE5(Profile.JAVA_EE_5));
79
        assertTrue(Util.isAtLeastJavaEE5(Profile.JAVA_EE_6_FULL));
80
        assertTrue(Util.isAtLeastJavaEE5(Profile.JAVA_EE_6_WEB));
81
        assertTrue(Util.isAtLeastJavaEE5(Profile.JAVA_EE_7_FULL));
82
        assertTrue(Util.isAtLeastJavaEE5(Profile.JAVA_EE_7_WEB));
83
    }
84
85
    public void testIsHigherJavaEEVersionJavaEE6full() {
86
        assertFalse(Util.isAtLeastJavaEE6Web(Profile.J2EE_13));
87
        assertFalse(Util.isAtLeastJavaEE6Web(Profile.J2EE_14));
88
        assertFalse(Util.isAtLeastJavaEE6Web(Profile.JAVA_EE_5));
89
90
        assertTrue(Util.isAtLeastJavaEE6Web(Profile.JAVA_EE_6_WEB));
91
        assertTrue(Util.isAtLeastJavaEE6Web(Profile.JAVA_EE_6_FULL));
92
        assertTrue(Util.isAtLeastJavaEE6Web(Profile.JAVA_EE_7_WEB));
93
        assertTrue(Util.isAtLeastJavaEE6Web(Profile.JAVA_EE_7_FULL));
94
    }
95
    
96
}
(-)a/j2ee.core/src/org/netbeans/api/j2ee/core/Profile.java (+91 lines)
Lines 113-118 Link Here
113
        return propertiesString;
113
        return propertiesString;
114
    }
114
    }
115
115
116
    /**
117
     * Find out if the version of the profile is equal or higher to given profile.
118
     * Note that Java EE Web is considered lower than Java EE Full profile.
119
     *
120
     * @param profile profile to compare against
121
     * @return true if this profile is equal or higher to given one,
122
     *         false otherwise
123
     * @since TDB
124
     */
125
    public boolean isAtLeast(Profile profile) {
126
        return isVersionEqualOrHigher(this, profile);
127
    }
128
116
    @Override
129
    @Override
117
    public String toString() {
130
    public String toString() {
118
        return toPropertiesString();
131
        return toPropertiesString();
Lines 142-145 Link Here
142
            return null;
155
            return null;
143
        }
156
        }
144
    }
157
    }
158
159
    private static String getProfileVersion(@NonNull Profile profile) {
160
        String profileDetails = profile.toPropertiesString();
161
        int indexOfDash = profileDetails.indexOf("-");
162
        if (indexOfDash != -1) {
163
            return profileDetails.substring(0, indexOfDash);
164
        }
165
        return profileDetails;
166
    }
167
168
    private static boolean compareWebAndFull(@NonNull Profile profileToCompare, @NonNull Profile comparingVersion) {
169
        boolean isThisFullProfile = isFullProfile(profileToCompare);
170
        boolean isParamFullProfile = isFullProfile(comparingVersion);
171
        if (isThisFullProfile && isParamFullProfile) {
172
            // Both profiles are Java EE Full
173
            return true;
174
        }
175
        if (!isThisFullProfile && !isParamFullProfile) {
176
            // Both profiles are Java EE Web
177
            return true;
178
        }
179
        if (isThisFullProfile && !isParamFullProfile) {
180
            // profileToCompare is Java EE Full profile and comparingVersion is only Java EEWeb profile
181
            return true;
182
        }
183
        return false;
184
    }
185
186
    private static boolean isFullProfile(@NonNull Profile profile) {
187
        final String profileDetails = profile.toPropertiesString();
188
        if (profileDetails.indexOf("-") == -1) {
189
            return true;
190
        }
191
        return false;
192
    }
193
194
    /**
195
     * Compares if the first given profile has equal or higher Java EE version
196
     * in comparison to the second profile.
197
     *
198
     * Please be aware of the following rules:
199
     * <br/><br/>
200
     *
201
     * 1) Each Java EE X version is considered as lower than Java EE X+1 version
202
     * (this applies regardless on Web/Full specification and in reality it means
203
     * that even Java EE 6 Full version is considered as lower than Java EE 7 Web)
204
     * <br/><br/>
205
     *
206
     * 2) Each Java EE X Web version is considered as lower than Java EE X Full
207
     * <br/>
208
     *
209
     * @param profileToCompare profile that we want to compare
210
     * @param comparingVersion version which we are comparing with
211
     * @return <code>true</code> if the profile version is equal or higher in
212
     *         comparison with the second one, <code>false</code> otherwise
213
     * @since TDB
214
     */
215
    private static boolean isVersionEqualOrHigher(@NonNull Profile profileToCompare, @NonNull Profile comparingVersion) {
216
        int comparisonResult = Profile.UI_COMPARATOR.compare(profileToCompare, comparingVersion);
217
        if (comparisonResult == 0) {
218
            // The same version for both
219
            return true;
220
        } else {
221
            String profileToCompareVersion = getProfileVersion(profileToCompare);
222
            String comparingProfileVersion = getProfileVersion(comparingVersion);
223
            if (profileToCompareVersion.equals(comparingProfileVersion)) {
224
                return compareWebAndFull(profileToCompare, comparingVersion);
225
            } else {
226
                if (comparisonResult > 0) {
227
                    // profileToCompare has lower version than comparingVersion
228
                    return false;
229
                } else {
230
                    return true;
231
                }
232
            }
233
        }
234
    }
235
145
}
236
}
(-)a/j2ee.core/test/unit/src/org/netbeans/api/j2ee/core/ProfileTest.java (+34 lines)
Lines 64-67 Link Here
64
        assertEquals(Profile.JAVA_EE_6_WEB, Profile.fromPropertiesString("EE_6_WEB"));
64
        assertEquals(Profile.JAVA_EE_6_WEB, Profile.fromPropertiesString("EE_6_WEB"));
65
        assertNull(Profile.fromPropertiesString("something"));
65
        assertNull(Profile.fromPropertiesString("something"));
66
    }
66
    }
67
68
    public void testIsHigherJavaEEVersionJavaEE5() {
69
        assertFalse(Profile.J2EE_13.isAtLeast(Profile.JAVA_EE_5));
70
        assertFalse(Profile.J2EE_14.isAtLeast(Profile.JAVA_EE_5));
71
72
        assertTrue(Profile.JAVA_EE_5.isAtLeast(Profile.JAVA_EE_5));
73
        assertTrue(Profile.JAVA_EE_6_FULL.isAtLeast(Profile.JAVA_EE_5));
74
        assertTrue(Profile.JAVA_EE_6_WEB.isAtLeast(Profile.JAVA_EE_5));
75
        assertTrue(Profile.JAVA_EE_7_FULL.isAtLeast(Profile.JAVA_EE_5));
76
        assertTrue(Profile.JAVA_EE_7_WEB.isAtLeast(Profile.JAVA_EE_5));
77
    }
78
79
    public void testIsHigherJavaEEVersionJavaEE6full() {
80
        assertFalse(Profile.J2EE_13.isAtLeast(Profile.JAVA_EE_6_WEB));
81
        assertFalse(Profile.J2EE_14.isAtLeast(Profile.JAVA_EE_6_WEB));
82
        assertFalse(Profile.JAVA_EE_5.isAtLeast(Profile.JAVA_EE_6_WEB));
83
84
        assertTrue(Profile.JAVA_EE_6_WEB.isAtLeast(Profile.JAVA_EE_6_WEB));
85
        assertTrue(Profile.JAVA_EE_6_FULL.isAtLeast(Profile.JAVA_EE_6_WEB));
86
        assertTrue(Profile.JAVA_EE_7_WEB.isAtLeast(Profile.JAVA_EE_6_WEB));
87
        assertTrue(Profile.JAVA_EE_7_FULL.isAtLeast(Profile.JAVA_EE_6_WEB));
88
    }
89
90
    public void testIsHigherJavaEEVersionJavaEE7full() {
91
        assertFalse(Profile.J2EE_13.isAtLeast(Profile.JAVA_EE_7_WEB));
92
        assertFalse(Profile.J2EE_14.isAtLeast(Profile.JAVA_EE_7_WEB));
93
        assertFalse(Profile.JAVA_EE_5.isAtLeast(Profile.JAVA_EE_7_WEB));
94
95
        assertFalse(Profile.JAVA_EE_6_WEB.isAtLeast(Profile.JAVA_EE_7_WEB));
96
        assertFalse(Profile.JAVA_EE_6_FULL.isAtLeast(Profile.JAVA_EE_7_WEB));
97
        assertTrue(Profile.JAVA_EE_7_WEB.isAtLeast(Profile.JAVA_EE_7_WEB));
98
        assertTrue(Profile.JAVA_EE_7_FULL.isAtLeast(Profile.JAVA_EE_7_WEB));
99
    }
100
67
}
101
}
(-)a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarMultiViewDataObject.java (-2 / +2 lines)
Lines 52-58 Link Here
52
import org.netbeans.api.project.Sources;
52
import org.netbeans.api.project.Sources;
53
import org.netbeans.api.xml.cookies.ValidateXMLCookie;
53
import org.netbeans.api.xml.cookies.ValidateXMLCookie;
54
import org.netbeans.core.spi.multiview.MultiViewElement;
54
import org.netbeans.core.spi.multiview.MultiViewElement;
55
import org.netbeans.modules.j2ee.common.Util;
56
import org.netbeans.modules.j2ee.dd.api.common.RootInterface;
55
import org.netbeans.modules.j2ee.dd.api.common.RootInterface;
57
import org.netbeans.modules.j2ee.dd.impl.common.DDUtils;
56
import org.netbeans.modules.j2ee.dd.impl.common.DDUtils;
58
import org.netbeans.modules.j2ee.dd.impl.ejb.EjbJarProxy;
57
import org.netbeans.modules.j2ee.dd.impl.ejb.EjbJarProxy;
Lines 86-91 Link Here
86
import java.util.Map;
85
import java.util.Map;
87
import java.util.logging.Level;
86
import java.util.logging.Level;
88
import java.util.logging.Logger;
87
import java.util.logging.Logger;
88
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
89
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
89
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
90
import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
90
import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
91
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
91
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
Lines 508-514 Link Here
508
508
509
    @Override
509
    @Override
510
    protected String getEditorMimeType() {
510
    protected String getEditorMimeType() {
511
        if (Util.isJavaEE5orHigher(getProject())){
511
        if (ProjectUtil.isJavaEE5orHigher(getProject())){
512
            return "text/x-dd-ejbjar-ee5";
512
            return "text/x-dd-ejbjar-ee5";
513
        }
513
        }
514
        return "text/x-dd-ejbjar";
514
        return "text/x-dd-ejbjar";
(-)a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefsTablePanel.java (-1 / +2 lines)
Lines 46-51 Link Here
46
46
47
import org.netbeans.api.project.FileOwnerQuery;
47
import org.netbeans.api.project.FileOwnerQuery;
48
import org.netbeans.api.project.Project;
48
import org.netbeans.api.project.Project;
49
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
49
import org.netbeans.modules.j2ee.dd.api.common.CommonDDBean;
50
import org.netbeans.modules.j2ee.dd.api.common.CommonDDBean;
50
import org.netbeans.modules.j2ee.dd.api.common.EjbRef;
51
import org.netbeans.modules.j2ee.dd.api.common.EjbRef;
51
import org.netbeans.modules.j2ee.dd.api.common.EjbLocalRef;
52
import org.netbeans.modules.j2ee.dd.api.common.EjbLocalRef;
Lines 75-81 Link Here
75
    	this.model=model;
76
    	this.model=model;
76
        this.dObj=dObj;
77
        this.dObj=dObj;
77
        Project project = FileOwnerQuery.getOwner(dObj.getPrimaryFile());
78
        Project project = FileOwnerQuery.getOwner(dObj.getPrimaryFile());
78
        this.javaEE5 = org.netbeans.modules.j2ee.common.Util.isJavaEE5orHigher(project);
79
        this.javaEE5 = ProjectUtil.isJavaEE5orHigher(project);
79
        
80
        
80
        removeButton.addActionListener(new java.awt.event.ActionListener() {
81
        removeButton.addActionListener(new java.awt.event.ActionListener() {
81
            public void actionPerformed(java.awt.event.ActionEvent evt) {
82
            public void actionPerformed(java.awt.event.ActionEvent evt) {
(-)a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectGenerator.java (-1 lines)
Lines 77-83 Link Here
77
import org.netbeans.api.java.project.classpath.ProjectClassPathModifier;
77
import org.netbeans.api.java.project.classpath.ProjectClassPathModifier;
78
import org.netbeans.api.project.SourceGroup;
78
import org.netbeans.api.project.SourceGroup;
79
import org.netbeans.api.project.libraries.LibraryManager;
79
import org.netbeans.api.project.libraries.LibraryManager;
80
import org.netbeans.modules.j2ee.common.Util;
81
import org.netbeans.modules.j2ee.common.dd.DDHelper;
80
import org.netbeans.modules.j2ee.common.dd.DDHelper;
82
import org.netbeans.modules.j2ee.common.project.ProjectConstants;
81
import org.netbeans.modules.j2ee.common.project.ProjectConstants;
83
import org.netbeans.modules.j2ee.common.project.ui.DeployOnSaveUtils;
82
import org.netbeans.modules.j2ee.common.project.ui.DeployOnSaveUtils;
(-)a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerJarContent.java (-2 lines)
Lines 49-56 Link Here
49
import javax.swing.JPanel;
49
import javax.swing.JPanel;
50
import org.netbeans.api.java.project.JavaProjectConstants;
50
import org.netbeans.api.java.project.JavaProjectConstants;
51
import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants;
51
import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants;
52
import org.netbeans.modules.j2ee.common.Util;
53
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
54
import org.netbeans.modules.j2ee.common.project.ui.UIUtil;
52
import org.netbeans.modules.j2ee.common.project.ui.UIUtil;
55
import org.netbeans.modules.java.api.common.classpath.ClassPathSupport;
53
import org.netbeans.modules.java.api.common.classpath.ClassPathSupport;
56
import org.netbeans.modules.java.api.common.classpath.ClassPathSupport.Item;
54
import org.netbeans.modules.java.api.common.classpath.ClassPathSupport.Item;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGenerator.java (-2 / +2 lines)
Lines 62-68 Link Here
62
import org.netbeans.api.project.Project;
62
import org.netbeans.api.project.Project;
63
import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer;
63
import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer;
64
import org.netbeans.modules.j2ee.api.ejbjar.ResourceReference;
64
import org.netbeans.modules.j2ee.api.ejbjar.ResourceReference;
65
import org.netbeans.modules.j2ee.common.Util;
65
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
66
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
66
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
67
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
67
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
68
import org.netbeans.modules.javaee.injection.api.InjectionTargetQuery;
68
import org.netbeans.modules.javaee.injection.api.InjectionTargetQuery;
Lines 111-117 Link Here
111
        ServiceLocatorStrategy serviceLocatorStrategy = (serviceLocator == null) ? null : 
111
        ServiceLocatorStrategy serviceLocatorStrategy = (serviceLocator == null) ? null : 
112
            ServiceLocatorStrategy.create(project, fileObject, serviceLocator);
112
            ServiceLocatorStrategy.create(project, fileObject, serviceLocator);
113
        EnterpriseReferenceContainer erc = project.getLookup().lookup(EnterpriseReferenceContainer.class);
113
        EnterpriseReferenceContainer erc = project.getLookup().lookup(EnterpriseReferenceContainer.class);
114
        if (Util.isJavaEE5orHigher(project) && serviceLocatorStrategy == null &&
114
        if (ProjectUtil.isJavaEE5orHigher(project) && serviceLocatorStrategy == null &&
115
                InjectionTargetQuery.isInjectionTarget(fileObject, className)) {
115
                InjectionTargetQuery.isInjectionTarget(fileObject, className)) {
116
            boolean isStatic = InjectionTargetQuery.isStaticReferenceRequired(fileObject, className);
116
            boolean isStatic = InjectionTargetQuery.isStaticReferenceRequired(fileObject, className);
117
            String fieldName = Utils.makeJavaIdentifierPart(Utils.jndiNameToCamelCase(datasourceReferenceName, true, null));
117
            String fieldName = Utils.makeJavaIdentifierPart(Utils.jndiNameToCamelCase(datasourceReferenceName, true, null));
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/CallEjbGenerator.java (-3 / +3 lines)
Lines 71-77 Link Here
71
import org.netbeans.modules.j2ee.api.ejbjar.EjbReference.EjbRefIType;
71
import org.netbeans.modules.j2ee.api.ejbjar.EjbReference.EjbRefIType;
72
import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer;
72
import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer;
73
import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities;
73
import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities;
74
import org.netbeans.modules.j2ee.common.Util;
74
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
75
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
75
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
76
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
76
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
77
import org.netbeans.modules.javaee.injection.api.InjectionTargetQuery;
77
import org.netbeans.modules.javaee.injection.api.InjectionTargetQuery;
Lines 146-153 Link Here
146
        Project enterpriseProject = FileOwnerQuery.getOwner(referencingFO);
146
        Project enterpriseProject = FileOwnerQuery.getOwner(referencingFO);
147
        EnterpriseReferenceContainer erc = enterpriseProject.getLookup().lookup(EnterpriseReferenceContainer.class);
147
        EnterpriseReferenceContainer erc = enterpriseProject.getLookup().lookup(EnterpriseReferenceContainer.class);
148
148
149
        boolean enterpriseProjectIsJavaEE5 = Util.isJavaEE5orHigher(enterpriseProject);
149
        boolean enterpriseProjectIsJavaEE5 = ProjectUtil.isJavaEE5orHigher(enterpriseProject);
150
        boolean nodeProjectIsJavaEE5 = Util.isJavaEE5orHigher(nodeProject);
150
        boolean nodeProjectIsJavaEE5 = ProjectUtil.isJavaEE5orHigher(nodeProject);
151
151
152
        //#157918
152
        //#157918
153
        ContainerClassPathModifier ccpm = enterpriseProject.getLookup().lookup(ContainerClassPathModifier.class);
153
        ContainerClassPathModifier ccpm = enterpriseProject.getLookup().lookup(ContainerClassPathModifier.class);
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGenerator.java (-3 / +2 lines)
Lines 61-67 Link Here
61
import org.netbeans.api.java.source.WorkingCopy;
61
import org.netbeans.api.java.source.WorkingCopy;
62
import org.netbeans.api.project.FileOwnerQuery;
62
import org.netbeans.api.project.FileOwnerQuery;
63
import org.netbeans.api.project.Project;
63
import org.netbeans.api.project.Project;
64
import org.netbeans.modules.j2ee.common.Util;
65
import org.netbeans.modules.j2ee.core.api.support.java.GenerationUtils;
64
import org.netbeans.modules.j2ee.core.api.support.java.GenerationUtils;
66
import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination;
65
import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination;
67
import org.netbeans.modules.j2ee.dd.api.common.VersionNotSupportedException;
66
import org.netbeans.modules.j2ee.dd.api.common.VersionNotSupportedException;
Lines 135-141 Link Here
135
        this.profile = profile;
134
        this.profile = profile;
136
        this.jmsSupport = jmsSupport;
135
        this.jmsSupport = jmsSupport;
137
        boolean useMappedName = useMappedName();
136
        boolean useMappedName = useMappedName();
138
        if (Util.isAtLeastJavaEE7Web(profile) && jmsSupport.useDestinationLookup()) {
137
        if (profile != null && profile.isAtLeast(Profile.JAVA_EE_7_WEB) && jmsSupport.useDestinationLookup()) {
139
            String destination = properties.get(ActivationConfigProperties.DESTINATION_LOOKUP) == null || ((String) properties.get(ActivationConfigProperties.DESTINATION_LOOKUP)).isEmpty() ?
138
            String destination = properties.get(ActivationConfigProperties.DESTINATION_LOOKUP) == null || ((String) properties.get(ActivationConfigProperties.DESTINATION_LOOKUP)).isEmpty() ?
140
                    messageDestination.getName() : properties.get(ActivationConfigProperties.DESTINATION_LOOKUP);
139
                    messageDestination.getName() : properties.get(ActivationConfigProperties.DESTINATION_LOOKUP);
141
            properties.put(DESTINATION_LOOKUP, destination);
140
            properties.put(DESTINATION_LOOKUP, destination);
Lines 331-337 Link Here
331
330
332
    private boolean useMappedName() {
331
    private boolean useMappedName() {
333
        // JavaEE7 platform should always use portable, compatible way if possible
332
        // JavaEE7 platform should always use portable, compatible way if possible
334
        if (Util.isAtLeastJavaEE7Web(profile) && jmsSupport.useDestinationLookup()) {
333
        if (profile != null && profile.isAtLeast(Profile.JAVA_EE_7_WEB) && jmsSupport.useDestinationLookup()) {
335
            return false;
334
            return false;
336
        } else {
335
        } else {
337
            return jmsSupport.useMappedName();
336
            return jmsSupport.useMappedName();
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/AppServerValidationPanel.java (-1 lines)
Lines 44-50 Link Here
44
import org.netbeans.api.j2ee.core.Profile;
44
import org.netbeans.api.j2ee.core.Profile;
45
import org.netbeans.api.java.classpath.ClassPath;
45
import org.netbeans.api.java.classpath.ClassPath;
46
import org.netbeans.api.project.Project;
46
import org.netbeans.api.project.Project;
47
import org.netbeans.modules.j2ee.common.Util;
48
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
47
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
49
import org.netbeans.modules.j2ee.core.api.support.wizard.DelegatingWizardDescriptorPanel;
48
import org.netbeans.modules.j2ee.core.api.support.wizard.DelegatingWizardDescriptorPanel;
50
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform;
49
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeVisualPanel2.java (-3 lines)
Lines 42-49 Link Here
42
package org.netbeans.modules.j2ee.ejbcore.ejb.wizard.jpa.dao;
42
package org.netbeans.modules.j2ee.ejbcore.ejb.wizard.jpa.dao;
43
43
44
import java.awt.Component;
44
import java.awt.Component;
45
import java.awt.event.ActionEvent;
46
import java.awt.event.ActionListener;
47
import java.io.IOException;
45
import java.io.IOException;
48
import java.util.List;
46
import java.util.List;
49
import java.util.logging.Level;
47
import java.util.logging.Level;
Lines 63-69 Link Here
63
import org.netbeans.api.project.ProjectUtils;
61
import org.netbeans.api.project.ProjectUtils;
64
import org.netbeans.api.project.SourceGroup;
62
import org.netbeans.api.project.SourceGroup;
65
import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities;
63
import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities;
66
import org.netbeans.modules.j2ee.common.Util;
67
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
64
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
68
import org.netbeans.modules.j2ee.core.api.support.SourceGroups;
65
import org.netbeans.modules.j2ee.core.api.support.SourceGroups;
69
import org.netbeans.modules.j2ee.ejbcore.ejb.wizard.session.SessionEJBWizardPanel;
66
import org.netbeans.modules.j2ee.ejbcore.ejb.wizard.session.SessionEJBWizardPanel;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbWizard.java (-4 / +3 lines)
Lines 60-66 Link Here
60
import org.netbeans.api.project.libraries.Library;
60
import org.netbeans.api.project.libraries.Library;
61
import org.netbeans.api.project.libraries.LibraryManager;
61
import org.netbeans.api.project.libraries.LibraryManager;
62
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
62
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
63
import org.netbeans.modules.j2ee.common.Util;
64
import org.netbeans.modules.j2ee.common.project.JavaEEProjectSettings;
63
import org.netbeans.modules.j2ee.common.project.JavaEEProjectSettings;
65
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
64
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
66
import org.netbeans.modules.j2ee.core.api.support.SourceGroups;
65
import org.netbeans.modules.j2ee.core.api.support.SourceGroups;
Lines 134-140 Link Here
134
        EjbJar ejbModule = EjbJar.getEjbJar(pkg);
133
        EjbJar ejbModule = EjbJar.getEjbJar(pkg);
135
134
136
        Profile profile = ejbModule.getJ2eeProfile();
135
        Profile profile = ejbModule.getJ2eeProfile();
137
        boolean isSimplified = Util.isAtLeastJavaEE5(profile);
136
        boolean isSimplified = profile != null && profile.isAtLeast(Profile.JAVA_EE_5);
138
        MessageGenerator generator = MessageGenerator.create(
137
        MessageGenerator generator = MessageGenerator.create(
139
                profile,
138
                profile,
140
                Templates.getTargetName(wiz),
139
                Templates.getTargetName(wiz),
Lines 201-209 Link Here
201
    private Profile getTargetFullProfile() {
200
    private Profile getTargetFullProfile() {
202
        Profile profile = JavaEEProjectSettings.getProfile(Templates.getProject(wiz));
201
        Profile profile = JavaEEProjectSettings.getProfile(Templates.getProject(wiz));
203
        if (profile != null) {
202
        if (profile != null) {
204
            if (Util.isAtLeastJavaEE7Web(profile)) {
203
            if (profile.isAtLeast(Profile.JAVA_EE_7_WEB)) {
205
                return Profile.JAVA_EE_7_FULL;
204
                return Profile.JAVA_EE_7_FULL;
206
            } else if (Util.isAtLeastJavaEE6Web(profile)) {
205
            } else if (profile.isAtLeast(Profile.JAVA_EE_6_WEB)) {
207
                return Profile.JAVA_EE_6_FULL;
206
                return Profile.JAVA_EE_6_FULL;
208
            } else {
207
            } else {
209
                LOG.severe("Unknown JavaEE web profile.");
208
                LOG.severe("Unknown JavaEE web profile.");
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/CallEjbDialog.java (-2 / +2 lines)
Lines 67-73 Link Here
67
import org.openide.util.NbBundle;
67
import org.openide.util.NbBundle;
68
import org.netbeans.modules.j2ee.ejbcore.Utils;
68
import org.netbeans.modules.j2ee.ejbcore.Utils;
69
import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer;
69
import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer;
70
import org.netbeans.modules.j2ee.common.Util;
70
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
71
import org.netbeans.modules.j2ee.ejbcore.util._RetoucheUtil;
71
import org.netbeans.modules.j2ee.ejbcore.util._RetoucheUtil;
72
import org.netbeans.modules.j2ee.ejbcore.api.codegeneration.CallEjbGenerator;
72
import org.netbeans.modules.j2ee.ejbcore.api.codegeneration.CallEjbGenerator;
73
import org.openide.DialogDisplayer;
73
import org.openide.DialogDisplayer;
Lines 107-113 Link Here
107
        Node root = new AbstractNode(children);
107
        Node root = new AbstractNode(children);
108
        root.setDisplayName(NbBundle.getMessage(CallEjbDialog.class, "LBL_EJBModules"));
108
        root.setDisplayName(NbBundle.getMessage(CallEjbDialog.class, "LBL_EJBModules"));
109
        EnterpriseReferenceContainer erc = enterpriseProject.getLookup().lookup(EnterpriseReferenceContainer.class);
109
        EnterpriseReferenceContainer erc = enterpriseProject.getLookup().lookup(EnterpriseReferenceContainer.class);
110
        boolean isJavaEE5orHigher = Util.isJavaEE5orHigher(enterpriseProject);
110
        boolean isJavaEE5orHigher = ProjectUtil.isJavaEE5orHigher(enterpriseProject);
111
        final CallEjbPanel panel = new CallEjbPanel(referencingFO, root, isJavaEE5orHigher ? null : erc.getServiceLocatorName(), referencingClassName);
111
        final CallEjbPanel panel = new CallEjbPanel(referencingFO, root, isJavaEE5orHigher ? null : erc.getServiceLocatorName(), referencingClassName);
112
        if (isJavaEE5orHigher) {
112
        if (isJavaEE5orHigher) {
113
            panel.disableServiceLocator();
113
            panel.disableServiceLocator();
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/CallEjbPanel.java (-3 / +3 lines)
Lines 74-80 Link Here
74
import org.netbeans.api.project.ant.AntArtifactQuery;
74
import org.netbeans.api.project.ant.AntArtifactQuery;
75
import org.netbeans.modules.j2ee.api.ejbjar.EjbReference;
75
import org.netbeans.modules.j2ee.api.ejbjar.EjbReference;
76
import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities;
76
import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities;
77
import org.netbeans.modules.j2ee.common.Util;
77
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
78
import org.netbeans.modules.j2ee.dd.api.common.EjbLocalRef;
78
import org.netbeans.modules.j2ee.dd.api.common.EjbLocalRef;
79
import org.netbeans.modules.j2ee.dd.api.common.EjbRef;
79
import org.netbeans.modules.j2ee.dd.api.common.EjbRef;
80
import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
80
import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
Lines 498-504 Link Here
498
                }
498
                }
499
            });
499
            });
500
            if (remote) {
500
            if (remote) {
501
                if (isTargetJavaSE() && Util.isJavaEE5orHigher(project)){
501
                if (isTargetJavaSE() && ProjectUtil.isJavaEE5orHigher(project)){
502
                    name = elementHandle.getQualifiedName();
502
                    name = elementHandle.getQualifiedName();
503
                } else if (isTargetJavaSE()){
503
                } else if (isTargetJavaSE()){
504
                    name = names.get(EntityAndSession.HOME);
504
                    name = names.get(EntityAndSession.HOME);
Lines 614-620 Link Here
614
                }
614
                }
615
            }
615
            }
616
            // see #75876
616
            // see #75876
617
            if (!Util.isJavaEE5orHigher(project) && Util.isJavaEE5orHigher(nodeProject)){
617
            if (!ProjectUtil.isJavaEE5orHigher(project) && ProjectUtil.isJavaEE5orHigher(nodeProject)){
618
                statusLine.setWarningMessage(NbBundle.getMessage(CallEjbPanel.class, "LBL_JEESpecificationLevelsDiffer")); //NOI18N
618
                statusLine.setWarningMessage(NbBundle.getMessage(CallEjbPanel.class, "LBL_JEESpecificationLevelsDiffer")); //NOI18N
619
            }
619
            }
620
620
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/DataSourceReferencePanel.java (-1 lines)
Lines 59-65 Link Here
59
import javax.swing.event.DocumentEvent;
59
import javax.swing.event.DocumentEvent;
60
import javax.swing.event.DocumentListener;
60
import javax.swing.event.DocumentListener;
61
import org.netbeans.modules.j2ee.common.DatasourceUIHelper;
61
import org.netbeans.modules.j2ee.common.DatasourceUIHelper;
62
import org.netbeans.modules.j2ee.common.Util;
63
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
62
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
64
import org.netbeans.modules.j2ee.core.api.support.progress.ProgressSupport;
63
import org.netbeans.modules.j2ee.core.api.support.progress.ProgressSupport;
65
import org.netbeans.modules.j2ee.core.api.support.progress.ProgressSupport.Action;
64
import org.netbeans.modules.j2ee.core.api.support.progress.ProgressSupport.Action;
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendEmailCodeGenerator.java (-3 / +2 lines)
Lines 65-71 Link Here
65
import org.netbeans.api.project.Project;
65
import org.netbeans.api.project.Project;
66
import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer;
66
import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer;
67
import org.netbeans.modules.j2ee.api.ejbjar.ResourceReference;
67
import org.netbeans.modules.j2ee.api.ejbjar.ResourceReference;
68
import org.netbeans.modules.j2ee.common.Util;
68
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
69
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
69
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
70
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
70
import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
71
import org.netbeans.modules.javaee.injection.api.InjectionTargetQuery;
71
import org.netbeans.modules.javaee.injection.api.InjectionTargetQuery;
Lines 82-88 Link Here
82
import org.openide.NotificationLineSupport;
82
import org.openide.NotificationLineSupport;
83
import org.openide.NotifyDescriptor;
83
import org.openide.NotifyDescriptor;
84
import org.openide.filesystems.FileObject;
84
import org.openide.filesystems.FileObject;
85
import org.openide.util.Exceptions;
86
import org.openide.util.HelpCtx;
85
import org.openide.util.HelpCtx;
87
import org.openide.util.Lookup;
86
import org.openide.util.Lookup;
88
import org.openide.util.NbBundle;
87
import org.openide.util.NbBundle;
Lines 189-195 Link Here
189
                }
188
                }
190
                
189
                
191
                String jndiName = null;
190
                String jndiName = null;
192
                if (!Util.isJavaEE5orHigher(enterpriseProject) || !InjectionTargetQuery.isInjectionTarget(srcFile, beanClass.getQualifiedName().toString())) {
191
                if (!ProjectUtil.isJavaEE5orHigher(enterpriseProject) || !InjectionTargetQuery.isInjectionTarget(srcFile, beanClass.getQualifiedName().toString())) {
193
                    jndiName = generateJNDILookup(sendEmailPanel.getJndiName(), erc, srcFile, beanClass.getQualifiedName().toString());
192
                    jndiName = generateJNDILookup(sendEmailPanel.getJndiName(), erc, srcFile, beanClass.getQualifiedName().toString());
194
                }
193
                }
195
                
194
                
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendJMSMessageCodeGenerator.java (-3 / +2 lines)
Lines 44-50 Link Here
44
44
45
package org.netbeans.modules.j2ee.ejbcore.ui.logicalview.entries;
45
package org.netbeans.modules.j2ee.ejbcore.ui.logicalview.entries;
46
46
47
import com.sun.source.tree.Tree;
48
import com.sun.source.util.TreePath;
47
import com.sun.source.util.TreePath;
49
import java.beans.PropertyChangeEvent;
48
import java.beans.PropertyChangeEvent;
50
import java.beans.PropertyChangeListener;
49
import java.beans.PropertyChangeListener;
Lines 64-70 Link Here
64
import org.netbeans.api.project.FileOwnerQuery;
63
import org.netbeans.api.project.FileOwnerQuery;
65
import org.netbeans.api.project.Project;
64
import org.netbeans.api.project.Project;
66
import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer;
65
import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer;
67
import org.netbeans.modules.j2ee.common.Util;
66
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
68
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
67
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
69
import org.netbeans.modules.j2ee.dd.api.web.WebApp;
68
import org.netbeans.modules.j2ee.dd.api.web.WebApp;
70
import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination;
69
import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination;
Lines 263-269 Link Here
263
        }
262
        }
264
        String j2eeVersion = j2eeModuleProvider.getJ2eeModule().getModuleVersion();
263
        String j2eeVersion = j2eeModuleProvider.getJ2eeModule().getModuleVersion();
265
        J2eeModule.Type moduleType = j2eeModuleProvider.getJ2eeModule().getType();
264
        J2eeModule.Type moduleType = j2eeModuleProvider.getJ2eeModule().getType();
266
        if (Util.isJavaEE5orHigher(project) ||
265
        if (ProjectUtil.isJavaEE5orHigher(project) ||
267
                (J2eeModule.Type.WAR.equals(moduleType) && WebApp.VERSION_2_4.equals(j2eeVersion)) ||
266
                (J2eeModule.Type.WAR.equals(moduleType) && WebApp.VERSION_2_4.equals(j2eeVersion)) ||
268
                (J2eeModule.Type.EJB.equals(moduleType) && EjbJar.VERSION_2_1.equals(j2eeVersion)))  {
267
                (J2eeModule.Type.EJB.equals(moduleType) && EjbJar.VERSION_2_1.equals(j2eeVersion)))  {
269
            return ElementKind.INTERFACE != typeElement.getKind();
268
            return ElementKind.INTERFACE != typeElement.getKind();
(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendJmsMessagePanel.java (-3 / +3 lines)
Lines 54-64 Link Here
54
import javax.swing.ComboBoxModel;
54
import javax.swing.ComboBoxModel;
55
import javax.swing.DefaultComboBoxModel;
55
import javax.swing.DefaultComboBoxModel;
56
import javax.swing.event.*;
56
import javax.swing.event.*;
57
import org.netbeans.api.j2ee.core.Profile;
57
import org.netbeans.api.java.source.ClasspathInfo;
58
import org.netbeans.api.java.source.ClasspathInfo;
58
import org.netbeans.api.java.source.SourceUtils;
59
import org.netbeans.api.java.source.SourceUtils;
59
import org.netbeans.api.project.Project;
60
import org.netbeans.api.project.Project;
60
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
61
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
61
import org.netbeans.modules.j2ee.common.Util;
62
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
62
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
63
import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination;
63
import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination;
64
import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination.Type;
64
import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination.Type;
Lines 282-288 Link Here
282
    
282
    
283
    private void setupProjectDestinationsOption() {
283
    private void setupProjectDestinationsOption() {
284
        if (J2eeModule.Type.EJB.equals(provider.getJ2eeModule().getType())
284
        if (J2eeModule.Type.EJB.equals(provider.getJ2eeModule().getType())
285
                || (ejbJar != null && Util.isAtLeastJavaEE6Web(ejbJar.getJ2eeProfile()))) {
285
                || (ejbJar != null && ejbJar.getJ2eeProfile() != null && ejbJar.getJ2eeProfile().isAtLeast(Profile.JAVA_EE_6_WEB))) {
286
            projectDestinationsRadio.setEnabled(true);
286
            projectDestinationsRadio.setEnabled(true);
287
            setupAddButton();
287
            setupAddButton();
288
            projectDestinationsRadio.setSelected(true);
288
            projectDestinationsRadio.setSelected(true);
Lines 314-320 Link Here
314
    
314
    
315
    private void handleConnectionFactory() {
315
    private void handleConnectionFactory() {
316
        MessageDestination messageDestination = getDestination();
316
        MessageDestination messageDestination = getDestination();
317
        if (Util.isAtLeastJavaEE7Web(ejbJar.getJ2eeProfile())) {
317
        if (ejbJar.getJ2eeProfile() != null && ejbJar.getJ2eeProfile().isAtLeast(Profile.JAVA_EE_7_WEB)) {
318
            // JavaEE7 specification - section EE.5.21.1
318
            // JavaEE7 specification - section EE.5.21.1
319
            // set the factory by default - message destination can be custom
319
            // set the factory by default - message destination can be custom
320
            connectionFactoryTextField.setText(DEFAULT_JMS_CONNECTION_FACTORY);
320
            connectionFactoryTextField.setText(DEFAULT_JMS_CONNECTION_FACTORY);
(-)a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProject.java (-1 lines)
Lines 85-91 Link Here
85
import org.netbeans.modules.j2ee.ejbjarproject.ui.customizer.EjbJarProjectProperties;
85
import org.netbeans.modules.j2ee.ejbjarproject.ui.customizer.EjbJarProjectProperties;
86
import org.netbeans.api.project.SourceGroup;
86
import org.netbeans.api.project.SourceGroup;
87
import org.netbeans.modules.j2ee.common.SharabilityUtility;
87
import org.netbeans.modules.j2ee.common.SharabilityUtility;
88
import org.netbeans.modules.j2ee.common.Util;
89
import org.netbeans.modules.j2ee.common.project.ArtifactCopyOnSaveSupport;
88
import org.netbeans.modules.j2ee.common.project.ArtifactCopyOnSaveSupport;
90
import org.netbeans.modules.java.api.common.classpath.ClassPathModifier;
89
import org.netbeans.modules.java.api.common.classpath.ClassPathModifier;
91
import org.netbeans.modules.java.api.common.classpath.ClassPathSupport;
90
import org.netbeans.modules.java.api.common.classpath.ClassPathSupport;
(-)a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProvider.java (-3 / +2 lines)
Lines 56-62 Link Here
56
import org.netbeans.api.project.SourceGroup;
56
import org.netbeans.api.project.SourceGroup;
57
import org.netbeans.api.project.Sources;
57
import org.netbeans.api.project.Sources;
58
import org.netbeans.api.project.ui.OpenProjects;
58
import org.netbeans.api.project.ui.OpenProjects;
59
import org.netbeans.modules.j2ee.common.Util;
60
import org.netbeans.modules.java.api.common.classpath.ClassPathProviderImpl;
59
import org.netbeans.modules.java.api.common.classpath.ClassPathProviderImpl;
61
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
60
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
62
import org.netbeans.modules.j2ee.dd.api.webservices.WebservicesMetadata;
61
import org.netbeans.modules.j2ee.dd.api.webservices.WebservicesMetadata;
Lines 315-323 Link Here
315
            platformVersion = Profile.JAVA_EE_7_FULL;
314
            platformVersion = Profile.JAVA_EE_7_FULL;
316
        }
315
        }
317
316
318
        if (Util.isAtLeastJavaEE7Web(platformVersion)) {
317
        if (platformVersion.isAtLeast(Profile.JAVA_EE_7_WEB)) {
319
            return EjbJar.VERSION_3_2;
318
            return EjbJar.VERSION_3_2;
320
        } else if (Util.isAtLeastJavaEE6Web(platformVersion)) {
319
        } else if (platformVersion.isAtLeast(Profile.JAVA_EE_6_WEB)) {
321
            return EjbJar.VERSION_3_1;
320
            return EjbJar.VERSION_3_1;
322
        } else if (Profile.JAVA_EE_5.equals(platformVersion)) {
321
        } else if (Profile.JAVA_EE_5.equals(platformVersion)) {
323
            return EjbJar.VERSION_3_0;
322
            return EjbJar.VERSION_3_0;
(-)a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectGenerator.java (-1 lines)
Lines 67-73 Link Here
67
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
67
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
68
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
68
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
69
import org.netbeans.api.j2ee.core.Profile;
69
import org.netbeans.api.j2ee.core.Profile;
70
import org.netbeans.modules.j2ee.common.Util;
71
import org.netbeans.modules.j2ee.common.dd.DDHelper;
70
import org.netbeans.modules.j2ee.common.dd.DDHelper;
72
import org.netbeans.modules.j2ee.common.project.ProjectConstants;
71
import org.netbeans.modules.j2ee.common.project.ProjectConstants;
73
import org.netbeans.modules.j2ee.common.project.ui.DeployOnSaveUtils;
72
import org.netbeans.modules.j2ee.common.project.ui.DeployOnSaveUtils;
(-)a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/classpath/ClassPathSupportCallbackImpl.java (-1 lines)
Lines 48-54 Link Here
48
import java.util.HashMap;
48
import java.util.HashMap;
49
import java.util.List;
49
import java.util.List;
50
import java.util.Map;
50
import java.util.Map;
51
import org.netbeans.modules.j2ee.common.Util;
52
import org.netbeans.modules.j2ee.common.project.ProjectConstants;
51
import org.netbeans.modules.j2ee.common.project.ProjectConstants;
53
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
52
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
54
import org.netbeans.modules.java.api.common.classpath.ClassPathSupport;
53
import org.netbeans.modules.java.api.common.classpath.ClassPathSupport;
(-)a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/CustomizerLibraries.java (-2 lines)
Lines 60-67 Link Here
60
import org.netbeans.api.java.platform.JavaPlatform;
60
import org.netbeans.api.java.platform.JavaPlatform;
61
import org.netbeans.api.java.platform.PlatformsCustomizer;
61
import org.netbeans.api.java.platform.PlatformsCustomizer;
62
import org.netbeans.api.project.libraries.LibraryManager;
62
import org.netbeans.api.project.libraries.LibraryManager;
63
import org.netbeans.modules.j2ee.common.Util;
64
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
65
import org.netbeans.modules.j2ee.common.project.ui.UIUtil;
63
import org.netbeans.modules.j2ee.common.project.ui.UIUtil;
66
import org.netbeans.modules.java.api.common.classpath.ClassPathSupport;
64
import org.netbeans.modules.java.api.common.classpath.ClassPathSupport;
67
import org.netbeans.modules.java.api.common.project.ui.ClassPathUiSupport;
65
import org.netbeans.modules.java.api.common.project.ui.ClassPathUiSupport;
(-)a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/CustomizerSources.java (-2 lines)
Lines 58-65 Link Here
58
import javax.swing.event.ListDataEvent;
58
import javax.swing.event.ListDataEvent;
59
import javax.swing.event.ListDataListener;
59
import javax.swing.event.ListDataListener;
60
import org.netbeans.api.queries.CollocationQuery;
60
import org.netbeans.api.queries.CollocationQuery;
61
import org.netbeans.modules.j2ee.common.Util;
62
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
63
import org.netbeans.modules.j2ee.common.project.ui.UIUtil;
61
import org.netbeans.modules.j2ee.common.project.ui.UIUtil;
64
import org.openide.filesystems.FileObject;
62
import org.openide.filesystems.FileObject;
65
import org.openide.filesystems.FileUtil;
63
import org.openide.filesystems.FileUtil;
(-)a/j2ee.ejbverification/src/org/netbeans/modules/j2ee/ejbverification/rules/AnnotationPostContruct.java (-2 / +1 lines)
Lines 51-57 Link Here
51
import javax.lang.model.util.ElementFilter;
51
import javax.lang.model.util.ElementFilter;
52
import org.netbeans.api.j2ee.core.Profile;
52
import org.netbeans.api.j2ee.core.Profile;
53
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
53
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
54
import org.netbeans.modules.j2ee.common.Util;
55
import org.netbeans.modules.j2ee.dd.api.ejb.Session;
54
import org.netbeans.modules.j2ee.dd.api.ejb.Session;
56
import org.netbeans.modules.j2ee.ejbverification.EJBAPIAnnotations;
55
import org.netbeans.modules.j2ee.ejbverification.EJBAPIAnnotations;
57
import org.netbeans.modules.j2ee.ejbverification.EJBProblemContext;
56
import org.netbeans.modules.j2ee.ejbverification.EJBProblemContext;
Lines 93-99 Link Here
93
            Profile profile = ejbModule.getJ2eeProfile();
92
            Profile profile = ejbModule.getJ2eeProfile();
94
93
95
            // not EE6+ project
94
            // not EE6+ project
96
            if (profile == null || !Util.isAtLeastJavaEE6Web(profile)) {
95
            if (profile == null || !profile.isAtLeast(Profile.JAVA_EE_6_WEB)) {
97
                return Collections.emptyList();
96
                return Collections.emptyList();
98
            }
97
            }
99
98
(-)a/j2ee.ejbverification/src/org/netbeans/modules/j2ee/ejbverification/rules/BusinessMethodExposed.java (-2 / +1 lines)
Lines 61-67 Link Here
61
import org.netbeans.api.java.source.CompilationInfo;
61
import org.netbeans.api.java.source.CompilationInfo;
62
import org.netbeans.api.java.source.ElementHandle;
62
import org.netbeans.api.java.source.ElementHandle;
63
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
63
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
64
import org.netbeans.modules.j2ee.common.Util;
65
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
64
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
66
import org.netbeans.modules.j2ee.dd.api.ejb.Session;
65
import org.netbeans.modules.j2ee.dd.api.ejb.Session;
67
import org.netbeans.modules.j2ee.ejbverification.EJBAPIAnnotations;
66
import org.netbeans.modules.j2ee.ejbverification.EJBAPIAnnotations;
Lines 112-118 Link Here
112
111
113
            EjbJar ejbModule = ctx.getEjbModule();
112
            EjbJar ejbModule = ctx.getEjbModule();
114
            Profile profile = ejbModule.getJ2eeProfile();
113
            Profile profile = ejbModule.getJ2eeProfile();
115
            if (profile != null && Util.isAtLeastJavaEE6Web(profile)) {
114
            if (profile != null && profile.isAtLeast(Profile.JAVA_EE_6_WEB)) {
116
                final int[] intfCount = new int[1];
115
                final int[] intfCount = new int[1];
117
                try {
116
                try {
118
                    ctx.getEjbModule().getMetadataModel().runReadAction(new MetadataModelAction<EjbJarMetadata, Void>() {
117
                    ctx.getEjbModule().getMetadataModel().runReadAction(new MetadataModelAction<EjbJarMetadata, Void>() {
(-)a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/JPAStuffImpl.java (-1 lines)
Lines 52-58 Link Here
52
import org.netbeans.modules.maven.j2ee.ejb.*;
52
import org.netbeans.modules.maven.j2ee.ejb.*;
53
import org.netbeans.api.project.Project;
53
import org.netbeans.api.project.Project;
54
import org.netbeans.modules.j2ee.common.DatasourceUIHelper;
54
import org.netbeans.modules.j2ee.common.DatasourceUIHelper;
55
import org.netbeans.modules.j2ee.common.Util;
56
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
55
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
57
import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
56
import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
58
import org.netbeans.modules.j2ee.deployment.common.api.Datasource;
57
import org.netbeans.modules.j2ee.deployment.common.api.Datasource;
(-)a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/web/AdditionalWebProvider.java (-2 / +1 lines)
Lines 44-50 Link Here
44
import org.netbeans.api.j2ee.core.Profile;
44
import org.netbeans.api.j2ee.core.Profile;
45
import org.netbeans.api.project.Project;
45
import org.netbeans.api.project.Project;
46
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
46
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
47
import org.netbeans.modules.j2ee.common.Util;
48
import org.netbeans.modules.j2ee.spi.ejbjar.EjbJarFactory;
47
import org.netbeans.modules.j2ee.spi.ejbjar.EjbJarFactory;
49
import org.netbeans.modules.j2ee.spi.ejbjar.EjbJarProvider;
48
import org.netbeans.modules.j2ee.spi.ejbjar.EjbJarProvider;
50
import org.netbeans.modules.j2ee.spi.ejbjar.EjbJarsInProject;
49
import org.netbeans.modules.j2ee.spi.ejbjar.EjbJarsInProject;
Lines 80-86 Link Here
80
79
81
        Profile profile = moduleProvider.getModuleImpl().getJ2eeProfile();
80
        Profile profile = moduleProvider.getModuleImpl().getJ2eeProfile();
82
        
81
        
83
        boolean javaEE6profile = Util.isAtLeastJavaEE6Web(profile);
82
        boolean javaEE6profile = profile != null && profile.isAtLeast(Profile.JAVA_EE_6_WEB);
84
        boolean webSupported = MavenProjectSupport.isWebSupported(project, packaging);
83
        boolean webSupported = MavenProjectSupport.isWebSupported(project, packaging);
85
        
84
        
86
        if (javaEE6profile && webSupported) {
85
        if (javaEE6profile && webSupported) {
(-)a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/web/WebModuleImpl.java (-3 / +2 lines)
Lines 50-56 Link Here
50
import org.netbeans.api.j2ee.core.Profile;
50
import org.netbeans.api.j2ee.core.Profile;
51
import org.netbeans.api.java.classpath.ClassPath;
51
import org.netbeans.api.java.classpath.ClassPath;
52
import org.netbeans.api.project.Project;
52
import org.netbeans.api.project.Project;
53
import org.netbeans.modules.j2ee.common.Util;
54
import org.netbeans.modules.j2ee.dd.api.web.DDProvider;
53
import org.netbeans.modules.j2ee.dd.api.web.DDProvider;
55
import org.netbeans.modules.j2ee.dd.api.web.WebApp;
54
import org.netbeans.modules.j2ee.dd.api.web.WebApp;
56
import org.netbeans.modules.j2ee.dd.api.web.WebAppMetadata;
55
import org.netbeans.modules.j2ee.dd.api.web.WebAppMetadata;
Lines 270-276 Link Here
270
        // #170528the javaee6 level might not have a descriptor,
269
        // #170528the javaee6 level might not have a descriptor,
271
        // but I still keep the check for older versions, as it was known to fail without one
270
        // but I still keep the check for older versions, as it was known to fail without one
272
        // in older versions it probably means the web.xml file is generated..
271
        // in older versions it probably means the web.xml file is generated..
273
        if(getDeploymentDescriptor() != null || Util.isAtLeastJavaEE6Web(getJ2eeProfile())) {
272
        if(getDeploymentDescriptor() != null || (getJ2eeProfile() != null && getJ2eeProfile().isAtLeast(Profile.JAVA_EE_6_WEB))) {
274
            try {
273
            try {
275
                String path = provider.getConfigSupport().getWebContextRoot();
274
                String path = provider.getConfigSupport().getWebContextRoot();
276
                if (path != null) {
275
                if (path != null) {
Lines 288-294 Link Here
288
        // #170528 the javaee6 level might not have a descriptor,
287
        // #170528 the javaee6 level might not have a descriptor,
289
        // but I still keep the check for older versions, as it was known to fail without one
288
        // but I still keep the check for older versions, as it was known to fail without one
290
        // in older versions it probably means the web.xml file is generated..
289
        // in older versions it probably means the web.xml file is generated..
291
        if (getDeploymentDescriptor() != null|| Util.isAtLeastJavaEE6Web(getJ2eeProfile())) {
290
        if (getDeploymentDescriptor() != null|| (getJ2eeProfile() != null && getJ2eeProfile().isAtLeast(Profile.JAVA_EE_6_WEB))) {
292
            try {
291
            try {
293
                provider.getConfigSupport().setWebContextRoot(newPath);
292
                provider.getConfigSupport().setWebContextRoot(newPath);
294
            }
293
            }
(-)a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/web/WebRecoPrivTemplates.java (-3 / +2 lines)
Lines 46-52 Link Here
46
import org.netbeans.api.j2ee.core.Profile;
46
import org.netbeans.api.j2ee.core.Profile;
47
import org.netbeans.api.project.Project;
47
import org.netbeans.api.project.Project;
48
import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities;
48
import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities;
49
import org.netbeans.modules.j2ee.common.Util;
50
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
49
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
51
import org.netbeans.modules.maven.api.NbMavenProject;
50
import org.netbeans.modules.maven.api.NbMavenProject;
52
import org.netbeans.modules.web.api.webmodule.WebModule;
51
import org.netbeans.modules.web.api.webmodule.WebModule;
Lines 168-174 Link Here
168
            if (Profile.JAVA_EE_5.equals(p)) {
167
            if (Profile.JAVA_EE_5.equals(p)) {
169
                return WEB_TYPES_5;
168
                return WEB_TYPES_5;
170
            }
169
            }
171
            if (Util.isAtLeastJavaEE6Web(p)) {
170
            if (p != null && p.isAtLeast(Profile.JAVA_EE_6_WEB)) {
172
                ArrayList<String> toRet = new ArrayList<String>(Arrays.asList(WEB_TYPES_6));
171
                ArrayList<String> toRet = new ArrayList<String>(Arrays.asList(WEB_TYPES_6));
173
                J2eeProjectCapabilities cap = J2eeProjectCapabilities.forProject(project);
172
                J2eeProjectCapabilities cap = J2eeProjectCapabilities.forProject(project);
174
                if (cap != null) {
173
                if (cap != null) {
Lines 194-200 Link Here
194
            if (Profile.JAVA_EE_5.equals(p)) {
193
            if (Profile.JAVA_EE_5.equals(p)) {
195
                return WEB_PRIVILEGED_NAMES_5;
194
                return WEB_PRIVILEGED_NAMES_5;
196
            }
195
            }
197
            if (Util.isAtLeastJavaEE6Web(p)) {
196
            if (p != null && p.isAtLeast(Profile.JAVA_EE_6_WEB)) {
198
                ArrayList<String> toRet = new ArrayList<String>(Arrays.asList(WEB_PRIVILEGED_NAMES_6));
197
                ArrayList<String> toRet = new ArrayList<String>(Arrays.asList(WEB_PRIVILEGED_NAMES_6));
199
                J2eeProjectCapabilities cap = J2eeProjectCapabilities.forProject(project);
198
                J2eeProjectCapabilities cap = J2eeProjectCapabilities.forProject(project);
200
                if (cap != null) {
199
                if (cap != null) {
(-)a/tomcat5/src/org/netbeans/modules/tomcat5/util/TomcatProperties.java (-2 lines)
Lines 61-67 Link Here
61
import org.netbeans.api.java.platform.JavaPlatform;
61
import org.netbeans.api.java.platform.JavaPlatform;
62
import org.netbeans.api.java.platform.JavaPlatformManager;
62
import org.netbeans.api.java.platform.JavaPlatformManager;
63
import org.netbeans.api.java.platform.Specification;
63
import org.netbeans.api.java.platform.Specification;
64
import org.netbeans.modules.j2ee.common.Util;
65
import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment;
64
import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment;
66
import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties;
65
import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties;
67
import org.netbeans.modules.tomcat5.TomcatFactory;
66
import org.netbeans.modules.tomcat5.TomcatFactory;
Lines 73-79 Link Here
73
import org.openide.filesystems.FileUtil;
72
import org.openide.filesystems.FileUtil;
74
import org.openide.modules.InstalledFileLocator;
73
import org.openide.modules.InstalledFileLocator;
75
import org.openide.util.EditableProperties;
74
import org.openide.util.EditableProperties;
76
import org.openide.util.Exceptions;
77
import org.openide.util.NbBundle;
75
import org.openide.util.NbBundle;
78
import org.openide.util.Utilities;
76
import org.openide.util.Utilities;
79
/**
77
/**
(-)a/web.core/src/org/netbeans/modules/web/wizards/PageIteratorValidation.java (-1 lines)
Lines 42-48 Link Here
42
package org.netbeans.modules.web.wizards;
42
package org.netbeans.modules.web.wizards;
43
43
44
import org.netbeans.api.project.Project;
44
import org.netbeans.api.project.Project;
45
import org.netbeans.modules.j2ee.common.Util;
46
import org.netbeans.modules.j2ee.core.api.support.wizard.DelegatingWizardDescriptorPanel;
45
import org.netbeans.modules.j2ee.core.api.support.wizard.DelegatingWizardDescriptorPanel;
47
import org.netbeans.modules.web.api.webmodule.WebModule;
46
import org.netbeans.modules.web.api.webmodule.WebModule;
48
import org.openide.WizardDescriptor;
47
import org.openide.WizardDescriptor;
(-)a/web.core/src/org/netbeans/modules/web/wizards/Utilities.java (-2 / +1 lines)
Lines 46-52 Link Here
46
46
47
import org.netbeans.api.project.Project;
47
import org.netbeans.api.project.Project;
48
import org.netbeans.api.j2ee.core.Profile;
48
import org.netbeans.api.j2ee.core.Profile;
49
import org.netbeans.modules.j2ee.common.Util;
50
import org.netbeans.modules.web.api.webmodule.WebModule;
49
import org.netbeans.modules.web.api.webmodule.WebModule;
51
import org.netbeans.spi.project.ui.templates.support.Templates;
50
import org.netbeans.spi.project.ui.templates.support.Templates;
52
import org.openide.filesystems.FileObject;
51
import org.openide.filesystems.FileObject;
Lines 173-179 Link Here
173
        WebModule wm = WebModule.getWebModule(project.getProjectDirectory());
172
        WebModule wm = WebModule.getWebModule(project.getProjectDirectory());
174
        if (wm != null) {
173
        if (wm != null) {
175
            Profile profile = wm.getJ2eeProfile();
174
            Profile profile = wm.getJ2eeProfile();
176
            return Util.isAtLeastJavaEE6Web(profile);
175
            return profile != null && profile.isAtLeast(Profile.JAVA_EE_6_WEB);
177
        }
176
        }
178
        return false;
177
        return false;
179
    }
178
    }
(-)a/web.jsf.richfaces/src/org/netbeans/modules/web/jsf/richfaces/Richfaces4Customizer.java (-1 lines)
Lines 57-63 Link Here
57
import org.netbeans.api.project.libraries.Library;
57
import org.netbeans.api.project.libraries.Library;
58
import org.netbeans.api.project.libraries.LibraryManager;
58
import org.netbeans.api.project.libraries.LibraryManager;
59
import org.netbeans.modules.j2ee.common.ClasspathUtil;
59
import org.netbeans.modules.j2ee.common.ClasspathUtil;
60
import org.netbeans.modules.j2ee.common.Util;
61
import org.netbeans.modules.web.jsf.richfaces.ui.Richfaces4CustomizerPanelVisual;
60
import org.netbeans.modules.web.jsf.richfaces.ui.Richfaces4CustomizerPanelVisual;
62
import org.netbeans.modules.web.jsf.spi.components.JsfComponentCustomizer;
61
import org.netbeans.modules.web.jsf.spi.components.JsfComponentCustomizer;
63
import org.openide.util.ChangeSupport;
62
import org.openide.util.ChangeSupport;
(-)a/web.jsf/src/org/netbeans/modules/web/jsf/JSFFrameworkProvider.java (-3 / +2 lines)
Lines 83-89 Link Here
83
import org.netbeans.api.project.libraries.LibraryManager;
83
import org.netbeans.api.project.libraries.LibraryManager;
84
import org.netbeans.api.queries.FileEncodingQuery;
84
import org.netbeans.api.queries.FileEncodingQuery;
85
import org.netbeans.modules.j2ee.common.ClasspathUtil;
85
import org.netbeans.modules.j2ee.common.ClasspathUtil;
86
import org.netbeans.modules.j2ee.common.Util;
87
import org.netbeans.modules.j2ee.common.dd.DDHelper;
86
import org.netbeans.modules.j2ee.common.dd.DDHelper;
88
import org.netbeans.modules.j2ee.common.ui.BrokenServerLibrarySupport;
87
import org.netbeans.modules.j2ee.common.ui.BrokenServerLibrarySupport;
89
import org.netbeans.modules.j2ee.dd.api.common.InitParam;
88
import org.netbeans.modules.j2ee.dd.api.common.InitParam;
Lines 587-593 Link Here
587
                String facesConfigTemplate = JSFCatalog.RES_FACES_CONFIG_DEFAULT;
586
                String facesConfigTemplate = JSFCatalog.RES_FACES_CONFIG_DEFAULT;
588
                if (ddRoot != null) {
587
                if (ddRoot != null) {
589
                    Profile profile = webModule.getJ2eeProfile();
588
                    Profile profile = webModule.getJ2eeProfile();
590
                    if (Util.isAtLeastJavaEE5(profile) && jsfVersion != null) {
589
                    if (profile != null && profile.isAtLeast(Profile.JAVA_EE_5) && jsfVersion != null) {
591
                        if (jsfVersion.isAtLeast(JSFVersion.JSF_2_2)) {
590
                        if (jsfVersion.isAtLeast(JSFVersion.JSF_2_2)) {
592
                            facesConfigTemplate = JSFCatalog.RES_FACES_CONFIG_2_2;
591
                            facesConfigTemplate = JSFCatalog.RES_FACES_CONFIG_2_2;
593
                        } else if (jsfVersion.isAtLeast(JSFVersion.JSF_2_1)) {
592
                        } else if (jsfVersion.isAtLeast(JSFVersion.JSF_2_1)) {
Lines 598-604 Link Here
598
                            facesConfigTemplate = JSFCatalog.RES_FACES_CONFIG_1_2;
597
                            facesConfigTemplate = JSFCatalog.RES_FACES_CONFIG_1_2;
599
                        }
598
                        }
600
                    }
599
                    }
601
                    if (!Util.isAtLeastJavaEE6Web(profile)
600
                    if (profile != null && !profile.isAtLeast(Profile.JAVA_EE_6_WEB)
602
                            && (jsfVersion == null || !jsfVersion.isAtLeast(JSFVersion.JSF_2_0))) {
601
                            && (jsfVersion == null || !jsfVersion.isAtLeast(JSFVersion.JSF_2_0))) {
603
                        createFacesConfig = true;
602
                        createFacesConfig = true;
604
                    }
603
                    }
(-)a/web.jsf/src/org/netbeans/modules/web/jsf/wizards/FacesConfigIterator.java (-3 lines)
Lines 58-66 Link Here
58
import org.netbeans.api.project.ProjectUtils;
58
import org.netbeans.api.project.ProjectUtils;
59
import org.netbeans.api.project.SourceGroup;
59
import org.netbeans.api.project.SourceGroup;
60
import org.netbeans.api.project.Sources;
60
import org.netbeans.api.project.Sources;
61
import org.netbeans.api.project.libraries.Library;
62
import org.netbeans.api.project.libraries.LibraryManager;
63
import org.netbeans.modules.j2ee.common.Util;
64
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
61
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
65
import org.netbeans.modules.j2ee.core.api.support.classpath.ContainerClassPathModifier;
62
import org.netbeans.modules.j2ee.core.api.support.classpath.ContainerClassPathModifier;
66
import org.netbeans.modules.j2ee.dd.api.common.InitParam;
63
import org.netbeans.modules.j2ee.dd.api.common.InitParam;
(-)a/web.jsf/src/org/netbeans/modules/web/jsf/wizards/JSFConfigurationPanelVisual.java (-2 / +1 lines)
Lines 101-107 Link Here
101
import org.netbeans.api.project.libraries.Library;
101
import org.netbeans.api.project.libraries.Library;
102
import org.netbeans.api.project.libraries.LibraryManager;
102
import org.netbeans.api.project.libraries.LibraryManager;
103
import org.netbeans.modules.j2ee.common.ClasspathUtil;
103
import org.netbeans.modules.j2ee.common.ClasspathUtil;
104
import org.netbeans.modules.j2ee.common.Util;
105
import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
104
import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
106
import org.netbeans.modules.j2ee.deployment.common.api.J2eeLibraryTypeProvider;
105
import org.netbeans.modules.j2ee.deployment.common.api.J2eeLibraryTypeProvider;
107
import org.netbeans.modules.j2ee.deployment.common.api.Version;
106
import org.netbeans.modules.j2ee.deployment.common.api.Version;
Lines 1829-1835 Link Here
1829
                    setServerLibraryModel(serverJsfLibraries);
1828
                    setServerLibraryModel(serverJsfLibraries);
1830
                    if (serverJsfLibraries.isEmpty()) {
1829
                    if (serverJsfLibraries.isEmpty()) {
1831
                        Library preferredLibrary;
1830
                        Library preferredLibrary;
1832
                        if (Util.isAtLeastJavaEE5(getProfile())) {
1831
                        if (getProfile() != null && getProfile().isAtLeast(Profile.JAVA_EE_5)) {
1833
                            preferredLibrary = LibraryManager.getDefault().getLibrary(JSFUtils.DEFAULT_JSF_2_0_NAME);
1832
                            preferredLibrary = LibraryManager.getDefault().getLibrary(JSFUtils.DEFAULT_JSF_2_0_NAME);
1834
                        } else {
1833
                        } else {
1835
                            preferredLibrary = LibraryManager.getDefault().getLibrary(JSFUtils.DEFAULT_JSF_1_2_NAME);
1834
                            preferredLibrary = LibraryManager.getDefault().getLibrary(JSFUtils.DEFAULT_JSF_1_2_NAME);
(-)a/web.jsf/src/org/netbeans/modules/web/jsf/wizards/JSFValidationPanel.java (-1 lines)
Lines 43-49 Link Here
43
package org.netbeans.modules.web.jsf.wizards;
43
package org.netbeans.modules.web.jsf.wizards;
44
44
45
import org.netbeans.api.project.Project;
45
import org.netbeans.api.project.Project;
46
import org.netbeans.modules.j2ee.common.Util;
47
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
46
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
48
import org.netbeans.modules.j2ee.core.api.support.wizard.DelegatingWizardDescriptorPanel;
47
import org.netbeans.modules.j2ee.core.api.support.wizard.DelegatingWizardDescriptorPanel;
49
import org.openide.WizardDescriptor;
48
import org.openide.WizardDescriptor;
(-)a/web.jsf/src/org/netbeans/modules/web/jsf/wizards/ManagedBeanPanel.java (-1 lines)
Lines 53-59 Link Here
53
import javax.swing.event.ChangeEvent;
53
import javax.swing.event.ChangeEvent;
54
import javax.swing.event.ChangeListener;
54
import javax.swing.event.ChangeListener;
55
import org.netbeans.api.project.Project;
55
import org.netbeans.api.project.Project;
56
import org.netbeans.modules.j2ee.common.Util;
57
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
56
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
58
57
59
import org.openide.WizardDescriptor;
58
import org.openide.WizardDescriptor;
(-)a/web.jsf/src/org/netbeans/modules/web/jsf/wizards/ManagedBeanPanelVisual.java (-3 / +1 lines)
Lines 58-67 Link Here
58
import org.netbeans.api.project.Project;
58
import org.netbeans.api.project.Project;
59
import org.netbeans.api.project.ProjectUtils;
59
import org.netbeans.api.project.ProjectUtils;
60
import org.netbeans.api.project.SourceGroup;
60
import org.netbeans.api.project.SourceGroup;
61
import org.netbeans.modules.j2ee.common.Util;
62
import org.netbeans.modules.web.api.webmodule.WebModule;
61
import org.netbeans.modules.web.api.webmodule.WebModule;
63
import org.netbeans.modules.web.jsf.JSFConfigUtilities;
62
import org.netbeans.modules.web.jsf.JSFConfigUtilities;
64
//import org.netbeans.modules.web.struts.StrutsConfigUtilities;
65
import org.netbeans.modules.web.jsf.JSFUtils;
63
import org.netbeans.modules.web.jsf.JSFUtils;
66
import org.netbeans.modules.web.jsf.api.ConfigurationUtils;
64
import org.netbeans.modules.web.jsf.api.ConfigurationUtils;
67
import org.netbeans.modules.web.jsf.api.facesmodel.FacesConfig;
65
import org.netbeans.modules.web.jsf.api.facesmodel.FacesConfig;
Lines 110-116 Link Here
110
                jComboBoxConfigFile.setEnabled(false);
108
                jComboBoxConfigFile.setEnabled(false);
111
            } else {
109
            } else {
112
                Profile profile = wm.getJ2eeProfile();
110
                Profile profile = wm.getJ2eeProfile();
113
                if (!Util.isAtLeastJavaEE6Web(profile)) {
111
                if (profile != null && !profile.isAtLeast(Profile.JAVA_EE_6_WEB)) {
114
                    addToFacesConfig = true;
112
                    addToFacesConfig = true;
115
                    addToConfigCheckBox.setSelected(true);
113
                    addToConfigCheckBox.setSelected(true);
116
                    setVisibleBeanDescription(true);
114
                    setVisibleBeanDescription(true);
(-)a/web.jsf/src/org/netbeans/modules/web/jsf/wizards/PersistenceClientIterator.java (-8 / +2 lines)
Lines 59-65 Link Here
59
import javax.swing.JComponent;
59
import javax.swing.JComponent;
60
import javax.swing.SwingUtilities;
60
import javax.swing.SwingUtilities;
61
import javax.swing.event.ChangeListener;
61
import javax.swing.event.ChangeListener;
62
import javax.swing.text.StyledEditorKit;
62
import org.netbeans.api.j2ee.core.Profile;
63
import org.netbeans.api.java.classpath.ClassPath;
63
import org.netbeans.api.java.classpath.ClassPath;
64
import org.netbeans.api.java.project.JavaProjectConstants;
64
import org.netbeans.api.java.project.JavaProjectConstants;
65
import org.netbeans.api.java.project.classpath.ProjectClassPathModifier;
65
import org.netbeans.api.java.project.classpath.ProjectClassPathModifier;
Lines 105-111 Link Here
105
import org.netbeans.modules.web.api.webmodule.WebProjectConstants;
105
import org.netbeans.modules.web.api.webmodule.WebProjectConstants;
106
import org.netbeans.modules.web.beans.CdiUtil;
106
import org.netbeans.modules.web.beans.CdiUtil;
107
import org.netbeans.modules.web.jsf.JSFFrameworkProvider;
107
import org.netbeans.modules.web.jsf.JSFFrameworkProvider;
108
import org.netbeans.modules.web.jsf.JSFUtils;
109
import org.netbeans.modules.web.jsf.api.ConfigurationUtils;
108
import org.netbeans.modules.web.jsf.api.ConfigurationUtils;
110
import org.netbeans.modules.web.jsf.api.facesmodel.Application;
109
import org.netbeans.modules.web.jsf.api.facesmodel.Application;
111
import org.netbeans.modules.web.jsf.api.facesmodel.JSFConfigModel;
110
import org.netbeans.modules.web.jsf.api.facesmodel.JSFConfigModel;
Lines 114-128 Link Here
114
import org.netbeans.modules.web.jsf.impl.facesmodel.JSFConfigModelUtilities;
113
import org.netbeans.modules.web.jsf.impl.facesmodel.JSFConfigModelUtilities;
115
import org.netbeans.modules.web.jsf.palette.JSFPaletteUtilities;
114
import org.netbeans.modules.web.jsf.palette.JSFPaletteUtilities;
116
import org.netbeans.modules.web.jsf.palette.items.FromEntityBase;
115
import org.netbeans.modules.web.jsf.palette.items.FromEntityBase;
117
import org.netbeans.modules.web.jsfapi.api.DefaultLibraryInfo;
118
import org.netbeans.modules.web.spi.webmodule.WebModuleExtender;
116
import org.netbeans.modules.web.spi.webmodule.WebModuleExtender;
119
import org.openide.DialogDisplayer;
117
import org.openide.DialogDisplayer;
120
import org.openide.NotifyDescriptor;
118
import org.openide.NotifyDescriptor;
121
import org.openide.cookies.SaveCookie;
122
import org.openide.filesystems.FileSystem;
119
import org.openide.filesystems.FileSystem;
123
import org.openide.loaders.DataObject;
124
import org.openide.loaders.DataObjectNotFoundException;
125
import org.openide.util.Exceptions;
126
import org.openide.util.RequestProcessor;
120
import org.openide.util.RequestProcessor;
127
121
128
/**
122
/**
Lines 748-754 Link Here
748
        WebModule wm = WebModule.getWebModule(project.getProjectDirectory());
742
        WebModule wm = WebModule.getWebModule(project.getProjectDirectory());
749
        JSFVersion jsfVersion = JSFVersion.forWebModule(wm);
743
        JSFVersion jsfVersion = JSFVersion.forWebModule(wm);
750
744
751
        if (org.netbeans.modules.j2ee.common.Util.isAtLeastJavaEE6Web(wm.getJ2eeProfile())
745
        if (wm.getJ2eeProfile() != null && wm.getJ2eeProfile().isAtLeast(Profile.JAVA_EE_6_WEB)
752
                || (jsfVersion != null && jsfVersion.isAtLeast(JSFVersion.JSF_2_0))) {
746
                || (jsfVersion != null && jsfVersion.isAtLeast(JSFVersion.JSF_2_0))) {
753
            wizard.putProperty(JSF2_GENERATOR_PROPERTY, "true");
747
            wizard.putProperty(JSF2_GENERATOR_PROPERTY, "true");
754
            helpCtx = new HelpCtx("persistence_entity_selection_javaee6");  //NOI18N
748
            helpCtx = new HelpCtx("persistence_entity_selection_javaee6");  //NOI18N
(-)a/web.primefaces/src/org/netbeans/modules/web/primefaces/PrimefacesImplementation.java (-1 lines)
Lines 55-61 Link Here
55
import org.netbeans.api.project.libraries.Library;
55
import org.netbeans.api.project.libraries.Library;
56
import org.netbeans.api.project.libraries.LibraryManager;
56
import org.netbeans.api.project.libraries.LibraryManager;
57
import org.netbeans.modules.j2ee.common.ClasspathUtil;
57
import org.netbeans.modules.j2ee.common.ClasspathUtil;
58
import org.netbeans.modules.j2ee.common.Util;
59
import org.netbeans.modules.web.api.webmodule.WebModule;
58
import org.netbeans.modules.web.api.webmodule.WebModule;
60
import org.netbeans.modules.web.jsf.api.JsfComponentUtils;
59
import org.netbeans.modules.web.jsf.api.JsfComponentUtils;
61
import org.netbeans.modules.web.jsf.api.facesmodel.JSFVersion;
60
import org.netbeans.modules.web.jsf.api.facesmodel.JSFVersion;
(-)a/web.project/src/org/netbeans/modules/web/project/WebProject.java (-1 lines)
Lines 115-121 Link Here
115
import org.netbeans.modules.j2ee.common.ClasspathUtil;
115
import org.netbeans.modules.j2ee.common.ClasspathUtil;
116
import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities;
116
import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities;
117
import org.netbeans.modules.j2ee.common.SharabilityUtility;
117
import org.netbeans.modules.j2ee.common.SharabilityUtility;
118
import org.netbeans.modules.j2ee.common.Util;
119
import org.netbeans.modules.j2ee.common.dd.DDHelper;
118
import org.netbeans.modules.j2ee.common.dd.DDHelper;
120
import org.netbeans.modules.j2ee.common.project.ArtifactCopyOnSaveSupport;
119
import org.netbeans.modules.j2ee.common.project.ArtifactCopyOnSaveSupport;
121
import org.netbeans.modules.j2ee.common.project.BaseClientSideDevelopmentSupport;
120
import org.netbeans.modules.j2ee.common.project.BaseClientSideDevelopmentSupport;
(-)a/web.project/src/org/netbeans/modules/web/project/api/WebProjectUtilities.java (-2 / +1 lines)
Lines 54-60 Link Here
54
import org.netbeans.api.java.project.JavaProjectConstants;
54
import org.netbeans.api.java.project.JavaProjectConstants;
55
import org.netbeans.api.project.ProjectManager;
55
import org.netbeans.api.project.ProjectManager;
56
import org.netbeans.api.project.ProjectUtils;
56
import org.netbeans.api.project.ProjectUtils;
57
import org.netbeans.modules.j2ee.common.Util;
58
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
57
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
59
import org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans;
58
import org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans;
60
import org.netbeans.modules.j2ee.dd.api.ejb.Session;
59
import org.netbeans.modules.j2ee.dd.api.ejb.Session;
Lines 382-388 Link Here
382
    }
381
    }
383
    
382
    
384
    private static FileObject createWelcomeFile(FileObject webFolder, Profile profile) throws IOException {
383
    private static FileObject createWelcomeFile(FileObject webFolder, Profile profile) throws IOException {
385
        FileObject template = profile != null && Util.isAtLeastJavaEE7Web(profile) ?
384
        FileObject template = profile != null && profile.isAtLeast(Profile.JAVA_EE_7_WEB) ?
386
                FileUtil.getConfigFile( "Templates/JSP_Servlet/Html.html" ) :
385
                FileUtil.getConfigFile( "Templates/JSP_Servlet/Html.html" ) :
387
                FileUtil.getConfigFile( "Templates/JSP_Servlet/JSP.jsp" ); // NOI18N
386
                FileUtil.getConfigFile( "Templates/JSP_Servlet/JSP.jsp" ); // NOI18N
388
        
387
        
(-)a/web.project/src/org/netbeans/modules/web/project/classpath/ClassPathSupportCallbackImpl.java (-1 lines)
Lines 47-53 Link Here
47
import java.util.LinkedHashMap;
47
import java.util.LinkedHashMap;
48
import java.util.List;
48
import java.util.List;
49
import java.util.Map;
49
import java.util.Map;
50
import org.netbeans.modules.j2ee.common.Util;
51
import org.netbeans.modules.j2ee.common.project.ProjectConstants;
50
import org.netbeans.modules.j2ee.common.project.ProjectConstants;
52
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
51
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
53
import org.netbeans.modules.java.api.common.classpath.ClassPathSupport.Item;
52
import org.netbeans.modules.java.api.common.classpath.ClassPathSupport.Item;
(-)a/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerLibraries.java (-4 lines)
Lines 53-61 Link Here
53
import java.util.List;
53
import java.util.List;
54
import javax.swing.DefaultListModel;
54
import javax.swing.DefaultListModel;
55
import javax.swing.JPanel;
55
import javax.swing.JPanel;
56
import javax.swing.ListSelectionModel;
57
import javax.swing.SwingUtilities;
56
import javax.swing.SwingUtilities;
58
import javax.swing.JTable;
59
import javax.swing.event.ListDataEvent;
57
import javax.swing.event.ListDataEvent;
60
import javax.swing.event.ListDataListener;
58
import javax.swing.event.ListDataListener;
61
import javax.swing.table.JTableHeader;
59
import javax.swing.table.JTableHeader;
Lines 66-73 Link Here
66
import org.netbeans.modules.java.api.common.classpath.ClassPathSupport.Item;
64
import org.netbeans.modules.java.api.common.classpath.ClassPathSupport.Item;
67
import org.netbeans.modules.java.api.common.ui.PlatformUiSupport;
65
import org.netbeans.modules.java.api.common.ui.PlatformUiSupport;
68
import org.netbeans.api.project.libraries.LibraryManager;
66
import org.netbeans.api.project.libraries.LibraryManager;
69
import org.netbeans.modules.j2ee.common.Util;
70
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
71
import org.netbeans.modules.java.api.common.classpath.ClassPathSupport;
67
import org.netbeans.modules.java.api.common.classpath.ClassPathSupport;
72
import org.netbeans.modules.java.api.common.project.ui.ClassPathUiSupport;
68
import org.netbeans.modules.java.api.common.project.ui.ClassPathUiSupport;
73
import org.netbeans.modules.java.api.common.project.ui.customizer.EditMediator;
69
import org.netbeans.modules.java.api.common.project.ui.customizer.EditMediator;
(-)a/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerSources.java (-2 lines)
Lines 58-65 Link Here
58
import org.openide.util.HelpCtx;
58
import org.openide.util.HelpCtx;
59
import org.openide.util.NbBundle;
59
import org.openide.util.NbBundle;
60
import org.netbeans.api.queries.CollocationQuery;
60
import org.netbeans.api.queries.CollocationQuery;
61
import org.netbeans.modules.j2ee.common.Util;
62
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
63
import org.netbeans.modules.j2ee.common.project.ui.UIUtil;
61
import org.netbeans.modules.j2ee.common.project.ui.UIUtil;
64
import org.netbeans.modules.java.api.common.project.ui.customizer.SourceRootsUi;
62
import org.netbeans.modules.java.api.common.project.ui.customizer.SourceRootsUi;
65
import org.netbeans.spi.project.support.ant.PropertyUtils;
63
import org.netbeans.spi.project.support.ant.PropertyUtils;
(-)a/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerWar.java (-3 lines)
Lines 55-62 Link Here
55
import javax.swing.table.TableModel;
55
import javax.swing.table.TableModel;
56
import org.netbeans.api.java.project.JavaProjectConstants;
56
import org.netbeans.api.java.project.JavaProjectConstants;
57
import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants;
57
import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants;
58
import org.netbeans.modules.j2ee.common.Util;
59
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
60
import org.netbeans.modules.j2ee.common.project.ui.MessageUtils;
58
import org.netbeans.modules.j2ee.common.project.ui.MessageUtils;
61
import org.netbeans.modules.j2ee.common.project.ui.UIUtil;
59
import org.netbeans.modules.j2ee.common.project.ui.UIUtil;
62
import org.netbeans.modules.java.api.common.classpath.ClassPathSupport;
60
import org.netbeans.modules.java.api.common.classpath.ClassPathSupport;
Lines 65-71 Link Here
65
import org.netbeans.modules.java.api.common.project.ui.customizer.EditMediator;
63
import org.netbeans.modules.java.api.common.project.ui.customizer.EditMediator;
66
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform;
64
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform;
67
import org.netbeans.modules.web.project.classpath.ClassPathSupportCallbackImpl;
65
import org.netbeans.modules.web.project.classpath.ClassPathSupportCallbackImpl;
68
import org.netbeans.spi.project.support.ant.PropertyUtils;
69
import org.netbeans.spi.project.ui.support.ProjectCustomizer;
66
import org.netbeans.spi.project.ui.support.ProjectCustomizer;
70
import org.openide.DialogDisplayer;
67
import org.openide.DialogDisplayer;
71
import org.openide.NotifyDescriptor;
68
import org.openide.NotifyDescriptor;
(-)a/websvc.core/src/org/netbeans/modules/websvc/core/WSInjectiontargetQueryImplementation.java (-2 / +2 lines)
Lines 50-58 Link Here
50
import javax.lang.model.element.Name;
50
import javax.lang.model.element.Name;
51
import org.netbeans.api.project.FileOwnerQuery;
51
import org.netbeans.api.project.FileOwnerQuery;
52
import org.netbeans.api.project.Project;
52
import org.netbeans.api.project.Project;
53
import org.netbeans.modules.j2ee.common.Util;
54
import javax.lang.model.element.TypeElement;
53
import javax.lang.model.element.TypeElement;
55
import org.netbeans.api.java.source.CompilationController;
54
import org.netbeans.api.java.source.CompilationController;
55
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
56
import org.netbeans.modules.javaee.injection.spi.InjectionTargetQueryImplementation;
56
import org.netbeans.modules.javaee.injection.spi.InjectionTargetQueryImplementation;
57
import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
57
import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
58
import org.openide.filesystems.FileObject;
58
import org.openide.filesystems.FileObject;
Lines 75-81 Link Here
75
        FileObject fo = controller.getFileObject();
75
        FileObject fo = controller.getFileObject();
76
        Project project = FileOwnerQuery.getOwner(fo);
76
        Project project = FileOwnerQuery.getOwner(fo);
77
        
77
        
78
        if (Util.isJavaEE5orHigher(project) && !isTomcatTargetServer(project) && !(ElementKind.INTERFACE==typeElement.getKind())) {
78
        if (ProjectUtil.isJavaEE5orHigher(project) && !isTomcatTargetServer(project) && !(ElementKind.INTERFACE==typeElement.getKind())) {
79
            
79
            
80
            List<? extends AnnotationMirror> annotations = typeElement.getAnnotationMirrors();
80
            List<? extends AnnotationMirror> annotations = typeElement.getAnnotationMirrors();
81
            boolean found = false;
81
            boolean found = false;
(-)a/websvc.core/src/org/netbeans/modules/websvc/core/WSStackUtils.java (-2 / +2 lines)
Lines 59-65 Link Here
59
import org.netbeans.api.project.Project;
59
import org.netbeans.api.project.Project;
60
import org.netbeans.api.project.ProjectUtils;
60
import org.netbeans.api.project.ProjectUtils;
61
import org.netbeans.api.project.SourceGroup;
61
import org.netbeans.api.project.SourceGroup;
62
import org.netbeans.modules.j2ee.common.Util;
62
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
63
import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment;
63
import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment;
64
import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException;
64
import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException;
65
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
65
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
Lines 195-201 Link Here
195
195
196
    private ErrorMessage getWSErrorMessage() {
196
    private ErrorMessage getWSErrorMessage() {
197
        ServerType serverType = getServerType();
197
        ServerType serverType = getServerType();
198
        if (Util.isJavaEE5orHigher(project)) {
198
        if (ProjectUtil.isJavaEE5orHigher(project)) {
199
            if (ServerType.GLASSFISH_V3 == serverType && !isWsitSupported()) {
199
            if (ServerType.GLASSFISH_V3 == serverType && !isWsitSupported()) {
200
                return new ErrorMessage(ErrorType.INFO,
200
                return new ErrorMessage(ErrorType.INFO,
201
                        NbBundle.getMessage(WSStackUtils.class, "MSG_NoMetroInstalled"), false);
201
                        NbBundle.getMessage(WSStackUtils.class, "MSG_NoMetroInstalled"), false);
(-)a/websvc.core/src/org/netbeans/modules/websvc/core/client/wizard/ClientInfo.java (-3 / +3 lines)
Lines 105-111 Link Here
105
import org.netbeans.api.project.ProjectUtils;
105
import org.netbeans.api.project.ProjectUtils;
106
import org.netbeans.api.project.SourceGroup;
106
import org.netbeans.api.project.SourceGroup;
107
import org.netbeans.api.project.Sources;
107
import org.netbeans.api.project.Sources;
108
import org.netbeans.modules.j2ee.common.Util;
108
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
109
import org.netbeans.spi.java.project.support.ui.PackageView;
109
import org.netbeans.spi.java.project.support.ui.PackageView;
110
import org.netbeans.spi.project.ui.templates.support.Templates;
110
import org.netbeans.spi.project.ui.templates.support.Templates;
111
111
Lines 841-847 Link Here
841
        if (projectType > 0) {
841
        if (projectType > 0) {
842
            //jLabelJaxVersion.setEnabled(false);
842
            //jLabelJaxVersion.setEnabled(false);
843
            //jComboBoxJaxVersion.setEnabled(false);
843
            //jComboBoxJaxVersion.setEnabled(false);
844
            if (Util.isJavaEE5orHigher(project) || JaxWsUtils.isEjbJavaEE5orHigher(project)) {
844
            if (ProjectUtil.isJavaEE5orHigher(project) || JaxWsUtils.isEjbJavaEE5orHigher(project)) {
845
                jComboBoxJaxVersion.setSelectedItem(ClientWizardProperties.JAX_WS);
845
                jComboBoxJaxVersion.setSelectedItem(ClientWizardProperties.JAX_WS);
846
            }
846
            }
847
            else{
847
            else{
Lines 910-916 Link Here
910
            jCbxPackageName.setModel(getPackageModel(project));
910
            jCbxPackageName.setModel(getPackageModel(project));
911
            String pName = (String) d.getProperty(ClientWizardProperties.WSDL_PACKAGE_NAME);
911
            String pName = (String) d.getProperty(ClientWizardProperties.WSDL_PACKAGE_NAME);
912
            String jaxwsVersion = (String)this.jComboBoxJaxVersion.getSelectedItem();
912
            String jaxwsVersion = (String)this.jComboBoxJaxVersion.getSelectedItem();
913
            if (Util.isJavaEE5orHigher(project) ||
913
            if (ProjectUtil.isJavaEE5orHigher(project) ||
914
                    (projectType == 0 && jaxwsVersion.equals(ClientWizardProperties.JAX_WS)) ){
914
                    (projectType == 0 && jaxwsVersion.equals(ClientWizardProperties.JAX_WS)) ){
915
                    jCbxPackageName.setToolTipText(NbBundle.getMessage(ClientInfo.class, "TOOLTIP_DEFAULT_PACKAGE"));
915
                    jCbxPackageName.setToolTipText(NbBundle.getMessage(ClientInfo.class, "TOOLTIP_DEFAULT_PACKAGE"));
916
            } else{
916
            } else{
(-)a/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/JaxWsHandlerCreatorProvider.java (-2 / +2 lines)
Lines 47-53 Link Here
47
import org.netbeans.modules.websvc.core.ProjectInfo;
47
import org.netbeans.modules.websvc.core.ProjectInfo;
48
import org.netbeans.api.java.queries.SourceLevelQuery;
48
import org.netbeans.api.java.queries.SourceLevelQuery;
49
import org.netbeans.api.project.Project;
49
import org.netbeans.api.project.Project;
50
import org.netbeans.modules.j2ee.common.Util;
50
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
51
import org.netbeans.modules.websvc.core.HandlerCreator;
51
import org.netbeans.modules.websvc.core.HandlerCreator;
52
import org.netbeans.modules.websvc.core.HandlerCreatorProvider;
52
import org.netbeans.modules.websvc.core.HandlerCreatorProvider;
53
import org.openide.WizardDescriptor;
53
import org.openide.WizardDescriptor;
Lines 68-74 Link Here
68
        int projectType = projectInfo.getProjectType();
68
        int projectType = projectInfo.getProjectType();
69
        if ((projectType == ProjectInfo.JSE_PROJECT_TYPE && Utils.isSourceLevel16orHigher(project)) ||
69
        if ((projectType == ProjectInfo.JSE_PROJECT_TYPE && Utils.isSourceLevel16orHigher(project)) ||
70
                (projectType == ProjectInfo.JSE_PROJECT_TYPE && "1.5".equals(SourceLevelQuery.getSourceLevel(project.getProjectDirectory()))) || //NOI18N
70
                (projectType == ProjectInfo.JSE_PROJECT_TYPE && "1.5".equals(SourceLevelQuery.getSourceLevel(project.getProjectDirectory()))) || //NOI18N
71
                (Util.isJavaEE5orHigher(project) && (projectType == ProjectInfo.WEB_PROJECT_TYPE 
71
                (ProjectUtil.isJavaEE5orHigher(project) && (projectType == ProjectInfo.WEB_PROJECT_TYPE
72
                || projectType == ProjectInfo.CAR_PROJECT_TYPE
72
                || projectType == ProjectInfo.CAR_PROJECT_TYPE
73
                || projectType == ProjectInfo.EJB_PROJECT_TYPE)) || //NOI18N
73
                || projectType == ProjectInfo.EJB_PROJECT_TYPE)) || //NOI18N
74
                (!projectInfo.isJsr109Supported() && projectType == ProjectInfo.WEB_PROJECT_TYPE/* && !projectInfo.isJsr109oldSupported()*/)
74
                (!projectInfo.isJsr109Supported() && projectType == ProjectInfo.WEB_PROJECT_TYPE/* && !projectInfo.isJsr109oldSupported()*/)
(-)a/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/JaxWsServiceCreator.java (-2 / +2 lines)
Lines 96-102 Link Here
96
import org.netbeans.api.project.libraries.Library;
96
import org.netbeans.api.project.libraries.Library;
97
import org.netbeans.api.project.libraries.LibraryManager;
97
import org.netbeans.api.project.libraries.LibraryManager;
98
import org.netbeans.modules.j2ee.api.ejbjar.EjbReference;
98
import org.netbeans.modules.j2ee.api.ejbjar.EjbReference;
99
import org.netbeans.modules.j2ee.common.Util;
99
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
100
import org.netbeans.modules.websvc.api.jaxws.project.config.JaxWsModel;
100
import org.netbeans.modules.websvc.api.jaxws.project.config.JaxWsModel;
101
import org.netbeans.modules.websvc.api.jaxws.project.config.Service;
101
import org.netbeans.modules.websvc.api.jaxws.project.config.Service;
102
import org.netbeans.modules.websvc.api.jaxws.project.config.ServiceAlreadyExistsExeption;
102
import org.netbeans.modules.websvc.api.jaxws.project.config.ServiceAlreadyExistsExeption;
Lines 239-245 Link Here
239
                 handle.finish();
239
                 handle.finish();
240
            }
240
            }
241
        } else if (serviceType == WizardProperties.ENCAPSULATE_SESSION_BEAN) {
241
        } else if (serviceType == WizardProperties.ENCAPSULATE_SESSION_BEAN) {
242
            if (/*(projectType == JSE_PROJECT_TYPE && Util.isSourceLevel16orHigher(project)) ||*/(Util.isJavaEE5orHigher(projectInfo.getProject()) && (projectType == ProjectInfo.WEB_PROJECT_TYPE || projectType == ProjectInfo.EJB_PROJECT_TYPE)) //NOI18N
242
            if (/*(projectType == JSE_PROJECT_TYPE && Util.isSourceLevel16orHigher(project)) ||*/(ProjectUtil.isJavaEE5orHigher(projectInfo.getProject()) && (projectType == ProjectInfo.WEB_PROJECT_TYPE || projectType == ProjectInfo.EJB_PROJECT_TYPE)) //NOI18N
243
                    ) {
243
                    ) {
244
244
245
                JAXWSSupport jaxWsSupport = JAXWSSupport.getJAXWSSupport(
245
                JAXWSSupport jaxWsSupport = JAXWSSupport.getJAXWSSupport(
(-)a/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/JaxWsServiceCreatorProvider.java (-3 / +3 lines)
Lines 47-57 Link Here
47
import org.netbeans.modules.websvc.api.support.ServiceCreator;
47
import org.netbeans.modules.websvc.api.support.ServiceCreator;
48
import org.netbeans.modules.websvc.core.ProjectInfo;
48
import org.netbeans.modules.websvc.core.ProjectInfo;
49
import org.netbeans.api.project.Project;
49
import org.netbeans.api.project.Project;
50
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
50
import org.netbeans.modules.websvc.core.JaxWsUtils;
51
import org.netbeans.modules.websvc.core.JaxWsUtils;
51
import org.netbeans.modules.websvc.core.ServerType;
52
import org.netbeans.modules.websvc.core.ServerType;
52
import org.netbeans.modules.websvc.spi.support.ServiceCreatorProvider;
53
import org.netbeans.modules.websvc.spi.support.ServiceCreatorProvider;
53
import org.openide.WizardDescriptor;
54
import org.openide.WizardDescriptor;
54
import org.netbeans.modules.j2ee.common.Util;
55
import org.netbeans.modules.websvc.jaxws.api.JAXWSSupport;
55
import org.netbeans.modules.websvc.jaxws.api.JAXWSSupport;
56
56
57
/**
57
/**
Lines 69-81 Link Here
69
            ProjectInfo projectInfo = new ProjectInfo(project);
69
            ProjectInfo projectInfo = new ProjectInfo(project);
70
            int projectType = projectInfo.getProjectType();
70
            int projectType = projectInfo.getProjectType();
71
            if ((projectType == ProjectInfo.JSE_PROJECT_TYPE && Utils.isSourceLevel16orHigher(project)) ||
71
            if ((projectType == ProjectInfo.JSE_PROJECT_TYPE && Utils.isSourceLevel16orHigher(project)) ||
72
                    ((Util.isJavaEE5orHigher(project) &&
72
                    ((ProjectUtil.isJavaEE5orHigher(project) &&
73
                    (projectType == ProjectInfo.WEB_PROJECT_TYPE || projectType == ProjectInfo.EJB_PROJECT_TYPE)))
73
                    (projectType == ProjectInfo.WEB_PROJECT_TYPE || projectType == ProjectInfo.EJB_PROJECT_TYPE)))
74
                    ) {
74
                    ) {
75
                return new JaxWsServiceCreator(projectInfo, wiz, false);
75
                return new JaxWsServiceCreator(projectInfo, wiz, false);
76
            } else if (JaxWsUtils.isEjbJavaEE5orHigher(projectInfo)) {
76
            } else if (JaxWsUtils.isEjbJavaEE5orHigher(projectInfo)) {
77
                return new JaxWsServiceCreator(projectInfo, wiz, false);
77
                return new JaxWsServiceCreator(projectInfo, wiz, false);
78
            } else if (!Util.isJavaEE5orHigher(project) &&
78
            } else if (!ProjectUtil.isJavaEE5orHigher(project) &&
79
                       (projectType == ProjectInfo.WEB_PROJECT_TYPE)) {
79
                       (projectType == ProjectInfo.WEB_PROJECT_TYPE)) {
80
                       if (!(projectInfo.isJsr109Supported() || projectInfo.isJsr109oldSupported())) {                   
80
                       if (!(projectInfo.isJsr109Supported() || projectInfo.isJsr109oldSupported())) {                   
81
                           boolean addLibraries = !projectInfo.isWsgenSupported() || !projectInfo.isWsimportSupported();
81
                           boolean addLibraries = !projectInfo.isWsgenSupported() || !projectInfo.isWsimportSupported();
(-)a/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/LogicalHandlerWizard.java (-3 / +3 lines)
Lines 64-72 Link Here
64
import org.netbeans.spi.project.ui.templates.support.Templates;
64
import org.netbeans.spi.project.ui.templates.support.Templates;
65
import org.openide.WizardDescriptor;
65
import org.openide.WizardDescriptor;
66
import javax.swing.event.ChangeListener;
66
import javax.swing.event.ChangeListener;
67
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
67
import org.openide.util.HelpCtx;
68
import org.openide.util.HelpCtx;
68
import org.openide.util.NbBundle;
69
import org.openide.util.NbBundle;
69
import org.netbeans.modules.j2ee.common.Util;
70
import org.netbeans.modules.websvc.api.support.SourceGroups;
70
import org.netbeans.modules.websvc.api.support.SourceGroups;
71
71
72
public class LogicalHandlerWizard implements WizardDescriptor.InstantiatingIterator {
72
public class LogicalHandlerWizard implements WizardDescriptor.InstantiatingIterator {
Lines 218-224 Link Here
218
                    return true;
218
                    return true;
219
            }
219
            }
220
            */
220
            */
221
            if (Util.isJavaEE5orHigher(project) && (projectType == ProjectInfo.WEB_PROJECT_TYPE 
221
            if (ProjectUtil.isJavaEE5orHigher(project) && (projectType == ProjectInfo.WEB_PROJECT_TYPE
222
                    || projectType == ProjectInfo.CAR_PROJECT_TYPE
222
                    || projectType == ProjectInfo.CAR_PROJECT_TYPE
223
                    || projectType == ProjectInfo.EJB_PROJECT_TYPE)) { //NOI18N
223
                    || projectType == ProjectInfo.EJB_PROJECT_TYPE)) { //NOI18N
224
                return true;
224
                return true;
Lines 226-232 Link Here
226
            
226
            
227
            //if platform is Tomcat, source level must be jdk 1.5 and jaxws library must be in classpath
227
            //if platform is Tomcat, source level must be jdk 1.5 and jaxws library must be in classpath
228
            WSStackUtils wsStackUtils = new WSStackUtils(project);
228
            WSStackUtils wsStackUtils = new WSStackUtils(project);
229
            if(!Util.isJavaEE5orHigher(project) && projectType == ProjectInfo.WEB_PROJECT_TYPE
229
            if(!ProjectUtil.isJavaEE5orHigher(project) && projectType == ProjectInfo.WEB_PROJECT_TYPE
230
                    && !wsStackUtils.isJsr109Supported() 
230
                    && !wsStackUtils.isJsr109Supported() 
231
                    && !wsStackUtils.isJsr109OldSupported() ){
231
                    && !wsStackUtils.isJsr109OldSupported() ){
232
                if (!wsStackUtils.hasJAXWSLibrary()) { //must have jaxws library
232
                if (!wsStackUtils.hasJAXWSLibrary()) { //must have jaxws library
(-)a/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/MessageHandlerWizard.java (-3 / +3 lines)
Lines 64-72 Link Here
64
import org.netbeans.api.java.classpath.ClassPath;
64
import org.netbeans.api.java.classpath.ClassPath;
65
import org.netbeans.api.java.project.JavaProjectConstants;
65
import org.netbeans.api.java.project.JavaProjectConstants;
66
import org.netbeans.api.project.ProjectUtils;
66
import org.netbeans.api.project.ProjectUtils;
67
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
67
import org.openide.util.HelpCtx;
68
import org.openide.util.HelpCtx;
68
import org.openide.util.NbBundle;
69
import org.openide.util.NbBundle;
69
import org.netbeans.modules.j2ee.common.Util;
70
import org.netbeans.modules.websvc.api.client.WebServicesClientSupport;
70
import org.netbeans.modules.websvc.api.client.WebServicesClientSupport;
71
import org.netbeans.modules.websvc.api.support.SourceGroups;
71
import org.netbeans.modules.websvc.api.support.SourceGroups;
72
import org.netbeans.modules.websvc.api.webservices.WebServicesSupport;
72
import org.netbeans.modules.websvc.api.webservices.WebServicesSupport;
Lines 201-207 Link Here
201
201
202
            //if platform is Tomcat, source level must be jdk 1.5 and jaxws library must be in classpath
202
            //if platform is Tomcat, source level must be jdk 1.5 and jaxws library must be in classpath
203
            WSStackUtils wsStackUtils = new WSStackUtils(project);
203
            WSStackUtils wsStackUtils = new WSStackUtils(project);
204
            if (!Util.isJavaEE5orHigher(project) && projectType == ProjectInfo.WEB_PROJECT_TYPE && !wsStackUtils.isJsr109Supported() && !wsStackUtils.isJsr109OldSupported()) {
204
            if (!ProjectUtil.isJavaEE5orHigher(project) && projectType == ProjectInfo.WEB_PROJECT_TYPE && !wsStackUtils.isJsr109Supported() && !wsStackUtils.isJsr109OldSupported()) {
205
                if (!wsStackUtils.hasJAXWSLibrary()) {
205
                if (!wsStackUtils.hasJAXWSLibrary()) {
206
                    //must have jaxws library
206
                    //must have jaxws library
207
                    wiz.putProperty(WizardDescriptor.PROP_ERROR_MESSAGE, NbBundle.getMessage(BottomPanel.class, "LBL_LogicalHandlerWarning")); // NOI18N
207
                    wiz.putProperty(WizardDescriptor.PROP_ERROR_MESSAGE, NbBundle.getMessage(BottomPanel.class, "LBL_LogicalHandlerWarning")); // NOI18N
Lines 211-217 Link Here
211
                }
211
                }
212
            }
212
            }
213
            // else check the JAXRPC support installation
213
            // else check the JAXRPC support installation
214
            if (!Util.isJavaEE5orHigher(project) && ((WebServicesSupport.getWebServicesSupport(project.getProjectDirectory()) == null) && (WebServicesClientSupport.getWebServicesClientSupport(project.getProjectDirectory()) == null))) {
214
            if (!ProjectUtil.isJavaEE5orHigher(project) && ((WebServicesSupport.getWebServicesSupport(project.getProjectDirectory()) == null) && (WebServicesClientSupport.getWebServicesClientSupport(project.getProjectDirectory()) == null))) {
215
                // check if jaxrpc plugin installed
215
                // check if jaxrpc plugin installed
216
                wiz.putProperty(WizardDescriptor.PROP_ERROR_MESSAGE, NbBundle.getMessage(MessageHandlerWizard.class, "ERR_NoJaxrpcPluginFoundHandler")); // NOI18N
216
                wiz.putProperty(WizardDescriptor.PROP_ERROR_MESSAGE, NbBundle.getMessage(MessageHandlerWizard.class, "ERR_NoJaxrpcPluginFoundHandler")); // NOI18N
217
                return false;
217
                return false;
(-)a/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/WebServiceFromWSDLPanel.java (-5 / +5 lines)
Lines 61-67 Link Here
61
import javax.xml.parsers.ParserConfigurationException;
61
import javax.xml.parsers.ParserConfigurationException;
62
import javax.xml.transform.stream.StreamSource;
62
import javax.xml.transform.stream.StreamSource;
63
import org.netbeans.api.project.Project;
63
import org.netbeans.api.project.Project;
64
import org.netbeans.modules.j2ee.common.Util;
64
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
65
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
65
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
66
import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
66
import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
67
import org.netbeans.modules.web.api.webmodule.WebModule;
67
import org.netbeans.modules.web.api.webmodule.WebModule;
Lines 366-372 Link Here
366
        Object result = DialogDisplayer.getDefault().notify(dd);
366
        Object result = DialogDisplayer.getDefault().notify(dd);
367
367
368
        if (result == DialogDescriptor.OK_OPTION) {
368
        if (result == DialogDescriptor.OK_OPTION) {
369
            if (Util.isJavaEE5orHigher(project) || jaxWsInJ2ee14Supported ||
369
            if (ProjectUtil.isJavaEE5orHigher(project) || jaxWsInJ2ee14Supported ||
370
                    (!jsr109Supported && !jsr109oldSupported ||
370
                    (!jsr109Supported && !jsr109oldSupported ||
371
                    (!jsr109Supported && jsr109oldSupported /* && jwsdpSupported*/))) {
371
                    (!jsr109Supported && jsr109oldSupported /* && jwsdpSupported*/))) {
372
372
Lines 438-444 Link Here
438
        boolean noJsr109InWeb = wm != null && !jsr109Supported && !jsr109oldSupported;
438
        boolean noJsr109InWeb = wm != null && !jsr109Supported && !jsr109oldSupported;
439
        boolean jaxWsInWeb14 = wm != null && jaxWsInJ2ee14Supported;
439
        boolean jaxWsInWeb14 = wm != null && jaxWsInJ2ee14Supported;
440
440
441
        return !Util.isJavaEE5orHigher(project) && !noJsr109InWeb && !jaxWsInWeb14;
441
        return !ProjectUtil.isJavaEE5orHigher(project) && !noJsr109InWeb && !jaxWsInWeb14;
442
    }
442
    }
443
443
444
    boolean isValid(WizardDescriptor wizardDescriptor) {
444
    boolean isValid(WizardDescriptor wizardDescriptor) {
Lines 475-481 Link Here
475
            }
475
            }
476
        }
476
        }
477
477
478
        if (Util.isJavaEE5orHigher(project) || JaxWsUtils.isEjbJavaEE5orHigher(project) || jaxWsInJ2ee14Supported ||
478
        if (ProjectUtil.isJavaEE5orHigher(project) || JaxWsUtils.isEjbJavaEE5orHigher(project) || jaxWsInJ2ee14Supported ||
479
                (!jsr109Supported && !jsr109oldSupported ||
479
                (!jsr109Supported && !jsr109oldSupported ||
480
                (!jsr109Supported && jsr109oldSupported/* && jwsdpSupported*/))) {
480
                (!jsr109Supported && jsr109oldSupported/* && jwsdpSupported*/))) {
481
            if (wsdlModel != null) {
481
            if (wsdlModel != null) {
Lines 599-605 Link Here
599
                }
599
                }
600
            }
600
            }
601
            fireChange(); //call to disable Finish button
601
            fireChange(); //call to disable Finish button
602
            if (Util.isJavaEE5orHigher(project) || JaxWsUtils.isEjbJavaEE5orHigher(project) || jaxWsInJ2ee14Supported ||
602
            if (ProjectUtil.isJavaEE5orHigher(project) || JaxWsUtils.isEjbJavaEE5orHigher(project) || jaxWsInJ2ee14Supported ||
603
                    (!jsr109Supported && !jsr109oldSupported ||
603
                    (!jsr109Supported && !jsr109oldSupported ||
604
                    (!jsr109Supported && jsr109oldSupported /*&& jwsdpSupported*/))) {
604
                    (!jsr109Supported && jsr109oldSupported /*&& jwsdpSupported*/))) {
605
                createModel();
605
                createModel();
(-)a/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/actions/JaxWsInvokeOperationProvider.java (-3 / +3 lines)
Lines 50-56 Link Here
50
import org.netbeans.api.project.Project;
50
import org.netbeans.api.project.Project;
51
import org.netbeans.api.project.ProjectUtils;
51
import org.netbeans.api.project.ProjectUtils;
52
import org.netbeans.api.project.SourceGroup;
52
import org.netbeans.api.project.SourceGroup;
53
import org.netbeans.modules.j2ee.common.Util;
53
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
54
import org.netbeans.modules.websvc.api.jaxws.client.JAXWSClientSupport;
54
import org.netbeans.modules.websvc.api.jaxws.client.JAXWSClientSupport;
55
import org.netbeans.modules.websvc.spi.support.InvokeOperationActionProvider;
55
import org.netbeans.modules.websvc.spi.support.InvokeOperationActionProvider;
56
import org.netbeans.modules.websvc.api.support.InvokeOperationCookie;
56
import org.netbeans.modules.websvc.api.support.InvokeOperationCookie;
Lines 67-73 Link Here
67
            int projectType = projectInfo.getProjectType();
67
            int projectType = projectInfo.getProjectType();
68
            if ((projectType == ProjectInfo.JSE_PROJECT_TYPE && !isJAXRPCProject(project) && !isJAXWSProject(project))
68
            if ((projectType == ProjectInfo.JSE_PROJECT_TYPE && !isJAXRPCProject(project) && !isJAXWSProject(project))
69
                    ||(projectType == ProjectInfo.JSE_PROJECT_TYPE && isJAXWSProject(project) && isJaxWsLibraryOnClasspath(targetSource)) ||
69
                    ||(projectType == ProjectInfo.JSE_PROJECT_TYPE && isJAXWSProject(project) && isJaxWsLibraryOnClasspath(targetSource)) ||
70
                    (Util.isJavaEE5orHigher(project) && (projectType == ProjectInfo.WEB_PROJECT_TYPE ||
70
                    (ProjectUtil.isJavaEE5orHigher(project) && (projectType == ProjectInfo.WEB_PROJECT_TYPE ||
71
                    projectType == ProjectInfo.CAR_PROJECT_TYPE || projectType == ProjectInfo.EJB_PROJECT_TYPE))
71
                    projectType == ProjectInfo.CAR_PROJECT_TYPE || projectType == ProjectInfo.EJB_PROJECT_TYPE))
72
                    ) {
72
                    ) {
73
                return new JaxWsInvokeOperation(targetSource);
73
                return new JaxWsInvokeOperation(targetSource);
Lines 75-81 Link Here
75
                return new JaxWsInvokeOperation(targetSource);
75
                return new JaxWsInvokeOperation(targetSource);
76
            }
76
            }
77
            // Tomcat on J2EE14 project Case
77
            // Tomcat on J2EE14 project Case
78
            if (projectType == ProjectInfo.WEB_PROJECT_TYPE && !Util.isJavaEE5orHigher(project) && isJaxWsLibraryOnRuntimeClasspath(targetSource)) {
78
            if (projectType == ProjectInfo.WEB_PROJECT_TYPE && !ProjectUtil.isJavaEE5orHigher(project) && isJaxWsLibraryOnRuntimeClasspath(targetSource)) {
79
                return new JaxWsInvokeOperation(targetSource);
79
                return new JaxWsInvokeOperation(targetSource);
80
            }
80
            }
81
        }
81
        }
(-)a/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/nodes/JaxWsNode.java (-4 / +3 lines)
Lines 78-84 Link Here
78
import org.netbeans.api.java.source.JavaSource.Phase;
78
import org.netbeans.api.java.source.JavaSource.Phase;
79
import org.netbeans.api.project.FileOwnerQuery;
79
import org.netbeans.api.project.FileOwnerQuery;
80
import org.netbeans.api.project.Project;
80
import org.netbeans.api.project.Project;
81
import org.netbeans.modules.j2ee.common.Util;
81
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
82
import org.netbeans.modules.j2ee.dd.api.web.DDProvider;
82
import org.netbeans.modules.j2ee.dd.api.web.DDProvider;
83
import org.netbeans.modules.j2ee.dd.api.web.Servlet;
83
import org.netbeans.modules.j2ee.dd.api.web.Servlet;
84
import org.netbeans.modules.j2ee.dd.api.web.ServletMapping;
84
import org.netbeans.modules.j2ee.dd.api.web.ServletMapping;
Lines 130-136 Link Here
130
import org.openide.loaders.DataObject;
130
import org.openide.loaders.DataObject;
131
import org.openide.loaders.DataObjectNotFoundException;
131
import org.openide.loaders.DataObjectNotFoundException;
132
import org.openide.nodes.AbstractNode;
132
import org.openide.nodes.AbstractNode;
133
import org.openide.util.Exceptions;
134
import org.openide.util.HelpCtx;
133
import org.openide.util.HelpCtx;
135
import org.openide.util.ImageUtilities;
134
import org.openide.util.ImageUtilities;
136
import org.openide.util.Mutex;
135
import org.openide.util.Mutex;
Lines 516-522 Link Here
516
        } else if (J2eeModule.Type.EJB.equals(moduleType) && ServerType.JBOSS == stackUtils.getServerType()) {
515
        } else if (J2eeModule.Type.EJB.equals(moduleType) && ServerType.JBOSS == stackUtils.getServerType()) {
517
            // JBoss type
516
            // JBoss type
518
            wsURI = (contextRoot == null ? "" : contextRoot+"/")+getNameFromPackageName(service.getImplementationClass());
517
            wsURI = (contextRoot == null ? "" : contextRoot+"/")+getNameFromPackageName(service.getImplementationClass());
519
        } else if (isJsr109Supported && Util.isJavaEE5orHigher(project) || JaxWsUtils.isEjbJavaEE5orHigher(project)) {
518
        } else if (isJsr109Supported && ProjectUtil.isJavaEE5orHigher(project) || JaxWsUtils.isEjbJavaEE5orHigher(project)) {
520
            try {
519
            try {
521
520
522
                ServiceInfo serviceInfo = new ServiceInfo();
521
                ServiceInfo serviceInfo = new ServiceInfo();
Lines 767-773 Link Here
767
        ServiceInfo serviceInfo = getServiceInfo();
766
        ServiceInfo serviceInfo = getServiceInfo();
768
        WSStackUtils stackUtils = new WSStackUtils(project);
767
        WSStackUtils stackUtils = new WSStackUtils(project);
769
        boolean isJsr109Supported = stackUtils.isJsr109Supported();
768
        boolean isJsr109Supported = stackUtils.isJsr109Supported();
770
        if (isJsr109Supported && Util.isJavaEE5orHigher(project) || JaxWsUtils.isEjbJavaEE5orHigher(project)) {
769
        if (isJsr109Supported && ProjectUtil.isJavaEE5orHigher(project) || JaxWsUtils.isEjbJavaEE5orHigher(project)) {
771
            WSStack<JaxWs> jaxWsStack = stackUtils.getWsStack(JaxWs.class);
770
            WSStack<JaxWs> jaxWsStack = stackUtils.getWsStack(JaxWs.class);
772
            if (jaxWsStack != null) {
771
            if (jaxWsStack != null) {
773
                JaxWs.UriDescriptor uriDescriptor = jaxWsStack.get().getWsUriDescriptor();
772
                JaxWs.UriDescriptor uriDescriptor = jaxWsStack.get().getWsUriDescriptor();
(-)a/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/nodes/JaxWsRootNode.java (-2 / +2 lines)
Lines 52-58 Link Here
52
import javax.swing.Icon;
52
import javax.swing.Icon;
53
import javax.swing.ImageIcon;
53
import javax.swing.ImageIcon;
54
import org.netbeans.api.project.Project;
54
import org.netbeans.api.project.Project;
55
import org.netbeans.modules.j2ee.common.Util;
55
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
56
import org.netbeans.modules.websvc.api.jaxws.project.config.JaxWsModel;
56
import org.netbeans.modules.websvc.api.jaxws.project.config.JaxWsModel;
57
import org.netbeans.modules.websvc.core.WSStackUtils;
57
import org.netbeans.modules.websvc.core.WSStackUtils;
58
import org.netbeans.modules.websvc.jaxws.api.JAXWSSupport;
58
import org.netbeans.modules.websvc.jaxws.api.JAXWSSupport;
Lines 88-94 Link Here
88
        super(new JaxWsRootChildren(jaxWsModel,srcRoots), Lookups.fixed(project));
88
        super(new JaxWsRootChildren(jaxWsModel,srcRoots), Lookups.fixed(project));
89
        setDisplayName(NbBundle.getBundle(JaxWsRootNode.class).getString("LBL_WebServices"));
89
        setDisplayName(NbBundle.getBundle(JaxWsRootNode.class).getString("LBL_WebServices"));
90
        this.project=project;
90
        this.project=project;
91
        if(!Util.isJavaEE5orHigher(project)){
91
        if(!ProjectUtil.isJavaEE5orHigher(project)){
92
            listenToServerChanges();
92
            listenToServerChanges();
93
            WSStackUtils stackUtils = new WSStackUtils(project);
93
            WSStackUtils stackUtils = new WSStackUtils(project);
94
            jsr109Supported = stackUtils.isJsr109Supported();
94
            jsr109Supported = stackUtils.isJsr109Supported();
(-)a/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/projects/JavaEEWSOpenHook.java (-3 / +3 lines)
Lines 52-58 Link Here
52
import java.util.logging.Logger;
52
import java.util.logging.Logger;
53
import org.netbeans.api.project.Project;
53
import org.netbeans.api.project.Project;
54
import org.netbeans.api.project.ProjectManager;
54
import org.netbeans.api.project.ProjectManager;
55
import org.netbeans.modules.j2ee.common.Util;
55
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
56
import org.netbeans.modules.j2ee.dd.api.webservices.PortComponent;
56
import org.netbeans.modules.j2ee.dd.api.webservices.PortComponent;
57
import org.netbeans.modules.j2ee.dd.api.webservices.WebserviceDescription;
57
import org.netbeans.modules.j2ee.dd.api.webservices.WebserviceDescription;
58
import org.netbeans.modules.j2ee.dd.api.webservices.Webservices;
58
import org.netbeans.modules.j2ee.dd.api.webservices.Webservices;
Lines 94-100 Link Here
94
94
95
            protected void projectOpened() {
95
            protected void projectOpened() {
96
                JAXWSSupport support = JAXWSSupport.getJAXWSSupport(prj.getProjectDirectory());
96
                JAXWSSupport support = JAXWSSupport.getJAXWSSupport(prj.getProjectDirectory());
97
                if (support != null && (JaxWsUtils.isEjbJavaEE5orHigher(prj) || Util.isJavaEE5orHigher(prj))) {
97
                if (support != null && (JaxWsUtils.isEjbJavaEE5orHigher(prj) || ProjectUtil.isJavaEE5orHigher(prj))) {
98
                    final MetadataModel<WebservicesMetadata> wsModel = support.getWebservicesMetadataModel();
98
                    final MetadataModel<WebservicesMetadata> wsModel = support.getWebservicesMetadataModel();
99
                    try {
99
                    try {
100
                        wsModel.runReadActionWhenReady(new MetadataModelAction<WebservicesMetadata, Void>() {
100
                        wsModel.runReadActionWhenReady(new MetadataModelAction<WebservicesMetadata, Void>() {
Lines 140-146 Link Here
140
140
141
            protected void projectClosed() {
141
            protected void projectClosed() {
142
                JAXWSSupport support = JAXWSSupport.getJAXWSSupport(prj.getProjectDirectory());
142
                JAXWSSupport support = JAXWSSupport.getJAXWSSupport(prj.getProjectDirectory());
143
                if (support != null && (JaxWsUtils.isEjbJavaEE5orHigher(prj) || Util.isJavaEE5orHigher(prj))) {
143
                if (support != null && (JaxWsUtils.isEjbJavaEE5orHigher(prj) || ProjectUtil.isJavaEE5orHigher(prj))) {
144
                    final MetadataModel<WebservicesMetadata> wsModel = support.getWebservicesMetadataModel();
144
                    final MetadataModel<WebservicesMetadata> wsModel = support.getWebservicesMetadataModel();
145
                    try {
145
                    try {
146
                        wsModel.runReadActionWhenReady(new MetadataModelAction<WebservicesMetadata, Void>() {
146
                        wsModel.runReadActionWhenReady(new MetadataModelAction<WebservicesMetadata, Void>() {
(-)a/websvc.jaxrpc/src/org/netbeans/modules/websvc/jaxrpc/actions/JaxRpcInvokeOperationProvider.java (-7 / +3 lines)
Lines 46-65 Link Here
46
46
47
import org.netbeans.api.java.classpath.ClassPath;
47
import org.netbeans.api.java.classpath.ClassPath;
48
import org.netbeans.api.java.project.JavaProjectConstants;
48
import org.netbeans.api.java.project.JavaProjectConstants;
49
import org.netbeans.api.project.FileOwnerQuery;
50
import org.netbeans.api.project.Project;
49
import org.netbeans.api.project.Project;
51
import org.netbeans.api.project.ProjectUtils;
50
import org.netbeans.api.project.ProjectUtils;
52
import org.netbeans.api.project.SourceGroup;
51
import org.netbeans.api.project.SourceGroup;
53
import org.netbeans.modules.j2ee.common.Util;
52
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
54
import org.netbeans.modules.websvc.api.client.WebServicesClientSupport;
53
import org.netbeans.modules.websvc.api.client.WebServicesClientSupport;
55
import org.netbeans.modules.websvc.api.registry.WebServiceMethod;
56
import org.netbeans.modules.websvc.spi.support.InvokeOperationActionProvider;
54
import org.netbeans.modules.websvc.spi.support.InvokeOperationActionProvider;
57
import org.netbeans.modules.websvc.api.support.InvokeOperationCookie;
55
import org.netbeans.modules.websvc.api.support.InvokeOperationCookie;
58
import org.netbeans.modules.websvc.core.JaxWsUtils;
56
import org.netbeans.modules.websvc.core.JaxWsUtils;
59
import org.netbeans.modules.websvc.core.ProjectInfo;
57
import org.netbeans.modules.websvc.core.ProjectInfo;
60
import org.openide.filesystems.FileObject;
58
import org.openide.filesystems.FileObject;
61
import org.openide.loaders.*;
62
import org.openide.nodes.Node;
63
59
64
@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.websvc.spi.support.InvokeOperationActionProvider.class)
60
@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.websvc.spi.support.InvokeOperationActionProvider.class)
65
public class JaxRpcInvokeOperationProvider implements InvokeOperationActionProvider {
61
public class JaxRpcInvokeOperationProvider implements InvokeOperationActionProvider {
Lines 82-90 Link Here
82
        if(projectType == ProjectInfo.JSE_PROJECT_TYPE && !isJAXWSProject(project) && !isJAXRPCProject(project)) return true;
78
        if(projectType == ProjectInfo.JSE_PROJECT_TYPE && !isJAXWSProject(project) && !isJAXRPCProject(project)) return true;
83
        if(projectType == ProjectInfo.JSE_PROJECT_TYPE && isJaxWsLibraryOnClasspath(targetSource) && !isJAXRPCProject(project)) return false;
79
        if(projectType == ProjectInfo.JSE_PROJECT_TYPE && isJaxWsLibraryOnClasspath(targetSource) && !isJAXRPCProject(project)) return false;
84
//        if(projectInfo.isJwsdpSupported())return false;
80
//        if(projectInfo.isJwsdpSupported())return false;
85
        if(Util.isJavaEE5orHigher(project)) return false;
81
        if(ProjectUtil.isJavaEE5orHigher(project)) return false;
86
        if (JaxWsUtils.isEjbJavaEE5orHigher(projectInfo)) return false;
82
        if (JaxWsUtils.isEjbJavaEE5orHigher(projectInfo)) return false;
87
        if (projectType == ProjectInfo.WEB_PROJECT_TYPE && !Util.isJavaEE5orHigher(project) && isJaxWsLibraryOnRuntimeClasspath(targetSource))return false;
83
        if (projectType == ProjectInfo.WEB_PROJECT_TYPE && !ProjectUtil.isJavaEE5orHigher(project) && isJaxWsLibraryOnRuntimeClasspath(targetSource))return false;
88
        return true;
84
        return true;
89
    }
85
    }
90
    
86
    
(-)a/websvc.jaxrpc/src/org/netbeans/modules/websvc/jaxrpc/dev/wizard/JaxRpcHandlerCreatorProvider.java (-2 / +2 lines)
Lines 49-55 Link Here
49
import org.netbeans.api.project.Project;
49
import org.netbeans.api.project.Project;
50
import org.netbeans.api.project.ProjectUtils;
50
import org.netbeans.api.project.ProjectUtils;
51
import org.netbeans.api.project.SourceGroup;
51
import org.netbeans.api.project.SourceGroup;
52
import org.netbeans.modules.j2ee.common.Util;
52
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
53
import org.netbeans.modules.websvc.core.HandlerCreator;
53
import org.netbeans.modules.websvc.core.HandlerCreator;
54
import org.netbeans.modules.websvc.core.HandlerCreatorProvider;
54
import org.netbeans.modules.websvc.core.HandlerCreatorProvider;
55
import org.netbeans.modules.websvc.core.ProjectInfo;
55
import org.netbeans.modules.websvc.core.ProjectInfo;
Lines 74-80 Link Here
74
        ProjectInfo projectInfo = new ProjectInfo(project);
74
        ProjectInfo projectInfo = new ProjectInfo(project);
75
        int projectType = projectInfo.getProjectType();
75
        int projectType = projectInfo.getProjectType();
76
        if ((projectType == ProjectInfo.JSE_PROJECT_TYPE  && wscompileFO != null)
76
        if ((projectType == ProjectInfo.JSE_PROJECT_TYPE  && wscompileFO != null)
77
                || (!Util.isJavaEE5orHigher(project) && (projectType == ProjectInfo.WEB_PROJECT_TYPE 
77
                || (!ProjectUtil.isJavaEE5orHigher(project) && (projectType == ProjectInfo.WEB_PROJECT_TYPE
78
                || projectType == ProjectInfo.CAR_PROJECT_TYPE || projectType == ProjectInfo.EJB_PROJECT_TYPE))) {
78
                || projectType == ProjectInfo.CAR_PROJECT_TYPE || projectType == ProjectInfo.EJB_PROJECT_TYPE))) {
79
            return new JaxRpcHandlerCreator(project, wiz);
79
            return new JaxRpcHandlerCreator(project, wiz);
80
        }
80
        }
(-)a/websvc.jaxrpc/src/org/netbeans/modules/websvc/jaxrpc/dev/wizard/JaxRpcServiceCreatorProvider.java (-2 / +2 lines)
Lines 45-51 Link Here
45
package org.netbeans.modules.websvc.jaxrpc.dev.wizard;
45
package org.netbeans.modules.websvc.jaxrpc.dev.wizard;
46
46
47
import org.netbeans.api.project.Project;
47
import org.netbeans.api.project.Project;
48
import org.netbeans.modules.j2ee.common.Util;
48
import org.netbeans.modules.j2ee.common.project.ProjectUtil;
49
import org.netbeans.modules.websvc.api.support.ServiceCreator;
49
import org.netbeans.modules.websvc.api.support.ServiceCreator;
50
import org.netbeans.modules.websvc.core.ProjectInfo;
50
import org.netbeans.modules.websvc.core.ProjectInfo;
51
import org.netbeans.modules.websvc.spi.support.ServiceCreatorProvider;
51
import org.netbeans.modules.websvc.spi.support.ServiceCreatorProvider;
Lines 66-72 Link Here
66
        ProjectInfo projectInfo = new ProjectInfo(project);
66
        ProjectInfo projectInfo = new ProjectInfo(project);
67
        int projectType = projectInfo.getProjectType();
67
        int projectType = projectInfo.getProjectType();
68
     
68
     
69
        if (!Util.isJavaEE5orHigher(project) &&
69
        if (!ProjectUtil.isJavaEE5orHigher(project) &&
70
                   (projectType == ProjectInfo.WEB_PROJECT_TYPE || projectType == ProjectInfo.EJB_PROJECT_TYPE)) {
70
                   (projectType == ProjectInfo.WEB_PROJECT_TYPE || projectType == ProjectInfo.EJB_PROJECT_TYPE)) {
71
               if ((!projectInfo.isJsr109Supported() && projectType == ProjectInfo.WEB_PROJECT_TYPE && !projectInfo.isJsr109oldSupported())) {
71
               if ((!projectInfo.isJsr109Supported() && projectType == ProjectInfo.WEB_PROJECT_TYPE && !projectInfo.isJsr109oldSupported())) {
72
                   return null;
72
                   return null;

Return to bug 232242