Author: fbricon
Date: 2012-02-09 03:50:31 -0500 (Thu, 09 Feb 2012)
New Revision: 38532
Modified:
trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java
trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFUtils.java
Log:
JBIDE-10785 : refresh parent to prevent o.o.s.p.BackingStoreException: Resource
'/parent/web/.settings' does not exist.
Modified:
trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java
===================================================================
---
trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java 2012-02-09
07:02:27 UTC (rev 38531)
+++
trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java 2012-02-09
08:50:31 UTC (rev 38532)
@@ -44,6 +44,7 @@
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
import org.jboss.tools.maven.core.IJBossMavenConstants;
+import org.jboss.tools.maven.core.MavenUtil;
import org.jboss.tools.maven.core.ProjectUtil;
import
org.jboss.tools.maven.core.internal.project.facet.MavenFacetInstallDataModelProvider;
import org.jboss.tools.maven.jsf.MavenJSFActivator;
@@ -171,6 +172,11 @@
markerManager.deleteMarkers(fproj.getProject(),
MavenJSFConstants.JSF_CONFIGURATION_ERROR_MARKER_ID);
if (!fproj.hasProjectFacet(JSF_FACET)) {
+
+ //JBIDE-10785 : refresh parent to prevent
+ // org.osgi.service.prefs.BackingStoreException: Resource
'/parent/web/.settings' does not exist.
+ MavenUtil.refreshParent(mavenProject);
+
String warSourceDir = getWarSourceDirectory(mavenProject,fproj.getProject());
String facesConfigPath = "WEB-INF/faces-config.xml";
IFile facesConfig =
fproj.getProject().getFolder(warSourceDir).getFile(facesConfigPath);
Modified:
trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFUtils.java
===================================================================
---
trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFUtils.java 2012-02-09
07:02:27 UTC (rev 38531)
+++
trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFUtils.java 2012-02-09
08:50:31 UTC (rev 38532)
@@ -36,7 +36,9 @@
public class JSFUtils {
public static final String FACES_SERVLET = "javax.faces.webapp.FacesServlet";
-
+
+ private static final String FACES_SERVLET_XPATH =
"//servlet[servlet-class=\"" + FACES_SERVLET + "\"]";
+
public static final String JSF_VERSION_2_0 = "2.0";
public static final String JSF_VERSION_1_2 = "1.2";
@@ -108,8 +110,7 @@
Document doc = builder.parse(input);
XPath xpath = XPathFactory.newInstance().newXPath();
- String expression = "//servlet[servlet-class=\"" + FACES_SERVLET +
"\"]";
- XPathExpression expr = xpath.compile(expression);
+ XPathExpression expr = xpath.compile(FACES_SERVLET_XPATH);
hasFacesServlet = null != expr.evaluate(doc, XPathConstants.NODE);
} catch (Exception e) {
Activator.log("An error occured trying to find to "+FACES_SERVLET+"
:"+e.getMessage());
Show replies by date