Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 226473 Details for
Bug 399524
Basic Java EE 7 support
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Java EE Tools Patch v1
Bug399524.JavaEEToolsPatch.v1.txt (text/plain), 69.26 KB, created by
Konstantin Komissarchik
on 2013-02-01 17:18:26 EST
(
hide
)
Description:
Java EE Tools Patch v1
Filename:
MIME Type:
Creator:
Konstantin Komissarchik
Created:
2013-02-01 17:18:26 EST
Size:
69.26 KB
patch
obsolete
>diff --git a/plugins/org.eclipse.jst.j2ee.core/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.j2ee.core/.settings/org.eclipse.jdt.core.prefs >index ccaa9be..2ba2c18 100644 >--- a/plugins/org.eclipse.jst.j2ee.core/.settings/org.eclipse.jdt.core.prefs >+++ b/plugins/org.eclipse.jst.j2ee.core/.settings/org.eclipse.jdt.core.prefs >@@ -1,95 +1,32 @@ >-#Wed Jun 24 10:13:32 EDT 2009 >-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled >-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error >-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning >-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error >-org.eclipse.jdt.core.compiler.problem.unusedLocal=error >-org.eclipse.jdt.core.compiler.problem.emptyStatement=error >-org.eclipse.jdt.core.compiler.problem.unusedLabel=error >-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning >-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning >-org.eclipse.jdt.core.incompatibleJDKLevel=ignore >-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error >-org.eclipse.jdt.core.compiler.debug.lineNumber=generate >-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning >+eclipse.preferences.version=1 >+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true > org.eclipse.jdt.core.builder.cleanOutputFolder=clean >-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning >-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error >-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled >-org.eclipse.jdt.core.compiler.problem.deprecation=warning >-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled >-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error >-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled >-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error >-org.eclipse.jdt.core.compiler.problem.unusedImport=error >+org.eclipse.jdt.core.builder.duplicateResourceTask=warning >+org.eclipse.jdt.core.builder.invalidClasspath=abort > org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore > org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch >-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled >-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled >-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error >-org.eclipse.jdt.core.builder.invalidClasspath=abort >-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning >-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error >-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error >-org.eclipse.jdt.core.codeComplete.argumentSuffixes= >-org.eclipse.jdt.core.codeComplete.argumentPrefixes= >-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore >-org.eclipse.jdt.core.compiler.problem.potentialNullReference=error >-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled >-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning >-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error >-org.eclipse.jdt.core.compiler.problem.nullReference=error >-org.eclipse.jdt.core.compiler.source=1.5 >-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error >-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore >-org.eclipse.jdt.core.builder.duplicateResourceTask=warning >-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning >-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled >-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error >-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error >-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error >-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error >-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning >-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled >-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error >-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning >-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore >-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error >-eclipse.preferences.version=1 >-org.eclipse.jdt.core.incompleteClasspath=error >-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error >-org.eclipse.jdt.core.compiler.problem.deadCode=error >-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled >-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled >-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error >-org.eclipse.jdt.core.compiler.debug.sourceFile=generate >-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled >-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning >-org.eclipse.jdt.core.codeComplete.fieldPrefixes= >-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning >-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 >-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error >-org.eclipse.jdt.core.compiler.problem.autoboxing=warning > org.eclipse.jdt.core.circularClasspath=error >-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning >-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error >+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled >+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled >+org.eclipse.jdt.core.codeComplete.argumentPrefixes= >+org.eclipse.jdt.core.codeComplete.argumentSuffixes= >+org.eclipse.jdt.core.codeComplete.fieldPrefixes= > org.eclipse.jdt.core.codeComplete.fieldSuffixes= >-org.eclipse.jdt.core.codeComplete.localSuffixes= >-org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning >-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error > org.eclipse.jdt.core.codeComplete.localPrefixes= >-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled >-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 >-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error >-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error >-org.eclipse.jdt.core.compiler.compliance=1.5 >-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled >+org.eclipse.jdt.core.codeComplete.localSuffixes= > org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= >-org.eclipse.jdt.core.compiler.debug.localVariable=generate >-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning >-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true >-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error >-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve >-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning >-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled > org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= >+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled >+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 >+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve >+org.eclipse.jdt.core.compiler.compliance=1.5 >+org.eclipse.jdt.core.compiler.debug.lineNumber=generate >+org.eclipse.jdt.core.compiler.debug.localVariable=generate >+org.eclipse.jdt.core.compiler.debug.sourceFile=generate >+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 >+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error >+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error >+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled >+org.eclipse.jdt.core.compiler.source=1.5 >+org.eclipse.jdt.core.incompatibleJDKLevel=ignore >+org.eclipse.jdt.core.incompleteClasspath=error >diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/util/internal/JavaEEQuickPeek.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/util/internal/JavaEEQuickPeek.java >index 9c2853a..f6e34b4 100644 >--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/util/internal/JavaEEQuickPeek.java >+++ b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/util/internal/JavaEEQuickPeek.java >@@ -179,6 +179,8 @@ > version = J2EEVersionConstants.JEE_5_0_ID; > } else if (schemaName.equals(J2EEConstants.APP_CLIENT_SCHEMA_6)) { > version = J2EEVersionConstants.JEE_6_0_ID; >+ } else if (schemaName.equals(J2EEConstants.APP_CLIENT_SCHEMA_7)) { >+ version = J2EEVersionConstants.JEE_7_0_ID; > } > } > break; >@@ -198,6 +200,8 @@ > version = J2EEVersionConstants.JEE_5_0_ID; > } else if (schemaName.equals(J2EEConstants.APPLICATION_SCHEMA_6)) { > version = J2EEVersionConstants.JEE_6_0_ID; >+ } else if (schemaName.equals(J2EEConstants.APPLICATION_SCHEMA_7)) { >+ version = J2EEVersionConstants.JEE_7_0_ID; > } > } > break; >@@ -215,6 +219,8 @@ > version = J2EEVersionConstants.EJB_3_0_ID; > } else if (schemaName.equals(J2EEConstants.EJBJAR_SCHEMA_3_1)) { > version = J2EEVersionConstants.EJB_3_1_ID; >+ } else if (schemaName.equals(J2EEConstants.EJBJAR_SCHEMA_3_2)) { >+ version = J2EEVersionConstants.EJB_3_2_ID; > } > } > break; >@@ -245,6 +251,8 @@ > version = J2EEVersionConstants.WEB_2_5_ID; > } else if (schemaName.equals(J2EEConstants.WEBAPP_SCHEMA_3_0)) { > version = J2EEVersionConstants.WEB_3_0_ID; >+ } else if (schemaName.equals(J2EEConstants.WEBAPP_SCHEMA_3_1)) { >+ version = J2EEVersionConstants.WEB_3_1_ID; > } > } > break; >@@ -314,6 +322,9 @@ > case J2EEVersionConstants.EJB_3_1_ID: > javaEEVersion = J2EEConstants.JEE_6_0_ID; > break; >+ case J2EEVersionConstants.EJB_3_2_ID: >+ javaEEVersion = J2EEConstants.JEE_7_0_ID; >+ break; > } > break; > case CONNECTOR_TYPE: >@@ -346,6 +357,9 @@ > case J2EEVersionConstants.WEB_3_0_ID: > javaEEVersion = J2EEVersionConstants.JEE_6_0_ID; > break; >+ case J2EEVersionConstants.WEB_3_1_ID: >+ javaEEVersion = J2EEVersionConstants.JEE_7_0_ID; >+ break; > } > break; > case WEBSERVICES_TYPE: >diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/J2EEFileUtil.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/J2EEFileUtil.java >index 95e983f..36ad836 100644 >--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/J2EEFileUtil.java >+++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/J2EEFileUtil.java >@@ -300,6 +300,8 @@ > version = J2EEVersionConstants.JEE_5_0_ID; > } else if (versionAttr.equals(J2EEVersionConstants.VERSION_6_0_TEXT)) { > version = J2EEVersionConstants.JEE_6_0_ID; >+ } else if (versionAttr.equals(J2EEVersionConstants.VERSION_7_0_TEXT)) { >+ version = J2EEVersionConstants.JEE_7_0_ID; > } > } else if (isEJBJarFile(fileURI)) { > if (null == versionAttr) { >@@ -314,6 +316,8 @@ > version = J2EEVersionConstants.EJB_3_0_ID; > } else if (versionAttr.equals(J2EEVersionConstants.VERSION_3_1_TEXT)) { > version = J2EEVersionConstants.EJB_3_1_ID; >+ } else if (versionAttr.equals(J2EEVersionConstants.VERSION_3_2_TEXT)) { >+ version = J2EEVersionConstants.EJB_3_2_ID; > } > } else if (isApplicationClientFile(fileURI)) { > if (null == versionAttr) { >@@ -328,6 +332,8 @@ > version = J2EEVersionConstants.JEE_5_0_ID; > } else if (versionAttr.equals(J2EEVersionConstants.VERSION_6_0_TEXT)) { > version = J2EEVersionConstants.JEE_6_0_ID; >+ } else if (versionAttr.equals(J2EEVersionConstants.VERSION_7_0_TEXT)) { >+ version = J2EEVersionConstants.JEE_7_0_ID; > } > } else if (isWARFile(fileURI)) { > if (null == versionAttr) { >@@ -342,6 +348,8 @@ > version = J2EEVersionConstants.WEB_2_5_ID; > } else if (versionAttr.equals(J2EEVersionConstants.VERSION_3_0_TEXT)) { > version = J2EEVersionConstants.WEB_3_0_ID; >+ } else if (versionAttr.equals(J2EEVersionConstants.VERSION_3_1_TEXT)) { >+ version = J2EEVersionConstants.WEB_3_1_ID; > } > } else if (isRARFile(fileURI)) { > if (null == versionAttr) { >@@ -363,7 +371,9 @@ > private static int lookupVersion(String fileURI, String schemaName) { > int version = -1; > if (isEARFile(fileURI)) { >- if (schemaName.equals(J2EEConstants.APPLICATION_SCHEMA_6)) { >+ if (schemaName.equals(J2EEConstants.APPLICATION_SCHEMA_7)) { >+ version = J2EEVersionConstants.JEE_7_0_ID; >+ } else if (schemaName.equals(J2EEConstants.APPLICATION_SCHEMA_6)) { > version = J2EEVersionConstants.JEE_6_0_ID; > } else if (schemaName.equals(J2EEConstants.APPLICATION_SCHEMA_5)) { > version = J2EEVersionConstants.JEE_5_0_ID; >@@ -371,7 +381,9 @@ > version = J2EEVersionConstants.J2EE_1_4_ID; > } > } else if (isEJBJarFile(fileURI)) { >- if ((schemaName.indexOf(J2EEConstants.EJBJAR_SCHEMA_3_1_NS)) != -1) { >+ if ((schemaName.indexOf(J2EEConstants.EJBJAR_SCHEMA_3_2_NS)) != -1) { >+ version = J2EEVersionConstants.EJB_3_2_ID; >+ } else if ((schemaName.indexOf(J2EEConstants.EJBJAR_SCHEMA_3_1_NS)) != -1) { > version = J2EEVersionConstants.EJB_3_1_ID; > } else if ((schemaName.indexOf(J2EEConstants.EJBJAR_SCHEMA_3_0_NS)) != -1) { > version = J2EEVersionConstants.EJB_3_0_ID; >@@ -379,7 +391,9 @@ > version = J2EEVersionConstants.EJB_2_1_ID; > } > } else if (isApplicationClientFile(fileURI)) { >- if (schemaName.equals(J2EEConstants.APP_CLIENT_SCHEMA_6)) { >+ if (schemaName.equals(J2EEConstants.APP_CLIENT_SCHEMA_7)) { >+ version = J2EEVersionConstants.JEE_7_0_ID; >+ } else if (schemaName.equals(J2EEConstants.APP_CLIENT_SCHEMA_6)) { > version = J2EEVersionConstants.JEE_6_0_ID; > } else if (schemaName.equals(J2EEConstants.APP_CLIENT_SCHEMA_5)) { > version = J2EEVersionConstants.JEE_5_0_ID; >@@ -387,7 +401,9 @@ > version = J2EEVersionConstants.J2EE_1_4_ID; > } > } else if (isWARFile(fileURI)) { >- if (schemaName.equals(J2EEConstants.WEBAPP_SCHEMA_3_0)) { >+ if (schemaName.equals(J2EEConstants.WEBAPP_SCHEMA_3_1)) { >+ version = J2EEVersionConstants.WEB_3_1_ID; >+ } else if (schemaName.equals(J2EEConstants.WEBAPP_SCHEMA_3_0)) { > version = J2EEVersionConstants.WEB_3_0_ID; > } else if (schemaName.equals(J2EEConstants.WEBAPP_SCHEMA_2_5)) { > version = J2EEVersionConstants.WEB_2_5_ID; >diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJBResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJBResourceImpl.java >index 3cf6472..43f93f6 100644 >--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJBResourceImpl.java >+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJBResourceImpl.java >@@ -157,6 +157,8 @@ > return J2EEVersionConstants.JEE_5_0_ID; > case J2EEVersionConstants.EJB_3_1_ID : > return J2EEVersionConstants.JEE_6_0_ID; >+ case J2EEVersionConstants.EJB_3_2_ID : >+ return J2EEVersionConstants.JEE_7_0_ID; > default : > return J2EEVersionConstants.J2EE_1_4_ID; > } >@@ -180,6 +182,10 @@ > public void setModuleVersionID(int id) { > super.setVersionID(id); > switch (id) { >+ case (EJB_3_2_ID) : >+ super.setDoctypeValues(null, null); >+ primSetVersionID(EJB_3_2_ID); >+ break; > case (EJB_3_1_ID) : > super.setDoctypeValues(null, null); > primSetVersionID(EJB_3_1_ID); >@@ -210,6 +216,10 @@ > @Override > public void setJ2EEVersionID(int id) { > switch (id) { >+ case (JEE_7_0_ID) : >+ primSetDoctypeValues(null, null); >+ primSetVersionID(EJB_3_2_ID); >+ break; > case (JEE_6_0_ID) : > primSetDoctypeValues(null, null); > primSetVersionID(EJB_3_1_ID); >diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEConstants.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEConstants.java >index 3d08362..73180ac 100644 >--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEConstants.java >+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEConstants.java >@@ -52,7 +52,8 @@ > String APP_CLIENT_ALT_SYSTEMID_1_3 = "http://java.sun.com/dtd/application-client_1.3.dtd"; //$NON-NLS-1$ > String APP_CLIENT_SCHEMA_1_4 = "http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd";//$NON-NLS-1$ > String APP_CLIENT_SCHEMA_5 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_5.xsd"; //$NON-NLS-1$ >- String APP_CLIENT_SCHEMA_6 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_6.xsd"; //$NON-NLS-1$ // EJB3 >+ String APP_CLIENT_SCHEMA_6 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_6.xsd"; //$NON-NLS-1$ >+ String APP_CLIENT_SCHEMA_7 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_7.xsd"; //$NON-NLS-1$ > > //Application constants > /** "Application_ID" */ >@@ -78,6 +79,7 @@ > String APPLICATION_SCHEMA_1_4 = "http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd";//$NON-NLS-1$ > String APPLICATION_SCHEMA_5 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd"; //$NON-NLS-1$ > String APPLICATION_SCHEMA_6 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_6.xsd"; //$NON-NLS-1$ >+ String APPLICATION_SCHEMA_7 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_7.xsd"; //$NON-NLS-1$ > > //EJB Jar Constants > /** "ejb-jar_ID" */ >@@ -103,6 +105,8 @@ > String EJBJAR_SCHEMA_3_0_NS = "http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"; //$NON-NLS-1$ > String EJBJAR_SCHEMA_3_1 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"; //$NON-NLS-1$ > String EJBJAR_SCHEMA_3_1_NS = "http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"; //$NON-NLS-1$ >+ String EJBJAR_SCHEMA_3_2 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_2.xsd"; //$NON-NLS-1$ >+ String EJBJAR_SCHEMA_3_2_NS = "http://java.sun.com/xml/ns/javaee/ejb-jar_3_2.xsd"; //$NON-NLS-1$ > > // EAR constants > >@@ -138,6 +142,7 @@ > String WEBAPP_SCHEMA_2_4 = "http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";//$NON-NLS-1$ > String WEBAPP_SCHEMA_2_5 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";//$NON-NLS-1$ > String WEBAPP_SCHEMA_3_0 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";//$NON-NLS-1$ >+ String WEBAPP_SCHEMA_3_1 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_1.xsd";//$NON-NLS-1$ > /** "WEB-INF/ejb-jar.xml" */ > String EJBJAR_IN_WAR_DD_URI = "WEB-INF/ejb-jar.xml"; //$NON-NLS-1$ > //J2C Resource Adapter Constants >@@ -202,19 +207,23 @@ > String JAVAEE_5_XSD_SHORT_NAME = "javaee_5.xsd"; //$NON-NLS-1$ //EJB3 > String XSI_NS_URL = "http://www.w3.org/2001/XMLSchema-instance"; //$NON-NLS-1$ > String APPLICATION_SCHEMA_LOC_1_4 = "http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"; //$NON-NLS-1$ >- String APPLICATION_SCHEMA_LOC_5 = "http://java.sun.com/xml/ns/javaee/application_5.xsd"; //$NON-NLS-1$ // EJB3 >- String APPLICATION_SCHEMA_LOC_6 = "http://java.sun.com/xml/ns/javaee/application_6.xsd"; //$NON-NLS-1$ // EAR6 >+ String APPLICATION_SCHEMA_LOC_5 = "http://java.sun.com/xml/ns/javaee/application_5.xsd"; //$NON-NLS-1$ >+ String APPLICATION_SCHEMA_LOC_6 = "http://java.sun.com/xml/ns/javaee/application_6.xsd"; //$NON-NLS-1$ >+ String APPLICATION_SCHEMA_LOC_7 = "http://java.sun.com/xml/ns/javaee/application_7.xsd"; //$NON-NLS-1$ > String APP_CLIENT_SCHEMA_LOC_1_4 = "http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"; //$NON-NLS-1$ >- String APP_CLIENT_SCHEMA_LOC_5 = "http://java.sun.com/xml/ns/javaee/application-client_5.xsd"; //$NON-NLS-1$ //EJB3 >- String APP_CLIENT_SCHEMA_LOC_6 = "http://java.sun.com/xml/ns/javaee/application-client_6.xsd"; //$NON-NLS-1$ //AppClient 6 >+ String APP_CLIENT_SCHEMA_LOC_5 = "http://java.sun.com/xml/ns/javaee/application-client_5.xsd"; //$NON-NLS-1$ >+ String APP_CLIENT_SCHEMA_LOC_6 = "http://java.sun.com/xml/ns/javaee/application-client_6.xsd"; //$NON-NLS-1$ >+ String APP_CLIENT_SCHEMA_LOC_7 = "http://java.sun.com/xml/ns/javaee/application-client_7.xsd"; //$NON-NLS-1$ > String EJB_JAR_SCHEMA_LOC_2_1 = "http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"; //$NON-NLS-1$ >- String EJB_JAR_SCHEMA_LOC_3_0 = "http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"; //$NON-NLS-1$ // EJB3 >- String EJB_JAR_SCHEMA_LOC_3_1 = "http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"; //$NON-NLS-1$ // EJB3.1 >+ String EJB_JAR_SCHEMA_LOC_3_0 = "http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"; //$NON-NLS-1$ >+ String EJB_JAR_SCHEMA_LOC_3_1 = "http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"; //$NON-NLS-1$ >+ String EJB_JAR_SCHEMA_LOC_3_2 = "http://java.sun.com/xml/ns/javaee/ejb-jar_3_2.xsd"; //$NON-NLS-1$ > String CONNECTOR_SCHEMA_LOC_1_5 = "http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"; //$NON-NLS-1$ > String CONNECTOR_SCHEMA_LOC_1_6 = "http://java.sun.com/xml/ns/javaee/connector_1_6.xsd"; //$NON-NLS-1$ > String WEB_APP_SCHEMA_LOC_2_4 = "http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"; //$NON-NLS-1$ >- String WEB_APP_SCHEMA_LOC_2_5 = "http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"; //$NON-NLS-1$ //EJB3 >- String WEB_APP_SCHEMA_LOC_3_0 = "http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"; //$NON-NLS-1$ //Web 3 >+ String WEB_APP_SCHEMA_LOC_2_5 = "http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"; //$NON-NLS-1$ >+ String WEB_APP_SCHEMA_LOC_3_0 = "http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"; //$NON-NLS-1$ >+ String WEB_APP_SCHEMA_LOC_3_1 = "http://java.sun.com/xml/ns/javaee/web-app_3_1.xsd"; //$NON-NLS-1$ > String WEB_SERVICES_CLIENT_SCHEMA_LOC_1_1 = "http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd"; //$NON-NLS-1$ > String JSP_SCHEMA_LOC_2_0 = "http://java.sun.com/xml/ns/j2ee/jsp_2_0.xsd"; //$NON-NLS-1$ > String JSP_SCHEMA_LOC_2_1 = "http://java.sun.com/xml/ns/javaee/jsp_2_1.xsd"; //$NON-NLS-1$ //EJB3 >diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEVersionConstants.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEVersionConstants.java >index 0b854db..802e5bc 100644 >--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEVersionConstants.java >+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEVersionConstants.java >@@ -33,17 +33,20 @@ > public int J2EE_1_4_ID = 14; > public int JEE_5_0_ID = 50; > public int JEE_6_0_ID = 60; >+ public int JEE_7_0_ID = 70; > public int EJB_1_0_ID = 10; > public int EJB_1_1_ID = 11; > public int EJB_2_0_ID = 20; > public int EJB_2_1_ID = 21; > public int EJB_3_0_ID = 30; > public int EJB_3_1_ID = 31; >+ public int EJB_3_2_ID = 32; > public int WEB_2_2_ID = 22; > public int WEB_2_3_ID = 23; > public int WEB_2_4_ID = 24; > public int WEB_2_5_ID = 25; > public int WEB_3_0_ID = 30; >+ public int WEB_3_1_ID = 31; > public int WEBFRAGMENT_3_0_ID = 30; > public int TAGLIB_1_1_ID = 11; > public int TAGLIB_1_2_ID = 12; >@@ -56,6 +59,7 @@ > public int SERVLET_2_4 = 24; > public int SERVLET_2_5 = 25; > public int SERVLET_3_0 = 30; >+ public int SERVLET_3_1 = 31; > public int JCA_1_0_ID = 10; > public int JCA_1_5_ID = 15; > public int JCA_1_6_ID = 16; >@@ -74,6 +78,7 @@ > public int VERSION_1_4 = 14; > public int VERSION_1_5 = 15; > public int VERSION_1_6 = 16; >+ public int VERSION_1_7 = 17; > public int VERSION_2_0 = 20; > public int VERSION_2_1 = 21; > public int VERSION_2_2 = 22; >@@ -82,8 +87,10 @@ > public int VERSION_2_5 = 25; > public int VERSION_3_0 = 30; > public int VERSION_3_1 = 31; >+ public int VERSION_3_2 = 32; > public int VERSION_5_0 = 50; > public int VERSION_6_0 = 60; >+ public int VERSION_7_0 = 70; > > public String VERSION_1_0_TEXT = "1.0"; //$NON-NLS-1$ > public String VERSION_1_1_TEXT = "1.1"; //$NON-NLS-1$ >@@ -100,9 +107,12 @@ > public String VERSION_2_5_TEXT = "2.5"; //$NON-NLS-1$ > public String VERSION_3_0_TEXT = "3.0"; //$NON-NLS-1$ > public String VERSION_3_1_TEXT = "3.1"; //$NON-NLS-1$ >+ public String VERSION_3_2_TEXT = "3.2"; //$NON-NLS-1$ > public String VERSION_5_0_TEXT = "5.0"; //$NON-NLS-1$ > public String VERSION_6_0_TEXT = "6.0"; //$NON-NLS-1$ >+ public String VERSION_7_0_TEXT = "7.0"; //$NON-NLS-1$ > public String VERSION_5_TEXT = "5"; //$NON-NLS-1$ > public String VERSION_6_TEXT = "6"; //$NON-NLS-1$ >+ public String VERSION_7_TEXT = "7"; //$NON-NLS-1$ > > } >diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/ConnectorResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/ConnectorResourceImpl.java >index 1179bb1..595178d 100644 >--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/ConnectorResourceImpl.java >+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/ConnectorResourceImpl.java >@@ -146,6 +146,7 @@ > @Override > public void setJ2EEVersionID(int id) { > switch (id) { >+ case(JEE_7_0_ID) : > case(JEE_6_0_ID) : > primSetDoctypeValues(null, null); > primSetVersionID(JCA_1_6_ID); >diff --git a/plugins/org.eclipse.jst.j2ee.web/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.j2ee.web/.settings/org.eclipse.jdt.core.prefs >index 8337c9e..7ba6289 100644 >--- a/plugins/org.eclipse.jst.j2ee.web/.settings/org.eclipse.jdt.core.prefs >+++ b/plugins/org.eclipse.jst.j2ee.web/.settings/org.eclipse.jdt.core.prefs >@@ -1,4 +1,3 @@ >-#Mon Feb 22 11:50:31 EET 2010 > eclipse.preferences.version=1 > instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true > org.eclipse.jdt.core.builder.cleanOutputFolder=clean >@@ -27,73 +26,9 @@ > org.eclipse.jdt.core.compiler.debug.localVariable=generate > org.eclipse.jdt.core.compiler.debug.sourceFile=generate > org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 >-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning > org.eclipse.jdt.core.compiler.problem.assertIdentifier=error >-org.eclipse.jdt.core.compiler.problem.autoboxing=warning >-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error >-org.eclipse.jdt.core.compiler.problem.deadCode=error >-org.eclipse.jdt.core.compiler.problem.deprecation=warning >-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled >-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled >-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning >-org.eclipse.jdt.core.compiler.problem.emptyStatement=error > org.eclipse.jdt.core.compiler.problem.enumIdentifier=error >-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error >-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled >-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning >-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning >-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error >-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error >-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error >-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error >-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error >-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore >-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning >-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error >-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning >-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error >-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error >-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled >-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error >-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error >-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error >-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error >-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error >-org.eclipse.jdt.core.compiler.problem.nullReference=error >-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error >-org.eclipse.jdt.core.compiler.problem.parameterAssignment=error >-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error >-org.eclipse.jdt.core.compiler.problem.potentialNullReference=error >-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning >-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error >-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error >-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled >-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error >-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled >-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore >-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error >-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning >-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning >-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning >-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error >-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error >-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore >-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning >-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled >-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled > org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled >-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled >-org.eclipse.jdt.core.compiler.problem.unusedImport=error >-org.eclipse.jdt.core.compiler.problem.unusedLabel=error >-org.eclipse.jdt.core.compiler.problem.unusedLocal=error >-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore >-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning >-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled >-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled >-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled >-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error >-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning >-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error > org.eclipse.jdt.core.compiler.source=1.5 > org.eclipse.jdt.core.incompatibleJDKLevel=ignore > org.eclipse.jdt.core.incompleteClasspath=error >diff --git a/plugins/org.eclipse.jst.j2ee.web/plugin.xml b/plugins/org.eclipse.jst.j2ee.web/plugin.xml >index f940841..f105718 100644 >--- a/plugins/org.eclipse.jst.j2ee.web/plugin.xml >+++ b/plugins/org.eclipse.jst.j2ee.web/plugin.xml >@@ -423,7 +423,7 @@ > <project-facet-version facet="jst.web" version="2.5"> > <constraint> > <and> >- <requires facet="jst.java" version="[5.0"/> >+ <requires facet="jst.java" version="[1.5"/> > <conflicts group="modules"/> > </and> > </constraint> >@@ -433,23 +433,33 @@ > <project-facet-version facet="jst.web" version="3.0"> > <constraint> > <and> >- <requires facet="jst.java" version="[6.0"/> >+ <requires facet="jst.java" version="[1.6"/> > <conflicts group="modules"/> > </and> > </constraint> > <group-member id="modules"/> > </project-facet-version> > >- <action facet="jst.web" version="[2.2-3.0]" type="INSTALL" id="jst.web.install"> >+ <project-facet-version facet="jst.web" version="3.1"> >+ <constraint> >+ <and> >+ <requires facet="jst.java" version="[1.7"/> >+ <conflicts group="modules"/> >+ </and> >+ </constraint> >+ <group-member id="modules"/> >+ </project-facet-version> >+ >+ <action facet="jst.web" type="INSTALL" id="jst.web.install"> > <delegate class="org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDelegate"/> > <config-factory class="org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDataModelProvider"/> > </action> > >- <event-handler facet="jst.web" version="[2.2-3.0]" type="RUNTIME_CHANGED"> >+ <event-handler facet="jst.web" type="RUNTIME_CHANGED"> > <delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/> > </event-handler> > >- <event-handler type="POST_INSTALL" facet="jst.web" version="[2.2-3.0]"> >+ <event-handler type="POST_INSTALL" facet="jst.web"> > <delegate class="org.eclipse.jst.j2ee.web.project.facet.WebFacetPostInstallDelegate"/> > </event-handler> > >diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java >index b696c7b..2f8e3a8 100644 >--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java >+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java >@@ -99,6 +99,9 @@ > else if(J2EEVersionConstants.VERSION_3_0_TEXT.equals(facetVersion)) { > return Boolean.valueOf(J2EEPlugin.getDefault().getJ2EEPreferences().getBoolean(J2EEPreferences.Keys.EE6_DYNAMIC_WEB_GENERATE_DD)); > } >+ else if(J2EEVersionConstants.VERSION_3_1_TEXT.equals(facetVersion)) { >+ return Boolean.valueOf(J2EEPlugin.getDefault().getJ2EEPreferences().getBoolean(J2EEPreferences.Keys.EE7_DYNAMIC_WEB_GENERATE_DD)); >+ } > > return Boolean.TRUE; > }else if (propertyName.equals(INSTALL_WEB_LIBRARY)){ >diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDelegate.java >index 0a57b65..76d7f9b 100644 >--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDelegate.java >+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDelegate.java >@@ -110,7 +110,13 @@ > J2EEModuleVirtualComponent.setDefaultDeploymentDescriptorFolder(webroot, configFolderPath, null); > } > >- if( fv == WebFacetUtils.WEB_30 ) >+ if( fv == WebFacetUtils.WEB_31 ) >+ { >+ if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){ >+ createWeb31DeploymentDescriptor(project, fv, webinfFolder, monitor); >+ } >+ } >+ else if( fv == WebFacetUtils.WEB_30 ) > { > if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){ > createWeb30DeploymentDescriptor(project, fv, webinfFolder, monitor); >@@ -220,6 +226,23 @@ > } > return pjpath.append(model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER)); > } >+ >+ private void createWeb31DeploymentDescriptor(final IProject project, final IProjectFacetVersion fv, >+ IFolder webinfFolder, IProgressMonitor monitor) throws CoreException { >+ // Create the deployment descriptor (web.xml) if one doesn't exist >+ IFile webxmlFile = webinfFolder.getFile("web.xml"); //$NON-NLS-1$ >+ if (!webxmlFile.exists()) { >+ try { >+ // Create a minimal web.xml file, so the model can be initialized >+ final String webXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<web-app id=\"WebApp_ID\" version=\"3.1\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_1.xsd\">\n</web-app>"; //$NON-NLS-1$ >+ webxmlFile.create(new ByteArrayInputStream(webXmlContents.getBytes("UTF-8")), true, monitor); //$NON-NLS-1$ >+ >+ populateDefaultContent(project, fv); >+ } catch (UnsupportedEncodingException e) { >+ WebPlugin.logError(e); >+ } >+ } >+ } > > private void createWeb30DeploymentDescriptor(final IProject project, final IProjectFacetVersion fv, > IFolder webinfFolder, IProgressMonitor monitor) throws CoreException { >diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetUtils.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetUtils.java >index c53840d..23cd5e6 100644 >--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetUtils.java >+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetUtils.java >@@ -24,6 +24,7 @@ > public static final IProjectFacetVersion WEB_24 = WEB_FACET.getVersion("2.4"); //$NON-NLS-1$ > public static final IProjectFacetVersion WEB_25 = WEB_FACET.getVersion("2.5"); //$NON-NLS-1$ > public static final IProjectFacetVersion WEB_30 = WEB_FACET.getVersion("3.0"); //$NON-NLS-1$ >+ public static final IProjectFacetVersion WEB_31 = WEB_FACET.getVersion("3.1"); //$NON-NLS-1$ > public static final IProjectFacetVersion WEBFRAGMENT_30 = WEBFRAGMENT_FACET.getVersion("3.0"); //$NON-NLS-1$ > > public static final IProjectFacet WEB_XDOCLET_FACET = getWebDocletFacet(); >diff --git a/plugins/org.eclipse.jst.j2ee/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.j2ee/.settings/org.eclipse.jdt.core.prefs >index 742a700..2ba2c18 100644 >--- a/plugins/org.eclipse.jst.j2ee/.settings/org.eclipse.jdt.core.prefs >+++ b/plugins/org.eclipse.jst.j2ee/.settings/org.eclipse.jdt.core.prefs >@@ -1,95 +1,32 @@ >-#Wed Jun 24 20:14:48 EDT 2009 >-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled >-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error >-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error >-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error >-org.eclipse.jdt.core.compiler.problem.unusedLocal=error >-org.eclipse.jdt.core.compiler.problem.emptyStatement=error >-org.eclipse.jdt.core.compiler.problem.unusedLabel=error >-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning >-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning >-org.eclipse.jdt.core.incompatibleJDKLevel=ignore >-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error >-org.eclipse.jdt.core.compiler.debug.lineNumber=generate >-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning >+eclipse.preferences.version=1 >+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true > org.eclipse.jdt.core.builder.cleanOutputFolder=clean >-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning >-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error >-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled >-org.eclipse.jdt.core.compiler.problem.deprecation=warning >-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled >-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error >-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled >-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error >-org.eclipse.jdt.core.compiler.problem.unusedImport=error >+org.eclipse.jdt.core.builder.duplicateResourceTask=warning >+org.eclipse.jdt.core.builder.invalidClasspath=abort > org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore > org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch >-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled >-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled >-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error >-org.eclipse.jdt.core.builder.invalidClasspath=abort >-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning >-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error >-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error >-org.eclipse.jdt.core.codeComplete.argumentSuffixes= >-org.eclipse.jdt.core.codeComplete.argumentPrefixes= >-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore >-org.eclipse.jdt.core.compiler.problem.potentialNullReference=error >-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled >-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning >-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error >-org.eclipse.jdt.core.compiler.problem.nullReference=error >-org.eclipse.jdt.core.compiler.source=1.5 >-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error >-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore >-org.eclipse.jdt.core.builder.duplicateResourceTask=warning >-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning >-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled >-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error >-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error >-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error >-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error >-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning >-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled >-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error >-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning >-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore >-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error >-eclipse.preferences.version=1 >-org.eclipse.jdt.core.incompleteClasspath=error >-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error >-org.eclipse.jdt.core.compiler.problem.deadCode=error >-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled >-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled >-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error >-org.eclipse.jdt.core.compiler.debug.sourceFile=generate >-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled >-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning >-org.eclipse.jdt.core.codeComplete.fieldPrefixes= >-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning >-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 >-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error >-org.eclipse.jdt.core.compiler.problem.autoboxing=warning > org.eclipse.jdt.core.circularClasspath=error >-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning >-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error >+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled >+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled >+org.eclipse.jdt.core.codeComplete.argumentPrefixes= >+org.eclipse.jdt.core.codeComplete.argumentSuffixes= >+org.eclipse.jdt.core.codeComplete.fieldPrefixes= > org.eclipse.jdt.core.codeComplete.fieldSuffixes= >-org.eclipse.jdt.core.codeComplete.localSuffixes= >-org.eclipse.jdt.core.compiler.problem.parameterAssignment=error >-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error > org.eclipse.jdt.core.codeComplete.localPrefixes= >-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled >-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 >-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error >-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error >-org.eclipse.jdt.core.compiler.compliance=1.5 >-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled >+org.eclipse.jdt.core.codeComplete.localSuffixes= > org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= >-org.eclipse.jdt.core.compiler.debug.localVariable=generate >-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning >-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true >-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error >-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve >-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning >-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled > org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= >+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled >+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 >+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve >+org.eclipse.jdt.core.compiler.compliance=1.5 >+org.eclipse.jdt.core.compiler.debug.lineNumber=generate >+org.eclipse.jdt.core.compiler.debug.localVariable=generate >+org.eclipse.jdt.core.compiler.debug.sourceFile=generate >+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 >+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error >+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error >+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled >+org.eclipse.jdt.core.compiler.source=1.5 >+org.eclipse.jdt.core.incompatibleJDKLevel=ignore >+org.eclipse.jdt.core.incompleteClasspath=error >diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDelegate.java >index 46ab1bf..22297c7 100644 >--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDelegate.java >+++ b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDelegate.java >@@ -114,7 +114,9 @@ > IPath configFolderpath = pjpath.append(configFolderName); > sourceFolder = ws.getRoot().getFolder(configFolderpath); > >- if( fv == IJ2EEFacetConstants.APPLICATION_CLIENT_60 || fv == IJ2EEFacetConstants.APPLICATION_CLIENT_50) >+ if( fv == IJ2EEFacetConstants.APPLICATION_CLIENT_70 || >+ fv == IJ2EEFacetConstants.APPLICATION_CLIENT_60 || >+ fv == IJ2EEFacetConstants.APPLICATION_CLIENT_50 ) > { > if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){ > // Create the deployment descriptor (application-client.xml) if one doesn't exist >@@ -126,7 +128,10 @@ > ((IFolder)appClientFile.getParent()).create(true, true, monitor); > } > String appClientXmlContents = null; >- if( fv == IJ2EEFacetConstants.APPLICATION_CLIENT_60) { >+ if( fv == IJ2EEFacetConstants.APPLICATION_CLIENT_70) { >+ appClientXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<application-client version=\"7\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_7.xsd\">\n <display-name>" + XMLWriter.getEscaped(project.getName()) + "</display-name> \n </application-client>"; //$NON-NLS-1$ //$NON-NLS-2$ >+ } >+ else if( fv == IJ2EEFacetConstants.APPLICATION_CLIENT_60) { > appClientXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<application-client version=\"6\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_6.xsd\">\n <display-name>" + XMLWriter.getEscaped(project.getName()) + "</display-name> \n </application-client>"; //$NON-NLS-1$ //$NON-NLS-2$ > } > else { >diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEArchiveUtilities.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEArchiveUtilities.java >index f479b8c..e4fdbb3 100644 >--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEArchiveUtilities.java >+++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEArchiveUtilities.java >@@ -192,6 +192,8 @@ > version = J2EEVersionConstants.JEE_5_0_ID; > } else if (versionStr.equals(J2EEVersionConstants.VERSION_6_0_TEXT)) { > version = J2EEVersionConstants.JEE_6_0_ID; >+ } else if (versionStr.equals(J2EEVersionConstants.VERSION_7_0_TEXT)) { >+ version = J2EEVersionConstants.JEE_7_0_ID; > } > break; > case J2EEVersionConstants.CONNECTOR_TYPE: >@@ -214,6 +216,8 @@ > version = J2EEVersionConstants.EJB_3_0_ID; > } else if (versionStr.equals(J2EEVersionConstants.VERSION_3_1_TEXT)) { > version = J2EEVersionConstants.EJB_3_1_ID; >+ } else if (versionStr.equals(J2EEVersionConstants.VERSION_3_2_TEXT)) { >+ version = J2EEVersionConstants.EJB_3_2_ID; > } > break; > case J2EEVersionConstants.WEB_TYPE: >@@ -227,6 +231,8 @@ > version = J2EEVersionConstants.WEB_2_5_ID; > } else if (versionStr.equals(J2EEVersionConstants.VERSION_3_0_TEXT)) { > version = J2EEVersionConstants.WEB_3_0_ID; >+ } else if (versionStr.equals(J2EEVersionConstants.VERSION_3_1_TEXT)) { >+ version = J2EEVersionConstants.WEB_3_1_ID; > } > break; > } >diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EEVersionUtil.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EEVersionUtil.java >index 185e22c..0aab384 100644 >--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EEVersionUtil.java >+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EEVersionUtil.java >@@ -39,6 +39,9 @@ > > case J2EEVersionConstants.SERVLET_3_0: > return J2EEVersionConstants.VERSION_3_0_TEXT; >+ >+ case J2EEVersionConstants.SERVLET_3_1: >+ return J2EEVersionConstants.VERSION_3_1_TEXT; > } > return ""; //$NON-NLS-1$ > >@@ -64,6 +67,9 @@ > > case J2EEVersionConstants.EJB_3_1_ID: > return J2EEVersionConstants.VERSION_3_1_TEXT; >+ >+ case J2EEVersionConstants.EJB_3_2_ID: >+ return J2EEVersionConstants.VERSION_3_2_TEXT; > } > return ""; //$NON-NLS-1$ > } >@@ -100,6 +106,9 @@ > case J2EEVersionConstants.JEE_6_0_ID: > return J2EEVersionConstants.VERSION_6_0_TEXT; > >+ case J2EEVersionConstants.JEE_7_0_ID: >+ return J2EEVersionConstants.VERSION_7_0_TEXT; >+ > } > return "";//$NON-NLS-1$ > } >@@ -115,6 +124,8 @@ > return J2EEVersionConstants.JEE_5_0_ID; > if (version.equals(J2EEVersionConstants.VERSION_6_0_TEXT)) > return J2EEVersionConstants.JEE_6_0_ID; >+ if (version.equals(J2EEVersionConstants.VERSION_7_0_TEXT)) >+ return J2EEVersionConstants.JEE_7_0_ID; > // default > return J2EEVersionConstants.JEE_5_0_ID; > } >@@ -130,6 +141,8 @@ > return J2EEVersionConstants.JEE_5_0_ID; > if (version.equals(J2EEVersionConstants.VERSION_3_1_TEXT)) > return J2EEVersionConstants.JEE_6_0_ID; >+ if (version.equals(J2EEVersionConstants.VERSION_3_2_TEXT)) >+ return J2EEVersionConstants.JEE_7_0_ID; > // default > return J2EEVersionConstants.JEE_5_0_ID; > } >@@ -145,6 +158,8 @@ > return J2EEVersionConstants.JEE_5_0_ID; > if (version.equals(J2EEVersionConstants.VERSION_3_0_TEXT)) > return J2EEVersionConstants.JEE_6_0_ID; >+ if (version.equals(J2EEVersionConstants.VERSION_3_1_TEXT)) >+ return J2EEVersionConstants.JEE_7_0_ID; > // default > return J2EEVersionConstants.J2EE_1_4_ID; > } >@@ -176,6 +191,8 @@ > return J2EEVersionConstants.EJB_3_0_ID; > case J2EEVersionConstants.JEE_6_0_ID: > return J2EEVersionConstants.EJB_3_1_ID; >+ case J2EEVersionConstants.JEE_7_0_ID: >+ return J2EEVersionConstants.EJB_3_2_ID; > } > // default > return J2EEVersionConstants.EJB_3_1_ID; >@@ -193,6 +210,8 @@ > return J2EEVersionConstants.WEB_2_5_ID; > case J2EEVersionConstants.JEE_6_0_ID: > return J2EEVersionConstants.WEB_3_0_ID; >+ case J2EEVersionConstants.JEE_7_0_ID: >+ return J2EEVersionConstants.WEB_3_1_ID; > } > // default > return J2EEVersionConstants.WEB_3_0_ID; >@@ -206,6 +225,7 @@ > case J2EEVersionConstants.JEE_5_0_ID: > return J2EEVersionConstants.JCA_1_5_ID; > case J2EEVersionConstants.JEE_6_0_ID: >+ case J2EEVersionConstants.JEE_7_0_ID: > return J2EEVersionConstants.JCA_1_6_ID; > } > // default >@@ -275,11 +295,17 @@ > else if (J2EEVersionConstants.VERSION_3_1_TEXT.equals(version)) > nVersion = J2EEVersionConstants.VERSION_3_1; > >+ else if (J2EEVersionConstants.VERSION_3_2_TEXT.equals(version)) >+ nVersion = J2EEVersionConstants.VERSION_3_2; >+ > else if (J2EEVersionConstants.VERSION_5_0_TEXT.equals(version)) > nVersion = J2EEVersionConstants.VERSION_5_0; > > else if (J2EEVersionConstants.VERSION_6_0_TEXT.equals(version)) > nVersion = J2EEVersionConstants.VERSION_6_0; >+ >+ else if (J2EEVersionConstants.VERSION_7_0_TEXT.equals(version)) >+ nVersion = J2EEVersionConstants.VERSION_7_0; > > return nVersion; > } >@@ -331,12 +357,18 @@ > else if (version == J2EEVersionConstants.VERSION_3_1) > nVersion = J2EEVersionConstants.VERSION_3_1_TEXT; > >+ else if (version == J2EEVersionConstants.VERSION_3_2) >+ nVersion = J2EEVersionConstants.VERSION_3_2_TEXT; >+ > else if (version == J2EEVersionConstants.VERSION_5_0) > nVersion = J2EEVersionConstants.VERSION_5_0_TEXT; > > else if (version == J2EEVersionConstants.VERSION_6_0) > nVersion = J2EEVersionConstants.VERSION_6_0_TEXT; > >+ else if (version == J2EEVersionConstants.VERSION_7_0) >+ nVersion = J2EEVersionConstants.VERSION_7_0_TEXT; >+ > return nVersion; > } > >diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/EarUtilities.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/EarUtilities.java >index b14d2c0..763669d 100644 >--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/EarUtilities.java >+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/EarUtilities.java >@@ -382,8 +382,12 @@ > > if (DYNAMIC_WEB.equals(moduleProjectFacetId)) { > switch (earVersion) { >+ case J2EEVersionConstants.VERSION_7_0: >+ retVal.add(DYNAMIC_WEB_31); >+ //$FALL-THROUGH$ > case J2EEVersionConstants.VERSION_6_0: > retVal.add(DYNAMIC_WEB_30); >+ //$FALL-THROUGH$ > case J2EEVersionConstants.VERSION_5_0: > retVal.add(DYNAMIC_WEB_25); > //$FALL-THROUGH$ >@@ -399,8 +403,12 @@ > } > } else if (EJB.equals(moduleProjectFacetId)) { > switch (earVersion) { >+ case J2EEVersionConstants.VERSION_7_0: >+ retVal.add(EJB_32); >+ //$FALL-THROUGH$ > case J2EEVersionConstants.VERSION_6_0: > retVal.add(EJB_31); >+ //$FALL-THROUGH$ > case J2EEVersionConstants.VERSION_5_0: > retVal.add(EJB_30); > //$FALL-THROUGH$ >@@ -415,6 +423,7 @@ > } > } else if (JCA.equals(moduleProjectFacetId)) { > switch (earVersion) { >+ case J2EEVersionConstants.VERSION_7_0: > case J2EEVersionConstants.VERSION_6_0: > retVal.add(JCA_16); > case J2EEVersionConstants.VERSION_5_0: >@@ -429,8 +438,12 @@ > } > } else if (APPLICATION_CLIENT.equals(moduleProjectFacetId)) { > switch (earVersion) { >+ case J2EEVersionConstants.VERSION_7_0: >+ retVal.add(APPLICATION_CLIENT_70); >+ //$FALL-THROUGH$ > case J2EEVersionConstants.VERSION_6_0: > retVal.add(APPLICATION_CLIENT_60); >+ //$FALL-THROUGH$ > case J2EEVersionConstants.VERSION_5_0: > retVal.add(APPLICATION_CLIENT_50); > //$FALL-THROUGH$ >diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/IJ2EEFacetConstants.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/IJ2EEFacetConstants.java >index c855b67..c06f8b0 100644 >--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/IJ2EEFacetConstants.java >+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/IJ2EEFacetConstants.java >@@ -25,6 +25,7 @@ > public static final IProjectFacetVersion ENTERPRISE_APPLICATION_14 = ENTERPRISE_APPLICATION_FACET.getVersion("1.4"); //$NON-NLS-1$ > public static final IProjectFacetVersion ENTERPRISE_APPLICATION_50 = ENTERPRISE_APPLICATION_FACET.getVersion("5.0"); //$NON-NLS-1$ > public static final IProjectFacetVersion ENTERPRISE_APPLICATION_60 = ENTERPRISE_APPLICATION_FACET.getVersion("6.0"); //$NON-NLS-1$ >+ public static final IProjectFacetVersion ENTERPRISE_APPLICATION_70 = ENTERPRISE_APPLICATION_FACET.getVersion("7.0"); //$NON-NLS-1$ > > public static final String APPLICATION_CLIENT = IModuleConstants.JST_APPCLIENT_MODULE; > public IProjectFacet APPLICATION_CLIENT_FACET = ProjectFacetsManager.getProjectFacet(APPLICATION_CLIENT); >@@ -33,6 +34,7 @@ > public static final IProjectFacetVersion APPLICATION_CLIENT_14 = APPLICATION_CLIENT_FACET.getVersion("1.4"); //$NON-NLS-1$ > public static final IProjectFacetVersion APPLICATION_CLIENT_50 = APPLICATION_CLIENT_FACET.getVersion("5.0"); //$NON-NLS-1$ > public static final IProjectFacetVersion APPLICATION_CLIENT_60 = APPLICATION_CLIENT_FACET.getVersion("6.0"); //$NON-NLS-1$ >+ public static final IProjectFacetVersion APPLICATION_CLIENT_70 = APPLICATION_CLIENT_FACET.getVersion("7.0"); //$NON-NLS-1$ > > public static final String EJB = IModuleConstants.JST_EJB_MODULE; > public IProjectFacet EJB_FACET = ProjectFacetsManager.getProjectFacet(EJB); >@@ -41,6 +43,7 @@ > public static final IProjectFacetVersion EJB_21 = EJB_FACET.getVersion("2.1"); //$NON-NLS-1$ > public static final IProjectFacetVersion EJB_30 = EJB_FACET.getVersion("3.0"); //$NON-NLS-1$ > public static final IProjectFacetVersion EJB_31 = EJB_FACET.getVersion("3.1"); //$NON-NLS-1$ >+ public static final IProjectFacetVersion EJB_32 = EJB_FACET.getVersion("3.2"); //$NON-NLS-1$ > > public static final String DYNAMIC_WEB = IModuleConstants.JST_WEB_MODULE; > public IProjectFacet DYNAMIC_WEB_FACET = ProjectFacetsManager.getProjectFacet(DYNAMIC_WEB); >@@ -49,6 +52,7 @@ > public static final IProjectFacetVersion DYNAMIC_WEB_24 = DYNAMIC_WEB_FACET.getVersion("2.4"); //$NON-NLS-1$ > public static final IProjectFacetVersion DYNAMIC_WEB_25 = DYNAMIC_WEB_FACET.getVersion("2.5"); //$NON-NLS-1$ > public static final IProjectFacetVersion DYNAMIC_WEB_30 = DYNAMIC_WEB_FACET.getVersion("3.0"); //$NON-NLS-1$ >+ public static final IProjectFacetVersion DYNAMIC_WEB_31 = DYNAMIC_WEB_FACET.getVersion("3.1"); //$NON-NLS-1$ > > public static final String DYNAMIC_WEB_XDOCLET = "jst.web.xdoclet"; //$NON-NLS-1$ > >diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java >index c39f34e..31a7726 100644 >--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java >+++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java >@@ -83,6 +83,10 @@ > */ > static final String EE6_DYNAMIC_WEB_GENERATE_DD = "ee6_dynamic_web_generate_dd"; //$NON-NLS-1$ > /** >+ * @since 3.5 >+ */ >+ static final String EE7_DYNAMIC_WEB_GENERATE_DD = "ee7_dynamic_web_generate_dd"; //$NON-NLS-1$ >+ /** > * @since 2.0 > */ > static final String EJB_GENERATE_DD = "ejb_generate_dd"; //$NON-NLS-1$ >diff --git a/plugins/org.eclipse.jst.j2ee/plugin.xml b/plugins/org.eclipse.jst.j2ee/plugin.xml >index cba8b41..f7d93ce 100644 >--- a/plugins/org.eclipse.jst.j2ee/plugin.xml >+++ b/plugins/org.eclipse.jst.j2ee/plugin.xml >@@ -432,7 +432,6 @@ > </and> > </constraint> > <group-member id="modules"/> >- > </project-facet-version> > > <project-facet-version facet="jst.ear" version="6.0"> >@@ -443,19 +442,28 @@ > </and> > </constraint> > <group-member id="modules"/> >- > </project-facet-version> > >- <action facet="jst.ear" version="[1.2-6.0]" type="INSTALL" id="jst.ear.install"> >+ <project-facet-version facet="jst.ear" version="7.0"> >+ <constraint> >+ <and> >+ <conflicts group="modules"/> >+ <conflicts facet="jst.java"/> >+ </and> >+ </constraint> >+ <group-member id="modules"/> >+ </project-facet-version> >+ >+ <action facet="jst.ear" type="INSTALL" id="jst.ear.install"> > <delegate class="org.eclipse.jst.j2ee.project.facet.EarFacetInstallDelegate"/> > <config-factory class="org.eclipse.jst.j2ee.internal.earcreation.EarFacetInstallDataModelProvider"/> > </action> > >- <event-handler facet="jst.ear" version="[1.2-6.0]" type="POST_INSTALL"> >+ <event-handler facet="jst.ear" type="POST_INSTALL"> > <delegate class="org.eclipse.jst.j2ee.project.facet.EarFacetPostInstallDelegate"/> > </event-handler> > >- <event-handler facet="jst.ear" version="[1.2-6.0]" type="RUNTIME_CHANGED"> >+ <event-handler facet="jst.ear" type="RUNTIME_CHANGED"> > <delegate class="org.eclipse.jst.j2ee.project.facet.EarFacetRuntimeHandler$RuntimeChangedDelegate"/> > </event-handler> > >@@ -530,7 +538,7 @@ > <project-facet-version facet="jst.appclient" version="5.0"> > <constraint> > <and> >- <requires facet="jst.java" version="[5.0"/> >+ <requires facet="jst.java" version="[1.5"/> > <conflicts group="modules"/> > </and> > </constraint> >@@ -540,23 +548,33 @@ > <project-facet-version facet="jst.appclient" version="6.0"> > <constraint> > <and> >- <requires facet="jst.java" version="[6.0"/> >+ <requires facet="jst.java" version="[1.6"/> > <conflicts group="modules"/> > </and> > </constraint> > <group-member id="modules"/> > </project-facet-version> > >- <action type="install" facet="jst.appclient" version="[1.2-6.0]" id="jst.appclient.install"> >+ <project-facet-version facet="jst.appclient" version="7.0"> >+ <constraint> >+ <and> >+ <requires facet="jst.java" version="[1.7"/> >+ <conflicts group="modules"/> >+ </and> >+ </constraint> >+ <group-member id="modules"/> >+ </project-facet-version> >+ >+ <action type="install" facet="jst.appclient" id="jst.appclient.install"> > <delegate class="org.eclipse.jst.j2ee.project.facet.AppClientFacetInstallDelegate"/> > <config-factory class="org.eclipse.jst.j2ee.project.facet.AppClientFacetInstallDataModelProvider"/> > </action> > >- <event-handler type="POST_INSTALL" facet="jst.appclient" version="[1.2-6.0]"> >+ <event-handler type="POST_INSTALL" facet="jst.appclient"> > <delegate class="org.eclipse.jst.j2ee.project.facet.AppClientFacetPostInstallDelegate"/> > </event-handler> > >- <event-handler type="RUNTIME_CHANGED" facet="jst.appclient" version="[1.2-6.0]"> >+ <event-handler type="RUNTIME_CHANGED" facet="jst.appclient"> > <delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/> > </event-handler> > >diff --git a/plugins/org.eclipse.jst.jee.web/plugin.xml b/plugins/org.eclipse.jst.jee.web/plugin.xml >index 4f8275b..0dcf178 100644 >--- a/plugins/org.eclipse.jst.jee.web/plugin.xml >+++ b/plugins/org.eclipse.jst.jee.web/plugin.xml >@@ -4,16 +4,13 @@ > <extension > point="org.eclipse.jst.j2ee.J2EEModelProvider"> > <provider> >- > <modelProvider factoryClass="org.eclipse.jst.jee.model.internal.Web25MergedModelProviderFactory"/> >- <!--<modelProvider factoryClass="org.eclipse.jst.jee.model.internal.Web25ModelProviderFactory"/>--> >- <facet id="jst.web" versions="2.5,3.0"/> >+ <facet id="jst.web" versions="2.5,3.0,3.1"/> > </provider> > </extension> > <extension > point="org.eclipse.jst.j2ee.J2EEModelProvider"> > <provider> >- > <modelProvider factoryClass="org.eclipse.jst.jee.model.internal.WebFragment30ModelProviderFactory"/> > <facet id="jst.webfragment" versions="3.0"/> > </provider> >diff --git a/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF >index 3873943..7c799bd 100644 >--- a/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF >+++ b/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF >@@ -48,6 +48,7 @@ > org.eclipse.team.cvs.core;bundle-version="[3.3.0,5.0.0)", > org.eclipse.team.cvs.ui;bundle-version="[3.3.0,5.0.0)", > org.eclipse.team.core;bundle-version="[3.5.0,5.0.0)", >- org.eclipse.team.ui;bundle-version="[3.5.0,5.0.0)" >+ org.eclipse.team.ui;bundle-version="[3.5.0,5.0.0)", >+ org.eclipse.jst.common.project.facet.core;bundle-version="[1.4.0,2.0.0)" > Eclipse-LazyStart: true > Bundle-RequiredExecutionEnvironment: J2SE-1.5 >diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebModuleTypeDialog.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebModuleTypeDialog.java >index a6409d0..1fe44dc 100644 >--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebModuleTypeDialog.java >+++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebModuleTypeDialog.java >@@ -30,7 +30,7 @@ > private String fShellTitle = IWebWizardConstants.CONVERT_TO_WEB_TITLE; > private String fLabelText = IWebWizardConstants.SELECT_WEB_VERSION; > private static String fSelection= null; >- private String[] fAllowedStrings = new String[] {J2EEVersionConstants.VERSION_2_2_TEXT, J2EEVersionConstants.VERSION_2_3_TEXT, J2EEVersionConstants.VERSION_2_4_TEXT, J2EEVersionConstants.VERSION_2_5_TEXT, J2EEVersionConstants.VERSION_3_0_TEXT}; >+ private String[] fAllowedStrings = new String[] {J2EEVersionConstants.VERSION_2_2_TEXT, J2EEVersionConstants.VERSION_2_3_TEXT, J2EEVersionConstants.VERSION_2_4_TEXT, J2EEVersionConstants.VERSION_2_5_TEXT, J2EEVersionConstants.VERSION_3_0_TEXT, J2EEVersionConstants.VERSION_3_1_TEXT}; > private int fInitialSelectionIndex = fAllowedStrings.length-1; > > public static String getSelectedVersion() { >diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java >index fe4506f..8eac032 100644 >--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java >+++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java >@@ -15,7 +15,7 @@ > import java.util.HashSet; > import java.util.Set; > >-import org.eclipse.jst.common.project.facet.JavaFacetUtils; >+import org.eclipse.jst.common.project.facet.core.JavaFacet; > import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; > import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons; > import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; >@@ -55,22 +55,25 @@ > else { > facets.add( primaryFacetVersion ); > >- if( primaryFacetVersion == WebFacetUtils.WEB_30) >+ if( primaryFacetVersion == WebFacetUtils.WEB_31 ) > { >- facets.add( JavaFacetUtils.JAVA_60 ); >+ facets.add( JavaFacet.VERSION_1_7 ); >+ } >+ else if( primaryFacetVersion == WebFacetUtils.WEB_30 ) >+ { >+ facets.add( JavaFacet.VERSION_1_6 ); > } > else if(primaryFacetVersion == WebFacetUtils.WEB_25 ) > { >- facets.add( JavaFacetUtils.JAVA_50 ); >+ facets.add( JavaFacet.VERSION_1_5 ); > } > else if( primaryFacetVersion == WebFacetUtils.WEB_24 ) > { >- facets.add( JavaFacetUtils.JAVA_14 ); >+ facets.add( JavaFacet.VERSION_1_4 ); > } >- else if( primaryFacetVersion == WebFacetUtils.WEB_23 || >- primaryFacetVersion == WebFacetUtils.WEB_22 ) >+ else if( primaryFacetVersion == WebFacetUtils.WEB_23 || primaryFacetVersion == WebFacetUtils.WEB_22 ) > { >- facets.add( JavaFacetUtils.JAVA_13 ); >+ facets.add( JavaFacet.VERSION_1_3 ); > } > } > return Collections.unmodifiableSet( facets );
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=226473">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 399524
:
226470
|
226472
|
226473
|
226474
|
226543
|
226544
|
227758
|
227759
|
227761
|
227762
|
227763
|
227764
|
227770
|
227772
|
228033
|
228379
|
228382
|
228456
