Author: snjeza Date: 2009-07-23 21:26:42 -0400 (Thu, 23 Jul 2009) New Revision: 16757 Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java Log: https://jira.jboss.org/jira/browse/JBIDE-4630 Maven parent project created under workspace even when alternate location specified in New -> Seam Web Project wizard Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2009-07-23 19:45:24 UTC (rev 16756) +++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2009-07-24 01:26:42 UTC (rev 16757) @@ -124,13 +124,23 @@ } public static IProject createMavenProject(String projectName, IProgressMonitor monitor, Model model, boolean force) throws CoreException { + return createMavenProject(projectName, monitor, model, force, null); + } + + public static IProject createMavenProject(String projectName, IProgressMonitor monitor, Model model, boolean force, IPath location) throws CoreException { IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); IProject project = root.getProject(projectName); if (project.exists() && !force ) { return project; } if (!project.exists()) { - project.create(monitor); + if (location != null) { + IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName()); + desc.setLocation(location); + project.create(desc, monitor); + } else { + project.create(monitor); + } project.open(monitor); } IJavaProject javaProject = JavaCore.create(project); Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2009-07-23 19:45:24 UTC (rev 16756) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2009-07-24 01:26:42 UTC (rev 16757) @@ -767,8 +767,12 @@ modules.add("../" + ejbArtifactId); modules.add("../" + earArtifactId); } + webProjectName = seamFacetModel.getStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME); - MavenCoreActivator.createMavenProject(parentProjectName, null, model, false); + IProject seamWebProject = ResourcesPlugin.getWorkspace().getRoot().getProject(webProjectName); + IPath location = seamWebProject.getLocation().removeLastSegments(1); + location = location.append(parentProjectName); + MavenCoreActivator.createMavenProject(parentProjectName, null, model, false, location); // disable workspace resolution MavenProjectManager projectManager = MavenPlugin.getDefault().getMavenProjectManager(); IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(parentProjectName);