Author: fbricon Date: 2012-02-03 20:08:31 -0500 (Fri, 03 Feb 2012) New Revision: 38425 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.seam/lifecycle-mapping-metadata.xml Log: JBIDE-10790 : changed the lifecycle-mapping to map the seam configurator for ear projects to the generate-application-xml goal, due to upstream change in m2e-wtp 0.15.0 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 2012-02-03 20:32:26 UTC (rev 38424) +++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2012-02-04 01:08:31 UTC (rev 38425) @@ -292,6 +292,10 @@ public static void addClasspathAttribute(IJavaProject javaProject, IClasspathAttribute attribute, IProgressMonitor monitor) throws JavaModelException { + if (javaProject == null || !javaProject.exists()) { + return; + } + IClasspathEntry[] cp = javaProject.getRawClasspath(); for (int i = 0; i < cp.length; i++) { if (IClasspathEntry.CPE_CONTAINER == cp[i].getEntryKind() 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 2012-02-03 20:32:26 UTC (rev 38424) +++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDelegate.java 2012-02-04 01:08:31 UTC (rev 38425) @@ -88,11 +88,9 @@ // build.setFinalName(artifactId); if (fpwc.hasProjectFacet(JavaFacet.FACET)) { - String outputDirectory = MavenCoreActivator - .getOutputDirectory(javaProject); + String outputDirectory = MavenCoreActivator.getOutputDirectory(javaProject); build.setOutputDirectory(outputDirectory); - String sourceDirectory = MavenCoreActivator - .getSourceDirectory(javaProject); + String sourceDirectory = MavenCoreActivator.getSourceDirectory(javaProject); if (sourceDirectory != null) { build.setSourceDirectory(sourceDirectory); } @@ -113,8 +111,7 @@ MavenCoreActivator.createMavenProject(project.getName(), monitor, model, true); } - IProjectFacet seamFacet = ProjectFacetsManager - .getProjectFacet(SEAM_FACET_ID); + IProjectFacet seamFacet = ProjectFacetsManager.getProjectFacet(SEAM_FACET_ID); if (!fpwc.hasProjectFacet(seamFacet)) { MavenCoreActivator.addCompilerPlugin(build, project); } Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/lifecycle-mapping-metadata.xml =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/lifecycle-mapping-metadata.xml 2012-02-03 20:32:26 UTC (rev 38424) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/lifecycle-mapping-metadata.xml 2012-02-04 01:08:31 UTC (rev 38425) @@ -57,6 +57,7 @@ <artifactId>maven-ear-plugin</artifactId> <versionRange>[1.0,)</versionRange> <goals> + <goal>generate-application-xml</goal> <goal>ear</goal> </goals> </pluginExecutionFilter>