Author: snjeza Date: 2009-08-22 14:07:26 -0400 (Sat, 22 Aug 2009) New Revision: 17228 Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java workspace/snjeza/seam-examples/booking-mavenized-2.1.1.zip Log: https://jira.jboss.org/jira/browse/JBIDE-4655 Mavenized Project Examples and Seam Web Project wizard with JBoss Maven Integration facet don't work when using WTP 3.1 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 2009-08-21 20:24:00 UTC (rev 17227) +++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2009-08-22 18:07:26 UTC (rev 17228) @@ -136,9 +136,15 @@ } if (!project.exists()) { if (location != null) { - IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName()); - desc.setLocation(location); - project.create(desc, monitor); + IPath workspacePath = project.getWorkspace().getRoot().getLocation(); + location = location.makeRelativeTo(workspacePath); + if (projectName.equals(location.toString())) { + project.create(monitor); + } else { + IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName()); + desc.setLocation(location); + project.create(desc, monitor); + } } else { project.create(monitor); } @@ -381,22 +387,25 @@ 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", "/"); //$NON-NLS-1$ //$NON-NLS-2$ + + "-ejb", "/", ejbModuleName ); //$NON-NLS-1$ //$NON-NLS-2$ modules.addChild(ejbProject); Xpp3Dom seamModule = getEarModule("ejbModule", "org.jboss.seam", //$NON-NLS-1$ //$NON-NLS-2$ - "jboss-seam", "/"); //$NON-NLS-1$ //$NON-NLS-2$ + "jboss-seam", "/", null); //$NON-NLS-1$ //$NON-NLS-2$ modules.addChild(seamModule); + String webModuleName = m2FacetModel.getStringProperty(IJBossMavenConstants.ARTIFACT_ID) + ".war"; //$NON-NLS-1$ + Xpp3Dom webProject = getEarModule( "webModule", //$NON-NLS-1$ m2FacetModel.getStringProperty(IJBossMavenConstants.GROUP_ID), m2FacetModel.getStringProperty(IJBossMavenConstants.ARTIFACT_ID), - "/"); //$NON-NLS-1$ + "/", webModuleName); //$NON-NLS-1$ Xpp3Dom contextRoot = new Xpp3Dom("contextRoot"); //$NON-NLS-1$ contextRoot.setValue(m2FacetModel .getStringProperty(IJBossMavenConstants.ARTIFACT_ID)); @@ -404,11 +413,11 @@ modules.addChild(webProject); Xpp3Dom richFacesApi = getEarModule("jarModule", //$NON-NLS-1$ - "org.richfaces.framework", "richfaces-api", "/lib"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + "org.richfaces.framework", "richfaces-api", "/lib", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ modules.addChild(richFacesApi); Xpp3Dom commonDigester = getEarModule("jarModule", //$NON-NLS-1$ - "commons-digester", "commons-digester", "/lib"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + "commons-digester", "commons-digester", "/lib", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ modules.addChild(commonDigester); } plugin.setConfiguration(configuration); @@ -419,7 +428,7 @@ } private static Xpp3Dom getEarModule(String module, - String groupIdString,String artifactIdString, String bundleDirString) { + String groupIdString,String artifactIdString, String bundleDirString, String bundleFileNameString) { Xpp3Dom earModule = new Xpp3Dom(module); //modules.addChild(earModule); Xpp3Dom groupId = new Xpp3Dom("groupId"); //$NON-NLS-1$ @@ -431,6 +440,12 @@ Xpp3Dom bundleDir = new Xpp3Dom("bundleDir"); //$NON-NLS-1$ bundleDir.setValue(bundleDirString); earModule.addChild(bundleDir); + if (bundleFileNameString != null) { + Xpp3Dom bundleFileName = new Xpp3Dom("bundleFileName"); //$NON-NLS-1$ + bundleFileName.setValue(bundleFileNameString); + earModule.addChild(bundleFileName); + + } return earModule; } Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml 2009-08-21 20:24:00 UTC (rev 17227) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml 2009-08-22 18:07:26 UTC (rev 17228) @@ -433,6 +433,7 @@ </configuration> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>2.4.3</version> </plugin> 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 2009-08-21 20:24:00 UTC (rev 17227) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2009-08-22 18:07:26 UTC (rev 17228) @@ -286,7 +286,7 @@ dependency.setArtifactId(ejbProjectName); dependency.setVersion(m2FacetModel.getStringProperty(IJBossMavenConstants.VERSION)); dependency.setType("ejb"); - dependency.setScope("compile"); + dependency.setScope("runtime"); dependencies.add(dependency); dependency = new Dependency(); @@ -294,7 +294,7 @@ dependency.setArtifactId(webProjectName); dependency.setVersion(m2FacetModel.getStringProperty(IJBossMavenConstants.VERSION)); dependency.setType("war"); - dependency.setScope("compile"); + dependency.setScope("runtime"); dependencies.add(dependency); dependency = getSeamDependency(); @@ -373,7 +373,7 @@ model.setBuild(build); MavenCoreActivator.createMavenProject(earProjectName, null, model, true); removeWTPContainers(m2FacetModel, project); - configureApplicationXml(project, m2FacetModel, null); + // configureApplicationXml(project, m2FacetModel, null); //removeRuntime(project); //IProject ejbProject = ResourcesPlugin.getWorkspace().getRoot().getProject(ejbProjectName); //removeRuntime(ejbProject); @@ -558,6 +558,8 @@ dependency = new Dependency(); dependency.setGroupId("org.jboss.seam"); dependency.setArtifactId("jboss-seam-debug"); + // FIXME + dependency.setVersion("${seam.version}"); modelManager.addDependency(pomFile,dependency); Modified: workspace/snjeza/seam-examples/booking-mavenized-2.1.1.zip =================================================================== (Binary files differ)