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

Author: snjeza Date: 2010-11-22 16:02:45 -0500 (Mon, 22 Nov 2010) New Revision: 26829 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/src/org/jboss/tools/maven/seam/MavenSeamActivator.java Log: JBIDE-7699 Mavenized Seam Project ignores changing name of ear, ejb and/or test project 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 2010-11-22 20:01:56 UTC (rev 26828) +++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2010-11-22 21:02:45 UTC (rev 26829) @@ -404,7 +404,7 @@ build.getResources().add(resource); } - public static void addMavenEarPlugin(Build build, IProject project, IDataModel m2FacetModel, boolean addModule) throws JavaModelException { + public static void addMavenEarPlugin(Build build, IProject project, IDataModel m2FacetModel, String ejbArtifactId, boolean addModule) throws JavaModelException { String sourceDirectory = getEarRoot(project); build.setSourceDirectory(sourceDirectory); org.apache.maven.model.Plugin plugin = new org.apache.maven.model.Plugin(); @@ -429,14 +429,15 @@ Xpp3Dom modules = new Xpp3Dom("modules"); //$NON-NLS-1$ configuration.addChild(modules); - String ejbModuleName = m2FacetModel.getStringProperty(IJBossMavenConstants.ARTIFACT_ID) + "-ejb.jar"; //$NON-NLS-1$ - Xpp3Dom ejbProject = getEarModule( - "ejbModule", //$NON-NLS-1$ - m2FacetModel.getStringProperty(IJBossMavenConstants.GROUP_ID), - m2FacetModel.getStringProperty(IJBossMavenConstants.ARTIFACT_ID) - + "-ejb", "/", ejbModuleName ); //$NON-NLS-1$ //$NON-NLS-2$ - modules.addChild(ejbProject); - + if (ejbArtifactId != null) { + String ejbModuleName = ejbArtifactId + ".jar"; //$NON-NLS-1$ + Xpp3Dom ejbProject = getEarModule( + "ejbModule", //$NON-NLS-1$ + m2FacetModel.getStringProperty(IJBossMavenConstants.GROUP_ID), + ejbArtifactId, "/", ejbModuleName); //$NON-NLS-1$ + modules.addChild(ejbProject); + } + Xpp3Dom seamModule = getEarModule("ejbModule", "org.jboss.seam", //$NON-NLS-1$ //$NON-NLS-2$ "jboss-seam", "/", null); //$NON-NLS-1$ //$NON-NLS-2$ modules.addChild(seamModule); 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 2010-11-22 20:01:56 UTC (rev 26828) +++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDelegate.java 2010-11-22 21:02:45 UTC (rev 26829) @@ -100,7 +100,7 @@ if (fpwc .hasProjectFacet(IJ2EEFacetConstants.ENTERPRISE_APPLICATION_FACET)) { MavenCoreActivator.addMavenEarPlugin(build, project, - config, false); + config, null, false); MavenCoreActivator.createMavenProject(project.getName(), monitor, model, true); } 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 2010-11-22 20:01:56 UTC (rev 26828) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2010-11-22 21:02:45 UTC (rev 26829) @@ -75,12 +75,6 @@ private static final String ORG_CODEHAUS_MOJO = "org.codehaus.mojo"; //$NON-NLS-1$ - private static final String TEST_SUFFIX = "-test"; //$NON-NLS-1$ - - private static final String EJB_SUFFIX = "-ejb"; //$NON-NLS-1$ - - private static final String EAR_SUFFIX = "-ear"; //$NON-NLS-1$ - private static final String PARENT_SUFFIX = "-parent"; //$NON-NLS-1$ // The plug-in ID @@ -149,12 +143,12 @@ groupId = m2FacetModel.getStringProperty(IJBossMavenConstants.GROUP_ID); parentProjectName = webProjectName + PARENT_SUFFIX; parentArtifactId = artifactId + PARENT_SUFFIX; - testProjectName = webProjectName + TEST_SUFFIX; - testArtifactId = artifactId + TEST_SUFFIX; - earProjectName = webProjectName + EAR_SUFFIX; - earArtifactId = artifactId + EAR_SUFFIX; - ejbProjectName = webProjectName + EJB_SUFFIX; - ejbArtifactId = artifactId + EJB_SUFFIX; + testProjectName = seamFacetModel.getStringProperty(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT); + testArtifactId = testProjectName; + earProjectName = seamFacetModel.getStringProperty(ISeamFacetDataModelProperties.SEAM_EAR_PROJECT); + earArtifactId = earProjectName; + ejbProjectName = seamFacetModel.getStringProperty(ISeamFacetDataModelProperties.SEAM_EJB_PROJECT);; + ejbArtifactId = ejbProjectName; configureParentProject(m2FacetModel, seamFacetModel); configureWarProject(m2FacetModel, seamFacetModel); configureTestProject(m2FacetModel, seamFacetModel); @@ -482,7 +476,7 @@ build.setSourceDirectory(sourceDirectory); } build.setOutputDirectory("target/classes"); //$NON-NLS-1$ - MavenCoreActivator.addMavenEarPlugin(build, project, m2FacetModel, true); + MavenCoreActivator.addMavenEarPlugin(build, project, m2FacetModel, ejbArtifactId, true); model.setBuild(build); MavenCoreActivator.createMavenProject(earProjectName, null, model, true); removeWTPContainers(m2FacetModel, project);