diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProject.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProject.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProject.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProject.java @@ -78,7 +78,6 @@ import org.netbeans.modules.j2ee.clientproject.wsclient.AppClientProjectWebServicesClientSupport; import org.netbeans.modules.j2ee.clientproject.wsclient.AppClientProjectWebServicesSupportProvider; import org.netbeans.modules.j2ee.common.SharabilityUtility; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.common.project.spi.JavaEEProjectSettingsImplementation; import org.netbeans.modules.java.api.common.classpath.ClassPathModifier; import org.netbeans.modules.java.api.common.classpath.ClassPathSupport; diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java @@ -72,7 +72,6 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; import org.netbeans.api.j2ee.core.Profile; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.common.dd.DDHelper; import org.netbeans.modules.j2ee.common.project.ProjectConstants; import org.netbeans.modules.j2ee.common.project.ui.J2EEProjectProperties; @@ -189,7 +188,7 @@ resource = "org-netbeans-modules-j2ee-clientproject/application-client-5.xml"; // NOI18N } else if (Profile.J2EE_14.equals(j2eeProfile)) { resource = "org-netbeans-modules-j2ee-clientproject/application-client-1.4.xml"; // NOI18N - } else if (Util.isAtLeastJavaEE7Web(j2eeProfile)) { + } else if (j2eeProfile != null && j2eeProfile.isAtLeast(Profile.JAVA_EE_7_WEB)) { resource = "org-netbeans-modules-j2ee-clientproject/application-client-7.xml"; // NOI18N } else { resource = "org-netbeans-modules-j2ee-clientproject/application-client-6.xml"; // NOI18N @@ -402,7 +401,7 @@ resource = "org-netbeans-modules-j2ee-clientproject/application-client-5.xml"; // NOI18N } else if (Profile.J2EE_14.equals(j2eeProfile)) { resource = "org-netbeans-modules-j2ee-clientproject/application-client-1.4.xml"; // NOI18N - } else if (Util.isAtLeastJavaEE7Web(j2eeProfile)) { + } else if (j2eeProfile != null && j2eeProfile.isAtLeast(Profile.JAVA_EE_7_WEB)) { resource = "org-netbeans-modules-j2ee-clientproject/application-client-7.xml"; // NOI18N } else { resource = "org-netbeans-modules-j2ee-clientproject/application-client-6.xml"; // NOI18N diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/classpath/ClassPathSupportCallbackImpl.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/classpath/ClassPathSupportCallbackImpl.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/classpath/ClassPathSupportCallbackImpl.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/classpath/ClassPathSupportCallbackImpl.java @@ -49,7 +49,6 @@ import java.util.List; import java.util.Map; import org.netbeans.modules.j2ee.clientproject.AppClientProjectType; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.common.project.ProjectConstants; import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.java.api.common.classpath.ClassPathSupport; diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/Util.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/Util.java deleted file mode 100644 --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/Util.java +++ /dev/null @@ -1,222 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * Contributor(s): - * - * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun - * Microsystems, Inc. All Rights Reserved. - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - */ - -package org.netbeans.modules.j2ee.common; - -import java.util.logging.Level; -import java.util.logging.Logger; -import org.netbeans.api.annotations.common.NonNull; -import org.netbeans.api.j2ee.core.Profile; -import org.netbeans.api.project.Project; -import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; -import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; - -public class Util { - - private static final Logger LOGGER = Logger.getLogger(Util.class.getName()); - - /** - * Is J2EE version of a given project JavaEE 5 or higher? - * - * @param project J2EE project - * @return true if J2EE version is JavaEE 5 or higher; otherwise false - */ - public static boolean isJavaEE5orHigher(Project project) { - if (project == null) { - return false; - } - J2eeModuleProvider j2eeModuleProvider = project.getLookup().lookup(J2eeModuleProvider.class); - if (j2eeModuleProvider != null) { - J2eeModule j2eeModule = j2eeModuleProvider.getJ2eeModule(); - if (j2eeModule != null) { - J2eeModule.Type type = j2eeModule.getType(); - String strVersion = j2eeModule.getModuleVersion(); - assert strVersion != null : "Module type " + j2eeModule.getType() + " returned null module version"; // NOI18N - try { - double version = Double.parseDouble(strVersion); - if (J2eeModule.Type.EJB.equals(type) && (version > 2.1)) { - return true; - } - if (J2eeModule.Type.WAR.equals(type) && (version > 2.4)) { - return true; - } - if (J2eeModule.Type.CAR.equals(type) && (version > 1.4)) { - return true; - } - } catch (NumberFormatException ex) { - LOGGER.log(Level.INFO, "Module version invalid " + strVersion, ex); - } - } - } - return false; - } - - /** - * Find out if the version of the given profile is at least Java EE 5 or higher. - * - * @param profile profile that we want to compare - * @return true if the version of the given profile is Java EE 5 or higher, - * false otherwise - * @since 1.75 - */ - public static boolean isAtLeastJavaEE5(@NonNull Profile profile) { - return isVersionEqualOrHigher(profile, Profile.JAVA_EE_5); - } - - /** - * Find out if the version of the given profile is at least Java EE 6 Web or - * higher. Please be aware that Java EE 6 Web is considered as lower than Java - * EE 6 Full. - * - * @param profile profile that we want to compare - * @return true if the version of the given profile is Java EE 6 Web or - * higher, false otherwise - * @since 1.75 - */ - public static boolean isAtLeastJavaEE6Web(@NonNull Profile profile) { - return isVersionEqualOrHigher(profile, Profile.JAVA_EE_6_WEB); - } - - /** - * Find out if the version of the given profile is at least Java EE 7 Web or - * higher. Please be aware that Java EE 7 Web is considered as lower than Java - * EE 7 Full. - * - * @param profile profile that we want to compare - * @return true if the version of the given profile is Java EE 7 Web or - * higher, false otherwise - * @since 1.79 - */ - public static boolean isAtLeastJavaEE7Web(@NonNull Profile profile) { - return isVersionEqualOrHigher(profile, Profile.JAVA_EE_7_WEB); - } - - /** - * Compares if the first given profile has equal or higher Java EE version - * in comparison to the second profile. - * - * Please be aware of the following rules: - *

- * - * 1) Each Java EE X version is considered as lower than Java EE X+1 version - * (this applies regardless on Web/Full specification and in reality it means - * that even Java EE 6 Full version is considered as lower than Java EE 7 Web) - *

- * - * 2) Each Java EE X Web version is considered as lower than Java EE X Full - *
- * - * @param profileToCompare profile that we want to compare - * @param comparingVersion version which we are comparing with - * @return true if the profile version is equal or higher in - * comparison with the second one, false otherwise - * @since 1.75 - */ - private static boolean isVersionEqualOrHigher( - @NonNull Profile profileToCompare, - @NonNull Profile comparingVersion) { - - int comparisonResult = Profile.UI_COMPARATOR.compare(profileToCompare, comparingVersion); - if (comparisonResult == 0) { - // The same version for both - return true; - - } else { - String profileToCompareVersion = getProfileVersion(profileToCompare); - String comparingProfileVersion = getProfileVersion(comparingVersion); - - // If the canonicalName is the same value we have to differ between Web and Full profile - if (profileToCompareVersion.equals(comparingProfileVersion)) { - return compareWebAndFull(profileToCompare, comparingVersion); - } else { - if (comparisonResult > 0) { - // profileToCompare has lower version than comparingVersion - return false; - } else { - return true; - } - } - } - } - - private static boolean compareWebAndFull( - @NonNull Profile profileToCompare, - @NonNull Profile comparingVersion) { - - boolean isThisFullProfile = isFullProfile(profileToCompare); - boolean isParamFullProfile = isFullProfile(comparingVersion); - - if (isThisFullProfile && isParamFullProfile) { - // Both profiles are Java EE Full - return true; - } - if (!isThisFullProfile && !isParamFullProfile) { - // Both profiles are Java EE Web - return true; - } - if (isThisFullProfile && !isParamFullProfile) { - // profileToCompare is Java EE Full profile and comparingVersion is only Java EEWeb profile - return true; - } - return false; - } - - private static String getProfileVersion(@NonNull Profile profile) { - String profileDetails = profile.toPropertiesString(); - int indexOfDash = profileDetails.indexOf("-"); - if (indexOfDash != -1) { - return profileDetails.substring(0, indexOfDash); - } - return profileDetails; - } - - private static boolean isFullProfile(@NonNull Profile profile) { - final String profileDetails = profile.toPropertiesString(); - if (profileDetails.indexOf("-") == -1) { - return true; - } - return false; - } - -} diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/DDHelper.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/DDHelper.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/DDHelper.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/DDHelper.java @@ -51,7 +51,6 @@ import org.netbeans.api.j2ee.core.Profile; import org.netbeans.api.project.Project; import org.netbeans.modules.j2ee.api.ejbjar.Ear; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; import org.openide.filesystems.FileLock; @@ -277,9 +276,9 @@ template = "ear-1.4.xml"; // NOI18N } else if (Profile.JAVA_EE_5.equals(profile) && forceCreation) { template = "ear-5.xml"; // NOI18N - } else if (Util.isAtLeastJavaEE7Web(profile) && forceCreation) { + } else if (profile != null && profile.isAtLeast(Profile.JAVA_EE_7_WEB) && forceCreation) { template = "ear-7.xml"; // NOI18N - } else if (Util.isAtLeastJavaEE6Web(profile) && forceCreation) { + } else if (profile != null && profile.isAtLeast(Profile.JAVA_EE_6_WEB) && forceCreation) { template = "ear-6.xml"; // NOI18N } diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ArtifactCopyOnSaveSupport.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ArtifactCopyOnSaveSupport.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ArtifactCopyOnSaveSupport.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ArtifactCopyOnSaveSupport.java @@ -60,7 +60,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.zip.ZipEntry; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.java.api.common.classpath.ClassPathSupport; import org.netbeans.modules.j2ee.deployment.devmodules.spi.ArtifactListener; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ProjectUtil.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ProjectUtil.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ProjectUtil.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ProjectUtil.java @@ -44,11 +44,14 @@ import java.io.IOException; import java.util.HashSet; import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; import org.w3c.dom.Element; import org.netbeans.api.j2ee.core.Profile; import org.netbeans.api.project.Project; import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; +import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; import org.netbeans.modules.j2ee.persistence.spi.server.ServerStatusProvider; @@ -59,6 +62,8 @@ public class ProjectUtil { + private static final Logger LOGGER = Logger.getLogger(ProjectUtil.class.getName()); + public static void updateDirsAttributeInCPSItem(org.netbeans.modules.java.api.common.classpath.ClassPathSupport.Item item, Element element) { String dirs = item.getAdditionalProperty(ProjectConstants.DESTINATION_DIRECTORY); @@ -177,4 +182,40 @@ return isValidServerInstance(j2eeModuleProvider); } + /** + * Is J2EE version of a given project JavaEE 5 or higher? + * + * @param project J2EE project + * @return true if J2EE version is JavaEE 5 or higher; otherwise false + */ + public static boolean isJavaEE5orHigher(Project project) { + if (project == null) { + return false; + } + J2eeModuleProvider j2eeModuleProvider = project.getLookup().lookup(J2eeModuleProvider.class); + if (j2eeModuleProvider != null) { + J2eeModule j2eeModule = j2eeModuleProvider.getJ2eeModule(); + if (j2eeModule != null) { + J2eeModule.Type type = j2eeModule.getType(); + String strVersion = j2eeModule.getModuleVersion(); + assert strVersion != null : "Module type " + j2eeModule.getType() + " returned null module version"; + try { + double version = Double.parseDouble(strVersion); + if (J2eeModule.Type.EJB.equals(type) && (version > 2.1)) { + return true; + } + if (J2eeModule.Type.WAR.equals(type) && (version > 2.4)) { + return true; + } + if (J2eeModule.Type.CAR.equals(type) && (version > 1.4)) { + return true; + } + } catch (NumberFormatException ex) { + LOGGER.log(Level.INFO, "Module version invalid " + strVersion, ex); + } + } + } + return false; + } + } diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2EEProjectProperties.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2EEProjectProperties.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2EEProjectProperties.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2EEProjectProperties.java @@ -55,14 +55,11 @@ import org.netbeans.api.j2ee.core.Profile; import org.netbeans.api.project.Project; import org.netbeans.modules.j2ee.common.ClasspathUtil; -import org.netbeans.modules.j2ee.common.Util; -import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.j2ee.deployment.devmodules.api.AntDeploymentHelper; import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; -import org.netbeans.modules.j2ee.deployment.devmodules.api.ServerInstance; import org.netbeans.modules.java.api.common.classpath.ClassPathSupport; import org.netbeans.modules.javaee.specs.support.api.JaxWs; import org.netbeans.modules.websvc.wsstack.api.WSStack; @@ -70,7 +67,6 @@ import org.netbeans.spi.project.support.ant.EditableProperties; import org.openide.filesystems.FileObject; import org.openide.filesystems.FileUtil; -import org.openide.util.Parameters; /** Helper class. Defines constants for properties. Knows the proper diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.java @@ -75,7 +75,6 @@ import org.netbeans.api.java.platform.JavaPlatform; import org.netbeans.api.java.platform.Specification; import org.netbeans.api.project.ant.AntArtifactQuery; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.deployment.devmodules.api.ServerInstance; import org.netbeans.spi.project.support.ant.PropertyUtils; import org.openide.WizardDescriptor; diff --git a/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/UtilTest.java b/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/UtilTest.java deleted file mode 100644 --- a/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/UtilTest.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * Contributor(s): - * - * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun - * Microsystems, Inc. All Rights Reserved. - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - */ - -package org.netbeans.modules.j2ee.common; - -import java.io.File; -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Arrays; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertTrue; -import org.netbeans.api.j2ee.core.Profile; -import org.netbeans.junit.NbTestCase; -import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; -import org.openide.filesystems.FileUtil; - -/** - * - * @author sherold - */ -public class UtilTest extends NbTestCase { - - /** Creates a new instance of UtilTest */ - public UtilTest(String testName) { - super(testName); - } - - public void testIsHigherJavaEEVersionJavaEE5() { - assertFalse(Util.isAtLeastJavaEE5(Profile.J2EE_13)); - assertFalse(Util.isAtLeastJavaEE5(Profile.J2EE_14)); - - assertTrue(Util.isAtLeastJavaEE5(Profile.JAVA_EE_5)); - assertTrue(Util.isAtLeastJavaEE5(Profile.JAVA_EE_6_FULL)); - assertTrue(Util.isAtLeastJavaEE5(Profile.JAVA_EE_6_WEB)); - assertTrue(Util.isAtLeastJavaEE5(Profile.JAVA_EE_7_FULL)); - assertTrue(Util.isAtLeastJavaEE5(Profile.JAVA_EE_7_WEB)); - } - - public void testIsHigherJavaEEVersionJavaEE6full() { - assertFalse(Util.isAtLeastJavaEE6Web(Profile.J2EE_13)); - assertFalse(Util.isAtLeastJavaEE6Web(Profile.J2EE_14)); - assertFalse(Util.isAtLeastJavaEE6Web(Profile.JAVA_EE_5)); - - assertTrue(Util.isAtLeastJavaEE6Web(Profile.JAVA_EE_6_WEB)); - assertTrue(Util.isAtLeastJavaEE6Web(Profile.JAVA_EE_6_FULL)); - assertTrue(Util.isAtLeastJavaEE6Web(Profile.JAVA_EE_7_WEB)); - assertTrue(Util.isAtLeastJavaEE6Web(Profile.JAVA_EE_7_FULL)); - } - -} diff --git a/j2ee.core/src/org/netbeans/api/j2ee/core/Profile.java b/j2ee.core/src/org/netbeans/api/j2ee/core/Profile.java --- a/j2ee.core/src/org/netbeans/api/j2ee/core/Profile.java +++ b/j2ee.core/src/org/netbeans/api/j2ee/core/Profile.java @@ -113,6 +113,19 @@ return propertiesString; } + /** + * Find out if the version of the profile is equal or higher to given profile. + * Note that Java EE Web is considered lower than Java EE Full profile. + * + * @param profile profile to compare against + * @return true if this profile is equal or higher to given one, + * false otherwise + * @since TDB + */ + public boolean isAtLeast(Profile profile) { + return isVersionEqualOrHigher(this, profile); + } + @Override public String toString() { return toPropertiesString(); @@ -142,4 +155,82 @@ return null; } } + + private static String getProfileVersion(@NonNull Profile profile) { + String profileDetails = profile.toPropertiesString(); + int indexOfDash = profileDetails.indexOf("-"); + if (indexOfDash != -1) { + return profileDetails.substring(0, indexOfDash); + } + return profileDetails; + } + + private static boolean compareWebAndFull(@NonNull Profile profileToCompare, @NonNull Profile comparingVersion) { + boolean isThisFullProfile = isFullProfile(profileToCompare); + boolean isParamFullProfile = isFullProfile(comparingVersion); + if (isThisFullProfile && isParamFullProfile) { + // Both profiles are Java EE Full + return true; + } + if (!isThisFullProfile && !isParamFullProfile) { + // Both profiles are Java EE Web + return true; + } + if (isThisFullProfile && !isParamFullProfile) { + // profileToCompare is Java EE Full profile and comparingVersion is only Java EEWeb profile + return true; + } + return false; + } + + private static boolean isFullProfile(@NonNull Profile profile) { + final String profileDetails = profile.toPropertiesString(); + if (profileDetails.indexOf("-") == -1) { + return true; + } + return false; + } + + /** + * Compares if the first given profile has equal or higher Java EE version + * in comparison to the second profile. + * + * Please be aware of the following rules: + *

+ * + * 1) Each Java EE X version is considered as lower than Java EE X+1 version + * (this applies regardless on Web/Full specification and in reality it means + * that even Java EE 6 Full version is considered as lower than Java EE 7 Web) + *

+ * + * 2) Each Java EE X Web version is considered as lower than Java EE X Full + *
+ * + * @param profileToCompare profile that we want to compare + * @param comparingVersion version which we are comparing with + * @return true if the profile version is equal or higher in + * comparison with the second one, false otherwise + * @since TDB + */ + private static boolean isVersionEqualOrHigher(@NonNull Profile profileToCompare, @NonNull Profile comparingVersion) { + int comparisonResult = Profile.UI_COMPARATOR.compare(profileToCompare, comparingVersion); + if (comparisonResult == 0) { + // The same version for both + return true; + } else { + String profileToCompareVersion = getProfileVersion(profileToCompare); + String comparingProfileVersion = getProfileVersion(comparingVersion); + if (profileToCompareVersion.equals(comparingProfileVersion)) { + return compareWebAndFull(profileToCompare, comparingVersion); + } else { + if (comparisonResult > 0) { + // profileToCompare has lower version than comparingVersion + return false; + } else { + return true; + } + } + } + } + } diff --git a/j2ee.core/test/unit/src/org/netbeans/api/j2ee/core/ProfileTest.java b/j2ee.core/test/unit/src/org/netbeans/api/j2ee/core/ProfileTest.java --- a/j2ee.core/test/unit/src/org/netbeans/api/j2ee/core/ProfileTest.java +++ b/j2ee.core/test/unit/src/org/netbeans/api/j2ee/core/ProfileTest.java @@ -64,4 +64,38 @@ assertEquals(Profile.JAVA_EE_6_WEB, Profile.fromPropertiesString("EE_6_WEB")); assertNull(Profile.fromPropertiesString("something")); } + + public void testIsHigherJavaEEVersionJavaEE5() { + assertFalse(Profile.J2EE_13.isAtLeast(Profile.JAVA_EE_5)); + assertFalse(Profile.J2EE_14.isAtLeast(Profile.JAVA_EE_5)); + + assertTrue(Profile.JAVA_EE_5.isAtLeast(Profile.JAVA_EE_5)); + assertTrue(Profile.JAVA_EE_6_FULL.isAtLeast(Profile.JAVA_EE_5)); + assertTrue(Profile.JAVA_EE_6_WEB.isAtLeast(Profile.JAVA_EE_5)); + assertTrue(Profile.JAVA_EE_7_FULL.isAtLeast(Profile.JAVA_EE_5)); + assertTrue(Profile.JAVA_EE_7_WEB.isAtLeast(Profile.JAVA_EE_5)); + } + + public void testIsHigherJavaEEVersionJavaEE6full() { + assertFalse(Profile.J2EE_13.isAtLeast(Profile.JAVA_EE_6_WEB)); + assertFalse(Profile.J2EE_14.isAtLeast(Profile.JAVA_EE_6_WEB)); + assertFalse(Profile.JAVA_EE_5.isAtLeast(Profile.JAVA_EE_6_WEB)); + + assertTrue(Profile.JAVA_EE_6_WEB.isAtLeast(Profile.JAVA_EE_6_WEB)); + assertTrue(Profile.JAVA_EE_6_FULL.isAtLeast(Profile.JAVA_EE_6_WEB)); + assertTrue(Profile.JAVA_EE_7_WEB.isAtLeast(Profile.JAVA_EE_6_WEB)); + assertTrue(Profile.JAVA_EE_7_FULL.isAtLeast(Profile.JAVA_EE_6_WEB)); + } + + public void testIsHigherJavaEEVersionJavaEE7full() { + assertFalse(Profile.J2EE_13.isAtLeast(Profile.JAVA_EE_7_WEB)); + assertFalse(Profile.J2EE_14.isAtLeast(Profile.JAVA_EE_7_WEB)); + assertFalse(Profile.JAVA_EE_5.isAtLeast(Profile.JAVA_EE_7_WEB)); + + assertFalse(Profile.JAVA_EE_6_WEB.isAtLeast(Profile.JAVA_EE_7_WEB)); + assertFalse(Profile.JAVA_EE_6_FULL.isAtLeast(Profile.JAVA_EE_7_WEB)); + assertTrue(Profile.JAVA_EE_7_WEB.isAtLeast(Profile.JAVA_EE_7_WEB)); + assertTrue(Profile.JAVA_EE_7_FULL.isAtLeast(Profile.JAVA_EE_7_WEB)); + } + } diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarMultiViewDataObject.java b/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarMultiViewDataObject.java --- a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarMultiViewDataObject.java +++ b/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarMultiViewDataObject.java @@ -52,7 +52,6 @@ import org.netbeans.api.project.Sources; import org.netbeans.api.xml.cookies.ValidateXMLCookie; import org.netbeans.core.spi.multiview.MultiViewElement; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.dd.api.common.RootInterface; import org.netbeans.modules.j2ee.dd.impl.common.DDUtils; import org.netbeans.modules.j2ee.dd.impl.ejb.EjbJarProxy; @@ -86,6 +85,7 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; +import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider; import org.netbeans.modules.j2ee.dd.api.ejb.Ejb; import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar; @@ -508,7 +508,7 @@ @Override protected String getEditorMimeType() { - if (Util.isJavaEE5orHigher(getProject())){ + if (ProjectUtil.isJavaEE5orHigher(getProject())){ return "text/x-dd-ejbjar-ee5"; } return "text/x-dd-ejbjar"; diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefsTablePanel.java b/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefsTablePanel.java --- a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefsTablePanel.java +++ b/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefsTablePanel.java @@ -46,6 +46,7 @@ import org.netbeans.api.project.FileOwnerQuery; import org.netbeans.api.project.Project; +import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.j2ee.dd.api.common.CommonDDBean; import org.netbeans.modules.j2ee.dd.api.common.EjbRef; import org.netbeans.modules.j2ee.dd.api.common.EjbLocalRef; @@ -75,7 +76,7 @@ this.model=model; this.dObj=dObj; Project project = FileOwnerQuery.getOwner(dObj.getPrimaryFile()); - this.javaEE5 = org.netbeans.modules.j2ee.common.Util.isJavaEE5orHigher(project); + this.javaEE5 = ProjectUtil.isJavaEE5orHigher(project); removeButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectGenerator.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectGenerator.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectGenerator.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectGenerator.java @@ -77,7 +77,6 @@ import org.netbeans.api.java.project.classpath.ProjectClassPathModifier; import org.netbeans.api.project.SourceGroup; import org.netbeans.api.project.libraries.LibraryManager; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.common.dd.DDHelper; import org.netbeans.modules.j2ee.common.project.ProjectConstants; import org.netbeans.modules.j2ee.common.project.ui.DeployOnSaveUtils; diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerJarContent.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerJarContent.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerJarContent.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerJarContent.java @@ -49,8 +49,6 @@ import javax.swing.JPanel; import org.netbeans.api.java.project.JavaProjectConstants; import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; -import org.netbeans.modules.j2ee.common.Util; -import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.j2ee.common.project.ui.UIUtil; import org.netbeans.modules.java.api.common.classpath.ClassPathSupport; import org.netbeans.modules.java.api.common.classpath.ClassPathSupport.Item; diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGenerator.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGenerator.java --- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGenerator.java +++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGenerator.java @@ -62,7 +62,7 @@ import org.netbeans.api.project.Project; import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer; import org.netbeans.modules.j2ee.api.ejbjar.ResourceReference; -import org.netbeans.modules.j2ee.common.Util; +import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel; import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport; import org.netbeans.modules.javaee.injection.api.InjectionTargetQuery; @@ -111,7 +111,7 @@ ServiceLocatorStrategy serviceLocatorStrategy = (serviceLocator == null) ? null : ServiceLocatorStrategy.create(project, fileObject, serviceLocator); EnterpriseReferenceContainer erc = project.getLookup().lookup(EnterpriseReferenceContainer.class); - if (Util.isJavaEE5orHigher(project) && serviceLocatorStrategy == null && + if (ProjectUtil.isJavaEE5orHigher(project) && serviceLocatorStrategy == null && InjectionTargetQuery.isInjectionTarget(fileObject, className)) { boolean isStatic = InjectionTargetQuery.isStaticReferenceRequired(fileObject, className); String fieldName = Utils.makeJavaIdentifierPart(Utils.jndiNameToCamelCase(datasourceReferenceName, true, null)); diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/CallEjbGenerator.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/CallEjbGenerator.java --- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/CallEjbGenerator.java +++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/CallEjbGenerator.java @@ -71,7 +71,7 @@ import org.netbeans.modules.j2ee.api.ejbjar.EjbReference.EjbRefIType; import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer; import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities; -import org.netbeans.modules.j2ee.common.Util; +import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel; import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport; import org.netbeans.modules.javaee.injection.api.InjectionTargetQuery; @@ -146,8 +146,8 @@ Project enterpriseProject = FileOwnerQuery.getOwner(referencingFO); EnterpriseReferenceContainer erc = enterpriseProject.getLookup().lookup(EnterpriseReferenceContainer.class); - boolean enterpriseProjectIsJavaEE5 = Util.isJavaEE5orHigher(enterpriseProject); - boolean nodeProjectIsJavaEE5 = Util.isJavaEE5orHigher(nodeProject); + boolean enterpriseProjectIsJavaEE5 = ProjectUtil.isJavaEE5orHigher(enterpriseProject); + boolean nodeProjectIsJavaEE5 = ProjectUtil.isJavaEE5orHigher(nodeProject); //#157918 ContainerClassPathModifier ccpm = enterpriseProject.getLookup().lookup(ContainerClassPathModifier.class); diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGenerator.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGenerator.java --- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGenerator.java +++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGenerator.java @@ -61,7 +61,6 @@ import org.netbeans.api.java.source.WorkingCopy; import org.netbeans.api.project.FileOwnerQuery; import org.netbeans.api.project.Project; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.core.api.support.java.GenerationUtils; import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination; import org.netbeans.modules.j2ee.dd.api.common.VersionNotSupportedException; @@ -135,7 +134,7 @@ this.profile = profile; this.jmsSupport = jmsSupport; boolean useMappedName = useMappedName(); - if (Util.isAtLeastJavaEE7Web(profile) && jmsSupport.useDestinationLookup()) { + if (profile != null && profile.isAtLeast(Profile.JAVA_EE_7_WEB) && jmsSupport.useDestinationLookup()) { String destination = properties.get(ActivationConfigProperties.DESTINATION_LOOKUP) == null || ((String) properties.get(ActivationConfigProperties.DESTINATION_LOOKUP)).isEmpty() ? messageDestination.getName() : properties.get(ActivationConfigProperties.DESTINATION_LOOKUP); properties.put(DESTINATION_LOOKUP, destination); @@ -331,7 +330,7 @@ private boolean useMappedName() { // JavaEE7 platform should always use portable, compatible way if possible - if (Util.isAtLeastJavaEE7Web(profile) && jmsSupport.useDestinationLookup()) { + if (profile != null && profile.isAtLeast(Profile.JAVA_EE_7_WEB) && jmsSupport.useDestinationLookup()) { return false; } else { return jmsSupport.useMappedName(); diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/AppServerValidationPanel.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/AppServerValidationPanel.java --- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/AppServerValidationPanel.java +++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/AppServerValidationPanel.java @@ -44,7 +44,6 @@ import org.netbeans.api.j2ee.core.Profile; import org.netbeans.api.java.classpath.ClassPath; import org.netbeans.api.project.Project; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.j2ee.core.api.support.wizard.DelegatingWizardDescriptorPanel; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeVisualPanel2.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeVisualPanel2.java --- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeVisualPanel2.java +++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeVisualPanel2.java @@ -42,8 +42,6 @@ package org.netbeans.modules.j2ee.ejbcore.ejb.wizard.jpa.dao; import java.awt.Component; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.io.IOException; import java.util.List; import java.util.logging.Level; @@ -63,7 +61,6 @@ import org.netbeans.api.project.ProjectUtils; import org.netbeans.api.project.SourceGroup; import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.j2ee.core.api.support.SourceGroups; import org.netbeans.modules.j2ee.ejbcore.ejb.wizard.session.SessionEJBWizardPanel; diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbWizard.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbWizard.java --- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbWizard.java +++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbWizard.java @@ -60,7 +60,6 @@ import org.netbeans.api.project.libraries.Library; import org.netbeans.api.project.libraries.LibraryManager; import org.netbeans.modules.j2ee.api.ejbjar.EjbJar; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.common.project.JavaEEProjectSettings; import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.j2ee.core.api.support.SourceGroups; @@ -134,7 +133,7 @@ EjbJar ejbModule = EjbJar.getEjbJar(pkg); Profile profile = ejbModule.getJ2eeProfile(); - boolean isSimplified = Util.isAtLeastJavaEE5(profile); + boolean isSimplified = profile != null && profile.isAtLeast(Profile.JAVA_EE_5); MessageGenerator generator = MessageGenerator.create( profile, Templates.getTargetName(wiz), @@ -201,9 +200,9 @@ private Profile getTargetFullProfile() { Profile profile = JavaEEProjectSettings.getProfile(Templates.getProject(wiz)); if (profile != null) { - if (Util.isAtLeastJavaEE7Web(profile)) { + if (profile.isAtLeast(Profile.JAVA_EE_7_WEB)) { return Profile.JAVA_EE_7_FULL; - } else if (Util.isAtLeastJavaEE6Web(profile)) { + } else if (profile.isAtLeast(Profile.JAVA_EE_6_WEB)) { return Profile.JAVA_EE_6_FULL; } else { LOG.severe("Unknown JavaEE web profile."); diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/CallEjbDialog.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/CallEjbDialog.java --- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/CallEjbDialog.java +++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/CallEjbDialog.java @@ -67,7 +67,7 @@ import org.openide.util.NbBundle; import org.netbeans.modules.j2ee.ejbcore.Utils; import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer; -import org.netbeans.modules.j2ee.common.Util; +import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.j2ee.ejbcore.util._RetoucheUtil; import org.netbeans.modules.j2ee.ejbcore.api.codegeneration.CallEjbGenerator; import org.openide.DialogDisplayer; @@ -107,7 +107,7 @@ Node root = new AbstractNode(children); root.setDisplayName(NbBundle.getMessage(CallEjbDialog.class, "LBL_EJBModules")); EnterpriseReferenceContainer erc = enterpriseProject.getLookup().lookup(EnterpriseReferenceContainer.class); - boolean isJavaEE5orHigher = Util.isJavaEE5orHigher(enterpriseProject); + boolean isJavaEE5orHigher = ProjectUtil.isJavaEE5orHigher(enterpriseProject); final CallEjbPanel panel = new CallEjbPanel(referencingFO, root, isJavaEE5orHigher ? null : erc.getServiceLocatorName(), referencingClassName); if (isJavaEE5orHigher) { panel.disableServiceLocator(); diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/CallEjbPanel.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/CallEjbPanel.java --- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/CallEjbPanel.java +++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/CallEjbPanel.java @@ -74,7 +74,7 @@ import org.netbeans.api.project.ant.AntArtifactQuery; import org.netbeans.modules.j2ee.api.ejbjar.EjbReference; import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities; -import org.netbeans.modules.j2ee.common.Util; +import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.j2ee.dd.api.common.EjbLocalRef; import org.netbeans.modules.j2ee.dd.api.common.EjbRef; import org.netbeans.modules.j2ee.dd.api.ejb.Ejb; @@ -498,7 +498,7 @@ } }); if (remote) { - if (isTargetJavaSE() && Util.isJavaEE5orHigher(project)){ + if (isTargetJavaSE() && ProjectUtil.isJavaEE5orHigher(project)){ name = elementHandle.getQualifiedName(); } else if (isTargetJavaSE()){ name = names.get(EntityAndSession.HOME); @@ -614,7 +614,7 @@ } } // see #75876 - if (!Util.isJavaEE5orHigher(project) && Util.isJavaEE5orHigher(nodeProject)){ + if (!ProjectUtil.isJavaEE5orHigher(project) && ProjectUtil.isJavaEE5orHigher(nodeProject)){ statusLine.setWarningMessage(NbBundle.getMessage(CallEjbPanel.class, "LBL_JEESpecificationLevelsDiffer")); //NOI18N } diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/DataSourceReferencePanel.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/DataSourceReferencePanel.java --- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/DataSourceReferencePanel.java +++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/DataSourceReferencePanel.java @@ -59,7 +59,6 @@ import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import org.netbeans.modules.j2ee.common.DatasourceUIHelper; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.j2ee.core.api.support.progress.ProgressSupport; import org.netbeans.modules.j2ee.core.api.support.progress.ProgressSupport.Action; diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendEmailCodeGenerator.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendEmailCodeGenerator.java --- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendEmailCodeGenerator.java +++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendEmailCodeGenerator.java @@ -65,7 +65,7 @@ import org.netbeans.api.project.Project; import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer; import org.netbeans.modules.j2ee.api.ejbjar.ResourceReference; -import org.netbeans.modules.j2ee.common.Util; +import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel; import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport; import org.netbeans.modules.javaee.injection.api.InjectionTargetQuery; @@ -82,7 +82,6 @@ import org.openide.NotificationLineSupport; import org.openide.NotifyDescriptor; import org.openide.filesystems.FileObject; -import org.openide.util.Exceptions; import org.openide.util.HelpCtx; import org.openide.util.Lookup; import org.openide.util.NbBundle; @@ -189,7 +188,7 @@ } String jndiName = null; - if (!Util.isJavaEE5orHigher(enterpriseProject) || !InjectionTargetQuery.isInjectionTarget(srcFile, beanClass.getQualifiedName().toString())) { + if (!ProjectUtil.isJavaEE5orHigher(enterpriseProject) || !InjectionTargetQuery.isInjectionTarget(srcFile, beanClass.getQualifiedName().toString())) { jndiName = generateJNDILookup(sendEmailPanel.getJndiName(), erc, srcFile, beanClass.getQualifiedName().toString()); } diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendJMSMessageCodeGenerator.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendJMSMessageCodeGenerator.java --- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendJMSMessageCodeGenerator.java +++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendJMSMessageCodeGenerator.java @@ -44,7 +44,6 @@ package org.netbeans.modules.j2ee.ejbcore.ui.logicalview.entries; -import com.sun.source.tree.Tree; import com.sun.source.util.TreePath; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -64,7 +63,7 @@ import org.netbeans.api.project.FileOwnerQuery; import org.netbeans.api.project.Project; import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer; -import org.netbeans.modules.j2ee.common.Util; +import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar; import org.netbeans.modules.j2ee.dd.api.web.WebApp; import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination; @@ -263,7 +262,7 @@ } String j2eeVersion = j2eeModuleProvider.getJ2eeModule().getModuleVersion(); J2eeModule.Type moduleType = j2eeModuleProvider.getJ2eeModule().getType(); - if (Util.isJavaEE5orHigher(project) || + if (ProjectUtil.isJavaEE5orHigher(project) || (J2eeModule.Type.WAR.equals(moduleType) && WebApp.VERSION_2_4.equals(j2eeVersion)) || (J2eeModule.Type.EJB.equals(moduleType) && EjbJar.VERSION_2_1.equals(j2eeVersion))) { return ElementKind.INTERFACE != typeElement.getKind(); diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendJmsMessagePanel.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendJmsMessagePanel.java --- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendJmsMessagePanel.java +++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendJmsMessagePanel.java @@ -54,11 +54,11 @@ import javax.swing.ComboBoxModel; import javax.swing.DefaultComboBoxModel; import javax.swing.event.*; +import org.netbeans.api.j2ee.core.Profile; import org.netbeans.api.java.source.ClasspathInfo; import org.netbeans.api.java.source.SourceUtils; import org.netbeans.api.project.Project; import org.netbeans.modules.j2ee.api.ejbjar.EjbJar; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination; import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination.Type; @@ -282,7 +282,7 @@ private void setupProjectDestinationsOption() { if (J2eeModule.Type.EJB.equals(provider.getJ2eeModule().getType()) - || (ejbJar != null && Util.isAtLeastJavaEE6Web(ejbJar.getJ2eeProfile()))) { + || (ejbJar != null && ejbJar.getJ2eeProfile() != null && ejbJar.getJ2eeProfile().isAtLeast(Profile.JAVA_EE_6_WEB))) { projectDestinationsRadio.setEnabled(true); setupAddButton(); projectDestinationsRadio.setSelected(true); @@ -314,7 +314,7 @@ private void handleConnectionFactory() { MessageDestination messageDestination = getDestination(); - if (Util.isAtLeastJavaEE7Web(ejbJar.getJ2eeProfile())) { + if (ejbJar.getJ2eeProfile() != null && ejbJar.getJ2eeProfile().isAtLeast(Profile.JAVA_EE_7_WEB)) { // JavaEE7 specification - section EE.5.21.1 // set the factory by default - message destination can be custom connectionFactoryTextField.setText(DEFAULT_JMS_CONNECTION_FACTORY); diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProject.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProject.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProject.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProject.java @@ -85,7 +85,6 @@ import org.netbeans.modules.j2ee.ejbjarproject.ui.customizer.EjbJarProjectProperties; import org.netbeans.api.project.SourceGroup; import org.netbeans.modules.j2ee.common.SharabilityUtility; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.common.project.ArtifactCopyOnSaveSupport; import org.netbeans.modules.java.api.common.classpath.ClassPathModifier; import org.netbeans.modules.java.api.common.classpath.ClassPathSupport; diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProvider.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProvider.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProvider.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProvider.java @@ -56,7 +56,6 @@ import org.netbeans.api.project.SourceGroup; import org.netbeans.api.project.Sources; import org.netbeans.api.project.ui.OpenProjects; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.java.api.common.classpath.ClassPathProviderImpl; import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata; import org.netbeans.modules.j2ee.dd.api.webservices.WebservicesMetadata; @@ -315,9 +314,9 @@ platformVersion = Profile.JAVA_EE_7_FULL; } - if (Util.isAtLeastJavaEE7Web(platformVersion)) { + if (platformVersion.isAtLeast(Profile.JAVA_EE_7_WEB)) { return EjbJar.VERSION_3_2; - } else if (Util.isAtLeastJavaEE6Web(platformVersion)) { + } else if (platformVersion.isAtLeast(Profile.JAVA_EE_6_WEB)) { return EjbJar.VERSION_3_1; } else if (Profile.JAVA_EE_5.equals(platformVersion)) { return EjbJar.VERSION_3_0; diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectGenerator.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectGenerator.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectGenerator.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectGenerator.java @@ -67,7 +67,6 @@ import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider; import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar; import org.netbeans.api.j2ee.core.Profile; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.common.dd.DDHelper; import org.netbeans.modules.j2ee.common.project.ProjectConstants; import org.netbeans.modules.j2ee.common.project.ui.DeployOnSaveUtils; diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/classpath/ClassPathSupportCallbackImpl.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/classpath/ClassPathSupportCallbackImpl.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/classpath/ClassPathSupportCallbackImpl.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/classpath/ClassPathSupportCallbackImpl.java @@ -48,7 +48,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.common.project.ProjectConstants; import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.java.api.common.classpath.ClassPathSupport; diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/CustomizerLibraries.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/CustomizerLibraries.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/CustomizerLibraries.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/CustomizerLibraries.java @@ -60,8 +60,6 @@ import org.netbeans.api.java.platform.JavaPlatform; import org.netbeans.api.java.platform.PlatformsCustomizer; import org.netbeans.api.project.libraries.LibraryManager; -import org.netbeans.modules.j2ee.common.Util; -import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.j2ee.common.project.ui.UIUtil; import org.netbeans.modules.java.api.common.classpath.ClassPathSupport; import org.netbeans.modules.java.api.common.project.ui.ClassPathUiSupport; diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/CustomizerSources.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/CustomizerSources.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/CustomizerSources.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/CustomizerSources.java @@ -58,8 +58,6 @@ import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; import org.netbeans.api.queries.CollocationQuery; -import org.netbeans.modules.j2ee.common.Util; -import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.j2ee.common.project.ui.UIUtil; import org.openide.filesystems.FileObject; import org.openide.filesystems.FileUtil; diff --git a/j2ee.ejbverification/src/org/netbeans/modules/j2ee/ejbverification/rules/AnnotationPostContruct.java b/j2ee.ejbverification/src/org/netbeans/modules/j2ee/ejbverification/rules/AnnotationPostContruct.java --- a/j2ee.ejbverification/src/org/netbeans/modules/j2ee/ejbverification/rules/AnnotationPostContruct.java +++ b/j2ee.ejbverification/src/org/netbeans/modules/j2ee/ejbverification/rules/AnnotationPostContruct.java @@ -51,7 +51,6 @@ import javax.lang.model.util.ElementFilter; import org.netbeans.api.j2ee.core.Profile; import org.netbeans.modules.j2ee.api.ejbjar.EjbJar; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.dd.api.ejb.Session; import org.netbeans.modules.j2ee.ejbverification.EJBAPIAnnotations; import org.netbeans.modules.j2ee.ejbverification.EJBProblemContext; @@ -93,7 +92,7 @@ Profile profile = ejbModule.getJ2eeProfile(); // not EE6+ project - if (profile == null || !Util.isAtLeastJavaEE6Web(profile)) { + if (profile == null || !profile.isAtLeast(Profile.JAVA_EE_6_WEB)) { return Collections.emptyList(); } diff --git a/j2ee.ejbverification/src/org/netbeans/modules/j2ee/ejbverification/rules/BusinessMethodExposed.java b/j2ee.ejbverification/src/org/netbeans/modules/j2ee/ejbverification/rules/BusinessMethodExposed.java --- a/j2ee.ejbverification/src/org/netbeans/modules/j2ee/ejbverification/rules/BusinessMethodExposed.java +++ b/j2ee.ejbverification/src/org/netbeans/modules/j2ee/ejbverification/rules/BusinessMethodExposed.java @@ -61,7 +61,6 @@ import org.netbeans.api.java.source.CompilationInfo; import org.netbeans.api.java.source.ElementHandle; import org.netbeans.modules.j2ee.api.ejbjar.EjbJar; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata; import org.netbeans.modules.j2ee.dd.api.ejb.Session; import org.netbeans.modules.j2ee.ejbverification.EJBAPIAnnotations; @@ -112,7 +111,7 @@ EjbJar ejbModule = ctx.getEjbModule(); Profile profile = ejbModule.getJ2eeProfile(); - if (profile != null && Util.isAtLeastJavaEE6Web(profile)) { + if (profile != null && profile.isAtLeast(Profile.JAVA_EE_6_WEB)) { final int[] intfCount = new int[1]; try { ctx.getEjbModule().getMetadataModel().runReadAction(new MetadataModelAction() { diff --git a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/JPAStuffImpl.java b/maven.j2ee/src/org/netbeans/modules/maven/j2ee/JPAStuffImpl.java --- a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/JPAStuffImpl.java +++ b/maven.j2ee/src/org/netbeans/modules/maven/j2ee/JPAStuffImpl.java @@ -52,7 +52,6 @@ import org.netbeans.modules.maven.j2ee.ejb.*; import org.netbeans.api.project.Project; import org.netbeans.modules.j2ee.common.DatasourceUIHelper; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException; import org.netbeans.modules.j2ee.deployment.common.api.Datasource; diff --git a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/web/AdditionalWebProvider.java b/maven.j2ee/src/org/netbeans/modules/maven/j2ee/web/AdditionalWebProvider.java --- a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/web/AdditionalWebProvider.java +++ b/maven.j2ee/src/org/netbeans/modules/maven/j2ee/web/AdditionalWebProvider.java @@ -44,7 +44,6 @@ import org.netbeans.api.j2ee.core.Profile; import org.netbeans.api.project.Project; import org.netbeans.modules.j2ee.api.ejbjar.EjbJar; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.spi.ejbjar.EjbJarFactory; import org.netbeans.modules.j2ee.spi.ejbjar.EjbJarProvider; import org.netbeans.modules.j2ee.spi.ejbjar.EjbJarsInProject; @@ -80,7 +79,7 @@ Profile profile = moduleProvider.getModuleImpl().getJ2eeProfile(); - boolean javaEE6profile = Util.isAtLeastJavaEE6Web(profile); + boolean javaEE6profile = profile != null && profile.isAtLeast(Profile.JAVA_EE_6_WEB); boolean webSupported = MavenProjectSupport.isWebSupported(project, packaging); if (javaEE6profile && webSupported) { diff --git a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/web/WebModuleImpl.java b/maven.j2ee/src/org/netbeans/modules/maven/j2ee/web/WebModuleImpl.java --- a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/web/WebModuleImpl.java +++ b/maven.j2ee/src/org/netbeans/modules/maven/j2ee/web/WebModuleImpl.java @@ -50,7 +50,6 @@ import org.netbeans.api.j2ee.core.Profile; import org.netbeans.api.java.classpath.ClassPath; import org.netbeans.api.project.Project; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.dd.api.web.DDProvider; import org.netbeans.modules.j2ee.dd.api.web.WebApp; import org.netbeans.modules.j2ee.dd.api.web.WebAppMetadata; @@ -270,7 +269,7 @@ // #170528the javaee6 level might not have a descriptor, // but I still keep the check for older versions, as it was known to fail without one // in older versions it probably means the web.xml file is generated.. - if(getDeploymentDescriptor() != null || Util.isAtLeastJavaEE6Web(getJ2eeProfile())) { + if(getDeploymentDescriptor() != null || (getJ2eeProfile() != null && getJ2eeProfile().isAtLeast(Profile.JAVA_EE_6_WEB))) { try { String path = provider.getConfigSupport().getWebContextRoot(); if (path != null) { @@ -288,7 +287,7 @@ // #170528 the javaee6 level might not have a descriptor, // but I still keep the check for older versions, as it was known to fail without one // in older versions it probably means the web.xml file is generated.. - if (getDeploymentDescriptor() != null|| Util.isAtLeastJavaEE6Web(getJ2eeProfile())) { + if (getDeploymentDescriptor() != null|| (getJ2eeProfile() != null && getJ2eeProfile().isAtLeast(Profile.JAVA_EE_6_WEB))) { try { provider.getConfigSupport().setWebContextRoot(newPath); } diff --git a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/web/WebRecoPrivTemplates.java b/maven.j2ee/src/org/netbeans/modules/maven/j2ee/web/WebRecoPrivTemplates.java --- a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/web/WebRecoPrivTemplates.java +++ b/maven.j2ee/src/org/netbeans/modules/maven/j2ee/web/WebRecoPrivTemplates.java @@ -46,7 +46,6 @@ import org.netbeans.api.j2ee.core.Profile; import org.netbeans.api.project.Project; import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.maven.api.NbMavenProject; import org.netbeans.modules.web.api.webmodule.WebModule; @@ -168,7 +167,7 @@ if (Profile.JAVA_EE_5.equals(p)) { return WEB_TYPES_5; } - if (Util.isAtLeastJavaEE6Web(p)) { + if (p != null && p.isAtLeast(Profile.JAVA_EE_6_WEB)) { ArrayList toRet = new ArrayList(Arrays.asList(WEB_TYPES_6)); J2eeProjectCapabilities cap = J2eeProjectCapabilities.forProject(project); if (cap != null) { @@ -194,7 +193,7 @@ if (Profile.JAVA_EE_5.equals(p)) { return WEB_PRIVILEGED_NAMES_5; } - if (Util.isAtLeastJavaEE6Web(p)) { + if (p != null && p.isAtLeast(Profile.JAVA_EE_6_WEB)) { ArrayList toRet = new ArrayList(Arrays.asList(WEB_PRIVILEGED_NAMES_6)); J2eeProjectCapabilities cap = J2eeProjectCapabilities.forProject(project); if (cap != null) { diff --git a/tomcat5/src/org/netbeans/modules/tomcat5/util/TomcatProperties.java b/tomcat5/src/org/netbeans/modules/tomcat5/util/TomcatProperties.java --- a/tomcat5/src/org/netbeans/modules/tomcat5/util/TomcatProperties.java +++ b/tomcat5/src/org/netbeans/modules/tomcat5/util/TomcatProperties.java @@ -61,7 +61,6 @@ import org.netbeans.api.java.platform.JavaPlatform; import org.netbeans.api.java.platform.JavaPlatformManager; import org.netbeans.api.java.platform.Specification; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties; import org.netbeans.modules.tomcat5.TomcatFactory; @@ -73,7 +72,6 @@ import org.openide.filesystems.FileUtil; import org.openide.modules.InstalledFileLocator; import org.openide.util.EditableProperties; -import org.openide.util.Exceptions; import org.openide.util.NbBundle; import org.openide.util.Utilities; /** diff --git a/web.core/src/org/netbeans/modules/web/wizards/PageIteratorValidation.java b/web.core/src/org/netbeans/modules/web/wizards/PageIteratorValidation.java --- a/web.core/src/org/netbeans/modules/web/wizards/PageIteratorValidation.java +++ b/web.core/src/org/netbeans/modules/web/wizards/PageIteratorValidation.java @@ -42,7 +42,6 @@ package org.netbeans.modules.web.wizards; import org.netbeans.api.project.Project; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.core.api.support.wizard.DelegatingWizardDescriptorPanel; import org.netbeans.modules.web.api.webmodule.WebModule; import org.openide.WizardDescriptor; diff --git a/web.core/src/org/netbeans/modules/web/wizards/Utilities.java b/web.core/src/org/netbeans/modules/web/wizards/Utilities.java --- a/web.core/src/org/netbeans/modules/web/wizards/Utilities.java +++ b/web.core/src/org/netbeans/modules/web/wizards/Utilities.java @@ -46,7 +46,6 @@ import org.netbeans.api.project.Project; import org.netbeans.api.j2ee.core.Profile; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.web.api.webmodule.WebModule; import org.netbeans.spi.project.ui.templates.support.Templates; import org.openide.filesystems.FileObject; @@ -173,7 +172,7 @@ WebModule wm = WebModule.getWebModule(project.getProjectDirectory()); if (wm != null) { Profile profile = wm.getJ2eeProfile(); - return Util.isAtLeastJavaEE6Web(profile); + return profile != null && profile.isAtLeast(Profile.JAVA_EE_6_WEB); } return false; } diff --git a/web.jsf.richfaces/src/org/netbeans/modules/web/jsf/richfaces/Richfaces4Customizer.java b/web.jsf.richfaces/src/org/netbeans/modules/web/jsf/richfaces/Richfaces4Customizer.java --- a/web.jsf.richfaces/src/org/netbeans/modules/web/jsf/richfaces/Richfaces4Customizer.java +++ b/web.jsf.richfaces/src/org/netbeans/modules/web/jsf/richfaces/Richfaces4Customizer.java @@ -57,7 +57,6 @@ import org.netbeans.api.project.libraries.Library; import org.netbeans.api.project.libraries.LibraryManager; import org.netbeans.modules.j2ee.common.ClasspathUtil; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.web.jsf.richfaces.ui.Richfaces4CustomizerPanelVisual; import org.netbeans.modules.web.jsf.spi.components.JsfComponentCustomizer; import org.openide.util.ChangeSupport; diff --git a/web.jsf/src/org/netbeans/modules/web/jsf/JSFFrameworkProvider.java b/web.jsf/src/org/netbeans/modules/web/jsf/JSFFrameworkProvider.java --- a/web.jsf/src/org/netbeans/modules/web/jsf/JSFFrameworkProvider.java +++ b/web.jsf/src/org/netbeans/modules/web/jsf/JSFFrameworkProvider.java @@ -83,7 +83,6 @@ import org.netbeans.api.project.libraries.LibraryManager; import org.netbeans.api.queries.FileEncodingQuery; import org.netbeans.modules.j2ee.common.ClasspathUtil; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.common.dd.DDHelper; import org.netbeans.modules.j2ee.common.ui.BrokenServerLibrarySupport; import org.netbeans.modules.j2ee.dd.api.common.InitParam; @@ -587,7 +586,7 @@ String facesConfigTemplate = JSFCatalog.RES_FACES_CONFIG_DEFAULT; if (ddRoot != null) { Profile profile = webModule.getJ2eeProfile(); - if (Util.isAtLeastJavaEE5(profile) && jsfVersion != null) { + if (profile != null && profile.isAtLeast(Profile.JAVA_EE_5) && jsfVersion != null) { if (jsfVersion.isAtLeast(JSFVersion.JSF_2_2)) { facesConfigTemplate = JSFCatalog.RES_FACES_CONFIG_2_2; } else if (jsfVersion.isAtLeast(JSFVersion.JSF_2_1)) { @@ -598,7 +597,7 @@ facesConfigTemplate = JSFCatalog.RES_FACES_CONFIG_1_2; } } - if (!Util.isAtLeastJavaEE6Web(profile) + if (profile != null && !profile.isAtLeast(Profile.JAVA_EE_6_WEB) && (jsfVersion == null || !jsfVersion.isAtLeast(JSFVersion.JSF_2_0))) { createFacesConfig = true; } diff --git a/web.jsf/src/org/netbeans/modules/web/jsf/wizards/FacesConfigIterator.java b/web.jsf/src/org/netbeans/modules/web/jsf/wizards/FacesConfigIterator.java --- a/web.jsf/src/org/netbeans/modules/web/jsf/wizards/FacesConfigIterator.java +++ b/web.jsf/src/org/netbeans/modules/web/jsf/wizards/FacesConfigIterator.java @@ -58,9 +58,6 @@ import org.netbeans.api.project.ProjectUtils; import org.netbeans.api.project.SourceGroup; import org.netbeans.api.project.Sources; -import org.netbeans.api.project.libraries.Library; -import org.netbeans.api.project.libraries.LibraryManager; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.j2ee.core.api.support.classpath.ContainerClassPathModifier; import org.netbeans.modules.j2ee.dd.api.common.InitParam; diff --git a/web.jsf/src/org/netbeans/modules/web/jsf/wizards/JSFConfigurationPanelVisual.java b/web.jsf/src/org/netbeans/modules/web/jsf/wizards/JSFConfigurationPanelVisual.java --- a/web.jsf/src/org/netbeans/modules/web/jsf/wizards/JSFConfigurationPanelVisual.java +++ b/web.jsf/src/org/netbeans/modules/web/jsf/wizards/JSFConfigurationPanelVisual.java @@ -101,7 +101,6 @@ import org.netbeans.api.project.libraries.Library; import org.netbeans.api.project.libraries.LibraryManager; import org.netbeans.modules.j2ee.common.ClasspathUtil; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException; import org.netbeans.modules.j2ee.deployment.common.api.J2eeLibraryTypeProvider; import org.netbeans.modules.j2ee.deployment.common.api.Version; @@ -1829,7 +1828,7 @@ setServerLibraryModel(serverJsfLibraries); if (serverJsfLibraries.isEmpty()) { Library preferredLibrary; - if (Util.isAtLeastJavaEE5(getProfile())) { + if (getProfile() != null && getProfile().isAtLeast(Profile.JAVA_EE_5)) { preferredLibrary = LibraryManager.getDefault().getLibrary(JSFUtils.DEFAULT_JSF_2_0_NAME); } else { preferredLibrary = LibraryManager.getDefault().getLibrary(JSFUtils.DEFAULT_JSF_1_2_NAME); diff --git a/web.jsf/src/org/netbeans/modules/web/jsf/wizards/JSFValidationPanel.java b/web.jsf/src/org/netbeans/modules/web/jsf/wizards/JSFValidationPanel.java --- a/web.jsf/src/org/netbeans/modules/web/jsf/wizards/JSFValidationPanel.java +++ b/web.jsf/src/org/netbeans/modules/web/jsf/wizards/JSFValidationPanel.java @@ -43,7 +43,6 @@ package org.netbeans.modules.web.jsf.wizards; import org.netbeans.api.project.Project; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.j2ee.core.api.support.wizard.DelegatingWizardDescriptorPanel; import org.openide.WizardDescriptor; diff --git a/web.jsf/src/org/netbeans/modules/web/jsf/wizards/ManagedBeanPanel.java b/web.jsf/src/org/netbeans/modules/web/jsf/wizards/ManagedBeanPanel.java --- a/web.jsf/src/org/netbeans/modules/web/jsf/wizards/ManagedBeanPanel.java +++ b/web.jsf/src/org/netbeans/modules/web/jsf/wizards/ManagedBeanPanel.java @@ -53,7 +53,6 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import org.netbeans.api.project.Project; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.openide.WizardDescriptor; diff --git a/web.jsf/src/org/netbeans/modules/web/jsf/wizards/ManagedBeanPanelVisual.java b/web.jsf/src/org/netbeans/modules/web/jsf/wizards/ManagedBeanPanelVisual.java --- a/web.jsf/src/org/netbeans/modules/web/jsf/wizards/ManagedBeanPanelVisual.java +++ b/web.jsf/src/org/netbeans/modules/web/jsf/wizards/ManagedBeanPanelVisual.java @@ -58,10 +58,8 @@ import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectUtils; import org.netbeans.api.project.SourceGroup; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.web.api.webmodule.WebModule; import org.netbeans.modules.web.jsf.JSFConfigUtilities; -//import org.netbeans.modules.web.struts.StrutsConfigUtilities; import org.netbeans.modules.web.jsf.JSFUtils; import org.netbeans.modules.web.jsf.api.ConfigurationUtils; import org.netbeans.modules.web.jsf.api.facesmodel.FacesConfig; @@ -110,7 +108,7 @@ jComboBoxConfigFile.setEnabled(false); } else { Profile profile = wm.getJ2eeProfile(); - if (!Util.isAtLeastJavaEE6Web(profile)) { + if (profile != null && !profile.isAtLeast(Profile.JAVA_EE_6_WEB)) { addToFacesConfig = true; addToConfigCheckBox.setSelected(true); setVisibleBeanDescription(true); diff --git a/web.jsf/src/org/netbeans/modules/web/jsf/wizards/PersistenceClientIterator.java b/web.jsf/src/org/netbeans/modules/web/jsf/wizards/PersistenceClientIterator.java --- a/web.jsf/src/org/netbeans/modules/web/jsf/wizards/PersistenceClientIterator.java +++ b/web.jsf/src/org/netbeans/modules/web/jsf/wizards/PersistenceClientIterator.java @@ -59,7 +59,7 @@ import javax.swing.JComponent; import javax.swing.SwingUtilities; import javax.swing.event.ChangeListener; -import javax.swing.text.StyledEditorKit; +import org.netbeans.api.j2ee.core.Profile; import org.netbeans.api.java.classpath.ClassPath; import org.netbeans.api.java.project.JavaProjectConstants; import org.netbeans.api.java.project.classpath.ProjectClassPathModifier; @@ -105,7 +105,6 @@ import org.netbeans.modules.web.api.webmodule.WebProjectConstants; import org.netbeans.modules.web.beans.CdiUtil; import org.netbeans.modules.web.jsf.JSFFrameworkProvider; -import org.netbeans.modules.web.jsf.JSFUtils; import org.netbeans.modules.web.jsf.api.ConfigurationUtils; import org.netbeans.modules.web.jsf.api.facesmodel.Application; import org.netbeans.modules.web.jsf.api.facesmodel.JSFConfigModel; @@ -114,15 +113,10 @@ import org.netbeans.modules.web.jsf.impl.facesmodel.JSFConfigModelUtilities; import org.netbeans.modules.web.jsf.palette.JSFPaletteUtilities; import org.netbeans.modules.web.jsf.palette.items.FromEntityBase; -import org.netbeans.modules.web.jsfapi.api.DefaultLibraryInfo; import org.netbeans.modules.web.spi.webmodule.WebModuleExtender; import org.openide.DialogDisplayer; import org.openide.NotifyDescriptor; -import org.openide.cookies.SaveCookie; import org.openide.filesystems.FileSystem; -import org.openide.loaders.DataObject; -import org.openide.loaders.DataObjectNotFoundException; -import org.openide.util.Exceptions; import org.openide.util.RequestProcessor; /** @@ -748,7 +742,7 @@ WebModule wm = WebModule.getWebModule(project.getProjectDirectory()); JSFVersion jsfVersion = JSFVersion.forWebModule(wm); - if (org.netbeans.modules.j2ee.common.Util.isAtLeastJavaEE6Web(wm.getJ2eeProfile()) + if (wm.getJ2eeProfile() != null && wm.getJ2eeProfile().isAtLeast(Profile.JAVA_EE_6_WEB) || (jsfVersion != null && jsfVersion.isAtLeast(JSFVersion.JSF_2_0))) { wizard.putProperty(JSF2_GENERATOR_PROPERTY, "true"); helpCtx = new HelpCtx("persistence_entity_selection_javaee6"); //NOI18N diff --git a/web.primefaces/src/org/netbeans/modules/web/primefaces/PrimefacesImplementation.java b/web.primefaces/src/org/netbeans/modules/web/primefaces/PrimefacesImplementation.java --- a/web.primefaces/src/org/netbeans/modules/web/primefaces/PrimefacesImplementation.java +++ b/web.primefaces/src/org/netbeans/modules/web/primefaces/PrimefacesImplementation.java @@ -55,7 +55,6 @@ import org.netbeans.api.project.libraries.Library; import org.netbeans.api.project.libraries.LibraryManager; import org.netbeans.modules.j2ee.common.ClasspathUtil; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.web.api.webmodule.WebModule; import org.netbeans.modules.web.jsf.api.JsfComponentUtils; import org.netbeans.modules.web.jsf.api.facesmodel.JSFVersion; diff --git a/web.project/src/org/netbeans/modules/web/project/WebProject.java b/web.project/src/org/netbeans/modules/web/project/WebProject.java --- a/web.project/src/org/netbeans/modules/web/project/WebProject.java +++ b/web.project/src/org/netbeans/modules/web/project/WebProject.java @@ -115,7 +115,6 @@ import org.netbeans.modules.j2ee.common.ClasspathUtil; import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities; import org.netbeans.modules.j2ee.common.SharabilityUtility; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.common.dd.DDHelper; import org.netbeans.modules.j2ee.common.project.ArtifactCopyOnSaveSupport; import org.netbeans.modules.j2ee.common.project.BaseClientSideDevelopmentSupport; diff --git a/web.project/src/org/netbeans/modules/web/project/api/WebProjectUtilities.java b/web.project/src/org/netbeans/modules/web/project/api/WebProjectUtilities.java --- a/web.project/src/org/netbeans/modules/web/project/api/WebProjectUtilities.java +++ b/web.project/src/org/netbeans/modules/web/project/api/WebProjectUtilities.java @@ -54,7 +54,6 @@ import org.netbeans.api.java.project.JavaProjectConstants; import org.netbeans.api.project.ProjectManager; import org.netbeans.api.project.ProjectUtils; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata; import org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans; import org.netbeans.modules.j2ee.dd.api.ejb.Session; @@ -382,7 +381,7 @@ } private static FileObject createWelcomeFile(FileObject webFolder, Profile profile) throws IOException { - FileObject template = profile != null && Util.isAtLeastJavaEE7Web(profile) ? + FileObject template = profile != null && profile.isAtLeast(Profile.JAVA_EE_7_WEB) ? FileUtil.getConfigFile( "Templates/JSP_Servlet/Html.html" ) : FileUtil.getConfigFile( "Templates/JSP_Servlet/JSP.jsp" ); // NOI18N diff --git a/web.project/src/org/netbeans/modules/web/project/classpath/ClassPathSupportCallbackImpl.java b/web.project/src/org/netbeans/modules/web/project/classpath/ClassPathSupportCallbackImpl.java --- a/web.project/src/org/netbeans/modules/web/project/classpath/ClassPathSupportCallbackImpl.java +++ b/web.project/src/org/netbeans/modules/web/project/classpath/ClassPathSupportCallbackImpl.java @@ -47,7 +47,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.common.project.ProjectConstants; import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.java.api.common.classpath.ClassPathSupport.Item; diff --git a/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerLibraries.java b/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerLibraries.java --- a/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerLibraries.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerLibraries.java @@ -53,9 +53,7 @@ import java.util.List; import javax.swing.DefaultListModel; import javax.swing.JPanel; -import javax.swing.ListSelectionModel; import javax.swing.SwingUtilities; -import javax.swing.JTable; import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; import javax.swing.table.JTableHeader; @@ -66,8 +64,6 @@ import org.netbeans.modules.java.api.common.classpath.ClassPathSupport.Item; import org.netbeans.modules.java.api.common.ui.PlatformUiSupport; import org.netbeans.api.project.libraries.LibraryManager; -import org.netbeans.modules.j2ee.common.Util; -import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.java.api.common.classpath.ClassPathSupport; import org.netbeans.modules.java.api.common.project.ui.ClassPathUiSupport; import org.netbeans.modules.java.api.common.project.ui.customizer.EditMediator; diff --git a/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerSources.java b/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerSources.java --- a/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerSources.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerSources.java @@ -58,8 +58,6 @@ import org.openide.util.HelpCtx; import org.openide.util.NbBundle; import org.netbeans.api.queries.CollocationQuery; -import org.netbeans.modules.j2ee.common.Util; -import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.j2ee.common.project.ui.UIUtil; import org.netbeans.modules.java.api.common.project.ui.customizer.SourceRootsUi; import org.netbeans.spi.project.support.ant.PropertyUtils; diff --git a/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerWar.java b/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerWar.java --- a/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerWar.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerWar.java @@ -55,8 +55,6 @@ import javax.swing.table.TableModel; import org.netbeans.api.java.project.JavaProjectConstants; import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; -import org.netbeans.modules.j2ee.common.Util; -import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.j2ee.common.project.ui.MessageUtils; import org.netbeans.modules.j2ee.common.project.ui.UIUtil; import org.netbeans.modules.java.api.common.classpath.ClassPathSupport; @@ -65,7 +63,6 @@ import org.netbeans.modules.java.api.common.project.ui.customizer.EditMediator; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; import org.netbeans.modules.web.project.classpath.ClassPathSupportCallbackImpl; -import org.netbeans.spi.project.support.ant.PropertyUtils; import org.netbeans.spi.project.ui.support.ProjectCustomizer; import org.openide.DialogDisplayer; import org.openide.NotifyDescriptor; diff --git a/websvc.core/src/org/netbeans/modules/websvc/core/WSInjectiontargetQueryImplementation.java b/websvc.core/src/org/netbeans/modules/websvc/core/WSInjectiontargetQueryImplementation.java --- a/websvc.core/src/org/netbeans/modules/websvc/core/WSInjectiontargetQueryImplementation.java +++ b/websvc.core/src/org/netbeans/modules/websvc/core/WSInjectiontargetQueryImplementation.java @@ -50,9 +50,9 @@ import javax.lang.model.element.Name; import org.netbeans.api.project.FileOwnerQuery; import org.netbeans.api.project.Project; -import org.netbeans.modules.j2ee.common.Util; import javax.lang.model.element.TypeElement; import org.netbeans.api.java.source.CompilationController; +import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.javaee.injection.spi.InjectionTargetQueryImplementation; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; import org.openide.filesystems.FileObject; @@ -75,7 +75,7 @@ FileObject fo = controller.getFileObject(); Project project = FileOwnerQuery.getOwner(fo); - if (Util.isJavaEE5orHigher(project) && !isTomcatTargetServer(project) && !(ElementKind.INTERFACE==typeElement.getKind())) { + if (ProjectUtil.isJavaEE5orHigher(project) && !isTomcatTargetServer(project) && !(ElementKind.INTERFACE==typeElement.getKind())) { List annotations = typeElement.getAnnotationMirrors(); boolean found = false; diff --git a/websvc.core/src/org/netbeans/modules/websvc/core/WSStackUtils.java b/websvc.core/src/org/netbeans/modules/websvc/core/WSStackUtils.java --- a/websvc.core/src/org/netbeans/modules/websvc/core/WSStackUtils.java +++ b/websvc.core/src/org/netbeans/modules/websvc/core/WSStackUtils.java @@ -59,7 +59,7 @@ import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectUtils; import org.netbeans.api.project.SourceGroup; -import org.netbeans.modules.j2ee.common.Util; +import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; @@ -195,7 +195,7 @@ private ErrorMessage getWSErrorMessage() { ServerType serverType = getServerType(); - if (Util.isJavaEE5orHigher(project)) { + if (ProjectUtil.isJavaEE5orHigher(project)) { if (ServerType.GLASSFISH_V3 == serverType && !isWsitSupported()) { return new ErrorMessage(ErrorType.INFO, NbBundle.getMessage(WSStackUtils.class, "MSG_NoMetroInstalled"), false); diff --git a/websvc.core/src/org/netbeans/modules/websvc/core/client/wizard/ClientInfo.java b/websvc.core/src/org/netbeans/modules/websvc/core/client/wizard/ClientInfo.java --- a/websvc.core/src/org/netbeans/modules/websvc/core/client/wizard/ClientInfo.java +++ b/websvc.core/src/org/netbeans/modules/websvc/core/client/wizard/ClientInfo.java @@ -105,7 +105,7 @@ import org.netbeans.api.project.ProjectUtils; import org.netbeans.api.project.SourceGroup; import org.netbeans.api.project.Sources; -import org.netbeans.modules.j2ee.common.Util; +import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.spi.java.project.support.ui.PackageView; import org.netbeans.spi.project.ui.templates.support.Templates; @@ -841,7 +841,7 @@ if (projectType > 0) { //jLabelJaxVersion.setEnabled(false); //jComboBoxJaxVersion.setEnabled(false); - if (Util.isJavaEE5orHigher(project) || JaxWsUtils.isEjbJavaEE5orHigher(project)) { + if (ProjectUtil.isJavaEE5orHigher(project) || JaxWsUtils.isEjbJavaEE5orHigher(project)) { jComboBoxJaxVersion.setSelectedItem(ClientWizardProperties.JAX_WS); } else{ @@ -910,7 +910,7 @@ jCbxPackageName.setModel(getPackageModel(project)); String pName = (String) d.getProperty(ClientWizardProperties.WSDL_PACKAGE_NAME); String jaxwsVersion = (String)this.jComboBoxJaxVersion.getSelectedItem(); - if (Util.isJavaEE5orHigher(project) || + if (ProjectUtil.isJavaEE5orHigher(project) || (projectType == 0 && jaxwsVersion.equals(ClientWizardProperties.JAX_WS)) ){ jCbxPackageName.setToolTipText(NbBundle.getMessage(ClientInfo.class, "TOOLTIP_DEFAULT_PACKAGE")); } else{ diff --git a/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/JaxWsHandlerCreatorProvider.java b/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/JaxWsHandlerCreatorProvider.java --- a/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/JaxWsHandlerCreatorProvider.java +++ b/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/JaxWsHandlerCreatorProvider.java @@ -47,7 +47,7 @@ import org.netbeans.modules.websvc.core.ProjectInfo; import org.netbeans.api.java.queries.SourceLevelQuery; import org.netbeans.api.project.Project; -import org.netbeans.modules.j2ee.common.Util; +import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.websvc.core.HandlerCreator; import org.netbeans.modules.websvc.core.HandlerCreatorProvider; import org.openide.WizardDescriptor; @@ -68,7 +68,7 @@ int projectType = projectInfo.getProjectType(); if ((projectType == ProjectInfo.JSE_PROJECT_TYPE && Utils.isSourceLevel16orHigher(project)) || (projectType == ProjectInfo.JSE_PROJECT_TYPE && "1.5".equals(SourceLevelQuery.getSourceLevel(project.getProjectDirectory()))) || //NOI18N - (Util.isJavaEE5orHigher(project) && (projectType == ProjectInfo.WEB_PROJECT_TYPE + (ProjectUtil.isJavaEE5orHigher(project) && (projectType == ProjectInfo.WEB_PROJECT_TYPE || projectType == ProjectInfo.CAR_PROJECT_TYPE || projectType == ProjectInfo.EJB_PROJECT_TYPE)) || //NOI18N (!projectInfo.isJsr109Supported() && projectType == ProjectInfo.WEB_PROJECT_TYPE/* && !projectInfo.isJsr109oldSupported()*/) diff --git a/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/JaxWsServiceCreator.java b/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/JaxWsServiceCreator.java --- a/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/JaxWsServiceCreator.java +++ b/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/JaxWsServiceCreator.java @@ -96,7 +96,7 @@ import org.netbeans.api.project.libraries.Library; import org.netbeans.api.project.libraries.LibraryManager; import org.netbeans.modules.j2ee.api.ejbjar.EjbReference; -import org.netbeans.modules.j2ee.common.Util; +import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.websvc.api.jaxws.project.config.JaxWsModel; import org.netbeans.modules.websvc.api.jaxws.project.config.Service; import org.netbeans.modules.websvc.api.jaxws.project.config.ServiceAlreadyExistsExeption; @@ -239,7 +239,7 @@ handle.finish(); } } else if (serviceType == WizardProperties.ENCAPSULATE_SESSION_BEAN) { - if (/*(projectType == JSE_PROJECT_TYPE && Util.isSourceLevel16orHigher(project)) ||*/(Util.isJavaEE5orHigher(projectInfo.getProject()) && (projectType == ProjectInfo.WEB_PROJECT_TYPE || projectType == ProjectInfo.EJB_PROJECT_TYPE)) //NOI18N + if (/*(projectType == JSE_PROJECT_TYPE && Util.isSourceLevel16orHigher(project)) ||*/(ProjectUtil.isJavaEE5orHigher(projectInfo.getProject()) && (projectType == ProjectInfo.WEB_PROJECT_TYPE || projectType == ProjectInfo.EJB_PROJECT_TYPE)) //NOI18N ) { JAXWSSupport jaxWsSupport = JAXWSSupport.getJAXWSSupport( diff --git a/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/JaxWsServiceCreatorProvider.java b/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/JaxWsServiceCreatorProvider.java --- a/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/JaxWsServiceCreatorProvider.java +++ b/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/JaxWsServiceCreatorProvider.java @@ -47,11 +47,11 @@ import org.netbeans.modules.websvc.api.support.ServiceCreator; import org.netbeans.modules.websvc.core.ProjectInfo; import org.netbeans.api.project.Project; +import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.websvc.core.JaxWsUtils; import org.netbeans.modules.websvc.core.ServerType; import org.netbeans.modules.websvc.spi.support.ServiceCreatorProvider; import org.openide.WizardDescriptor; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.websvc.jaxws.api.JAXWSSupport; /** @@ -69,13 +69,13 @@ ProjectInfo projectInfo = new ProjectInfo(project); int projectType = projectInfo.getProjectType(); if ((projectType == ProjectInfo.JSE_PROJECT_TYPE && Utils.isSourceLevel16orHigher(project)) || - ((Util.isJavaEE5orHigher(project) && + ((ProjectUtil.isJavaEE5orHigher(project) && (projectType == ProjectInfo.WEB_PROJECT_TYPE || projectType == ProjectInfo.EJB_PROJECT_TYPE))) ) { return new JaxWsServiceCreator(projectInfo, wiz, false); } else if (JaxWsUtils.isEjbJavaEE5orHigher(projectInfo)) { return new JaxWsServiceCreator(projectInfo, wiz, false); - } else if (!Util.isJavaEE5orHigher(project) && + } else if (!ProjectUtil.isJavaEE5orHigher(project) && (projectType == ProjectInfo.WEB_PROJECT_TYPE)) { if (!(projectInfo.isJsr109Supported() || projectInfo.isJsr109oldSupported())) { boolean addLibraries = !projectInfo.isWsgenSupported() || !projectInfo.isWsimportSupported(); diff --git a/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/LogicalHandlerWizard.java b/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/LogicalHandlerWizard.java --- a/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/LogicalHandlerWizard.java +++ b/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/LogicalHandlerWizard.java @@ -64,9 +64,9 @@ import org.netbeans.spi.project.ui.templates.support.Templates; import org.openide.WizardDescriptor; import javax.swing.event.ChangeListener; +import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.openide.util.HelpCtx; import org.openide.util.NbBundle; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.websvc.api.support.SourceGroups; public class LogicalHandlerWizard implements WizardDescriptor.InstantiatingIterator { @@ -218,7 +218,7 @@ return true; } */ - if (Util.isJavaEE5orHigher(project) && (projectType == ProjectInfo.WEB_PROJECT_TYPE + if (ProjectUtil.isJavaEE5orHigher(project) && (projectType == ProjectInfo.WEB_PROJECT_TYPE || projectType == ProjectInfo.CAR_PROJECT_TYPE || projectType == ProjectInfo.EJB_PROJECT_TYPE)) { //NOI18N return true; @@ -226,7 +226,7 @@ //if platform is Tomcat, source level must be jdk 1.5 and jaxws library must be in classpath WSStackUtils wsStackUtils = new WSStackUtils(project); - if(!Util.isJavaEE5orHigher(project) && projectType == ProjectInfo.WEB_PROJECT_TYPE + if(!ProjectUtil.isJavaEE5orHigher(project) && projectType == ProjectInfo.WEB_PROJECT_TYPE && !wsStackUtils.isJsr109Supported() && !wsStackUtils.isJsr109OldSupported() ){ if (!wsStackUtils.hasJAXWSLibrary()) { //must have jaxws library diff --git a/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/MessageHandlerWizard.java b/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/MessageHandlerWizard.java --- a/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/MessageHandlerWizard.java +++ b/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/MessageHandlerWizard.java @@ -64,9 +64,9 @@ import org.netbeans.api.java.classpath.ClassPath; import org.netbeans.api.java.project.JavaProjectConstants; import org.netbeans.api.project.ProjectUtils; +import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.openide.util.HelpCtx; import org.openide.util.NbBundle; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.websvc.api.client.WebServicesClientSupport; import org.netbeans.modules.websvc.api.support.SourceGroups; import org.netbeans.modules.websvc.api.webservices.WebServicesSupport; @@ -201,7 +201,7 @@ //if platform is Tomcat, source level must be jdk 1.5 and jaxws library must be in classpath WSStackUtils wsStackUtils = new WSStackUtils(project); - if (!Util.isJavaEE5orHigher(project) && projectType == ProjectInfo.WEB_PROJECT_TYPE && !wsStackUtils.isJsr109Supported() && !wsStackUtils.isJsr109OldSupported()) { + if (!ProjectUtil.isJavaEE5orHigher(project) && projectType == ProjectInfo.WEB_PROJECT_TYPE && !wsStackUtils.isJsr109Supported() && !wsStackUtils.isJsr109OldSupported()) { if (!wsStackUtils.hasJAXWSLibrary()) { //must have jaxws library wiz.putProperty(WizardDescriptor.PROP_ERROR_MESSAGE, NbBundle.getMessage(BottomPanel.class, "LBL_LogicalHandlerWarning")); // NOI18N @@ -211,7 +211,7 @@ } } // else check the JAXRPC support installation - if (!Util.isJavaEE5orHigher(project) && ((WebServicesSupport.getWebServicesSupport(project.getProjectDirectory()) == null) && (WebServicesClientSupport.getWebServicesClientSupport(project.getProjectDirectory()) == null))) { + if (!ProjectUtil.isJavaEE5orHigher(project) && ((WebServicesSupport.getWebServicesSupport(project.getProjectDirectory()) == null) && (WebServicesClientSupport.getWebServicesClientSupport(project.getProjectDirectory()) == null))) { // check if jaxrpc plugin installed wiz.putProperty(WizardDescriptor.PROP_ERROR_MESSAGE, NbBundle.getMessage(MessageHandlerWizard.class, "ERR_NoJaxrpcPluginFoundHandler")); // NOI18N return false; diff --git a/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/WebServiceFromWSDLPanel.java b/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/WebServiceFromWSDLPanel.java --- a/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/WebServiceFromWSDLPanel.java +++ b/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/WebServiceFromWSDLPanel.java @@ -61,7 +61,7 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.stream.StreamSource; import org.netbeans.api.project.Project; -import org.netbeans.modules.j2ee.common.Util; +import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; import org.netbeans.modules.web.api.webmodule.WebModule; @@ -366,7 +366,7 @@ Object result = DialogDisplayer.getDefault().notify(dd); if (result == DialogDescriptor.OK_OPTION) { - if (Util.isJavaEE5orHigher(project) || jaxWsInJ2ee14Supported || + if (ProjectUtil.isJavaEE5orHigher(project) || jaxWsInJ2ee14Supported || (!jsr109Supported && !jsr109oldSupported || (!jsr109Supported && jsr109oldSupported /* && jwsdpSupported*/))) { @@ -438,7 +438,7 @@ boolean noJsr109InWeb = wm != null && !jsr109Supported && !jsr109oldSupported; boolean jaxWsInWeb14 = wm != null && jaxWsInJ2ee14Supported; - return !Util.isJavaEE5orHigher(project) && !noJsr109InWeb && !jaxWsInWeb14; + return !ProjectUtil.isJavaEE5orHigher(project) && !noJsr109InWeb && !jaxWsInWeb14; } boolean isValid(WizardDescriptor wizardDescriptor) { @@ -475,7 +475,7 @@ } } - if (Util.isJavaEE5orHigher(project) || JaxWsUtils.isEjbJavaEE5orHigher(project) || jaxWsInJ2ee14Supported || + if (ProjectUtil.isJavaEE5orHigher(project) || JaxWsUtils.isEjbJavaEE5orHigher(project) || jaxWsInJ2ee14Supported || (!jsr109Supported && !jsr109oldSupported || (!jsr109Supported && jsr109oldSupported/* && jwsdpSupported*/))) { if (wsdlModel != null) { @@ -599,7 +599,7 @@ } } fireChange(); //call to disable Finish button - if (Util.isJavaEE5orHigher(project) || JaxWsUtils.isEjbJavaEE5orHigher(project) || jaxWsInJ2ee14Supported || + if (ProjectUtil.isJavaEE5orHigher(project) || JaxWsUtils.isEjbJavaEE5orHigher(project) || jaxWsInJ2ee14Supported || (!jsr109Supported && !jsr109oldSupported || (!jsr109Supported && jsr109oldSupported /*&& jwsdpSupported*/))) { createModel(); diff --git a/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/actions/JaxWsInvokeOperationProvider.java b/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/actions/JaxWsInvokeOperationProvider.java --- a/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/actions/JaxWsInvokeOperationProvider.java +++ b/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/actions/JaxWsInvokeOperationProvider.java @@ -50,7 +50,7 @@ import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectUtils; import org.netbeans.api.project.SourceGroup; -import org.netbeans.modules.j2ee.common.Util; +import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.websvc.api.jaxws.client.JAXWSClientSupport; import org.netbeans.modules.websvc.spi.support.InvokeOperationActionProvider; import org.netbeans.modules.websvc.api.support.InvokeOperationCookie; @@ -67,7 +67,7 @@ int projectType = projectInfo.getProjectType(); if ((projectType == ProjectInfo.JSE_PROJECT_TYPE && !isJAXRPCProject(project) && !isJAXWSProject(project)) ||(projectType == ProjectInfo.JSE_PROJECT_TYPE && isJAXWSProject(project) && isJaxWsLibraryOnClasspath(targetSource)) || - (Util.isJavaEE5orHigher(project) && (projectType == ProjectInfo.WEB_PROJECT_TYPE || + (ProjectUtil.isJavaEE5orHigher(project) && (projectType == ProjectInfo.WEB_PROJECT_TYPE || projectType == ProjectInfo.CAR_PROJECT_TYPE || projectType == ProjectInfo.EJB_PROJECT_TYPE)) ) { return new JaxWsInvokeOperation(targetSource); @@ -75,7 +75,7 @@ return new JaxWsInvokeOperation(targetSource); } // Tomcat on J2EE14 project Case - if (projectType == ProjectInfo.WEB_PROJECT_TYPE && !Util.isJavaEE5orHigher(project) && isJaxWsLibraryOnRuntimeClasspath(targetSource)) { + if (projectType == ProjectInfo.WEB_PROJECT_TYPE && !ProjectUtil.isJavaEE5orHigher(project) && isJaxWsLibraryOnRuntimeClasspath(targetSource)) { return new JaxWsInvokeOperation(targetSource); } } diff --git a/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/nodes/JaxWsNode.java b/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/nodes/JaxWsNode.java --- a/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/nodes/JaxWsNode.java +++ b/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/nodes/JaxWsNode.java @@ -78,7 +78,7 @@ import org.netbeans.api.java.source.JavaSource.Phase; import org.netbeans.api.project.FileOwnerQuery; import org.netbeans.api.project.Project; -import org.netbeans.modules.j2ee.common.Util; +import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.j2ee.dd.api.web.DDProvider; import org.netbeans.modules.j2ee.dd.api.web.Servlet; import org.netbeans.modules.j2ee.dd.api.web.ServletMapping; @@ -130,7 +130,6 @@ import org.openide.loaders.DataObject; import org.openide.loaders.DataObjectNotFoundException; import org.openide.nodes.AbstractNode; -import org.openide.util.Exceptions; import org.openide.util.HelpCtx; import org.openide.util.ImageUtilities; import org.openide.util.Mutex; @@ -516,7 +515,7 @@ } else if (J2eeModule.Type.EJB.equals(moduleType) && ServerType.JBOSS == stackUtils.getServerType()) { // JBoss type wsURI = (contextRoot == null ? "" : contextRoot+"/")+getNameFromPackageName(service.getImplementationClass()); - } else if (isJsr109Supported && Util.isJavaEE5orHigher(project) || JaxWsUtils.isEjbJavaEE5orHigher(project)) { + } else if (isJsr109Supported && ProjectUtil.isJavaEE5orHigher(project) || JaxWsUtils.isEjbJavaEE5orHigher(project)) { try { ServiceInfo serviceInfo = new ServiceInfo(); @@ -767,7 +766,7 @@ ServiceInfo serviceInfo = getServiceInfo(); WSStackUtils stackUtils = new WSStackUtils(project); boolean isJsr109Supported = stackUtils.isJsr109Supported(); - if (isJsr109Supported && Util.isJavaEE5orHigher(project) || JaxWsUtils.isEjbJavaEE5orHigher(project)) { + if (isJsr109Supported && ProjectUtil.isJavaEE5orHigher(project) || JaxWsUtils.isEjbJavaEE5orHigher(project)) { WSStack jaxWsStack = stackUtils.getWsStack(JaxWs.class); if (jaxWsStack != null) { JaxWs.UriDescriptor uriDescriptor = jaxWsStack.get().getWsUriDescriptor(); diff --git a/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/nodes/JaxWsRootNode.java b/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/nodes/JaxWsRootNode.java --- a/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/nodes/JaxWsRootNode.java +++ b/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/nodes/JaxWsRootNode.java @@ -52,7 +52,7 @@ import javax.swing.Icon; import javax.swing.ImageIcon; import org.netbeans.api.project.Project; -import org.netbeans.modules.j2ee.common.Util; +import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.websvc.api.jaxws.project.config.JaxWsModel; import org.netbeans.modules.websvc.core.WSStackUtils; import org.netbeans.modules.websvc.jaxws.api.JAXWSSupport; @@ -88,7 +88,7 @@ super(new JaxWsRootChildren(jaxWsModel,srcRoots), Lookups.fixed(project)); setDisplayName(NbBundle.getBundle(JaxWsRootNode.class).getString("LBL_WebServices")); this.project=project; - if(!Util.isJavaEE5orHigher(project)){ + if(!ProjectUtil.isJavaEE5orHigher(project)){ listenToServerChanges(); WSStackUtils stackUtils = new WSStackUtils(project); jsr109Supported = stackUtils.isJsr109Supported(); diff --git a/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/projects/JavaEEWSOpenHook.java b/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/projects/JavaEEWSOpenHook.java --- a/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/projects/JavaEEWSOpenHook.java +++ b/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/projects/JavaEEWSOpenHook.java @@ -52,7 +52,7 @@ import java.util.logging.Logger; import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectManager; -import org.netbeans.modules.j2ee.common.Util; +import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.j2ee.dd.api.webservices.PortComponent; import org.netbeans.modules.j2ee.dd.api.webservices.WebserviceDescription; import org.netbeans.modules.j2ee.dd.api.webservices.Webservices; @@ -94,7 +94,7 @@ protected void projectOpened() { JAXWSSupport support = JAXWSSupport.getJAXWSSupport(prj.getProjectDirectory()); - if (support != null && (JaxWsUtils.isEjbJavaEE5orHigher(prj) || Util.isJavaEE5orHigher(prj))) { + if (support != null && (JaxWsUtils.isEjbJavaEE5orHigher(prj) || ProjectUtil.isJavaEE5orHigher(prj))) { final MetadataModel wsModel = support.getWebservicesMetadataModel(); try { wsModel.runReadActionWhenReady(new MetadataModelAction() { @@ -140,7 +140,7 @@ protected void projectClosed() { JAXWSSupport support = JAXWSSupport.getJAXWSSupport(prj.getProjectDirectory()); - if (support != null && (JaxWsUtils.isEjbJavaEE5orHigher(prj) || Util.isJavaEE5orHigher(prj))) { + if (support != null && (JaxWsUtils.isEjbJavaEE5orHigher(prj) || ProjectUtil.isJavaEE5orHigher(prj))) { final MetadataModel wsModel = support.getWebservicesMetadataModel(); try { wsModel.runReadActionWhenReady(new MetadataModelAction() { diff --git a/websvc.jaxrpc/src/org/netbeans/modules/websvc/jaxrpc/actions/JaxRpcInvokeOperationProvider.java b/websvc.jaxrpc/src/org/netbeans/modules/websvc/jaxrpc/actions/JaxRpcInvokeOperationProvider.java --- a/websvc.jaxrpc/src/org/netbeans/modules/websvc/jaxrpc/actions/JaxRpcInvokeOperationProvider.java +++ b/websvc.jaxrpc/src/org/netbeans/modules/websvc/jaxrpc/actions/JaxRpcInvokeOperationProvider.java @@ -46,20 +46,16 @@ import org.netbeans.api.java.classpath.ClassPath; import org.netbeans.api.java.project.JavaProjectConstants; -import org.netbeans.api.project.FileOwnerQuery; import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectUtils; import org.netbeans.api.project.SourceGroup; -import org.netbeans.modules.j2ee.common.Util; +import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.websvc.api.client.WebServicesClientSupport; -import org.netbeans.modules.websvc.api.registry.WebServiceMethod; import org.netbeans.modules.websvc.spi.support.InvokeOperationActionProvider; import org.netbeans.modules.websvc.api.support.InvokeOperationCookie; import org.netbeans.modules.websvc.core.JaxWsUtils; import org.netbeans.modules.websvc.core.ProjectInfo; import org.openide.filesystems.FileObject; -import org.openide.loaders.*; -import org.openide.nodes.Node; @org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.websvc.spi.support.InvokeOperationActionProvider.class) public class JaxRpcInvokeOperationProvider implements InvokeOperationActionProvider { @@ -82,9 +78,9 @@ if(projectType == ProjectInfo.JSE_PROJECT_TYPE && !isJAXWSProject(project) && !isJAXRPCProject(project)) return true; if(projectType == ProjectInfo.JSE_PROJECT_TYPE && isJaxWsLibraryOnClasspath(targetSource) && !isJAXRPCProject(project)) return false; // if(projectInfo.isJwsdpSupported())return false; - if(Util.isJavaEE5orHigher(project)) return false; + if(ProjectUtil.isJavaEE5orHigher(project)) return false; if (JaxWsUtils.isEjbJavaEE5orHigher(projectInfo)) return false; - if (projectType == ProjectInfo.WEB_PROJECT_TYPE && !Util.isJavaEE5orHigher(project) && isJaxWsLibraryOnRuntimeClasspath(targetSource))return false; + if (projectType == ProjectInfo.WEB_PROJECT_TYPE && !ProjectUtil.isJavaEE5orHigher(project) && isJaxWsLibraryOnRuntimeClasspath(targetSource))return false; return true; } diff --git a/websvc.jaxrpc/src/org/netbeans/modules/websvc/jaxrpc/dev/wizard/JaxRpcHandlerCreatorProvider.java b/websvc.jaxrpc/src/org/netbeans/modules/websvc/jaxrpc/dev/wizard/JaxRpcHandlerCreatorProvider.java --- a/websvc.jaxrpc/src/org/netbeans/modules/websvc/jaxrpc/dev/wizard/JaxRpcHandlerCreatorProvider.java +++ b/websvc.jaxrpc/src/org/netbeans/modules/websvc/jaxrpc/dev/wizard/JaxRpcHandlerCreatorProvider.java @@ -49,7 +49,7 @@ import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectUtils; import org.netbeans.api.project.SourceGroup; -import org.netbeans.modules.j2ee.common.Util; +import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.websvc.core.HandlerCreator; import org.netbeans.modules.websvc.core.HandlerCreatorProvider; import org.netbeans.modules.websvc.core.ProjectInfo; @@ -74,7 +74,7 @@ ProjectInfo projectInfo = new ProjectInfo(project); int projectType = projectInfo.getProjectType(); if ((projectType == ProjectInfo.JSE_PROJECT_TYPE && wscompileFO != null) - || (!Util.isJavaEE5orHigher(project) && (projectType == ProjectInfo.WEB_PROJECT_TYPE + || (!ProjectUtil.isJavaEE5orHigher(project) && (projectType == ProjectInfo.WEB_PROJECT_TYPE || projectType == ProjectInfo.CAR_PROJECT_TYPE || projectType == ProjectInfo.EJB_PROJECT_TYPE))) { return new JaxRpcHandlerCreator(project, wiz); } diff --git a/websvc.jaxrpc/src/org/netbeans/modules/websvc/jaxrpc/dev/wizard/JaxRpcServiceCreatorProvider.java b/websvc.jaxrpc/src/org/netbeans/modules/websvc/jaxrpc/dev/wizard/JaxRpcServiceCreatorProvider.java --- a/websvc.jaxrpc/src/org/netbeans/modules/websvc/jaxrpc/dev/wizard/JaxRpcServiceCreatorProvider.java +++ b/websvc.jaxrpc/src/org/netbeans/modules/websvc/jaxrpc/dev/wizard/JaxRpcServiceCreatorProvider.java @@ -45,7 +45,7 @@ package org.netbeans.modules.websvc.jaxrpc.dev.wizard; import org.netbeans.api.project.Project; -import org.netbeans.modules.j2ee.common.Util; +import org.netbeans.modules.j2ee.common.project.ProjectUtil; import org.netbeans.modules.websvc.api.support.ServiceCreator; import org.netbeans.modules.websvc.core.ProjectInfo; import org.netbeans.modules.websvc.spi.support.ServiceCreatorProvider; @@ -66,7 +66,7 @@ ProjectInfo projectInfo = new ProjectInfo(project); int projectType = projectInfo.getProjectType(); - if (!Util.isJavaEE5orHigher(project) && + if (!ProjectUtil.isJavaEE5orHigher(project) && (projectType == ProjectInfo.WEB_PROJECT_TYPE || projectType == ProjectInfo.EJB_PROJECT_TYPE)) { if ((!projectInfo.isJsr109Supported() && projectType == ProjectInfo.WEB_PROJECT_TYPE && !projectInfo.isJsr109oldSupported())) { return null;