Author: snjeza Date: 2009-06-23 14:46:07 -0400 (Tue, 23 Jun 2009) New Revision: 16152 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/src/org/jboss/tools/maven/seam/MavenSeamActivator.java Log: https://jira.jboss.org/jira/browse/JBIDE-3874 Maven integration 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-06-23 18:44:15 UTC (rev 16151) +++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2009-06-23 18:46:07 UTC (rev 16152) @@ -124,9 +124,8 @@ } if (!hasJavaNature) { // EAR project - createFolder("src",monitor, project); - createFolder("src/main",monitor,project); - IFolder binFolder = createFolder("src/main/application",monitor, project); + createFolder("target",monitor, project); + IFolder binFolder = createFolder("target/classes",monitor, project); String[] newNatureIds = new String[natureIds.length + 1]; for (int i = 0; i < natureIds.length; i++) { newNatureIds[i]=natureIds[i]; @@ -338,6 +337,9 @@ Xpp3Dom defaultLibBundleDir = new Xpp3Dom("defaultLibBundleDir"); defaultLibBundleDir.setValue("lib"); configuration.addChild(defaultLibBundleDir); + Xpp3Dom earSourceDirectory = new Xpp3Dom("earSourceDirectory"); + earSourceDirectory.setValue(sourceDirectory); + configuration.addChild(earSourceDirectory); if (addModule) { Xpp3Dom modules = new Xpp3Dom("modules"); 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-06-23 18:44:15 UTC (rev 16151) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2009-06-23 18:46:07 UTC (rev 16152) @@ -352,13 +352,13 @@ Build build = new Build(); try { - //build.setFinalName(earProjectName); + build.setFinalName(earProjectName); String sourceDirectory = MavenCoreActivator.getEarRoot(project); if (sourceDirectory != null) { build.setSourceDirectory(sourceDirectory); } - build.setOutputDirectory("src/main/application"); + build.setOutputDirectory("target/classes"); MavenCoreActivator.addMavenEarPlugin(build, project, m2FacetModel, true); model.setBuild(build); MavenCoreActivator.createMavenProject(earProjectName, null, model, true);