Author: scabanovich Date: 2007-08-27 08:02:24 -0400 (Mon, 27 Aug 2007) New Revision: 3342 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/LibrariesPerformer.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/facet/PostInstallJsfFacetDelegate.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/AdoptJSFProjectFinisher.java Log: JBIDE-850 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/LibrariesPerformer.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/LibrariesPerformer.java 2007-08-27 12:01:30 UTC (rev 3341) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/LibrariesPerformer.java 2007-08-27 12:02:24 UTC (rev 3342) @@ -116,7 +116,7 @@ XModelObject webinf = FileSystemsHelper.getWebInf(model); File webInfDir = ((IResource)webinf.getAdapter(IResource.class)).getLocation().toFile(); libName = (location.getParentFile().equals(webInfDir)) - ? "%redhat.workspace%/lib/" : location.getAbsolutePath().replace('\\', '/')+"/"; + ? XModelConstants.WORKSPACE_REF + "/lib/" : location.getAbsolutePath().replace('\\', '/')+"/"; CapabilityPerformer pp = (CapabilityPerformer)getParent(); String capability = pp.capability.getAttributeValue("name"); Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/facet/PostInstallJsfFacetDelegate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/facet/PostInstallJsfFacetDelegate.java 2007-08-27 12:01:30 UTC (rev 3341) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/facet/PostInstallJsfFacetDelegate.java 2007-08-27 12:02:24 UTC (rev 3342) @@ -15,6 +15,7 @@ import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.IDelegate; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; +import org.jboss.tools.common.model.XModelConstants; import org.jboss.tools.common.model.util.EclipseResourceUtil; /** @@ -75,14 +76,14 @@ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<FILESYSTEMS APPLICATION_NAME=\"{0}\" ENTITY=\"FileSystems\"" + " VERSION=\"2.0.0\" WORKSPACE_HOME=\"./{1}/WEB-INF\">" + - "<FILESYSTEM ENTITY=\"FileSystemFolder\" LOCATION=\"%redhat.workspace%\" NAME=\"WEB-INF\"/>" + + "<FILESYSTEM ENTITY=\"FileSystemFolder\" LOCATION=\"" + XModelConstants.WORKSPACE_REF + "\" NAME=\"WEB-INF\"/>" + "<FILESYSTEM ENTITY=\"FileSystemFolder\" INFO=\"Content-Type=Web\"" + - " LOCATION=\"%redhat.workspace%/..\" NAME=\"WEB-ROOT\"/>" + + " LOCATION=\"" + XModelConstants.WORKSPACE_REF + "/..\" NAME=\"WEB-ROOT\"/>" + "<FILESYSTEM ENTITY=\"FileSystemFolder\"" + - " LOCATION=\"%redhat.workspace%/../../{2}\" NAME=\"src\"/>" + - "<FILESYSTEM ENTITY=\"FileSystemFolder\" LOCATION=\"%redhat.workspace%/lib\" NAME=\"lib\"/>" + + " LOCATION=\"" + XModelConstants.WORKSPACE_REF + "/../../{2}\" NAME=\"src\"/>" + + "<FILESYSTEM ENTITY=\"FileSystemFolder\" LOCATION=\"" + XModelConstants.WORKSPACE_REF + "/lib\" NAME=\"lib\"/>" + "<FILESYSTEM ENTITY=\"FileSystemFolder\"" + - " LOCATION=\"%redhat.workspace%/classes\" NAME=\"classes\"/>" + + " LOCATION=\"" + XModelConstants.WORKSPACE_REF + "/classes\" NAME=\"classes\"/>" + "<WEB ENTITY=\"JstWeb\" MODEL_PATH=\"/web.xml\" SERVLET_VERSION=\"2.4\">" + " <MODULE ENTITY=\"WebJSFModule\" MODEL_PATH=\"/faces-config.xml\"" + " ROOT=\"WEB-ROOT\" SRC=\"src\" URI=\"/WEB-INF/faces-config.xml\"/>" + Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/AdoptJSFProjectFinisher.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/AdoptJSFProjectFinisher.java 2007-08-27 12:01:30 UTC (rev 3341) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/AdoptJSFProjectFinisher.java 2007-08-27 12:02:24 UTC (rev 3342) @@ -18,6 +18,7 @@ import java.util.Map; import org.jboss.tools.common.model.XModel; +import org.jboss.tools.common.model.XModelConstants; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.util.FileUtil; import org.jboss.tools.jst.web.context.IImportWebProjectContext; @@ -82,7 +83,7 @@ } private void createWebInfFileSystem() { - getOrCreateFileSystem("WEB-INF", "%redhat.workspace%", true); + getOrCreateFileSystem("WEB-INF", XModelConstants.WORKSPACE_REF, true); } private void createWebXMLFileSystem() { @@ -90,7 +91,7 @@ String webxmlfolder = webxml.getParent(); String relative = getRelativePath(workspace, webxmlfolder); if(relative == null || relative.startsWith("/..")) { - String loc = (relative == null) ? webxmlfolder : "%redhat.workspace%" + relative; + String loc = (relative == null) ? webxmlfolder : XModelConstants.WORKSPACE_REF + relative; getOrCreateFileSystem("web-xml", loc, true); web.setAttributeValue("model path", "/" + webxml.getName()); } else { @@ -197,7 +198,7 @@ public static String getFileSystemLocation(String rootpath, String path) { path = path.replace('\\', '/'); String relative = getRelativePath(rootpath, path); - return (relative == null) ? path : "%redhat.workspace%" + relative; + return (relative == null) ? path : XModelConstants.WORKSPACE_REF + relative; } }