[jbosstools-commits] JBoss Tools SVN: r31351 - in trunk/maven: plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet and 5 other directories.

Author: snjeza Date: 2011-05-17 14:56:15 -0400 (Tue, 17 May 2011) New Revision: 31351 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/internal/project/facet/MavenFacetInstallDelegate.java trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenLibraryProviderInstallOperation.java 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/configurators/SeamProjectConfigurator.java trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java Log: JBIDE-8955 Upgrade JBoss Maven Integration feature to use m2e 0.13.x M7 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 2011-05-17 15:51:31 UTC (rev 31350) +++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2011-05-17 18:56:15 UTC (rev 31351) @@ -55,11 +55,9 @@ import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderOperationConfig; import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants; import org.eclipse.m2e.core.MavenPlugin; -import org.eclipse.m2e.core.core.IMavenConstants; -import org.eclipse.m2e.core.embedder.IMavenConfiguration; import org.eclipse.m2e.core.embedder.MavenModelManager; +import org.eclipse.m2e.core.internal.IMavenConstants; import org.eclipse.m2e.core.project.IProjectConfigurationManager; -import org.eclipse.m2e.core.project.ResolverConfiguration; import org.eclipse.m2e.jdt.internal.BuildPathManager; import org.eclipse.m2e.model.edit.pom.Dependency; import org.eclipse.m2e.model.edit.pom.PomFactory; Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDelegate.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDelegate.java 2011-05-17 15:51:31 UTC (rev 31350) +++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDelegate.java 2011-05-17 18:56:15 UTC (rev 31351) @@ -28,8 +28,8 @@ import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants; import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils; import org.eclipse.m2e.core.MavenPlugin; -import org.eclipse.m2e.core.core.IMavenConstants; import org.eclipse.m2e.core.embedder.MavenModelManager; +import org.eclipse.m2e.core.internal.IMavenConstants; import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.IDelegate; Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenLibraryProviderInstallOperation.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenLibraryProviderInstallOperation.java 2011-05-17 15:51:31 UTC (rev 31350) +++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenLibraryProviderInstallOperation.java 2011-05-17 18:56:15 UTC (rev 31351) @@ -31,13 +31,10 @@ import org.eclipse.jst.common.project.facet.core.libprov.ILibraryProvider; import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderOperation; import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderOperationConfig; -import org.eclipse.m2e.core.MavenPlugin; -import org.eclipse.m2e.core.core.IMavenConstants; -import org.eclipse.m2e.core.embedder.MavenModelManager; +import org.eclipse.m2e.core.internal.IMavenConstants; import org.eclipse.m2e.model.edit.pom.Model; import org.eclipse.m2e.model.edit.pom.util.PomResourceFactoryImpl; import org.eclipse.m2e.model.edit.pom.util.PomResourceImpl; -import org.eclipse.osgi.util.NLS; import org.eclipse.wst.common.project.facet.core.IFacetedProjectBase; import org.jboss.tools.maven.core.MavenCoreActivator; 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 2011-05-17 15:51:31 UTC (rev 31350) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2011-05-17 18:56:15 UTC (rev 31351) @@ -44,9 +44,11 @@ import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.m2e.core.MavenPlugin; -import org.eclipse.m2e.core.core.IMavenConstants; import org.eclipse.m2e.core.embedder.MavenModelManager; -import org.eclipse.m2e.core.project.MavenProjectManager; +import org.eclipse.m2e.core.internal.IMavenConstants; +import org.eclipse.m2e.core.internal.MavenPluginActivator; +import org.eclipse.m2e.core.internal.project.ResolverConfigurationIO; +import org.eclipse.m2e.core.internal.project.registry.MavenProjectManager; import org.eclipse.m2e.core.project.ResolverConfiguration; import org.eclipse.m2e.model.edit.pom.Configuration; import org.eclipse.m2e.model.edit.pom.Plugin; @@ -961,11 +963,11 @@ location = location.append(parentProjectName); MavenCoreActivator.createMavenProject(parentProjectName, null, model, false, location); // disable workspace resolution - MavenProjectManager projectManager = MavenPlugin.getDefault().getMavenProjectManager(); + MavenProjectManager projectManager = MavenPluginActivator.getDefault().getMavenProjectManager(); IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(parentProjectName); - ResolverConfiguration configuration = projectManager.getResolverConfiguration(project); + ResolverConfiguration configuration = ResolverConfigurationIO.readResolverConfiguration(project); configuration.setResolveWorkspaceProjects(false); - projectManager.setResolverConfiguration(project, configuration); + ResolverConfigurationIO.saveResolverConfiguration(project, configuration); } catch (Exception e) { log(e); } finally { Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java 2011-05-17 15:51:31 UTC (rev 31350) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java 2011-05-17 18:56:15 UTC (rev 31351) @@ -45,11 +45,11 @@ import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater; import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities; -import org.eclipse.m2e.core.MavenPlugin; -import org.eclipse.m2e.core.core.IMavenConstants; +import org.eclipse.m2e.core.internal.IMavenConstants; +import org.eclipse.m2e.core.internal.MavenPluginActivator; +import org.eclipse.m2e.core.internal.project.registry.MavenProjectManager; import org.eclipse.m2e.core.project.IMavenProjectFacade; import org.eclipse.m2e.core.project.MavenProjectChangedEvent; -import org.eclipse.m2e.core.project.MavenProjectManager; import org.eclipse.m2e.core.project.configurator.AbstractProjectConfigurator; import org.eclipse.m2e.core.project.configurator.ProjectConfigurationRequest; import org.eclipse.wst.common.componentcore.ComponentCore; @@ -413,7 +413,7 @@ if (refProject.hasNature(IMavenConstants.NATURE_ID)) { IFile pom = refProject.getFile(IMavenConstants.POM_FILE_NAME); if (pom.exists()) { - MavenProjectManager projectManager = MavenPlugin.getDefault().getMavenProjectManager(); + MavenProjectManager projectManager = MavenPluginActivator.getDefault().getMavenProjectManager(); IMavenProjectFacade facade = projectManager.create(pom, true, null); if(facade!=null) { MavenProject mavenProject = facade.getMavenProject(null); @@ -447,7 +447,7 @@ IFile pom = refProject .getFile(IMavenConstants.POM_FILE_NAME); if (pom.exists()) { - MavenProjectManager projectManager = MavenPlugin + MavenProjectManager projectManager = MavenPluginActivator .getDefault().getMavenProjectManager(); IMavenProjectFacade facade = projectManager.create( pom, true, null); Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java 2011-05-17 15:51:31 UTC (rev 31350) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java 2011-05-17 18:56:15 UTC (rev 31351) @@ -18,8 +18,8 @@ import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants; import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils; import org.eclipse.m2e.core.MavenPlugin; -import org.eclipse.m2e.core.core.IMavenConstants; import org.eclipse.m2e.core.embedder.MavenModelManager; +import org.eclipse.m2e.core.internal.IMavenConstants; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java 2011-05-17 15:51:31 UTC (rev 31350) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java 2011-05-17 18:56:15 UTC (rev 31351) @@ -44,7 +44,7 @@ import org.eclipse.datatools.connectivity.drivers.IPropertySet; import org.eclipse.datatools.connectivity.drivers.PropertySetImpl; import org.eclipse.datatools.connectivity.drivers.models.TemplateDescriptor; -import org.eclipse.m2e.core.core.IMavenConstants; +import org.eclipse.m2e.core.internal.IMavenConstants; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event;