[417874] SimpleWebFacetInstallDataModelProvider should use ProductManager default
diff --git a/web/bundles/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebPreferences.java b/web/bundles/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebPreferences.java
index df92af8..a75e10c 100644
--- a/web/bundles/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebPreferences.java
+++ b/web/bundles/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebPreferences.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
+ * Copyright (c) 2003, 2021 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -21,7 +21,7 @@
final static String STATIC_WEB_CONTENT = "org.eclipse.jst.j2ee.preference.staticWebContentName"; //$NON-NLS-1$
}
public interface Values {
- final static String STATIC_WEB_CONTENT = "WebContent"; //$NON-NLS-1$
+ final static String STATIC_WEB_CONTENT = "public"; //$NON-NLS-1$
}
public interface Defaults {
final static String STATIC_WEB_CONTENT = Values.STATIC_WEB_CONTENT;
diff --git a/web/bundles/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDataModelProvider.java b/web/bundles/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDataModelProvider.java
index d138250..33826f3 100644
--- a/web/bundles/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDataModelProvider.java
+++ b/web/bundles/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDataModelProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
+ * Copyright (c) 2005, 2021 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -51,7 +51,7 @@
@Override
public Object getDefaultProperty(String propertyName) {
if (propertyName.equals(CONTENT_DIR)) {
- return "WebContent"; //$NON-NLS-1$
+ return ProductManager.getProperty(IProductConstants.STATIC_WEB_CONTENT_FOLDER);
} else if (propertyName.equals(CONTEXT_ROOT)) {
return getStringProperty(FACET_PROJECT_NAME).replace(' ', '_');
} else if (propertyName.equals(FACET_ID)) {
