Author: fbricon Date: 2012-02-07 09:35:37 -0500 (Tue, 07 Feb 2012) New Revision: 38464 Modified: trunk/maven/plugins/org.jboss.tools.maven.jpa/lifecycle-mapping-metadata.xml trunk/maven/plugins/org.jboss.tools.maven.jpa/src/org/jboss/tools/maven/jpa/configurators/JpaProjectConfigurator.java trunk/maven/plugins/org.jboss.tools.maven.jpa/src/org/jboss/tools/maven/jpa/configurators/MavenResourceLocator.java Log: JBIDE-10750 : cleanup Modified: trunk/maven/plugins/org.jboss.tools.maven.jpa/lifecycle-mapping-metadata.xml =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jpa/lifecycle-mapping-metadata.xml 2012-02-07 14:31:09 UTC (rev 38463) +++ trunk/maven/plugins/org.jboss.tools.maven.jpa/lifecycle-mapping-metadata.xml 2012-02-07 14:35:37 UTC (rev 38464) @@ -9,7 +9,6 @@ <versionRange>[2.0,)</versionRange> <goals> <goal>compile</goal> - <goal>testCompile</goal> </goals> </pluginExecutionFilter> <action> Modified: trunk/maven/plugins/org.jboss.tools.maven.jpa/src/org/jboss/tools/maven/jpa/configurators/JpaProjectConfigurator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jpa/src/org/jboss/tools/maven/jpa/configurators/JpaProjectConfigurator.java 2012-02-07 14:31:09 UTC (rev 38463) +++ trunk/maven/plugins/org.jboss.tools.maven.jpa/src/org/jboss/tools/maven/jpa/configurators/JpaProjectConfigurator.java 2012-02-07 14:35:37 UTC (rev 38464) @@ -81,7 +81,7 @@ MavenUtil.refreshParent(request.getMavenProject()); configureFacets(monitor, project, facetedProject, persistenceXml); - } + } } private void configureFacets(IProgressMonitor monitor, IProject project, Modified: trunk/maven/plugins/org.jboss.tools.maven.jpa/src/org/jboss/tools/maven/jpa/configurators/MavenResourceLocator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jpa/src/org/jboss/tools/maven/jpa/configurators/MavenResourceLocator.java 2012-02-07 14:31:09 UTC (rev 38463) +++ trunk/maven/plugins/org.jboss.tools.maven.jpa/src/org/jboss/tools/maven/jpa/configurators/MavenResourceLocator.java 2012-02-07 14:35:37 UTC (rev 38464) @@ -32,12 +32,12 @@ import org.eclipse.jpt.common.core.internal.resource.SimpleJavaResourceLocator; import org.eclipse.jpt.common.core.internal.resource.WebModuleResourceLocator; import org.eclipse.jpt.common.core.resource.ResourceLocator; -import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils; import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.internal.IMavenConstants; import org.eclipse.m2e.core.project.IMavenProjectFacade; import org.eclipse.wst.common.componentcore.ModuleCoreNature; import org.eclipse.wst.common.project.facet.core.IFacetedProject; +import org.eclipse.wst.common.project.facet.core.IProjectFacet; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; /** @@ -49,6 +49,8 @@ public class MavenResourceLocator implements ResourceLocator { private static IPath META_INF_PATH = new Path("META-INF"); + + private static final IProjectFacet WEB_FACET = ProjectFacetsManager.getProjectFacet("jst.web"); /** * Accepts all resources not under the build output and test build output @@ -69,6 +71,7 @@ } } else { // Maven project not loaded yet, fallback to default behaviour. + //System.err.println(project + " not loaded"); accept = getDelegate(project).acceptResourceLocation(project, container); } // Sometimes src/main/resources/META-INF is not even sent immediately to @@ -84,7 +87,7 @@ if (ModuleCoreNature.isFlexibleProject(project)) { try { IFacetedProject facetedProject = ProjectFacetsManager.create(project); - if (facetedProject != null && facetedProject.hasProjectFacet(WebFacetUtils.WEB_FACET)) { + if (facetedProject != null && facetedProject.hasProjectFacet(WEB_FACET)) { return new WebModuleResourceLocator(); } } catch (CoreException e) { @@ -131,8 +134,7 @@ // System.err.println("getResourcePath (" + project + ", " + runtimePath // + ") = " + resourcePath); if (resourcePath == null) { - resourcePath = getDelegate(project).getResourcePath(project, - runtimePath); + resourcePath = getDelegate(project).getResourcePath(project, runtimePath); } return resourcePath; } @@ -197,12 +199,13 @@ * Returns the cached IMavenProjectFacade in m2e's project registry */ private IMavenProjectFacade getMavenProjectFacade(IProject project) { - return MavenPlugin.getMavenProjectRegistry().create(project.getFile(IMavenConstants.POM_FILE_NAME), true, new NullProgressMonitor()); + return MavenPlugin.getMavenProjectRegistry().create(project.getFile(IMavenConstants.POM_FILE_NAME), + true, + new NullProgressMonitor()); } public IPath getRuntimePath(IProject project, IPath resourcePath) { IPath runtimePath = getDelegate(project).getRuntimePath(project, resourcePath); - System.err.println("getRuntimePath("+resourcePath+") ="+ runtimePath); return runtimePath; } } \ No newline at end of file