[jbosstools-commits] JBoss Tools SVN: r20420 - in trunk/maven/plugins: org.jboss.tools.maven.seam/META-INF and 1 other directories.

Author: snjeza Date: 2010-02-22 13:51:16 -0500 (Mon, 22 Feb 2010) New Revision: 20420 Modified: trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF trunk/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/JSFProjectConfigurator.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/PortletProjectConfigurator.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java Log: https://jira.jboss.org/jira/browse/JBIDE-5899 Maven integration NPE's Modified: trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF 2010-02-22 17:11:05 UTC (rev 20419) +++ trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF 2010-02-22 18:51:16 UTC (rev 20420) @@ -12,17 +12,18 @@ org.eclipse.wst.common.frameworks;visibility:=reexport, org.eclipse.jst.common.frameworks;visibility:=reexport, org.eclipse.wst.common.modulecore;visibility:=reexport, - org.maven.ide.eclipse;visibility:=reexport, - org.maven.ide.eclipse.maven_embedder;visibility:=reexport, + org.maven.ide.eclipse;bundle-version="0.10.0";visibility:=reexport, + org.maven.ide.eclipse.maven_embedder;bundle-version="0.10.0";visibility:=reexport, org.eclipse.jdt.core;visibility:=reexport, - org.maven.ide.eclipse.jdt;visibility:=reexport, + org.maven.ide.eclipse.jdt;bundle-version="0.10.0";visibility:=reexport, org.eclipse.jst.j2ee;visibility:=reexport, org.eclipse.jst.j2ee.web;visibility:=reexport, org.jboss.tools.common;visibility:=reexport, org.eclipse.jdt.launching;visibility:=reexport, org.eclipse.ui.workbench;visibility:=reexport, - org.maven.ide.eclipse.maven_model_edit;visibility:=reexport, - org.eclipse.core.expressions + org.maven.ide.eclipse.maven_model_edit;bundle-version="0.10.0";visibility:=reexport, + org.eclipse.core.expressions, + org.maven.ide.eclipse.wtp;bundle-version="0.10.0";visibility:=reexport Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %Bundle-Vendor Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF 2010-02-22 17:11:05 UTC (rev 20419) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF 2010-02-22 18:51:16 UTC (rev 20420) @@ -12,7 +12,7 @@ org.jboss.tools.portlet.core, org.jboss.tools.seam.ui, org.jboss.tools.common.model, - org.maven.ide.eclipse.maven_model_edit, + org.maven.ide.eclipse.maven_model_edit;bundle-version="0.10.0";visibility:=reexport, org.eclipse.jst.j2ee.core, org.eclipse.jst.j2ee, org.eclipse.wst.common.emfworkbench.integration, Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/JSFProjectConfigurator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/JSFProjectConfigurator.java 2010-02-22 17:11:05 UTC (rev 20419) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/JSFProjectConfigurator.java 2010-02-22 18:51:16 UTC (rev 20420) @@ -71,7 +71,7 @@ String jsfVersion = getJSFVersion(mavenProject); if (jsfVersion != null) { final IFacetedProject fproj = ProjectFacetsManager.create(project); - if ("war".equals(packaging)) { //$NON-NLS-1$ + if (fproj != null && "war".equals(packaging)) { //$NON-NLS-1$ installWarFacets(fproj, jsfVersion, monitor); } } Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/PortletProjectConfigurator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/PortletProjectConfigurator.java 2010-02-22 17:11:05 UTC (rev 20419) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/PortletProjectConfigurator.java 2010-02-22 18:51:16 UTC (rev 20420) @@ -78,7 +78,7 @@ String jsfportletVersion = MavenSeamActivator.getDefault().getDependencyVersion(mavenProject, PORTLETBRIDGE_API_GROUP_ID, PORTLETBRIDGE_API_ARTIFACT_ID); if (portletVersion != null) { final IFacetedProject fproj = ProjectFacetsManager.create(project); - if ("war".equals(packaging)) { //$NON-NLS-1$ + if (fproj != null && "war".equals(packaging)) { //$NON-NLS-1$ installWarFacets(fproj, portletVersion, jsfportletVersion, monitor); } } 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 2010-02-22 17:11:05 UTC (rev 20419) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java 2010-02-22 18:51:16 UTC (rev 20420) @@ -148,6 +148,9 @@ deploying = "ear"; //$NON-NLS-1$ } final IFacetedProject fproj = ProjectFacetsManager.create(project); + if (fproj == null) { + return; + } if ("war".equals(packaging)) { //$NON-NLS-1$ IDataModel model = createSeamDataModel(deploying, seamVersion, project); installWarFacets(fproj, model, seamVersion, monitor);