[308546] Update default facets to correspond with Java EE 6
diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/util/FacetModuleCoreSupport.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/util/FacetModuleCoreSupport.java
index dcfea95..33b8c64 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/util/FacetModuleCoreSupport.java
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/util/FacetModuleCoreSupport.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * Copyright (c) 2007, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -36,6 +36,8 @@
private static final String WEB_INF = "WEB-INF"; //$NON-NLS-1$
private static final IPath WEB_INF_PATH = new Path(WEB_INF);
+ static final float DEFAULT_SERVLET_VERSION = 3f;
+
/**
* @param project
* @return the computed IPath to the "root" of the web contents, either from facet knowledge or hueristics, or null if one can not be determined
@@ -69,7 +71,7 @@
*/
public static float getDynamicWebProjectVersion(IProject project) {
// In the absence of any facet information, assume the highest level
- float version = 2.5f;
+ float version = DEFAULT_SERVLET_VERSION;
try {
version = FacetModuleCoreSupportDelegate.getDynamicWebProjectVersion(project);
}
@@ -230,6 +232,4 @@
return basePath.uptoSegment(1);
}
-
-
}
diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/util/FacetModuleCoreSupportDelegate.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/util/FacetModuleCoreSupportDelegate.java
index efbb85f..c751360 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/util/FacetModuleCoreSupportDelegate.java
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/util/FacetModuleCoreSupportDelegate.java
@@ -43,8 +43,6 @@
* @see org.eclipse.wst.common.componentcore.internal.util.IModuleConstants.JST_WEB_MODULE
*/
private final static String JST_WEB_MODULE = "jst.web"; //$NON-NLS-1$
- private static final float JST_WEB_MODULE_DEFAULT_VERSION = 3f;
-
/**
* @param project
* @return -1 if the project does not have the JST Web facet, the version
@@ -53,10 +51,10 @@
*/
static float getDynamicWebProjectVersion(IProject project) {
if (project == null)
- return JST_WEB_MODULE_DEFAULT_VERSION;
+ return FacetModuleCoreSupport.DEFAULT_SERVLET_VERSION;
// In the absence of any facet information, assume the highest level
- float version = JST_WEB_MODULE_DEFAULT_VERSION;
+ float version = FacetModuleCoreSupport.DEFAULT_SERVLET_VERSION;
try {
IFacetedProject faceted = ProjectFacetsManager.create(project);
if (faceted != null && ProjectFacetsManager.isProjectFacetDefined(JST_WEB_MODULE)) {
