diff -r 9b795c1330fb glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JavaEEPlatformImpl.java --- a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JavaEEPlatformImpl.java Wed Jan 07 04:55:36 2009 +0000 +++ b/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JavaEEPlatformImpl.java Tue Jan 06 23:23:31 2009 -0800 @@ -243,6 +243,7 @@ Set result = new HashSet(); result.add(J2eeModule.J2EE_14); result.add(J2eeModule.JAVA_EE_5); + result.add(J2eeModule.JAVA_EE_6); return result; } diff -r 9b795c1330fb j2ee.common/src/org/netbeans/modules/j2ee/common/Bundle.properties --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/Bundle.properties Wed Jan 07 04:55:36 2009 +0000 +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/Bundle.properties Tue Jan 06 23:23:31 2009 -0800 @@ -81,4 +81,4 @@ LBL_J2EESpec_13=J2EE 1.3 LBL_J2EESpec_14=J2EE 1.4 LBL_JavaEESpec_5=Java EE 5 - +LBL_JavaEESpec_6=Java EE 6 diff -r 9b795c1330fb j2ee.common/src/org/netbeans/modules/j2ee/common/Util.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/Util.java Wed Jan 07 04:55:36 2009 +0000 +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/Util.java Tue Jan 06 23:23:31 2009 -0800 @@ -392,6 +392,8 @@ return NbBundle.getMessage(Util.class, "LBL_J2EESpec_14"); } else if (J2eeModule.JAVA_EE_5.equals(specificationVersion)) { return NbBundle.getMessage(Util.class, "LBL_JavaEESpec_5"); + } else if (J2eeModule.JAVA_EE_6.equals(specificationVersion)) { + return NbBundle.getMessage(Util.class, "LBL_JavaEESpec_6"); } else { throw new IllegalArgumentException("Unknown specification version: " + specificationVersion); // NOI18N } diff -r 9b795c1330fb j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/Bundle.properties --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/Bundle.properties Wed Jan 07 04:55:36 2009 +0000 +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/Bundle.properties Tue Jan 06 23:23:32 2009 -0800 @@ -110,6 +110,7 @@ LBL_PanelOptions_SharableProject_Checkbox=Project Shared With Other Users LBL_PanelOptions_Location_Label=Sharable Libraries Location: LBL_Browse_Libraries_AcceptedFiles=*.properties files +JavaEESpecLevel_60=Java EE 6 JavaEESpecLevel_50=Java EE 5 J2EESpecLevel_14=J2EE 1.4 J2EESpecLevel_13=J2EE 1.3 diff -r 9b795c1330fb 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 Wed Jan 07 04:55:36 2009 +0000 +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.java Tue Jan 06 23:23:32 2009 -0800 @@ -86,6 +86,7 @@ private static final String J2EE_SPEC_13_LABEL = NbBundle.getMessage(ProjectServerPanel.class, "J2EESpecLevel_13"); //NOI18N private static final String J2EE_SPEC_14_LABEL = NbBundle.getMessage(ProjectServerPanel.class, "J2EESpecLevel_14"); //NOI18N private static final String JAVA_EE_SPEC_50_LABEL = NbBundle.getMessage(ProjectServerPanel.class, "JavaEESpecLevel_50"); //NOI18N + private static final String JAVA_EE_SPEC_60_LABEL = NbBundle.getMessage(ProjectServerPanel.class, "JavaEESpecLevel_60"); //NOI18N private List earProjects; private Object j2eeModuleType; @@ -412,6 +413,10 @@ J2eePlatform j2eePlatform = Deployment.getDefault().getJ2eePlatform(serverInstanceWrapper.getServerInstanceID()); Set supportedVersions = j2eePlatform.getSupportedSpecVersions(j2eeModuleType); j2eeSpecComboBox.removeAllItems(); + // TODO - use o.n.m.j2ee.common.Util.getJ2eeSpecificationLabel here? + if (supportedVersions.contains(J2eeModule.JAVA_EE_6)) { + j2eeSpecComboBox.addItem(JAVA_EE_SPEC_60_LABEL); + } if (supportedVersions.contains(J2eeModule.JAVA_EE_5)) { j2eeSpecComboBox.addItem(JAVA_EE_SPEC_50_LABEL); } @@ -702,10 +707,12 @@ } private String getSelectedJ2eeSpec() { + // TODO - use o.n.m.j2ee.common.Util.getJ2eeSpecificationLabel in here? Object item = j2eeSpecComboBox.getSelectedItem(); return item == null ? null - : item.equals(JAVA_EE_SPEC_50_LABEL) ? J2eeModule.JAVA_EE_5 : - ( item.equals(J2EE_SPEC_14_LABEL) ? J2eeModule.J2EE_14 : J2eeModule.J2EE_13); + : item.equals(JAVA_EE_SPEC_60_LABEL) ? J2eeModule.JAVA_EE_6 : + (item.equals(JAVA_EE_SPEC_50_LABEL) ? J2eeModule.JAVA_EE_5 : + ( item.equals(J2EE_SPEC_14_LABEL) ? J2eeModule.J2EE_14 : J2eeModule.J2EE_13)); } private String getSelectedServer() { diff -r 9b795c1330fb j2eeserver/apichanges.xml --- a/j2eeserver/apichanges.xml Wed Jan 07 04:55:36 2009 +0000 +++ b/j2eeserver/apichanges.xml Tue Jan 06 23:23:32 2009 -0800 @@ -113,6 +113,22 @@ + + + + Add constant for Java EE 6 spec + + + + + + +

+ Add a constant for Java EE 6 specification level. +

+ + + diff -r 9b795c1330fb j2eeserver/nbproject/project.properties --- a/j2eeserver/nbproject/project.properties Wed Jan 07 04:55:36 2009 +0000 +++ b/j2eeserver/nbproject/project.properties Tue Jan 06 23:23:32 2009 -0800 @@ -39,7 +39,7 @@ is.autoload=true javac.source=1.5 -spec.version.base=1.55.0 +spec.version.base=1.56.0 javadoc.overview=${basedir}/api/doc/overview.html javadoc.arch=${basedir}/arch.xml diff -r 9b795c1330fb j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eeModule.java --- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eeModule.java Wed Jan 07 04:55:36 2009 +0000 +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eeModule.java Tue Jan 06 23:23:32 2009 -0800 @@ -100,7 +100,15 @@ * @since 1.6 */ public static final String JAVA_EE_5 = "1.5"; // NOI18N - + + /** + * + * JAVA EE 6 specification version + * + * @since 1.56 + */ + public static final String JAVA_EE_6 = "1.6"; // NOI18N + public static final String APP_XML = "META-INF/application.xml"; public static final String WEB_XML = "WEB-INF/web.xml"; public static final String WEBSERVICES_XML = "WEB-INF/webservices.xml";