Author: scabanovich Date: 2007-08-27 08:03:23 -0400 (Mon, 27 Aug 2007) New Revision: 3344 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHelper.java trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectCreationOperation.java Log: JBIDE-850 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHelper.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHelper.java 2007-08-27 12:02:51 UTC (rev 3343) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHelper.java 2007-08-27 12:03:23 UTC (rev 3344) @@ -94,7 +94,7 @@ XModelObject webinf = FileSystemsHelper.getWebInf(model); File webInfDir = ((IResource)webinf.getAdapter(IResource.class)).getLocation().toFile(); libName = (new File(libLocation).getParentFile().equals(webInfDir)) - ? "%redhat.workspace%/lib/" : libLocation.replace('\\', '/')+"/"; + ? XModelConstants.WORKSPACE_REF + "/lib/" : libLocation.replace('\\', '/')+"/"; for (int i = 0; i < fs.length; i++) { String jarName = fs[i].getName(); if(!jarName.endsWith(".jar")) continue; Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectCreationOperation.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectCreationOperation.java 2007-08-27 12:02:51 UTC (rev 3343) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectCreationOperation.java 2007-08-27 12:03:23 UTC (rev 3344) @@ -35,7 +35,6 @@ import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.util.FileUtil; import org.jboss.tools.common.model.ui.ModelUIPlugin; -import org.jboss.tools.jst.web.WebModelPlugin; import org.jboss.tools.jst.web.context.RegisterTomcatContext; import org.jboss.tools.jst.web.model.helpers.WebAppHelper; import org.jboss.tools.jst.web.project.helpers.IWebProjectTemplate; @@ -121,10 +120,10 @@ text = text.substring(0, i) + "\"./" + getProject().getName() + "/WebContent/WEB-INF\"" + text.substring(i + match.length()); } - match = "%redhat.workspace%/classes"; + match = XModelConstants.WORKSPACE_REF + "/classes"; i = text.indexOf(match); if(i >= 0) { - String replace = "%redhat.workspace%/../../../.deployables/" + getProject().getName() + "/WEB-INF/classes"; + String replace = XModelConstants.WORKSPACE_REF + "/../../../.deployables/" + getProject().getName() + "/WEB-INF/classes"; text = text.substring(0, i) + replace + text.substring(i + match.length()); } @@ -138,6 +137,7 @@ p.putAll(System.getProperties()); String workspace = new ProjectHome().getLocation(templateLocation); p.setProperty(XModelConstants.WORKSPACE, workspace); + p.setProperty(XModelConstants.WORKSPACE_OLD, workspace); p.setProperty(IModelNature.ECLIPSE_PROJECT, templateLocation); templateModel = XModelFactory.getModel(p); }